573 Commits

Author	SHA1	Message	Date
Rafael Schouten	89ce4ba632	Merge branch 'master' into bugfix ... Conflicts: app/models/enterprise.rb	2014-10-21 08:51:23 +11:00
Rafael Schouten	08cd273be3	Merge branch 'migrate_ent_types' into bugfix ... Conflicts: app/models/spree/ability_decorator.rb	2014-10-18 07:37:41 +11:00
Rob Harrington	b2565991e6	Merge branch 'master' into reg_and_ent_types	2014-10-17 12:33:21 +11:00
Rob Harrington	81715aaf5d	Remove unrequired store registration action	2014-10-17 11:01:39 +11:00
Rob Harrington	c4d47ccc20	Change enterprise attributes defined in reg controller	2014-10-17 11:01:38 +11:00
Rob Harrington	28807d4f4d	Merge migrate_ent_types into reg	2014-10-17 10:20:48 +11:00
Rafael Schouten	027189ac3c	rename check methods	2014-10-16 16:26:49 +11:00
Rob Harrington	7db68795a4	Redirect to admin root after confirmation	2014-10-16 16:06:54 +11:00
Rohan Mitchell	0e03b5f209	Admin can change the format that Spree::Images are stored/served in	2014-10-16 12:41:11 +11:00
Rafael Schouten	46df14c0d9	refator reports controller a little	2014-10-16 04:29:33 +11:00
Rafael Schouten	e44fed2ff0	add authorization to reports listings on index page	2014-10-16 04:29:33 +11:00
Rafael Schouten	20a94b4365	Merge branch 'master' into migrate_ent_types ... Conflicts: app/serializers/api/admin/enterprise_serializer.rb	2014-10-07 10:52:26 +11:00
Rafael Schouten	b3520c4385	Bugfix for specs	2014-10-02 16:49:32 +10:00
Rob Harrington	5f4b2a752b	Product controller loads correct data for create and update actions	2014-10-02 12:32:26 +10:00
Rafael Schouten	5c0d846643	bugfix sells and is_distributor specs and code	2014-09-28 11:55:46 +10:00
Rafael Schouten	beb85e862a	get type > sells migration mostly working	2014-09-27 15:21:27 +10:00
Rob Harrington	6fa7d9cbcb	Registration controller checks number of owned enterpises	2014-09-25 12:10:45 +10:00
Rob Harrington	509cf6250a	Explicitly sort managed products	2014-09-19 18:32:03 +10:00
Rob Harrington	07275574b6	Manager can't bulk update owner	2014-09-19 18:31:50 +10:00
Rob Harrington	5d2d619d66	Assigning @spree_api_key for store	2014-09-19 18:31:33 +10:00
Rob Harrington	d3e72b5a2a	Adding images to registration process	2014-09-19 12:41:24 +10:00
Rob H	bcca8c5c0d	Merging master into all the things	2014-09-12 13:28:30 +10:00
Rob H	5c7ab2efa3	Restrict editing of ownership and type in enterprise api controller	2014-09-12 12:47:16 +10:00
Rohan Mitchell	e50bbeaefb	Edit product form shows permitted suppliers	2014-09-12 11:33:47 +10:00
Rohan Mitchell	033fe88513	New product form shows permitted suppliers	2014-09-12 11:07:59 +10:00
Rob H	6ee3010fa7	Differentiation of on-boarding process by url	2014-09-12 11:00:34 +10:00
Rob H	f1ef8ba3c7	Getting signup to work and authentication to load in reg specific template	2014-09-11 17:07:07 +10:00
Rob H	f1f9a2e7fc	Updating on later pages of registration process	2014-09-11 17:07:06 +10:00
Rob H	69b1d14cc4	Adding authorize to api enterprise create	2014-09-11 17:07:05 +10:00
Rob H	7dc42c9e39	Creating an enterprise works in registration process	2014-09-11 17:07:05 +10:00
Rob H	3d4e00a03c	Swtich API key injection over to helper	2014-09-11 17:07:05 +10:00
Rob H	c92aa41e28	Adding introduction and details pages to registration process	2014-09-11 16:34:19 +10:00
Rob H	595aa760cb	Loads registration page with authentication	2014-09-11 16:34:19 +10:00
Rob H	e83e2295ed	Adding some extra controller-level specs for enterprise ownership	2014-09-11 14:54:51 +10:00
Rob H	138e0281a3	Specify owner for enterprise create action	2014-09-11 14:39:14 +10:00
Rohan Mitchell	c297b7014a	Charge customers for their shipping fee	2014-09-10 14:01:36 +10:00
Rob H	6540bb8efc	Adding select field for enterprise type to index when super admin	2014-09-07 19:51:14 +10:00
Rob H	b8fadb50ae	Special Instructions in checkout are actually wired up	2014-09-06 12:00:27 +10:00
Rob H	58dcdbd9c4	Restricting ability to change enterprise type at the controller level	2014-09-05 18:30:15 +10:00
Rohan Mitchell	94683f1eaa	Check authorisation for bulk update products	2014-09-01 11:15:00 +10:00
Rohan Mitchell	c81503d95f	Include producers I have permission to in BPE producers choice	2014-09-01 10:44:09 +10:00
Rohan Mitchell	e0645dfbd9	Fetch managed products via OpenFoodNetwork::Permissions	2014-09-01 09:42:50 +10:00
Rohan Mitchell	7f74854a2f	For OC, fetch all enterprises we have access to, including those via E2E relationships	2014-08-29 16:38:23 +10:00
Rohan Mitchell	0b61872d96	Revert 5ede8d1, reinstating a4be0ff..7b89e6a	2014-08-29 16:38:10 +10:00
Rob H	5ede8d169f	Revert a4be0ff..7b89e6a for deployment	2014-08-28 14:32:57 +10:00
Rohan Mitchell	a5debc19dc	Permit edits to exchanges involving enterprises permitted via E2E relationships	2014-08-28 10:09:50 +10:00
Rohan Mitchell	8548a1a67e	Determine producer options on order cycle screen through OpenFoodNetwork::Permissions class	2014-08-28 10:09:50 +10:00
Rob H	435819acc4	Removing unit text from total units column	2014-08-25 20:29:24 +10:00
Rob H	310d1b3726	Zeus server does not crash when editing controllers	2014-08-25 20:29:24 +10:00
Rohan Mitchell	cb615ba994	Render enterprise relationships JSON with AMS instead of rabl	2014-08-25 13:07:31 +10:00