743 Commits

Author	SHA1	Message	Date
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
alexs	a8a0c0513e	Fixed id duplication for login and sign up forms.	2013-08-14 11:12:36 +10:00
alexs	e90ccef337	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-13 11:40:54 +10:00
David Cook	725766d82e	Feature tests for PaymentMethod in admin and checkout	2013-08-13 10:57:36 +10:00
Rohan Mitchell	b71f7eec3d	Fix spec for charges by adjustment not shipping method	2013-08-13 09:11:26 +10:00
Rohan Mitchell	b5d324ec8c	Drop itemwise shipping method use in tests	2013-08-13 09:11:25 +10:00
Rohan Mitchell	b7ea03f7fc	Remove distributor fees table at checkout, pending design of new breakdown	2013-08-13 09:11:25 +10:00
alexs	f2f507c5c7	Suburb auto-complete functionality for the new landing page.	2013-08-12 17:34:56 +10:00
alexs	653525e9b0	Updated the spec to reflect the field name change.	2013-08-11 17:19:17 +10:00
alexs	3b4c02865f	Tests for logging in from the new landing page.	2013-08-09 13:16:58 +10:00
Rohan Mitchell	ec3e00c128	Refactor LineItem and clients for new fields	2013-08-06 13:47:17 +10:00
alexs	17f9a4645a	Added login to the landing page.	2013-08-06 12:34:22 +10:00
Rohan Mitchell	7640eb497a	Merge branch 'supplied-active-products-on-hand' ... Conflicts: app/controllers/application_controller.rb app/models/enterprise.rb app/views/spree/products/_source_sidebar.html.haml spec/features/consumer/distributors_spec.rb spec/models/enterprises_spec.rb	2013-07-29 11:05:42 +10:00
Rohan Mitchell	863236b827	Remove speculative test	2013-07-29 09:47:28 +10:00
David Cook	6265dfc80d	remove block commented code	2013-07-29 09:29:23 +10:00
Rohan Mitchell	1d5e970b47	Fix test regressions with multiple 'Save and Continue' buttons in checkout	2013-07-23 17:48:54 +10:00
Rohan Mitchell	dd97768947	Merge branch 'move-save-checkout-button' ... Conflicts: spec/features/consumer/checkout_spec.rb	2013-07-23 17:03:00 +10:00
Rohan Mitchell	638d7b1c33	Stylistic changes, extract commented code to private method	2013-07-23 17:02:06 +10:00