raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-06 07:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move value and unit into the same input disabled text field

Browse Source 
- Both value and unit of the unit price is now inside the `<input />` text field.
This commit is contained in:
Jean-Baptiste Bellet
2021-03-09 16:47:49 +01:00
parent c084299b72
commit 5ce558c2db
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/admin/products/controllers/units_controller.js.coffee
View File

@@ -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

5
app/views/spree/admin/products/new.html.haml
View File

@@ -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" }
&nbsp;/&nbsp;
%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