From adcdca812d37e9f4b341fe79d210d90f4e0fa7fd Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 8 Mar 2022 14:58:34 +0100 Subject: [PATCH] Delete that getScale method which is now useless since we now rely on the serialized variant_unit_scale --- .../services/variant_unit_manager.js.coffee | 11 ----------- .../services/variant_unit_manager_spec.js.coffee | 15 --------------- 2 files changed, 26 deletions(-) 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 31a3a14bd9..edcc93145f 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 @@ -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'] diff --git a/spec/javascripts/unit/admin/services/variant_unit_manager_spec.js.coffee b/spec/javascripts/unit/admin/services/variant_unit_manager_spec.js.coffee index 7270a92f5f..9a635078d0 100644 --- a/spec/javascripts/unit/admin/services/variant_unit_manager_spec.js.coffee +++ b/spec/javascripts/unit/admin/services/variant_unit_manager_spec.js.coffee @@ -10,21 +10,6 @@ describe "VariantUnitManager", -> beforeEach inject (_VariantUnitManager_) -> VariantUnitManager = _VariantUnitManager_ - describe "getScale", -> - it "returns the largest scale for which value/scale is greater than 1", -> - expect(VariantUnitManager.getScale(1.2,"weight")).toEqual 1.0 - expect(VariantUnitManager.getScale(1000,"weight")).toEqual 1000.0 - expect(VariantUnitManager.getScale(0.0012,"volume")).toEqual 0.001 - expect(VariantUnitManager.getScale(1001,"volume")).toEqual 1000.0 - - it "returns the smallest unit available when value is smaller", -> - expect(VariantUnitManager.getScale(0.4,"weight")).toEqual 1 - expect(VariantUnitManager.getScale(0.0004,"volume")).toEqual 0.001 - - it "returns the right unit when using imperial units", -> - expect(VariantUnitManager.getScale(453.6, "weight")).toEqual 453.6 - expect(VariantUnitManager.getScale(28.35, "weight")).toEqual 28.35 - describe "getUnitName", -> it "returns the unit name based on the scale and unit type (weight/volume) provided", -> expect(VariantUnitManager.getUnitName(1, "weight")).toEqual "g"