452 Commits

Author	SHA1	Message	Date
Rohan Mitchell	ea17e475a6	When viewing enterprise fees, only show those for the enterprise I select	2013-10-18 14:44:01 +11:00
Rohan Mitchell	91f14dcd4c	Enterprise manager can create/edit enterprise fees	2013-10-18 13:56:22 +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	c07c52085a	Enterprise user can view and create shipping methods	2013-10-18 09:35:53 +11:00
Rohan Mitchell	e6041aaf2f	Enterprise user can view, create and edit payment methods	2013-10-18 09:09:53 +11:00
Rohan Mitchell	05932a69cd	Adjust checkout spec for shipping method HABTM distributors	2013-10-17 12:30:26 +11:00
Rohan Mitchell	358ca25f31	Admin can assign multiple distributors to a shipping method	2013-10-17 11:16:26 +11:00
Rohan Mitchell	d480e96d7a	Do not add an extra product which confuses other tests	2013-10-16 17:38:39 +11:00
Rohan Mitchell	e29497c5b4	Enterprise users can bulk edit inactive products	2013-10-16 16:57:20 +11:00
Rohan Mitchell	751801653e	Bulk product update with >25 products succeeds	2013-10-16 14:36:22 +11:00
Rohan Mitchell	30bc45370b	When order cycle expires mid-order, clear the order cycle and display a message	2013-09-30 16:56:11 +10:00
Rohan Mitchell	935229fa09	On order show / confirmation page, show correct pickup time for order cycle pickup	2013-09-30 14:53:28 +10:00
Rohan Mitchell	57aa10a6f6	Fix specs for time zone change	2013-09-30 11:40:05 +10:00
Rohan Mitchell	f5b56617a0	As an enterprise user, when I create an enterprise, I should have management permission for it	2013-09-30 11:10:20 +10:00
Rohan Mitchell	208ffb3317	Fix commented-out order cycle specs	2013-09-27 16:02:06 +10:00
Rohan Mitchell	dac49d1044	Order cycle-aware pickup time	2013-09-27 11:17:24 +10:00
Rohan Mitchell	c9e543b25a	Update delivery page of checkout, change shipping to delivery	2013-09-19 13:40:49 +10:00
David Cook	fe513d42c4	Rename 'Order Cycles' report group to 'Orders & Fulfillment'	2013-09-18 09:25:51 +10:00
Rohan Mitchell	8a849b8e47	When selecting hub, auto-select order cycle if there is only one option available	2013-09-17 10:20:14 +10:00
Rohan Mitchell	c2f1f0986b	Fix broken specs	2013-09-16 14:30:46 +10:00
Rohan Mitchell	f0381f7579	Fix problems with spree_last_address - upgrade gem to a newer version, add a spec around it	2013-09-16 14:11:00 +10:00
David Cook	4f9c7fb601	Remove distributor_id from payment method and update tests	2013-09-13 16:58:19 +10:00
Rohan Mitchell	b8376a040f	Remove superfluous manual change triggers	2013-09-10 12:57:49 +10:00
Rohan Mitchell	a136161dd6	When showing enterprise, do not show enterprise name when we're in this enterprise - fix duplicate name in header	2013-09-10 12:57:35 +10:00
Rohan Mitchell	0e8443e118	Rename 'Change Pick-up Date' to 'Change Collection Date'. Fix this to clear the cart. Do not clear distributor when setting Order.order_cycle to nil.	2013-09-10 11:28:49 +10:00
Rohan Mitchell	64a3a309f5	Change 'pick-up date' to 'available on', provide absolute dates in options	2013-09-10 09:16:23 +10:00
Rohan Mitchell	d32a8b56d0	When order cycle is selected, only show variants that are in it	2013-09-09 10:40:15 +10:00
Rohan Mitchell	33d1948bda	Display log in / sign up links on landing page	2013-09-06 13:44:35 +10:00
alexs333	80bb55496b	Temporarily disabling some tests.	2013-09-05 14:18:40 +10:00
alexs333	999bc2697a	Implemented simlified shop flow.	2013-09-04 20:33:18 +10:00
David Cook	6a303d7db9	Merge branch 'enterprise-reports' ... Conflicts: app/models/spree/ability_decorator.rb	2013-08-30 16:27:13 +10:00
Rohan Mitchell	911d8b8bbc	Shipping method has a distributor, admin can create and edit	2013-08-30 11:43:45 +10:00
Rohan Mitchell	314e464c3f	Add failing spec for admin creatin a shipping method owned by a distributor	2013-08-27 10:53:59 +10:00
Rohan Mitchell	6a5d819fa6	Enterprise manager can create an order	2013-08-27 10:05:55 +10:00
David Cook	9de5a0061e	Enterprise user can only view their own distributors in reports (and remove redundant feature test)	2013-08-23 16:09:37 +10:00
Rohan Mitchell	4f8014306e	Admin can't change distributor or order cycle once order has been finalized	2013-08-23 14:00:31 +10:00
Rohan Mitchell	2cab83cb29	Admin create order can set distributor and order cycle	2013-08-23 14:00:31 +10:00
Rohan Mitchell	8a092697ee	Enterprise manager can clone an order cycle	2013-08-22 17:11:53 +10:00
Rohan Mitchell	f1fa90d7c3	Clone order cycles	2013-08-22 16:53:11 +10:00
Rohan Mitchell	f870e70560	Enterprise manager can edit and bulk edit enterprises they have access to	2013-08-22 11:40:33 +10:00
Rohan Mitchell	aab7176f2c	Enterprise manager can bulk edit products	2013-08-22 11:21:49 +10:00
David Cook	b41f6234db	Test to filter report by order cycle	2013-08-21 17:23:55 +10:00
alexs	01ad4a04a4	Bumped up the sleep time in the spec.	2013-08-21 16:26:08 +10:00
alexs	a623e2dee6	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-21 16:05:29 +10:00
alexs	8b4c0682fb	Replaced eaterprises logo with the distributor name header.	2013-08-21 16:05:06 +10:00
David Cook	b2878ddc40	Payment Method must belong to a Distributor	2013-08-21 15:14:01 +10:00
alexs	845f7bb8d7	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-21 10:50:08 +10:00
alexs	f6983078a2	Removed search box and distributor/supplier sidebar from the hub page.	2013-08-21 10:49:43 +10:00
Rohan Mitchell	31a078a53c	Enterprise manager can access enterprise fees for enterprises they manage - fixes fees on order cycles interface	2013-08-20 16:26:46 +10:00
Rohan Mitchell	673c0dca36	Fix varying shipping amounts	2013-08-20 16:26:46 +10:00