12629 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	27c17d6b07	Test that enterprise user can't access other enterprises' products	2013-08-06 11:22:44 +10:00
David Cook	0a7c5d4992	Add cancan ability tests on enterprise user roles	2013-08-06 11:12:37 +10:00
David Cook	7a92d99817	Remove unnecessary test on editing product (now tested under cancan abilities)	2013-08-06 11:12:06 +10:00
David Cook	fd8fc480dc	Always show supplier form for enterprise user again (list is now filtered according to enterprise_roles)	2013-08-06 10:56:31 +10:00
David Cook	2347acc2c1	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-06 09:23:30 +10:00
alexs	24d559cd3a	Merge branch 'master' into landing_page ... Conflicts: db/schema.rb db/seeds.rb	2013-08-05 17:08:39 +10:00
alexs	38b0a581e0	New landing page - initial layout and functionality	2013-08-05 17:04:56 +10:00
David Cook	a2b612e723	Add clone and destroy product access for enterprise users	2013-08-05 15:21:20 +10:00
David Cook	c40d694a15	Output correct task name	2013-08-05 15:20:35 +10:00
Andrew Spinks	b0d9596489	Fix bug with available on translation - seemed to be getting overridden.	2013-08-05 10:00:47 +10:00
Andrew Spinks	e75021d7bd	Fix loading of products for an enterprise in the admin section. NOTE: this is a major hack - had to copy the current fetch data from the spree product_controller and modify it to get the roles to take affect. There must be a better way.	2013-08-02 18:13:42 +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	5bccd38b5e	Fix tests - don't have feature toggle overrides on when running tests!	2013-08-01 15:37:42 +10:00
Andrew Spinks	46474ea4cc	Prevent order cycle validations on orders when feature toggled off.	2013-08-01 15:01:47 +10:00
Andrew Spinks	287bd57a4e	Fix loading of initial data to ensure there is an itemwise shipping method.	2013-08-01 10:52:06 +10:00
Andrew Spinks	65617e0e77	Add enterprise roles for a user and wire up interface.	2013-08-01 10:32:50 +10:00
Andrew Spinks	4f5679aac3	Add EnterpriseRole model and link up to users and enterprises.	2013-08-01 10:32:49 +10:00
Andrew Spinks	5810503068	Move test data seeding into separate rake task. Add new role to seeds file.	2013-08-01 10:31:58 +10:00
Rohan Mitchell	c64944d11a	Fix test	2013-07-30 17:32:53 +10:00
Rohan Mitchell	4a893fd548	Style	2013-07-30 13:49:38 +10:00
Rohan Mitchell	4a0e35deef	Clear coordinator fees when coordinator changes	2013-07-30 13:46:30 +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	dc7f8986a0	Click to add coordinator fee	2013-07-30 11:34:10 +10:00
Rohan Mitchell	ae0f82b479	Display only coordinator fees belonging to the selected coordinator	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	13a1809d6c	Load enterprise fees in controllers	2013-07-30 11:34:10 +10:00
Rohan Mitchell	93e7ac53ad	Add EnterpriseFee service for order cycles admin	2013-07-30 11:34:10 +10:00
Rohan Mitchell	f613da30d0	Output order cycle coordinator fees in JSON	2013-07-30 11:34:10 +10:00
Rohan Mitchell	a19a43da79	Add blank enterprise fees in js rather than in controller	2013-07-30 11:34:10 +10:00
Rohan Mitchell	122b9b5617	Make order cycle coordinator fees many-to-many	2013-07-30 11:34:10 +10:00
alexs	bb9368a1b2	Listed dependecy on PhantomJS.	2013-07-29 18:20:34 +10:00
Andrew Spinks	d107786614	Make sure the payment details are shown prominently in the checkout screen.	2013-07-29 16:29:27 +10:00
Rohan Mitchell	dcc23078ff	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-07-29 11:52:06 +10:00
Rohan Mitchell	36a124c10e	Fix merge issues: DCV name change and application controller var name issues.	2013-07-29 11:49:43 +10:00
alexs	285353fb9a	Updated copyright info.	2013-07-29 11:13:48 +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
Andrew Spinks	5adab948c9	Re-instate old order checkout behaviour.	2013-07-26 14:30:54 +10:00
Andrew Spinks	1797933501	Remove xvfb from travis deploy. Should no longer be required.	2013-07-25 14:13:06 +10:00
Andrew Spinks	6c18c5c65f	Fix bulk product edit so that it works with products with a blank available_on field.	2013-07-25 13:51:37 +10:00
Andrew Spinks	39536b2a13	And another dependency getting lost.	2013-07-24 17:52:15 +10:00
Andrew Spinks	54a79bc6ab	Fix other dependency injection problems in bpe angular code after magnification.	2013-07-24 17:47:48 +10:00
Andrew Spinks	24414036b9	Attempt to fix bulk product angular dependency injection which breaks on minification.	2013-07-23 18:16:39 +10:00
alexs	fadb1e4710	Merge branch 'master' of github.com:eaterprises/openfoodweb ... Conflicts: Gemfile	2013-07-23 18:02:28 +10:00