Rohan Mitchell
|
a355a09a7c
|
Disable distributor change in checkout until it takes order cycles into account
|
2013-06-17 11:45:23 +10:00 |
|
Rohan Mitchell
|
b5479380b6
|
Refactor alternative distributors at checkout form, fixing indentation and removed double negatives
|
2013-06-17 11:41:35 +10:00 |
|
Rohan Mitchell
|
6d22f56c86
|
Distribution selection form is not shown when there are products in the cart.
This form doesn't filter options based on which can supply the products in the cart,
so don't show it in those circumstances.
|
2013-06-17 11:29:36 +10:00 |
|
Rohan Mitchell
|
95de78f24e
|
Tidy-ups
|
2013-06-17 10:03:00 +10:00 |
|
Rohan Mitchell
|
bfe8184b6a
|
Reload order before setting variant attributes, fixes group buy
|
2013-06-17 10:02:49 +10:00 |
|
Rohan Mitchell
|
4e5f0b9963
|
Set potential distributor and order cycle before attempting add to cart, revert on failure
|
2013-06-14 14:57:08 +10:00 |
|
Rohan Mitchell
|
5e120b35aa
|
Ensure orders controller decorator is loaded, fixes home controller test failures
|
2013-06-13 07:57:03 +10:00 |
|
Rohan Mitchell
|
4bcae29553
|
Add specs for OrderPopulator#check_distribution_provided_for and distribution_provided_for
|
2013-06-05 15:50:20 +10:00 |
|
Rohan Mitchell
|
f4df69765d
|
Add spec for OrderPopulator#distributor_can_supply_products_in_cart
|
2013-06-05 15:09:11 +10:00 |
|
Rohan Mitchell
|
fb4f533976
|
Refactor OrderPopulator, add outside level spec
|
2013-06-05 14:44:57 +10:00 |
|
Rohan Mitchell
|
98f3197c08
|
WIP Move orders#populate logic to OrderPopulator class
|
2013-06-05 11:47:47 +10:00 |
|
Rohan Mitchell
|
f91e1144e0
|
Name blank order cycle option
|
2013-06-04 11:11:13 +10:00 |
|
Rohan Mitchell
|
661ce4e597
|
Add to cart page does not allow the user to add a product from an order cycle that cannot supply the cart's products
|
2013-06-04 10:26:13 +10:00 |
|
Rohan Mitchell
|
cb703c2a66
|
Do not give order cycle choice when there is only one option
|
2013-05-28 16:35:39 +10:00 |
|
Rohan Mitchell
|
54fe63e7f3
|
User can add subsequent order cycles product to cart, show order cycle selection in page header along with distributor
|
2013-05-28 16:20:58 +10:00 |
|
Rohan Mitchell
|
1f9f5efb79
|
Add first product to cart with order cycle choice
|
2013-05-28 14:06:52 +10:00 |
|
Rohan Mitchell
|
9ef7da1339
|
Add OrderCycle#distributed_variants
|
2013-05-28 14:01:04 +10:00 |
|
Rohan Mitchell
|
3bedfc3d1d
|
Add OrderCycle distributing_product scope
|
2013-05-28 13:27:52 +10:00 |
|
Rohan Mitchell
|
1b25364160
|
Cherry-pick c3b2f52: Cache DistributorChangeValidator#all_available_distributors, move Enterprise#available_variants into SQLland - massive render speed improvement
Conflicts:
app/models/enterprise.rb
lib/open_food_web/distribution_change_validator.rb
|
2013-05-28 13:01:07 +10:00 |
|
Rohan Mitchell
|
0e08829a29
|
Rename DistributorChangeValidator to DistributionChangeValidator in preparation for expansion to include order cycles
|
2013-05-28 12:32:52 +10:00 |
|
Rohan Mitchell
|
02561ee252
|
With order cycle distribution, show error message when adding a product to cart with no distribution chosen
|
2013-05-28 11:54:46 +10:00 |
|
Rohan Mitchell
|
a2abcaf7bd
|
Push product_compatible_with_current_order and available_distributors_for down to DistributorChangeValidator, add tests
|
2013-05-27 13:50:33 +10:00 |
|
Rohan Mitchell
|
612e6aed2c
|
Include order cycle distributions in distributor choice when adding product to cart
|
2013-05-27 13:12:29 +10:00 |
|
Rohan Mitchell
|
e3a419993c
|
Work around order cycles not having fees / shipping methods yet - notify bugsnag and provide an undefined shipping method
|
2013-05-27 13:00:12 +10:00 |
|
Rohan Mitchell
|
796be2ee6d
|
Refactor add to cart form into partials and helpers
|
2013-05-27 11:25:09 +10:00 |
|
Rohan Mitchell
|
ff9200ebb8
|
Display order cycle distributors on product details page
|
2013-04-12 13:18:40 +10:00 |
|
Rohan Mitchell
|
6e7ee6481d
|
Fetch enterprises that are distributing a product via a product or order cycle distribution
|
2013-04-12 10:13:04 +10:00 |
|
Rohan Mitchell
|
32629a27e7
|
Remove explicit class specification
|
2013-04-05 16:57:53 +11:00 |
|
Rohan Mitchell
|
f66ff0f8b1
|
Rename Enterprise#available_variants to distributed_variants to remove ambiguity between supplied/distributed variants
|
2013-04-05 16:51:51 +11:00 |
|
Rohan Mitchell
|
5649a50e28
|
Add tests around Enterprise#available_variants, make it also show variants distributed via an order cycle
|
2013-04-05 16:49:27 +11:00 |
|
Rohan Mitchell
|
ad32147576
|
Display correct product splitting criteria
|
2013-04-05 14:30:35 +11:00 |
|
Rohan Mitchell
|
0874f12797
|
Controllers provide current order cycle for product splitting
|
2013-04-05 14:30:11 +11:00 |
|
Rohan Mitchell
|
3aa48907a6
|
Add per-product tests for membership of distributor or order cycle
|
2013-04-05 12:45:01 +11:00 |
|
Rohan Mitchell
|
f8ebb0c715
|
Rename split partial and update overrides
|
2013-04-05 11:34:03 +11:00 |
|
Rohan Mitchell
|
11ac0a1277
|
Fix order cycle selection on products page
|
2013-04-05 11:26:47 +11:00 |
|
Rohan Mitchell
|
b3976bfbd0
|
Rename SplitProductsByDistributor to SplitProductsByDistribution
|
2013-04-05 11:08:19 +11:00 |
|
Rohan Mitchell
|
7cc24f7340
|
Handle the case where we're viewing a product from a remote distributor that we can change to
|
2013-04-05 10:28:08 +11:00 |
|
Rohan Mitchell
|
1d7cf4436a
|
Add comments linking areas concerned with separating products by distributor and order cycle
|
2013-03-15 17:02:54 +11:00 |
|
Rohan Mitchell
|
a9a58db137
|
Add spec for viewing product counts when both a distributor and an order cycle are selected, scope Spree::Product.with_order_cycles_outer joins to avoid clash when using both in_distributor and in_order_cycle in the same query
|
2013-03-15 12:17:29 +11:00 |
|
Rohan Mitchell
|
bcd545c13f
|
Alias spree_variants join to avoid name clash when loading products for home page
|
2013-03-08 17:21:18 +11:00 |
|
Rohan Mitchell
|
955f313abc
|
Remove require for queries_product_distribution
|
2013-03-08 16:59:47 +11:00 |
|
Rohan Mitchell
|
c9d1573049
|
Remove placeholder scopes, use new Enterprise.active_distributors scope for loading sidebar distributors
|
2013-03-08 16:56:58 +11:00 |
|
Rohan Mitchell
|
b25dcaa92b
|
Enterprise.active_distributors doesn't show distributors from inactive order cycles
|
2013-03-08 16:54:22 +11:00 |
|
Rohan Mitchell
|
2a890f80f4
|
Enterprise.active_distributors doesn't show distributors of out of stock products
|
2013-03-08 16:48:35 +11:00 |
|
Rohan Mitchell
|
13abf9ada7
|
Enterprise.active_distributors doesn't show distributors of unavailable products
|
2013-03-08 16:46:25 +11:00 |
|
Rohan Mitchell
|
cd61bad0b9
|
Enterprise.active_distributors doesn't show distributors of deleted products
|
2013-03-08 16:43:45 +11:00 |
|
Rohan Mitchell
|
00d7fcbfb6
|
Enterprise.active_distributors finds active distributors by order cycles
|
2013-03-08 16:39:42 +11:00 |
|
Rohan Mitchell
|
977344e279
|
Rewrite scope with outer join
|
2013-03-08 16:31:54 +11:00 |
|
Rohan Mitchell
|
98cad56e7c
|
Enterprise.active_distributors finds active distributors by product distributions
|
2013-03-08 16:23:45 +11:00 |
|
Rohan Mitchell
|
69392100f9
|
Push QueriesProductDistribution.products_available_for back to model
|
2013-03-08 15:18:53 +11:00 |
|