2043 Commits

Author	SHA1	Message	Date
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
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
Rohan Mitchell	290607b5bf	CrUD for order cycle exchange fees	2013-08-16 10:22:29 +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	03b36bb14b	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-12 17:35:36 +10:00
alexs	f2f507c5c7	Suburb auto-complete functionality for the new landing page.	2013-08-12 17:34:56 +10:00
Rohan Mitchell	d7cce918f5	Instead of protecting shipping methods from destruction when referenced by product distributions, protect enterprise fees	2013-08-12 14:22:11 +10:00
Rohan Mitchell	f1485bf9c5	Remove shipping method from product distribution in factory.	2013-08-12 14:21:39 +10:00
Rohan Mitchell	af6b16ecc4	Admin can assign enterprise fees to product distributions	2013-08-12 11:05:00 +10:00
Rohan Mitchell	7ea1122833	Make spec naming consistent	2013-08-12 10:13:31 +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	f1dbc03401	Use correct amount for order total in spec	2013-08-06 13:47:17 +10:00
Rohan Mitchell	8fdf0b6ff9	Fix payment not being captured due to being to small to cover order's distribution fee	2013-08-06 13:47:17 +10:00
Rohan Mitchell	ec3e00c128	Refactor LineItem and clients for new fields	2013-08-06 13:47:17 +10:00
alexs	57e185af78	Merge branch 'landing_page'	2013-08-06 12:35:06 +10:00
alexs	17f9a4645a	Added login to the landing page.	2013-08-06 12:34:22 +10:00
David Cook	7a92d99817	Remove unnecessary test on editing product (now tested under cancan abilities)	2013-08-06 11:12:06 +10:00
Andrew Spinks	9d32a5775a	Enterprise user admin: only allow suppliers and distributors that we manage to be selected when creating and editing products.	2013-08-02 16:08:10 +10:00
Andrew Spinks	269294612d	Add product tests for an enterprise user.	2013-08-02 14:01:45 +10:00
Andrew Spinks	0bb4f676e1	Add permissions to enterprise users so they can manage their own products.	2013-08-02 11:51:25 +10:00
Andrew Spinks	65617e0e77	Add enterprise roles for a user and wire up interface.	2013-08-01 10:32:50 +10:00
Rohan Mitchell	c64944d11a	Fix test	2013-07-30 17:32:53 +10:00
Rohan Mitchell	d64bcf0e94	Remove coordinator fees	2013-07-30 11:55:21 +10:00
Rohan Mitchell	24b957dc57	Process coordinator fees before submit to Rails to use _ids field. Add ng spec for OrderCycle.update. Add acceptance specs for create/edit/update coordinator fees.	2013-07-30 11:34:10 +10:00
Rohan Mitchell	43474d6408	Display coordinator fees on admin edit order cycle	2013-07-30 11:34:10 +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
alexs	fadb1e4710	Merge branch 'master' of github.com:eaterprises/openfoodweb ... Conflicts: Gemfile	2013-07-23 18:02:28 +10:00
alexs	37a88a1be6	Changed JavaScript driver from selenium to phantomjs.	2013-07-23 17:54:05 +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