From c8099dc2a4f8fbb0f42b713d227645b5b0a909db Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 9 Mar 2021 14:03:54 +0100 Subject: [PATCH] Do not display unit price value and unit until information is filled - Display the field but with `null` value --- .../admin/products/controllers/units_controller.js.coffee | 2 ++ app/views/spree/admin/products/new.html.haml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/admin/products/controllers/units_controller.js.coffee b/app/assets/javascripts/admin/products/controllers/units_controller.js.coffee index a8646cceb8..b3bbacc09b 100644 --- a/app/assets/javascripts/admin/products/controllers/units_controller.js.coffee +++ b/app/assets/javascripts/admin/products/controllers/units_controller.js.coffee @@ -39,6 +39,8 @@ angular.module("admin.products") unit_type = $scope.product.variant_unit unit_value = $scope.product.master.unit_value variant_unit_name = $scope.product.variant_unit_name + $scope.product.unit_price_value = null + $scope.product.unit_price_unit = null if price && unit_type && unit_value $scope.product.unit_price_value = localizeCurrencyFilter(UnitPrices.price(price, scale, unit_type, unit_value, variant_unit_name)) $scope.product.unit_price_unit = UnitPrices.unit(scale, unit_type, variant_unit_name) diff --git a/app/views/spree/admin/products/new.html.haml b/app/views/spree/admin/products/new.html.haml index da605a22a1..a5ce8ab67e 100644 --- a/app/views/spree/admin/products/new.html.haml +++ b/app/views/spree/admin/products/new.html.haml @@ -63,9 +63,9 @@ key: "'js.shopfront.unit_price_tooltip.admin'"} %br/ = f.text_field :price, {"class" => '', "disabled" => true, "ng-model" => "product.unit_price_value"} - %span + %span{ style: "color: #757575", "ng-show": "product.unit_price_unit !== null" }  /  - %span{style: "color: #757575", "ng-bind" => "product.unit_price_unit" } + %span{ "ng-bind" => "product.unit_price_unit" } %div{style: "color: black"} = t(".unit_price_legend") .sixteen.columns.alpha