From 9deadc8ae1a3982124e76100860fa442f04e93a5 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 3 Mar 2021 13:23:48 +0000 Subject: [PATCH] Simplify order.adjustment_total sum --- .../app/services/order_management/order/updater.rb | 3 +-- .../spec/services/order_management/order/updater_spec.rb | 2 +- 2 files changed, 2 insertions(+), 3 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 c96201f10a..7ff69ceeaa 100644 --- a/engines/order_management/app/services/order_management/order/updater.rb +++ b/engines/order_management/app/services/order_management/order/updater.rb @@ -57,8 +57,7 @@ module OrderManagement end def update_adjustment_total - order.adjustment_total = adjustments.eligible.sum(:amount) + - all_adjustments.shipping.sum(:amount) + 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.sum(:included_tax) + all_adjustments.enterprise_fee.sum(:included_tax) + 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 017f8b710a..f0df8269af 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 @@ -28,7 +28,7 @@ module OrderManagement end it "updates adjustment totals" do - allow(order).to receive_message_chain(:adjustments, :eligible, :sum).and_return(-10) + 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)