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

Use js-big-decimal package for calculation

Browse Source
This commit is contained in:
saunmanoj888
2022-10-21 21:30:00 +05:30
parent b40cd579bc
commit ee8454bd2c
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,8 +262,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
variant.unit_value = parseFloat(match[1].replace(",", "."))
variant.unit_value = null if isNaN(variant.unit_value)
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_value = parseFloat(bigDecimal.multiply(variant.unit_value, product.variant_unit_scale, 2))
variant.unit_description = match[3]
$scope.incrementLimit = ->

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

@@ -66,7 +66,7 @@ angular.module("ofn.admin").factory "BulkProducts", (ProductResource, dataFetche
if variant.unit_value?
if product.variant_unit_scale
variant_unit_value = @divideAsInteger variant.unit_value, product.variant_unit_scale
parseFloat(variant_unit_value.toFixed(8))
parseFloat(bigDecimal.round(variant_unit_value, 2))
else
variant.unit_value
else

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

@@ -676,14 +676,14 @@ 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", ->
it "rounds off the unit_value upto 2 decimal places", ->
testProduct = {id: 123, variant_unit_scale: 28.35}
testVariant = {unit_value_with_description: "1234.5"}
testVariant = {unit_value_with_description: "1234.567"}
$scope.packVariant(testProduct, testVariant)
expect(testVariant).toEqual
unit_value: 1234.5
unit_value: 1234.57
unit_description: ''
unit_value_with_description: "1234.5"
unit_value_with_description: "1234.567"
describe "filtering products", ->

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

@@ -152,10 +152,10 @@ 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", ->
it "returns the scaled value rounded off upto 2 decimal points", ->
product = {variant_unit_scale: 28.35}
variant = {unit_value: 1234.5}
expect(BulkProducts.variantUnitValue(product, variant)).toEqual 43.54497354
expect(BulkProducts.variantUnitValue(product, variant)).toEqual 43.54
it "returns the unscaled value when the product has no scale", ->
product = {}