diff --git a/app/views/spree/orders/_form.html.haml b/app/views/spree/orders/_form.html.haml index 778e7540cfa..3df13e7c3ca 100644 --- a/app/views/spree/orders/_form.html.haml +++ b/app/views/spree/orders/_form.html.haml @@ -34,7 +34,10 @@ - checkout_adjustments_for(@order, exclude: [:line_item]).reverse_each do |adjustment| %tr.order-adjustment %td.text-right{:colspan => "3"} - = adjustment.label + - if adjustment.originator_type == "Voucher" + = t(:order_voucher_label, code: adjustment.label) + - else + = adjustment.label %td.text-right.total %span= adjustment.display_amount.to_html %td diff --git a/config/locales/en.yml b/config/locales/en.yml index ad27ac5884e..a22d527edc0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2455,6 +2455,7 @@ en: order_back_to_store: Back To Store order_back_to_cart: Back To Cart order_back_to_website: Back To Website + order_voucher_label: "Voucher: %{code}" checkout_details_title: Checkout Details checkout_payment_title: Checkout Payment checkout_summary_title: Checkout Summary diff --git a/spec/views/spree/orders/edit.html.haml_spec.rb b/spec/views/spree/orders/edit.html.haml_spec.rb index cb1186592bf..c4c9fcf1d46 100644 --- a/spec/views/spree/orders/edit.html.haml_spec.rb +++ b/spec/views/spree/orders/edit.html.haml_spec.rb @@ -31,4 +31,28 @@ expect(rendered).to have_selector(".unit-price") end end + + describe "display adjustments" do + let(:voucher) { create(:voucher, enterprise: order.distributor) } + + before do + voucher.create_adjustment(voucher.code, order) + OrderManagement::Order::Updater.new(order).update_voucher + render + end + + it "includes Voucher text with label" do + expect(rendered).to include("Voucher: #{voucher.code}") + end + + # shipping fee is derived from 'completed_order_with_fees' factory, it applies when using shipping method such as Home Delivery. + it "includes Shipping label" do + expect(rendered).to include("Shipping") + end + + # transaction fee is derived from 'completed_order_with_fees' factory, it applies when using payment methods such as Check & Stripe. + it "includes Transaction fee label" do + expect(rendered).to include("Transaction fee") + end + end end