From d29c0cdcb72d8dd313d3f64fab5230f6cac080d0 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 14 Apr 2021 15:17:38 +0100
Subject: [PATCH] Don't show line item adjustments in
 Admin::OrdersHelper#order_adjustments_for_display

Line item adjustments are displayed separately, if we don't filter them here they get displayed twice.
---
 app/helpers/admin/orders_helper.rb                |  4 +---
 .../spree/admin/orders_controller_spec.rb         |  2 +-
 spec/helpers/admin/orders_helper_spec.rb          | 15 +++++++++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/helpers/admin/orders_helper.rb b/app/helpers/admin/orders_helper.rb
index 022394c624..4be258821a 100644
--- a/app/helpers/admin/orders_helper.rb
+++ b/app/helpers/admin/orders_helper.rb
@@ -5,9 +5,7 @@ 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.all_adjustments.enterprise_fee +
-        order.all_adjustments.payment_fee.eligible +
-        order.adjustments.admin
+      order.adjustments + order.all_adjustments.payment_fee.eligible
     end
   end
 end
diff --git a/spec/controllers/spree/admin/orders_controller_spec.rb b/spec/controllers/spree/admin/orders_controller_spec.rb
index 567e01807e..0d881bc82f 100644
--- a/spec/controllers/spree/admin/orders_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders_controller_spec.rb
@@ -22,7 +22,7 @@ describe Spree::Admin::OrdersController, type: :controller do
       it "does not show ineligible payment adjustments" do
         adjustment = create(
           :adjustment,
-          adjustable: order,
+          adjustable: build(:payment),
           originator_type: "Spree::PaymentMethod",
           label: "invalid adjustment",
           eligible: false,
diff --git a/spec/helpers/admin/orders_helper_spec.rb b/spec/helpers/admin/orders_helper_spec.rb
index 721eb2e4fb..cfc9732a38 100644
--- a/spec/helpers/admin/orders_helper_spec.rb
+++ b/spec/helpers/admin/orders_helper_spec.rb
@@ -13,15 +13,22 @@ describe Admin::OrdersHelper, type: :helper do
     end
 
     it "filters shipping method adjustments" do
-      create(:adjustment, order: order, adjustable: order, amount: 1,
+      create(:adjustment, order: order, adjustable: build(:shipment), amount: 1,
                           originator_type: "Spree::ShippingMethod")
 
       expect(helper.order_adjustments_for_display(order)).to eq []
     end
 
-    it "filters ineligible adjustments" do
-      create(:adjustment, adjustable: order, amount: 0, eligible: false,
-                          originator_type: "Spree::TaxRate")
+    it "filters ineligible payment adjustments" do
+      create(:adjustment, adjustable: build(:payment), amount: 0, eligible: false,
+                          originator_type: "Spree::PaymentMethod", order: order)
+
+      expect(helper.order_adjustments_for_display(order)).to eq []
+    end
+
+    it "filters out line item adjustments" do
+      create(:adjustment, adjustable: build(:line_item), amount: 0, eligible: false,
+                          originator_type: "EnterpriseFee", order: order)
 
       expect(helper.order_adjustments_for_display(order)).to eq []
     end