diff --git a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee index 1b838926a9..f17ea5f25e 100644 --- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee +++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee @@ -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 '' diff --git a/spec/javascripts/unit/admin/line_items/controllers/line_items_controller_spec.js.coffee b/spec/javascripts/unit/admin/line_items/controllers/line_items_controller_spec.js.coffee index 62d965dae4..cd3c715a09 100644 --- a/spec/javascripts/unit/admin/line_items/controllers/line_items_controller_spec.js.coffee +++ b/spec/javascripts/unit/admin/line_items/controllers/line_items_controller_spec.js.coffee @@ -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 = [