37 Commits

Author	SHA1	Message	Date
Rob H	20bfcd6e48	Switching enterprise relationships form around	2014-09-05 17:11:57 +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	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	3932884dba	Admin can create enterprise relationships with permissions	2014-08-25 14:59:10 +10:00
Rohan Mitchell	b4e89ad2c0	Convert enterprise relationship permission to string presentation	2014-08-25 13:27:01 +10:00
Rohan Mitchell	6e17f0aaa2	Admin can create enterprise roles	2014-08-15 16:09:05 +10:00
Rohan Mitchell	8bc9def6ae	Switch to AMS for enterprise role serialisation	2014-08-15 16:09:05 +10:00
Rohan Mitchell	1d77812ab8	Admin can list enterprise roles	2014-08-15 16:09:04 +10:00
Rob H	32c8b9cdcd	Switch Taxons input over to category selection on BPE, clean up interface	2014-08-08 14:05:53 +10:00
Rob H	37ecadf6fc	Taxons by ID converts id to string	2014-08-08 14:05:53 +10:00
Rob H	59a3fe11ad	Fix taxon service specs	2014-08-08 14:05:52 +10:00
Rob H	2f5b5e7ee5	Inject taxons into BPE	2014-08-08 14:05:52 +10:00
Rohan Mitchell	7db2aff398	Generate variantUnitOptions - DRY	2014-07-18 14:10:42 +10:00
Rohan Mitchell	8484d19144	Convert variant_unit_options to a method, camelcase	2014-07-18 12:44:58 +10:00
Rohan Mitchell	04eca9591b	Derive unitScales from unitNames	2014-07-18 12:39:16 +10:00
Rohan Mitchell	52b74bde91	Extract unit names from OptionValueNamer into VariantUnitManager	2014-07-18 12:39:16 +10:00
Rohan Mitchell	8d5f953f78	Extract getScale from BOM controller to VariantUnitManager, extract specs as well	2014-07-18 12:39:16 +10:00
Rohan Mitchell	eafdf85c28	Extract class methods to new class VariantUnitManager	2014-07-18 12:39:11 +10:00
Rohan Mitchell	6c59ffc16f	Switch to class case for OptionValueNamer	2014-07-18 10:06:13 +10:00
Rohan Mitchell	91e4f24fde	Extract JS unit options into option value namer	2014-07-17 16:57:23 +10:00
Rohan Mitchell	989a14fa37	Change KL to kL, update specs for ML to kL change	2014-07-17 16:16:08 +10:00
Rafael Schouten	58e6379e43	Merge branch 'master' into fix_units ... Conflicts: app/assets/javascripts/admin/products/units_controller.js.coffee	2014-07-14 15:10:26 +01:00
Rafael Schouten	e89b782787	Use Kilolitres instead of Megalitres. Megalitres are REALLY big!	2014-07-02 23:20:54 +01:00
Rob H	934f960336	Add display as to new product page	2014-06-26 15:27:24 +10:00
Rob H	5f8ed01475	Adding dynamic text to display as placeholder	2014-06-12 11:49:54 +10:00
Rob H	f688461e84	Add fields for variant display name and display as to bpe	2014-06-12 11:49:53 +10:00
Rohan Mitchell	403e957111	Further removal of references to 'Admin' from global namespace	2014-05-24 17:15:20 +10:00
Rohan Mitchell	e951f80070	Merge branch 'new-product-form' ... Conflicts: app/assets/javascripts/admin/admin.js.coffee	2014-05-24 17:14:32 +10:00
Rob H	e85c144e87	Remove reference to 'Admin' from global namespace	2014-05-23 11:22:12 +10:00
Rohan Mitchell	06955a024f	Enterprise user can only create relationships with their own enterprises as parent	2014-05-22 11:02:03 +10:00
Rohan Mitchell	18886c931f	Extract create EnterpriseRelationship to service	2014-05-21 11:29:11 +10:00
Rohan Mitchell	5d0680234d	Admin can delete enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	9b2a80c6b5	Admin can create enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	5f4e4ebeb0	Admin can list enterprise relationships	2014-05-21 11:29:11 +10:00
Rob H	d7b232aefd	Split dirtyProducts out into its own service	2014-05-07 11:25:09 +10:00
Rob H	6ba0d6c5f9	WIP: Split out admin angularjs	2014-05-02 21:38:39 +10:00