From 4c508a5bf938a8ecc89f2d7efbd58a940416be75 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Mon, 10 Jan 2022 11:24:22 +0100 Subject: [PATCH] Group by unit size is specific: it needs to be divided by scale if not the smallest unit --- .../line_items/controllers/line_items_controller.js.coffee | 6 ++++++ app/views/spree/admin/orders/bulk_management.html.haml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 a496e7018d..3d35b7164d 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 @@ -161,6 +161,12 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $scope.getFormattedValueWithUnitName = (value, unitsProduct, unitsVariant, scale) -> unit_name = VariantUnitManager.getUnitName(scale, unitsProduct.variant_unit) $scope.roundToThreeDecimals(value) + " " + unit_name + + $scope.getGroupBySizeFormattedValueWithUnitName = (value, unitsProduct, unitsVariant) -> + scale = $scope.getScale(unitsProduct, unitsVariant) + if scale + value = value / scale if scale != 28.35 && scale != 1 # divide by scale if not smallest unit + $scope.getFormattedValueWithUnitName(value, unitsProduct, unitsVariant, scale) else '' diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml index 1177f7ae58..5534b8435f 100644 --- a/app/views/spree/admin/orders/bulk_management.html.haml +++ b/app/views/spree/admin/orders/bulk_management.html.haml @@ -70,7 +70,7 @@ .three.columns .text-center = t("admin.orders.bulk_management.group_buy_unit_size") - .text-center {{ formattedValueWithUnitName( selectedUnitsProduct.group_buy_unit_size, selectedUnitsProduct, selectedUnitsVariant ) }} + .text-center {{ getGroupBySizeFormattedValueWithUnitName(selectedUnitsProduct.group_buy_unit_size , selectedUnitsProduct, selectedUnitsVariant ) }} .three.columns .text-center = t("admin.orders.bulk_management.total_qtt_ordered")