Commit Graph

653 Commits

Author SHA1 Message Date
Rohan Mitchell
bc40b2c856 Test each distinct distributor/order cycle invalid combination case 2013-06-21 11:06:21 +10:00
Rohan Mitchell
3386da4b4c Validate distribution combination for new products added to cart 2013-06-21 10:39:08 +10:00
Rohan Mitchell
cfcc8c3fb2 Fix DistributionChangeValidator#variants_available_for_distribution: Do not show products distributed through a different order cycle 2013-06-21 10:34:39 +10:00
Rohan Mitchell
69019859da Refactor views 2013-06-20 15:14:23 +10:00
Rohan Mitchell
b8d0e3f49a OrderPopulator decorator checks cart contents against order cycle as well as distributor 2013-06-20 15:13:59 +10:00
Rohan Mitchell
12fb43e268 DistributionChangeValidator returns an empty array when distributor and order cycle are both nil 2013-06-17 16:01:10 +10:00
Rohan Mitchell
1d977de328 Order validation performed over both product distribution and order cycle distribution 2013-06-17 15:06:41 +10:00
Rohan Mitchell
705af41684 DistributionChangeValidator finds variants distributed by product distribution when order cycle is nil 2013-06-17 15:06:20 +10:00
Rohan Mitchell
be29974dd8 DistributionChangeValidator checks if an order can change to a specified new distributION 2013-06-17 15:00:19 +10:00
Rohan Mitchell
27b5dc071a Order cycle reports on the variants distributed by a particular distributor 2013-06-17 14:58:13 +10:00
Rohan Mitchell
17103a8b0c Remove DistributionChangeValidator#can_change_distributor? method 2013-06-17 14:00:39 +10:00
Rohan Mitchell
da02cb5a93 Reorder specs 2013-06-17 12:05:46 +10:00
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
065ea6a1a1 Remove controller specs that are now covered by OrderPopulator 2013-06-14 14:57:31 +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
1e0491e90f Add spec for OrderPopulator#check_variant_available_under_distributor 2013-06-05 16:00:17 +10:00
Rohan Mitchell
e90077bb09 Add spec for OrderPopulator#order_cycle_required_for 2013-06-05 15:54:45 +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
3724a67d16 Add spec for OrderPopulator#set_cart_distributor_and_order_cycle 2013-06-05 15:04:42 +10:00
Rohan Mitchell
bfc300a3c2 Add spec for OrderPopulator#load_distributor_and_order_cycle 2013-06-05 15:01:52 +10:00
Rohan Mitchell
437da7425c Add spec for OrderPopulator#attempt_cart_add 2013-06-05 14:55:56 +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
6670c9543b Remove spork
Conflicts:

	Gemfile
	Gemfile.lock
2013-06-04 14:04:26 +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
fbac41b060 Add DistributionChangeValidator#available_order_cycles, analagous to available_distributors 2013-05-28 13:51:52 +10:00
Rohan Mitchell
fb5c050b48 Refactor DistributionChangeValidator#available_distributors specs 2013-05-28 13:44:17 +10:00
Rohan Mitchell
11755346ce DistributionChangeValidator finds available order cycles for a product 2013-05-28 13:40:13 +10:00
Rohan Mitchell
3bedfc3d1d Add OrderCycle distributing_product scope 2013-05-28 13:27:52 +10:00
Rohan Mitchell
46fd94eded Fix minor test fail 2013-05-28 13:01:48 +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
881bceb4d1 Fill in some missing / incorrect test cases for add to cart 2013-05-27 18:40:06 +10:00
Rohan Mitchell
7b332d0f53 Re-group add to cart specs 2013-05-27 18:12:59 +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
a21783c814 Allow changing distributor when there are alternate distributors available that can service the cart's order 2013-05-27 13:11:30 +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