Commit Graph

26 Commits

Author SHA1 Message Date
Rob H
6a45e8be3b Make tests pass after changes to checkout broke them all 2013-01-18 15:29:36 +11:00
Rohan Mitchell
34588e6141 Remove old supplier and distributor routes, models, controllers, views, specs 2012-11-01 09:55:45 +11:00
Rohan Mitchell
58d227e76a Home controller and product model specs pass 2012-11-01 08:28:40 +11:00
Rohan Mitchell
9d5c127f0d Add enterprises controller that supercedes suppliers and distributors controllers. Add to cart consumer spec passes. 2012-10-31 16:47:01 +11:00
Rohan Mitchell
a8f4178894 Update orders controller for enterprises 2012-10-31 16:33:38 +11:00
Rohan Mitchell
15e91f7743 WIP Move non-admin non-Spree controllers out of Spree namespace 2012-10-25 10:45:39 +11:00
Rohan Mitchell
2535e3965b When merging orders, set distributor when target order distributor is nil 2012-10-09 08:42:29 +11:00
Rohan Mitchell
568d948cbe Destroy incomplete orders if they can't be merged, prevents that order unexpectedly appearing in cart after checkout. Also ensure all orders have a shipping method. 2012-10-05 12:09:53 +10:00
Rohan Mitchell
27b7d59f46 BaseController does not attempt to merge incomplete and current orders when they have differing distributors 2012-10-02 09:44:51 +10:00
Rohan Mitchell
a1b5102476 Fix checkout totals, also amend factories for valid test shipping method data 2012-09-21 12:35:01 +10:00
Rohan Mitchell
3794c00856 Upgrade Rails to 3.2.8 and Spree to 1.1.3 2012-09-14 10:20:52 +10:00
Rohan Mitchell
2db2fbcade Change set_variant_attribute to set_variant_attributes, implement it on Order 2012-08-02 14:45:27 +10:00
Rohan Mitchell
ea05f05576 When adding a group buy product to the cart, set the max quantity on the order 2012-08-02 14:29:05 +10:00
Rohan Mitchell
5e04032797 Explicitly specify Spree 1.1.1, fix test regression in OrdersController 2012-07-23 18:48:30 +10:00
Rohan Mitchell
98bcc9ce71 When adding first product to cart, add the product and set the distributor even if the order has a different distributor set 2012-06-25 06:57:24 +10:00
Rohan Mitchell
df831a9128 Do not add the product to cart if the chosen distributor is different from the order's distributor 2012-06-24 20:14:07 +10:00
Rohan Mitchell
4481ca83f9 OrdersController does not permit adding products with invalid distributors 2012-06-24 19:58:09 +10:00
Rohan Mitchell
24ad4f53fc Raise error if distributor changed illegally 2012-06-24 19:23:44 +10:00
Rohan Mitchell
7b92fcb614 Do not allow deselecting distributor after product added to cart at controller level 2012-06-24 14:56:27 +10:00
Rohan Mitchell
d3c80e99fc Do not allow changing distributor after product added to cart at controller level 2012-06-24 14:54:48 +10:00
Rohan Mitchell
056733a426 Add controller spec for deselecting distributors 2012-06-24 13:48:55 +10:00
Rohan Mitchell
3219006423 Push several request specs down to controller level, replace with scenario. Set order's distributor when adding product to cart 2012-06-24 13:21:36 +10:00
Rohan Mitchell
fc5795173e Do not add the product to cart if the user specifies a distributor that the product is not available at 2012-06-24 12:56:47 +10:00
Rohan Mitchell
99d6f0baa9 Require a distributor when adding a product to the cart 2012-06-24 12:13:33 +10:00
Rohan Mitchell
5411685c83 Split products by local/remote distributor: logic 2012-06-24 07:36:56 +10:00
Rohan Mitchell
03b87225d0 Add spec for selecting a distributor, add distributor to order model, add controller method for selecting distributor 2012-06-22 11:25:32 +10:00