210 Commits

Author	SHA1	Message	Date
Will Marshall	3c37696882	Adding specs and implementation: moving current distributor to new empty order after checkout	2013-11-06 12:35:22 +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	217f1b58ad	Fix spec broken by 8595839	2013-10-31 13:49:57 +11:00
Rohan Mitchell	32889715f0	Grey out hubs that have no products available for distribution and are not in an order cycle	2013-10-30 16:09:18 +11:00
Rohan Mitchell	521ed565b4	Modify specs to create enterprise groups where needed	2013-10-30 13:56:10 +11:00
Rohan Mitchell	57a450b0aa	Load landing page distributors from enterprise groups instead of yaml file	2013-10-30 13:55:47 +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	b8320a9bb6	Rename some directives and internal login details	2013-10-19 09:45:38 +11:00
Rohan Mitchell	05932a69cd	Adjust checkout spec for shipping method HABTM distributors	2013-10-17 12:30:26 +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	c9e543b25a	Update delivery page of checkout, change shipping to delivery	2013-09-19 13:40:49 +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	c2f1f0986b	Fix broken specs	2013-09-16 14:30:46 +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	64a3a309f5	Change 'pick-up date' to 'available on', provide absolute dates in options	2013-09-10 09:16:23 +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
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	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
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	64c9d4254a	Fix spec failures - enterprise fee calculator type change, distributor info rich text tests, summarised distribution fee at checkout	2013-08-19 17:28:00 +10:00
Rohan Mitchell	0458f7a6bb	Summarise distribution fees in checkout after cart page	2013-08-19 17:02:02 +10:00
David Cook	5a3ad8e68b	Remove test for payment method with no distributor	2013-08-19 16:19:18 +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
Rohan Mitchell	a9b70e67df	Change to using flat rate per item calculators - per-order is confusing when used against line items	2013-08-19 14:38:51 +10:00
Rohan Mitchell	c1f9d9789d	Extract table test to private method	2013-08-19 12:29:26 +10:00
Rohan Mitchell	ba4d3d5d7d	Removing a product from cart removes its fees	2013-08-19 12:19:03 +10:00
Rohan Mitchell	6c24c0ef68	Make specs more resilient and less context-sensitive	2013-08-19 11:10:00 +10:00
Rohan Mitchell	24cd5209d6	Do not error when attempting to mix product and order cycle distribution	2013-08-19 10:41:14 +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	5ffd56aad7	Re-write spec with new fee display at checkout	2013-08-19 10:41:14 +10:00