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 b3bbacc09b..fb42028d60 100644 --- a/app/assets/javascripts/admin/products/controllers/units_controller.js.coffee +++ b/app/assets/javascripts/admin/products/controllers/units_controller.js.coffee @@ -39,11 +39,11 @@ 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 + $scope.unit_price = 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) + value = localizeCurrencyFilter(UnitPrices.price(price, scale, unit_type, unit_value, variant_unit_name)) + unit = UnitPrices.unit(scale, unit_type, variant_unit_name) + $scope.unit_price = value + " / " + unit $scope.hasVariants = (product) -> Object.keys(product.variants).length > 0 diff --git a/app/views/spree/admin/products/new.html.haml b/app/views/spree/admin/products/new.html.haml index a5ce8ab67e..757abf650e 100644 --- a/app/views/spree/admin/products/new.html.haml +++ b/app/views/spree/admin/products/new.html.haml @@ -62,10 +62,7 @@ "question-mark-with-tooltip-animation" => true, key: "'js.shopfront.unit_price_tooltip.admin'"} %br/ - = f.text_field :price, {"class" => '', "disabled" => true, "ng-model" => "product.unit_price_value"} - %span{ style: "color: #757575", "ng-show": "product.unit_price_unit !== null" } -  /  - %span{ "ng-bind" => "product.unit_price_unit" } + = f.text_field :price, {"class" => 'fullwidth', "disabled" => true, "ng-model" => "unit_price"} %div{style: "color: black"} = t(".unit_price_legend") .sixteen.columns.alpha