raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Multiply by unit_value as sumOfUnitValues is now scaled

Browse Source
This commit is contained in:
Jean-Baptiste Bellet
2021-12-07 10:59:49 +01:00
parent b746eacd11
commit 515e2cfc51
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
View File

@@ -168,7 +168,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
if $scope.selectedUnitsProduct.hasOwnProperty("group_buy_unit_size") && $scope.selectedUnitsProduct.group_buy_unit_size > 0 &&
$scope.selectedUnitsProduct.hasOwnProperty("variant_unit") &&
( $scope.selectedUnitsProduct.variant_unit == "weight" || $scope.selectedUnitsProduct.variant_unit == "volume" )
$scope.roundToThreeDecimals(sumOfUnitValues / $scope.selectedUnitsProduct.group_buy_unit_size)
$scope.roundToThreeDecimals(sumOfUnitValues / $scope.selectedUnitsProduct.group_buy_unit_size * $scope.selectedUnitsVariant.unit_value)
else
''

6
spec/javascripts/unit/admin/line_items/controllers/line_items_controller_spec.js.coffee
View File

@@ -171,8 +171,14 @@ describe "LineItemsCtrl", ->
it "returns the quantity of fulfilled group buy units", ->
scope.selectedUnitsProduct = { variant_unit: "weight", group_buy_unit_size: 1000 }
scope.selectedUnitsVariant = { unit_value: 1 }
expect(scope.fulfilled(1500)).toEqual 1.5
it "returns the quantity of fulfilled group buy units by volume", ->
scope.selectedUnitsProduct = { variant_unit: "volume", group_buy_unit_size: 5000 }
scope.selectedUnitsVariant = { unit_value: 1000 }
expect(scope.fulfilled(5)).toEqual 1
describe "allFinalWeightVolumesPresent()", ->
it "returns false if the unit_value of any item in filteredLineItems does not exist", ->
scope.filteredLineItems = [