From 821be3eef50eaaee260ea2e8c6aeb0601b2b508d Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 22 Mar 2021 13:43:50 +0000
Subject: [PATCH] Update combined queries to use #or

---
 app/services/order_tax_adjustments_fetcher.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/order_tax_adjustments_fetcher.rb b/app/services/order_tax_adjustments_fetcher.rb
index 103953947b..50eae0a89a 100644
--- a/app/services/order_tax_adjustments_fetcher.rb
+++ b/app/services/order_tax_adjustments_fetcher.rb
@@ -22,9 +22,9 @@ class OrderTaxAdjustmentsFetcher
   def all
     tax_adjustments = order.all_adjustments.tax
     enterprise_fees_with_tax = order.all_adjustments.enterprise_fee.with_tax
-    admin_adjustments_with_tax = order.adjustments.admin.with_tax
+    admin_adjustments_with_tax = order.all_adjustments.admin.with_tax
 
-    tax_adjustments | enterprise_fees_with_tax | admin_adjustments_with_tax
+    tax_adjustments.or(enterprise_fees_with_tax).or(admin_adjustments_with_tax)
   end
 
   def table