183 Commits

Author	SHA1	Message	Date
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	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	450a1e49c2	Do not 500 when add to cart fails	2013-09-23 14:15:53 +10:00
Rohan Mitchell	4956a4e384	Only geocode addresses associated with enterprises. Makes Checkout#update much faster.	2013-09-19 16:56:48 +10:00
David Cook	0183b0f2c1	Fix bulk update of order cycles for enterprise users	2013-09-19 15:48:39 +10:00
David Cook	2df2096d74	Sort payment and shipping methods by distributor name	2013-09-19 15:21:14 +10:00
David Cook	2e13abf933	Show only orders I am distributing	2013-09-19 15:21:14 +10:00
Rohan Mitchell	c9e543b25a	Update delivery page of checkout, change shipping to delivery	2013-09-19 13:40:49 +10:00
David Cook	402ed01207	Refactor/cleanup	2013-09-19 12:12:50 +10:00
David Cook	fe513d42c4	Rename 'Order Cycles' report group to 'Orders & Fulfillment'	2013-09-18 09:25:51 +10:00
Rohan Mitchell	2f73161421	Move patch to address class - much simpler	2013-09-18 07:14:21 +10:00
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
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
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
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
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	e15e9a1476	Charge order cycle fees	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
Andrew Spinks	0a39fb87a5	Fix multi-cart association and add some temporary multi-cart support into the current front end.	2013-08-14 10:49:54 +10:00
David Cook	6c4ace8d14	Ensure that all PaymentMethod-derived classes also allow distributor_id	2013-08-13 10:57:36 +10:00
David Cook	98d520f0e3	Filter PaymentMethods by distributor	2013-08-13 10:55:52 +10:00