raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-07 03:01:33 +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