From 43863069e9b3378f86d64acd20d31a8050ca908f Mon Sep 17 00:00:00 2001 From: Rob H Date: Thu, 20 Mar 2014 16:07:14 +1100 Subject: [PATCH] Minor fix to BOM group buy calc box --- .../javascripts/admin/bulk_order_management.js.coffee | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/admin/bulk_order_management.js.coffee b/app/assets/javascripts/admin/bulk_order_management.js.coffee index babc8ce604..3953c64f1d 100644 --- a/app/assets/javascripts/admin/bulk_order_management.js.coffee +++ b/app/assets/javascripts/admin/bulk_order_management.js.coffee @@ -244,7 +244,7 @@ orderManagementModule.controller "AdminOrderMgmtCtrl", [ $scope.formattedValueWithUnitName = (value, unitsVariant) -> # A Units Variant is an API object which holds unit properies of a variant - if unitsVariant.hasOwnProperty("variant_unit") && unitsVariant.variant_unit == "weight" || unitsVariant.variant_unit == "volume" + if unitsVariant.hasOwnProperty("variant_unit") && (unitsVariant.variant_unit == "weight" || unitsVariant.variant_unit == "volume") && value > 0 scale = $scope.getScale(value, unitsVariant.variant_unit) Math.round(value/scale * 1000)/1000 + " " + $scope.getUnitName(scale,unitsVariant.variant_unit) else @@ -252,8 +252,10 @@ orderManagementModule.controller "AdminOrderMgmtCtrl", [ $scope.fulfilled = -> # A Units Variant is an API object which holds unit properies of a variant - if $scope.selectedUnitsVariant.hasOwnProperty("variant_unit") && ( $scope.selectedUnitsVariant.variant_unit == "weight" || $scope.selectedUnitsVariant.variant_unit == "volume" ) - Math.round( $scope.sumUnitValues( $scope.filteredLineItems ) / $scope.selectedUnitsVariant.group_buy_unit_size * 1000)/1000 + if $scope.selectedUnitsVariant.hasOwnProperty("group_buy_unit_size") && $scope.selectedUnitsVariant.group_buy_unit_size > 0 && + $scope.selectedUnitsVariant.hasOwnProperty("variant_unit") && + ( $scope.selectedUnitsVariant.variant_unit == "weight" || $scope.selectedUnitsVariant.variant_unit == "volume" ) + Math.round( $scope.sumUnitValues( $scope.filteredLineItems ) / $scope.selectedUnitsVariant.group_buy_unit_size * 1000)/1000 else ''