204 Commits

Author	SHA1	Message	Date
Rohan Mitchell	7a8bd16083	On enterprise page, do not display products outside of the outgoing exchange	2013-11-15 15:08:45 +11:00
Rohan Mitchell	59935619e3	Rename OrderCycle#distributed_variants_by to variants_distributed_by	2013-11-15 14:34:05 +11:00
Rohan Mitchell	52b6c33aaa	When converting an exchange to a hash for comparison, ensure id lists are sorted - ordering issues should not indicate inequality	2013-11-15 12:09:26 +11:00
Will Marshall	2ce687fc79	Adding variant update permissions to Enterprise users	2013-11-14 11:53:14 +11:00
Rohan Mitchell	27b8c4508f	Split product distribution editing into its own admin page	2013-11-13 15:22:17 +11:00
Rohan Mitchell	48f18a93de	Order shipping methods by name, not distributor	2013-11-07 16:25:43 +11:00
Will Marshall	f0d335a454	Fixing up the failing spec for distributor changes, reworking a method to SharedHelper	2013-11-07 11:47:05 +11:00
Rohan Mitchell	04387aa6b7	Scope time since last oc expired to distributor	2013-11-06 16:17:36 +11:00
Will Marshall	9f150c8d87	Adding a small display on the distributor page indicating when the next order cycle is, if any - BugHerd#127	2013-11-01 16:12:31 +11:00
Will Marshall	b8fcfbd72b	Test and implementation: dropping inclusion of product_distributions from active Distributors on front page - BugHerd#125	2013-11-01 14:48:23 +11:00
Rohan Mitchell	758676c1ea	When visiting supplier page without selecting a distributor, provide choice of distributors that distribute their products	2013-10-31 14:49:26 +11:00
Rohan Mitchell	647e1d196c	Position enterprise groups	2013-10-30 14:46:49 +11:00
Rohan Mitchell	7f6f725e02	Find enterprise groups on the front page	2013-10-30 13:54:11 +11:00
Rohan Mitchell	e78815c2d3	Create models for EnterpriseGroups	2013-10-30 10:42:32 +11:00
Rohan Mitchell	fb22b5e2b7	When there are no order cycles open, display an 'orders closed' message	2013-10-24 10:32:30 +11:00
Rohan Mitchell	57f7d489ff	Rename OpenFoodWeb namespace to OpenFoodNetwork	2013-10-18 17:29:55 +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	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	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
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	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	01036ec730	Add LineItem#supplied_by scope, fixes orders and fulfillment report supplier filtering	2013-09-27 14:11:12 +10:00
Rohan Mitchell	dac49d1044	Order cycle-aware pickup time	2013-09-27 11:17:24 +10:00
Rohan Mitchell	68fe20c37a	Add scope: Exchange.with_product	2013-09-23 17:39:16 +10:00
Rohan Mitchell	19349c805f	Destroy supplied products when a supplier is destroyed	2013-09-23 14:58:26 +10:00
Rohan Mitchell	450a1e49c2	Do not 500 when add to cart fails	2013-09-23 14:15:53 +10:00
Rohan Mitchell	08941ae22b	Data integrity	2013-09-19 11:22:55 +10:00
David Cook	5ec3c1831d	Only show order cycles that the user has access to in reports drop-down	2013-09-18 09:26:50 +10:00
Rohan Mitchell	2f73161421	Move patch to address class - much simpler	2013-09-18 07:14:21 +10:00
Rohan Mitchell	a929312979	Add scope: OrderCycle.with_distributor	2013-09-17 09:54:21 +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	644beeb093	Revert "Fix test fail" ... This reverts commit 1de0f85c73.	2013-09-09 10:55:40 +10:00
Rohan Mitchell	1de0f85c73	Fix test fail	2013-09-09 10:41:28 +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
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	25b25b7681	New scope Order.not_state to filter out cancelled orders from reports	2013-08-30 17:07:17 +10:00
David Cook	bf3c5c6dd6	Merge branch 'master' into reports-completed-only ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb	2013-08-30 16:42:00 +10:00
Rohan Mitchell	cace60b187	Shipping methods are only shown at checkout if their distributor matches the order	2013-08-30 12: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	9824e1b9c5	Make spec more precise and robust - query was finding outgoing instead of incoming exchange	2013-08-27 10:41:02 +10:00
Rohan Mitchell	6a5d819fa6	Enterprise manager can create an order	2013-08-27 10:05:55 +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