10 Commits

Author	SHA1	Message	Date
Rohan Mitchell	22230294ab	Merge branch 'master' into optimise-shopfront	2015-06-03 10:07:42 +10:00
Rohan Mitchell	97e49c2bdb	Replace 'array.sort.should == expected.sort' pattern with match_array	2015-05-28 10:46:08 +10:00
Rohan Mitchell	f0e909c92b	Look up the shipping services (pickup, delivery) that different hubs provide	2015-05-27 15:44:01 +10:00
Will Marshall	cc3fb27490	Restoring the old checkout, but NOW our new checkout is broken	2014-03-06 16:16:00 +11:00
Rohan Mitchell	5f4d787d26	Fix sorting error in spec	2014-01-08 14:43:46 +11:00
Rohan Mitchell	48f18a93de	Order shipping methods by name, not distributor	2013-11-07 16:25:43 +11:00
Rohan Mitchell	bd112c64b0	Fix edit enterprise link to point to edit page, fix spec breakages	2013-10-18 15:39:58 +11:00
Rohan Mitchell	3b5e6f5742	When viewing shipping methods, only show those for the distributor I select	2013-10-18 10:01:11 +11:00
Rohan Mitchell	93cb845ee2	DB and model changes to make ShippingMethod distributor habtm	2013-10-17 11:15:43 +11:00
Rohan Mitchell	8654f23a19	Move spree model decorator specs into their own dir to mirror model dir layout	2013-10-17 09:53:54 +11:00