1343 Commits

Author	SHA1	Message	Date
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	d43df754d3	Load correct products on enterprise and product listing pages	2013-09-10 10:36:13 +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	3ac4bd3b5f	Hide adjustments in cart by default, show by click	2013-09-09 14:37:36 +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	4f64679de7	Simplified shop flow.	2013-09-04 20:33:18 +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
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	61e5ec24e7	Generalise ModelClassFromControllerName	2013-08-30 15:21:30 +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
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	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	02089541cd	Syntax tweaks	2013-08-23 14:00:31 +10:00
David Cook	078bd033b6	Refactor authorisation to play nice with Spree instead of patching it (thanks to Rohan's suggestions)	2013-08-23 13:25:42 +10:00
David Cook	1bfb54f310	Refactor authorisation to play nice with Spree instead of patching it (thanks to Rohan's suggestions)	2013-08-23 13:25:10 +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
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	f5b326ee1a	Fixed the bug where search gets cleared after user clicks inside the suburb input field.	2013-08-21 12:04:35 +10:00
alexs	acfb1bd600	Making sure that only distributor enterprises are displayed on the landing page.	2013-08-21 12:03:44 +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	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	fa459c0395	Summarise distribution charges: order confirm page and email	2013-08-20 16:26:46 +10:00
alexs	dd9b6b344f	Changed links to point to the shopfront urls (that set the distributor).	2013-08-20 15:31:43 +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	7b5eca3a50	Fix error when generating checkout email when distributor_info is nil	2013-08-20 09:19:23 +10:00
alexs	8f67f385b7	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-19 17:37:49 +10:00
alexs	f160e051e5	Added new temporary landing page.	2013-08-19 17:37:22 +10:00
Rohan Mitchell	0458f7a6bb	Summarise distribution fees in checkout after cart page	2013-08-19 17:02:02 +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