raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display fee name instead of fee type

Browse Source 
+ update specs as well
This commit is contained in:
Jean-Baptiste Bellet
2022-06-21 14:21:59 +02:00
parent 3c05fc3c80
commit 400a490ec5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/templates/price_breakdown.html.haml
View File

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

2
spec/system/consumer/shopping/variant_overrides_spec.rb
View File

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