230 Commits

Author	SHA1	Message	Date
Rohan Mitchell	0b3dfa7278	Merge branch 'product-reports-without-deleted'	2014-12-12 15:29:03 +11:00
Rohan Mitchell	b1ba519a73	When finding per hub order cycle enterprises, also return managed producers	2014-12-12 13:33:12 +11:00
Rohan Mitchell	5b82fcaca7	Inject hub permissions - which producers each hub can add to order cycle	2014-12-12 13:33:12 +11:00
Rohan Mitchell	eab2e5de2a	Use scope	2014-12-11 15:00:44 +11:00
Maikel Linke	3cc79d0036	Filter deleted products in products report ... BugHerd 484: Remove deleted products from Product / Inventory reports	2014-12-05 15:52:10 +11:00
Rohan Mitchell	bad5d798bf	Comment proxy classes	2014-11-21 13:49:09 +11:00
Rohan Mitchell	2b0f6b7865	Add ProductProxy which wraps the product's variants in VariantProxys	2014-11-21 13:49:09 +11:00
Rohan Mitchell	f3fa5edb9d	Add simple variant proxy	2014-11-21 13:49:09 +11:00
Rob Harrington	d9d6b7bee4	Adding filtering to Users and Enterprises report	2014-11-14 16:36:22 +11:00
Rob Harrington	79a83ee206	Adding users and enterprises report, controller action and template	2014-11-14 16:36:22 +11:00
Rafael Schouten	095dd28505	Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork	2014-10-25 18:53:46 +11:00
Rafael Schouten	feff4fd46f	fix reports taxons and specs	2014-10-25 18:51:03 +11:00
Rafael Schouten	6f1c90ea25	add toxons to prodcut reports	2014-10-25 17:09:23 +11:00
Rob Harrington	cc0e205f50	Merge master into onbaording	2014-10-24 15:36:59 +11:00
Rohan Mitchell	aea8ab4c7f	Move #manages_one_enterprise? from User model to Permissions	2014-10-23 16:44:16 +11:00
Rohan Mitchell	694dd0c329	Enterprise user selling own produce only sees simple order cycle listing	2014-10-17 10:52:36 +11:00
Rob Harrington	5d2d619d66	Assigning @spree_api_key for store	2014-09-19 18:31:33 +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
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	4af704b1d0	Fetch managed products via OpenFoodNetwork::Permissions	2014-09-05 15:10:14 +10:00
digital dreamer	503fb53750	Fix #242 - foreign key constraint error on load_sample_data	2014-09-05 15:10:14 +10:00
Rohan Mitchell	913c167fdf	Revert 5ede8d1, reinstating a4be0ff..7b89e6a	2014-09-05 15:10:12 +10:00
Rob H	5ede8d169f	Revert a4be0ff..7b89e6a for deployment	2014-08-28 14:32:57 +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	8548a1a67e	Determine producer options on order cycle screen through OpenFoodNetwork::Permissions class	2014-08-28 10:09:50 +10:00
Rob H	30a14edb06	Adding 'Total Units' field to supplier report	2014-08-07 14:21:01 +10:00
Will Marshall	bb09236468	Merge branch 'laura_and_will'	2014-07-31 16:06:39 +10:00
Rohan Mitchell	494b572c69	Do not show zero fees	2014-07-31 15:36:26 +10:00
Rohan Mitchell	a26450d173	Remove unused spree searcher class - causing intermittent test failures	2014-07-31 14:58:18 +10:00
Rohan Mitchell	8c41a6c909	Calculate fee breakdown	2014-07-31 11:36:53 +10:00
Rohan Mitchell	66cece5903	WIP: Extract order cycle fee calculations to EnterpriseFeeCalculator	2014-07-31 11:36:53 +10:00
Rohan Mitchell	03273a76ad	Merge branch 'fix_units'	2014-07-18 14:11:41 +10:00
Rohan Mitchell	989a14fa37	Change KL to kL, update specs for ML to kL change	2014-07-17 16:16:08 +10:00
Rohan Mitchell	3758a8ae2b	Add rake task to export enterprises to CSV	2014-07-16 09:33:59 +10:00
Rafael Schouten	ef1b72cec9	Megalitres to Kilolitres	2014-07-03 00:07:57 +01:00
Rob H	9b126df5b6	Add variant display_name to reports	2014-06-23 14:31:16 +10:00
Rohan Mitchell	2f2e0d41af	On customer reports, do not show orders through a hub that the current user does not manage	2014-06-19 10:35:32 +10:00
Rohan Mitchell	9ccdd3b4e0	Add reactive integrity test that soft-deleted variants are removed from order cycles	2014-06-12 14:59:27 +10:00
Rob H	8d87cfbc35	Move option value naming logic into separate lib class	2014-06-04 14:54:42 +10:00
Rohan Mitchell	d1028cb912	User import/export includes addresses	2014-05-23 17:51:19 +10:00
Rohan Mitchell	9aadc9d1ce	Add initial user import/export via CSV	2014-05-23 17:51:19 +10:00
Rohan Mitchell	9e46108e9a	Enterprise user can only add order cycle exchanges where it manages the participant enterprise	2014-05-23 12:18:22 +10:00
Rohan Mitchell	14dee8d7fe	OrderCycleFormApplicator requires permitted_enterprises to be set explicitly	2014-05-23 12:09:38 +10:00
Rohan Mitchell	095b9bf67a	Enterprise user can only update order cycle exchanges where it manages the participant enterprise	2014-05-23 12:05:46 +10:00
Rohan Mitchell	9b15c213d1	When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges	2014-05-23 11:28:00 +10:00
Will Marshall	5f712a8984	Removing code	2014-05-14 15:16:29 +10:00