592 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	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	a929312979	Add scope: OrderCycle.with_distributor	2013-09-17 09:54:21 +10:00
Rohan Mitchell	c2f1f0986b	Fix broken specs	2013-09-16 14:30:46 +10:00
Rohan Mitchell	b032bc0420	Add commented-out code for debugging specs that are otherwise thwarted by poltergeist's timeout	2013-09-16 14:13:07 +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	91550ac82f	Move distributor config to its own file, re-enable pry for tests	2013-09-10 09:50:16 +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	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
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	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	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	314e464c3f	Add failing spec for admin creatin a shipping method owned by a distributor	2013-08-27 10:53:59 +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
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
David Cook	f1c2582e65	WIP: Test for enterprise user access in reports	2013-08-22 12:49:39 +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
Rohan Mitchell	fa459c0395	Summarise distribution charges: order confirm page and email	2013-08-20 16:26:46 +10:00
alexs	fdf80cac5e	Adjusted specs to accommodate for new (temporary) landing page.	2013-08-20 16:14:29 +10:00
alexs	7061d0c53e	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-20 11:06:06 +10:00
alexs	18d60a1643	Fixed specs broken by new temp landing page (take 1).	2013-08-20 11:05:06 +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	8dd602f9de	Remove pry from spec	2013-08-20 09:19:38 +10:00