From 00f116f35f0b38bfb06598bc7003b282e08b34f0 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 10 Feb 2021 19:54:16 +0000
Subject: [PATCH] Update Order::Updater to include shipment adjustments

---
 .../app/services/order_management/order/updater.rb           | 5 +++--
 .../spec/services/order_management/order/updater_spec.rb     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/engines/order_management/app/services/order_management/order/updater.rb b/engines/order_management/app/services/order_management/order/updater.rb
index 33a1254f1a..c96201f10a 100644
--- a/engines/order_management/app/services/order_management/order/updater.rb
+++ b/engines/order_management/app/services/order_management/order/updater.rb
@@ -57,11 +57,12 @@ module OrderManagement
       end
 
       def update_adjustment_total
-        order.adjustment_total = adjustments.eligible.sum(:amount)
+        order.adjustment_total = adjustments.eligible.sum(:amount) +
+                                 all_adjustments.shipping.sum(:amount)
         order.additional_tax_total = all_adjustments.tax.additional.sum(:amount)
         order.included_tax_total = order.line_item_adjustments.tax.sum(:included_tax) +
                                    all_adjustments.enterprise_fee.sum(:included_tax) +
-                                   adjustments.shipping.sum(:included_tax) +
+                                   all_adjustments.shipping.sum(:included_tax) +
                                    adjustments.admin.sum(:included_tax)
       end
 
diff --git a/engines/order_management/spec/services/order_management/order/updater_spec.rb b/engines/order_management/spec/services/order_management/order/updater_spec.rb
index d869607639..017f8b710a 100644
--- a/engines/order_management/spec/services/order_management/order/updater_spec.rb
+++ b/engines/order_management/spec/services/order_management/order/updater_spec.rb
@@ -31,11 +31,11 @@ module OrderManagement
           allow(order).to receive_message_chain(:adjustments, :eligible, :sum).and_return(-10)
           allow(order).to receive_message_chain(:all_adjustments, :tax, :additional, :sum).and_return(20)
           allow(order).to receive_message_chain(:all_adjustments, :enterprise_fee, :sum).and_return(10)
-          allow(order).to receive_message_chain(:adjustments, :shipping, :sum).and_return(5)
+          allow(order).to receive_message_chain(:all_adjustments, :shipping, :sum).and_return(5)
           allow(order).to receive_message_chain(:adjustments, :admin, :sum).and_return(2)
 
           updater.update_adjustment_total
-          expect(order.adjustment_total).to eq(-10)
+          expect(order.adjustment_total).to eq(-5)
           expect(order.additional_tax_total).to eq(20)
           expect(order.included_tax_total).to eq(17)
         end