raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-15 23:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change KL to kL, update specs for ML to kL change

Browse Source
This commit is contained in:
Rohan Mitchell
2014-07-17 16:16:08 +10:00
parent 58e6379e43
commit 989a14fa37
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/bulk_order_management.js.coffee
View File

@@ -150,7 +150,7 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
$scope.getUnitName = (scale, unitType) ->
unitNames =
'weight': {1.0: 'g', 1000.0: 'kg', 1000000.0: 'T'}
'volume': {0.001: 'mL', 1.0: 'L', 1000.0: 'KL'}
'volume': {0.001: 'mL', 1.0: 'L', 1000.0: 'kL'}
unitNames[unitType][scale]
$scope.formattedValueWithUnitName = (value, unitsProduct, unitsVariant) ->

2
app/assets/javascripts/admin/bulk_product_update.js.coffee
View File

@@ -20,7 +20,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", [
["Weight (T)", "weight_1000000"],
["Volume (mL)", "volume_0.001"],
["Volume (L)", "volume_1"],
["Volume (KL)", "volume_1000"],
["Volume (kL)", "volume_1000"],
["Items", "items"]
]

2
app/assets/javascripts/admin/products/units_controller.js.coffee
View File

@@ -32,7 +32,7 @@ angular.module("admin.products")
["Weight (T)", "weight_1000000"],
["Volume (mL)", "volume_0.001"],
["Volume (L)", "volume_1"],
["Volume (KL)", "volume_1000"],
["Volume (kL)", "volume_1000"],
["Items", "items"]
]

2
app/assets/javascripts/admin/services/option_value_namer.js.coffee
View File

@@ -48,7 +48,7 @@ angular.module("admin.products").factory "optionValueNamer", ->
'volume':
0.001: 'mL'
1.0: 'L'
1000.0: 'KL'
1000.0: 'kL'
# Find the largest available unit where unit_value comes to >= 1 when expressed in it.
# If there is none available where this is true, use the smallest available unit.