From 5d1d72b36bff53524326d90dfed7b0a46e3b8a92 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Sat, 27 Feb 2021 12:40:01 +0000 Subject: [PATCH] Update Admin::OrdersHelper#order_adjustments_for_display --- app/helpers/admin/orders_helper.rb | 6 +++--- spec/helpers/admin/orders_helper_spec.rb | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/helpers/admin/orders_helper.rb b/app/helpers/admin/orders_helper.rb index 9e16d27ed5..022394c624 100644 --- a/app/helpers/admin/orders_helper.rb +++ b/app/helpers/admin/orders_helper.rb @@ -5,9 +5,9 @@ module Admin # We exclude shipping method adjustments because they are displayed in a # separate table together with the order line items. def order_adjustments_for_display(order) - order.adjustments.eligible.reject do |adjustment| - adjustment.originator_type == "Spree::ShippingMethod" - end + order.all_adjustments.enterprise_fee + + order.all_adjustments.payment_fee.eligible + + order.adjustments.admin end end end diff --git a/spec/helpers/admin/orders_helper_spec.rb b/spec/helpers/admin/orders_helper_spec.rb index 13079d4590..63357be422 100644 --- a/spec/helpers/admin/orders_helper_spec.rb +++ b/spec/helpers/admin/orders_helper_spec.rb @@ -7,13 +7,14 @@ describe Admin::OrdersHelper, type: :helper do let(:order) { create(:order) } it "selects eligible adjustments" do - adjustment = create(:adjustment, order: order, adjustable: order, amount: 1) + adjustment = create(:adjustment, order: order, adjustable: order, amount: 1, source: nil) expect(helper.order_adjustments_for_display(order)).to eq [adjustment] end it "filters shipping method adjustments" do - create(:adjustment, order: order, adjustable: order, amount: 1, originator_type: "Spree::ShippingMethod") + create(:adjustment, order: order, adjustable: order, amount: 1, + originator_type: "Spree::ShippingMethod") expect(helper.order_adjustments_for_display(order)).to eq [] end