From 400a490ec516543ff03dd169a1588d4951f71c5d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 21 Jun 2022 14:21:59 +0200 Subject: [PATCH] Display fee name instead of fee type + update specs as well --- .../javascripts/templates/price_breakdown.html.haml | 10 +++++----- .../system/consumer/shopping/variant_overrides_spec.rb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/templates/price_breakdown.html.haml b/app/assets/javascripts/templates/price_breakdown.html.haml index bd4c3bf88f..78d4ed7f33 100644 --- a/app/assets/javascripts/templates/price_breakdown.html.haml +++ b/app/assets/javascripts/templates/price_breakdown.html.haml @@ -9,19 +9,19 @@ %span{"ng-bind" => "::'item_cost' | t"} %li{"ng-if" => "::variant.fees.admin"} .right {{ ::variant.fees.admin | localizeCurrency }} - %span{"ng-bind" => "::'admin_fee' | t"} + %span{"ng-bind" => "::variant.fees_name.admin"} %li{"ng-if" => "::variant.fees.sales"} .right {{ ::variant.fees.sales | localizeCurrency }} - %span{"ng-bind" => "::'sales_fee' | t"} + %span{"ng-bind" => "::variant.fees_name.sales"} %li{"ng-if" => "::variant.fees.packing"} .right {{ ::variant.fees.packing | localizeCurrency }} - %span{"ng-bind" => "::'packing_fee' | t"} + %span{"ng-bind" => "::variant.fees_name.packing"} %li{"ng-if" => "::variant.fees.transport"} .right {{ ::variant.fees.transport | localizeCurrency }} - %span{"ng-bind" => "::'transport_fee' | t"} + %span{"ng-bind" => "::variant.fees_name.transport"} %li{"ng-if" => "::variant.fees.fundraising"} .right {{ ::variant.fees.fundraising | localizeCurrency }} - %span{"ng-bind" => "::'fundraising_fee' | t"} + %span{"ng-bind" => "::variant.fees_name.fundraising"} %li %strong .right = {{ ::variant.price_with_fees | localizeCurrency }} diff --git a/spec/system/consumer/shopping/variant_overrides_spec.rb b/spec/system/consumer/shopping/variant_overrides_spec.rb index 1248c32ff2..9ae0b5dd21 100644 --- a/spec/system/consumer/shopping/variant_overrides_spec.rb +++ b/spec/system/consumer/shopping/variant_overrides_spec.rb @@ -57,7 +57,7 @@ describe "shopping with variant overrides defined", js: true do default_stock: nil, resettable: false) } let(:enterprise_fee) { - create(:enterprise_fee, enterprise: hub, fee_type: 'packing', + create(:enterprise_fee, enterprise: hub, fee_type: 'packing', name: "Packing fee", calculator: Calculator::FlatPercentPerItem.new(preferred_flat_percent: 10)) } let!(:product4_variant1_override) {