7 Commits

Author	SHA1	Message	Date
Rohan Mitchell	02b524bfce	Fix our monkey-patch of spree's order merging to accomodate orders having an order cycle	2013-04-05 15:00:42 +11:00
Rob H	c956706d78	Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test	2013-02-14 15:12:50 +11:00
Rohan Mitchell	58d227e76a	Home controller and product model specs pass	2012-11-01 08:28:40 +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	5411685c83	Split products by local/remote distributor: logic	2012-06-24 07:36:56 +10:00