diff --git a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee index fae14798bb..b05150522f 100644 --- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee +++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee @@ -185,6 +185,8 @@ 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") unitsProduct.variant_unit_scale + else if unitsProduct.hasOwnProperty("variant_unit") && unitsProduct.variant_unit == "items" + 1 else null diff --git a/app/assets/javascripts/admin/products/services/variant_unit_manager.js.coffee b/app/assets/javascripts/admin/products/services/variant_unit_manager.js.coffee index edcc93145f..72848f844b 100644 --- a/app/assets/javascripts/admin/products/services/variant_unit_manager.js.coffee +++ b/app/assets/javascripts/admin/products/services/variant_unit_manager.js.coffee @@ -27,6 +27,9 @@ angular.module("admin.products").factory "VariantUnitManager", (availableUnits) 1000.0: name: 'kL' system: 'metric' + 'items': + 1: + name: 'items' @variantUnitOptions: -> available = availableUnits.split(",") diff --git a/spec/javascripts/unit/admin/line_items/controllers/line_items_controller_spec.js.coffee b/spec/javascripts/unit/admin/line_items/controllers/line_items_controller_spec.js.coffee index aec35f788b..60b0c6a77c 100644 --- a/spec/javascripts/unit/admin/line_items/controllers/line_items_controller_spec.js.coffee +++ b/spec/javascripts/unit/admin/line_items/controllers/line_items_controller_spec.js.coffee @@ -305,10 +305,9 @@ describe "LineItemsCtrl", -> it "returns '' if selectedUnitsVariant has no property 'variant_unit'", -> expect(scope.formattedValueWithUnitName(1,{})).toEqual '' - it "returns '', and does not call Math.round if variant_unit is 'items'", -> + it "returns the value, and does not call Math.round if variant_unit is 'items'", -> unitsProduct = { variant_unit: "items" } - expect(scope.formattedValueWithUnitName(1,unitsProduct,unitsVariant)).toEqual '' - expect(Math.round).not.toHaveBeenCalled() + expect(scope.formattedValueWithUnitName(1, unitsProduct, unitsVariant)).toEqual "1 items" it "calls Math.round() if variant_unit is 'weight' or 'volume'", -> unitsProduct = { variant_unit: "weight", variant_unit_scale: 1 }