raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-18 00:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8972 from jibees/8965-retrieve-scale-of-a-product-in-the-BOM-interface

Browse Source 
Improve the way we get the unit value (g, oz, lb, ...) in the Bulk Order Management interface
This commit is contained in:
jibees
2022-03-11 09:01:02 +01:00
committed by GitHub
parent d4a4a36b14 0ccba7f144
commit 04ed7e4a94
6 changed files with 16 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
View File

@@ -130,7 +130,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
$scope.getLineItemScale = (lineItem) ->
if lineItem.units_product && lineItem.units_variant && (lineItem.units_product.variant_unit == "weight" || lineItem.units_product.variant_unit == "volume")
VariantUnitManager.getScale(lineItem.units_variant.unit_value, lineItem.units_product.variant_unit)
lineItem.units_product.variant_unit_scale
else
1
@@ -154,7 +154,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
$scope.getScale = (unitsProduct, unitsVariant) ->
if unitsProduct.hasOwnProperty("variant_unit") && (unitsProduct.variant_unit == "weight" || unitsProduct.variant_unit == "volume")
VariantUnitManager.getScale(unitsVariant.unit_value, unitsProduct.variant_unit)
unitsProduct.variant_unit_scale
else
null

11
app/assets/javascripts/admin/products/services/variant_unit_manager.js.coffee
View File

@@ -37,17 +37,6 @@ angular.module("admin.products").factory "VariantUnitManager", (availableUnits)
options.push [[I18n.t('items'), 'items']]
options = [].concat options...
@getScale: (value, unitType) ->
scaledValue = null
validScales = []
unitScales = VariantUnitManager.unitScales(unitType)
validScales.unshift scale for scale in unitScales when value/scale >= 1
if validScales.length > 0
validScales[0]
else
unitScales[0]
@getUnitName: (scale, unitType) ->
if @units[unitType][scale]
@units[unitType][scale]['name']