raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unit value UI issue

Browse Source
This commit is contained in:
saunmanoj888
2022-10-19 22:59:28 +05:30
parent bf74612892
commit 8e45b758ba
4 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,7 +261,9 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
product = BulkProducts.find product.id
variant.unit_value = parseFloat(match[1].replace(",", "."))
variant.unit_value = null if isNaN(variant.unit_value)
variant.unit_value *= product.variant_unit_scale if variant.unit_value && product.variant_unit_scale
if variant.unit_value && product.variant_unit_scale
variant_unit_value = variant.unit_value * product.variant_unit_scale
variant.unit_value = parseFloat(variant_unit_value.toFixed(8))
variant.unit_description = match[3]
$scope.incrementLimit = ->

3
app/assets/javascripts/admin/services/bulk_products.js.coffee
View File

@@ -65,7 +65,8 @@ angular.module("ofn.admin").factory "BulkProducts", (ProductResource, dataFetche
variantUnitValue: (product, variant) ->
if variant.unit_value?
if product.variant_unit_scale
@divideAsInteger variant.unit_value, product.variant_unit_scale
variant_unit_value = @divideAsInteger variant.unit_value, product.variant_unit_scale
parseFloat(variant_unit_value.toFixed(8))
else
variant.unit_value
else

9
spec/javascripts/unit/admin/bulk_product_update_spec.js.coffee
View File

@@ -676,6 +676,15 @@ describe "AdminProductEditCtrl", ->
unit_description: ''
unit_value_with_description: "250,5"
it "rounds off the unit_value upto 8 decimal places and removes the trailing zeroes", ->
testProduct = {id: 123, variant_unit_scale: 28.35}
testVariant = {unit_value_with_description: "1234.5"}
$scope.packVariant(testProduct, testVariant)
expect(testVariant).toEqual
unit_value: 34998.075
unit_description: ''
unit_value_with_description: "1234.5"
describe "filtering products", ->
beforeEach ->

5
spec/javascripts/unit/admin/services/bulk_products_spec.js.coffee
View File

@@ -152,6 +152,11 @@ describe "BulkProducts service", ->
variant = {unit_value: 5}
expect(BulkProducts.variantUnitValue(product, variant)).toEqual 5000
it "returns the scaled value rounded off upto 8 decimal points removing the trailing zeroes", ->
product = {variant_unit_scale: 28.35}
variant = {unit_value: 1234.5}
expect(BulkProducts.variantUnitValue(product, variant)).toEqual 43.54497354
it "returns the unscaled value when the product has no scale", ->
product = {}
variant = {unit_value: 5}