257 Commits

Author	SHA1	Message	Date
Rohan Mitchell	56590e2f4a	Instrument saving spree addresses with invalid values in an attempt to track down the cause of some invalid records finding their way into the database	2013-09-17 18:06:06 +10:00
Rohan Mitchell	a929312979	Add scope: OrderCycle.with_distributor	2013-09-17 09:54:21 +10:00
David Cook	4f9c7fb601	Remove distributor_id from payment method and update tests	2013-09-13 16:58:19 +10:00
David Cook	ee9d9a36d5	Make distributor payment method multi-select	2013-09-13 12:03:37 +10:00
David Cook	107c6978c2	Create many-to-many relationship between payment method and distributor	2013-09-13 10:25:25 +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	d32a8b56d0	When order cycle is selected, only show variants that are in it	2013-09-09 10:40:15 +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	b0abe566eb	Comments	2013-08-30 16:28:02 +10:00
David Cook	6a303d7db9	Merge branch 'enterprise-reports' ... Conflicts: app/models/spree/ability_decorator.rb	2013-08-30 16:27:13 +10:00
David Cook	80bfc5ce53	Ensure Supplier enterprise users can only view their own products in reports	2013-08-30 15:17:27 +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	72136a59ae	Remove permission dupliation, fixes accessible_by errors when accessing admin backend	2013-08-27 10:19:54 +10:00
Rohan Mitchell	6a5d819fa6	Enterprise manager can create an order	2013-08-27 10:05:55 +10:00
Rohan Mitchell	2e1de9a6d3	Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210), fix nil state error	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
David Cook	3d32e6480b	Enterprise user can access all OFN reports	2013-08-22 13:07:17 +10:00
David Cook	3a75f6b86a	Enterprise user can access all OFN reports	2013-08-22 11:49:18 +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	b2878ddc40	Payment Method must belong to a Distributor	2013-08-21 15:14:01 +10:00
Rohan Mitchell	1a328e9567	Simplify syntax	2013-08-20 16:26:46 +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	fb33b853dd	Revert payment method changes that broke the build: 5f7cbe3, 5a3ad8e, 3ffe732, 2d305b5, 08babee, 6f73f41, 77329b5, 4be2fe5	2013-08-20 10:47:56 +10:00
Rohan Mitchell	562365311e	Lock enterprise fee adjustments on creation to avoid them being recalculated against order by update hooks	2013-08-19 14:38:51 +10:00
David Cook	3ffe732b30	Ensure valid payment method is selected	2013-08-19 13:57:40 +10:00
David Cook	2d305b59d9	Only show payment methods for the distributor of the order	2013-08-19 13:57:40 +10:00
David Cook	08babeed65	Payment Method must have one Distributor	2013-08-19 13:57:40 +10:00
David Cook	77329b5532	Allow user to delete their enterprises' own payment methods	2013-08-19 13:57:40 +10:00
Rohan Mitchell	ba4d3d5d7d	Removing a product from cart removes its fees	2013-08-19 12:19:03 +10:00
Rohan Mitchell	80d6e3b87f	Do not charge for distributor fees for a distributor you're not checking out with	2013-08-19 10:41:14 +10:00
Rohan Mitchell	7a75898b2b	Find exchanges going to/from any number of enterprises	2013-08-19 10:41:14 +10:00
Rohan Mitchell	e15e9a1476	Charge order cycle fees	2013-08-19 10:41:14 +10:00
Rohan Mitchell	dfd1a89975	Test whether exchanges are incoming	2013-08-19 10:41:14 +10:00
Rohan Mitchell	9563aad9fa	Find exchanges with a particular variant	2013-08-19 10:41:14 +10:00
Rohan Mitchell	1d23446c40	ProductDistribution validates_presence_of enterprise fee, check no longer required	2013-08-19 10:41:14 +10:00
Rohan Mitchell	591f6a8a57	Move ProductDistribution#clear_all_enterprise_fee_adjustments_for to EnterpriseFee class	2013-08-19 10:41:14 +10:00
Andrew Spinks	38522e2b74	Fix order cycle permissions for enterprise user.	2013-08-18 19:41:04 +10:00
Andrew Spinks	82726d032c	Add enterprise roles for order cycles.	2013-08-16 11:34:07 +10:00
Rohan Mitchell	552cecb2e0	Find incoming and outgoing exchanges	2013-08-16 10:22:29 +10:00
alexs	4e715f62a2	Moved limit into the model.	2013-08-16 09:53:40 +10:00
alexs	a7256611cf	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-15 16:54:47 +10:00
alexs	cfffced652	Fixed the bug in the enterprise geo search.	2013-08-15 16:33:41 +10:00
Andrew Spinks	fdaa5364a1	Add controller action for adding products to multi cart via javascript API.	2013-08-15 15:36:35 +10:00
alexs	d3842b2d8d	Further compressed the landing page image to make it really light.	2013-08-15 11:34:48 +10:00
Andrew Spinks	d5791657f3	Support multiple orders when adding a product to a cart.	2013-08-14 10:49:55 +10:00
Andrew Spinks	dd3aaccf9f	When adding a variant to a cart, split into multiple orders depending on the distributors that it contains.	2013-08-14 10:49:55 +10:00
Andrew Spinks	59fce8a964	Show line items for each order in multi-cart.	2013-08-14 10:49:55 +10:00