From 49f1e44999924b7afddf99479e6b27d0add63fa6 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Thu, 18 Mar 2021 14:05:29 +0000
Subject: [PATCH] Simplify Order#total_tax to cover all taxes from all sources

---
 app/models/spree/order.rb       | 4 +---
 spec/models/spree/order_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index 3e460753c5..0e76b64ddf 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -662,9 +662,7 @@ module Spree
     end
 
     def total_tax
-      adjustments.sum(:included_tax) +
-        shipment_adjustments.sum(:included_tax) +
-        line_item_adjustments.tax.sum(:amount)
+      additional_tax_total + included_tax_total
     end
 
     def has_taxes_included
diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb
index 8937d4c81d..a2c9ad50a7 100644
--- a/spec/models/spree/order_spec.rb
+++ b/spec/models/spree/order_spec.rb
@@ -699,7 +699,7 @@ describe Spree::Order do
         amount: 123,
         included_tax: 2
       )
-      order.reload
+      order.update!
     end
 
     it "returns a sum of all tax on the order" do