14 Commits

Author	SHA1	Message	Date
Will Marshall	ed6bb2275a	Fixing some regressions in tests, switching favicons	2014-06-26 15:04:32 +10:00
Will Marshall	a3b5ba2257	Adding a spec for visiblity filtering	2014-05-13 16:38:52 +10:00
Will Marshall	f9b7b602da	Moving from darkswarm to home	2014-04-24 16:53:00 +10:00
Rohan Mitchell	3a2394675f	Rename OrderCycle#expired? to #closed?	2013-11-22 11:08:42 +11:00
Rohan Mitchell	e3307623dd	When order cycle expires, clear cart and display a message (from BaseController)	2013-10-23 17:16:07 +11:00
Rohan Mitchell	c5228c9ad2	Fix home controller for oc hit by global before_filter	2013-09-30 17:22:55 +10:00
Rohan Mitchell	5fac29d2ed	Do not merge current and incomplete orders when logging in - fixes #20	2013-08-14 10:44:02 +10:00
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