From 6e9ae0b0db113923b4b8dcae0efe88c188a2f4f9 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Tue, 9 Mar 2021 17:01:44 +0000 Subject: [PATCH] Update tax totals calculation in Order::Updater Line items, shipments, and fees now all have taxes recorded in a uniform way, so we can drop more complexity here (and the number of queries). --- .../app/services/order_management/order/updater.rb | 4 +--- .../spec/services/order_management/order/updater_spec.rb | 4 +--- 2 files changed, 2 insertions(+), 6 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 fb1f7cda01..0e29c7c012 100644 --- a/engines/order_management/app/services/order_management/order/updater.rb +++ b/engines/order_management/app/services/order_management/order/updater.rb @@ -65,9 +65,7 @@ module OrderManagement def update_adjustment_total order.adjustment_total = all_adjustments.additional.eligible.sum(:amount) order.additional_tax_total = all_adjustments.tax.additional.sum(:amount) - order.included_tax_total = order.line_item_adjustments.tax.inclusive.sum(:amount) + - all_adjustments.enterprise_fee.sum(:included_tax) + - order.shipment_adjustments.tax.inclusive.sum(:amount) + + order.included_tax_total = all_adjustments.tax.inclusive.sum(:amount) + 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 c2ddf1f9d7..10260c56db 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 @@ -30,9 +30,7 @@ module OrderManagement it "updates adjustment totals" do allow(order).to receive_message_chain(:all_adjustments, :additional, :eligible, :sum).and_return(-5) 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(:all_adjustments, :shipping, :sum).and_return(5) - allow(order).to receive_message_chain(:shipment_adjustments, :tax, :inclusive, :sum).and_return(5) + allow(order).to receive_message_chain(:all_adjustments, :tax, :inclusive, :sum).and_return(15) allow(order).to receive_message_chain(:adjustments, :admin, :sum).and_return(2) updater.update_adjustment_total