From d17ff38a7e6405332839b34d7c4b51beb17f83dd Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 3 Mar 2021 11:20:05 +0000
Subject: [PATCH] Delete Order#tax_total

#display_tax_total is not used anywhere, #tax_total is used in once place but it's not needed.
---
 app/models/spree/order.rb                   | 8 --------
 app/models/spree/payment/processing.rb      | 2 +-
 spec/models/spree/order/adjustments_spec.rb | 7 -------
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index 71d76036df..6c637f689e 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -184,10 +184,6 @@ module Spree
       Spree::Money.new(adjustment_total, currency: currency)
     end
 
-    def display_tax_total
-      Spree::Money.new(tax_total, currency: currency)
-    end
-
     def display_total
       Spree::Money.new(total, currency: currency)
     end
@@ -383,10 +379,6 @@ module Spree
       adjustments.shipping.sum(:amount)
     end
 
-    def tax_total
-      adjustments.tax.sum(:amount)
-    end
-
     # Creates new tax charges if there are any applicable rates. If prices already
     # include taxes then price adjustments are created instead.
     def create_tax_charge!
diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
index 80d9d2dc0f..08eb305566 100644
--- a/app/models/spree/payment/processing.rb
+++ b/app/models/spree/payment/processing.rb
@@ -175,7 +175,7 @@ module Spree
                     order_id: gateway_order_id }
 
         options.merge!(shipping: order.ship_total * 100,
-                       tax: order.tax_total * 100,
+                       tax: order.additional_tax_total * 100,
                        subtotal: order.item_total * 100,
                        discount: 0,
                        currency: currency)
diff --git a/spec/models/spree/order/adjustments_spec.rb b/spec/models/spree/order/adjustments_spec.rb
index ede6051f38..65c994e255 100644
--- a/spec/models/spree/order/adjustments_spec.rb
+++ b/spec/models/spree/order/adjustments_spec.rb
@@ -16,13 +16,6 @@ describe Spree::Order do
         expect(order.ship_total).to eq 15
       end
     end
-
-    context "#tax_total" do
-      it "should return the correct amount" do
-        allow(order).to receive_message_chain :adjustments, tax: adjustments
-        expect(order.tax_total).to eq 15
-      end
-    end
   end
 
   context "line item adjustments" do