1648 Commits

Author	SHA1	Message	Date
Rohan Mitchell	69d1111c73	Fix expected payment amount	2014-09-10 17:00:51 +10:00
Rohan Mitchell	32a2e793ad	When deleting enterprise relationships, delete dependent permissions	2014-09-10 14:49:15 +10:00
Rohan Mitchell	c297b7014a	Charge customers for their shipping fee	2014-09-10 14:01:36 +10:00
Rob H	b49a4cbc4f	Fix intermittent failing spec	2014-09-08 11:11:07 +10:00
Rob H	3ee0cf46e0	Merge branch 'working' into merging	2014-09-08 10:12:31 +10:00
Rob H	5fb4110328	Adding distributor and producer checkboxes to enterprise index	2014-09-07 21:04:53 +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	ee4a1925fe	Bulk Order Management works with navigation helper override	2014-09-06 00:34:27 +10:00
Rob H	780df6bfe0	Hide 'profile type' form element for non super-admin users	2014-09-05 18:38:43 +10:00
Rob H	58dcdbd9c4	Restricting ability to change enterprise type at the controller level	2014-09-05 18:30:15 +10:00
Rob H	20bfcd6e48	Switching enterprise relationships form around	2014-09-05 17:11:57 +10:00
Rohan Mitchell	c43c35601b	Set product.largeImage in JS, use for product modal	2014-09-05 15:10:16 +10:00
Rohan Mitchell	fe1c60ba47	Enterprise manager can edit products from enterprises it has manage_products permission on	2014-09-05 15:10:16 +10:00
Rohan Mitchell	b7708d750b	Check authorisation for bulk update products	2014-09-05 15:10:15 +10:00
Rohan Mitchell	fbd4f98fa9	Include producers I have permission to in BPE producers choice	2014-09-05 15:10:15 +10:00
Rohan Mitchell	9ec5dc6466	Find enterprises that we manage products for	2014-09-05 15:10:14 +10:00
Rohan Mitchell	e023a66167	Bulk product edit lists managed products	2014-09-05 15:10:14 +10:00
Rohan Mitchell	1ea63bca6e	Name test enterprises semantically	2014-09-05 15:10:14 +10:00
Rohan Mitchell	6ff6e4248c	Rename spec to match view name change	2014-09-05 15:10:14 +10:00
Rohan Mitchell	57af658e7c	For OC, fetch all enterprises we have access to, including those via E2E relationships	2014-09-05 15:10:13 +10:00
Rohan Mitchell	913c167fdf	Revert 5ede8d1, reinstating a4be0ff..7b89e6a	2014-09-05 15:10:12 +10:00
Rohan Mitchell	2cd5afbf9c	Set product.largeImage in JS, use for product modal	2014-09-01 16:21:23 +10:00
Rohan Mitchell	e72c3d861b	Enterprise manager can edit products from enterprises it has manage_products permission on	2014-09-01 11:49:09 +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	4d8d74dec7	Find enterprises that we manage products for	2014-09-01 10:36:59 +10:00
Rohan Mitchell	cfb31b46e4	Bulk product edit lists managed products	2014-09-01 10:13:59 +10:00
Rohan Mitchell	66f20a6b8a	Name test enterprises semantically	2014-09-01 09:17:38 +10:00
summerscope	a4aa949499	Applying new icons for map view	2014-08-29 18:04:06 +10:00
Rohan Mitchell	62e6cacfd0	Rename spec to match view name change	2014-08-29 17:37:56 +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	ba3f97ca1f	Fixing enterprise relationships spec	2014-08-28 14:45:24 +10:00
Rob H	5ede8d169f	Revert a4be0ff..7b89e6a for deployment	2014-08-28 14:32:57 +10:00
Rob H	bfd9ffd84a	Adding missing data-bindings for country/state	2014-08-28 14:25:21 +10:00
Rohan Mitchell	1871d42e68	Switch to correct grammatical ordering of child/parent enterprise on enterprise relationships page	2014-08-28 10:09:50 +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	628d87b69a	Add to OC permission allows adding distributors to order cycle	2014-08-28 10:09:50 +10:00
Rohan Mitchell	5ef13d3c5a	Change 'add products to OC' permission into the more general 'add enterprise to OC'	2014-08-28 10:09:50 +10:00
Rohan Mitchell	099a5b0b7b	Show E2E related enterprise exchanges in OC	2014-08-28 10:09:50 +10:00
Rohan Mitchell	34602244ca	Show permitted suppliers in order cycle add supplier select box	2014-08-28 10:09:50 +10:00
Rohan Mitchell	b9e5821497	Add EnterpriseRelationship scopes permitting and with_permission	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
Rohan Mitchell	a7689973be	Semantically name enterprises in spec	2014-08-28 10:09:50 +10:00
Rohan Mitchell	5e8bdce67d	Refactor spec	2014-08-28 10:09:50 +10:00
Rohan Mitchell	45a44844ca	Remove old rabl spec	2014-08-25 16:38:17 +10:00
Rohan Mitchell	1a995aedda	Simplify enterprise_relationship factory - leverage permissions_list= model method	2014-08-25 15:20:46 +10:00
Rohan Mitchell	3932884dba	Admin can create enterprise relationships with permissions	2014-08-25 14:59:10 +10:00
Rohan Mitchell	057ad9c6d3	Set enterprise relationship permissions from a list	2014-08-25 14:54:52 +10:00