From f037bda1dec22573c1caeccf5d46aaad30eaa6f5 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 16 Jun 2021 15:58:59 +0100
Subject: [PATCH] Replace callback for applying tax to an admin adjustment

:tada:
---
 .../spree/admin/adjustments_controller.rb          | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/controllers/spree/admin/adjustments_controller.rb b/app/controllers/spree/admin/adjustments_controller.rb
index 10909f805f..55ab5efefe 100644
--- a/app/controllers/spree/admin/adjustments_controller.rb
+++ b/app/controllers/spree/admin/adjustments_controller.rb
@@ -5,10 +5,10 @@ module Spree
     class AdjustmentsController < ::Admin::ResourceController
       belongs_to 'spree/order', find_by: :number
 
-      prepend_before_action :set_included_tax, only: [:create, :update]
       before_action :set_order_id, only: [:create, :update]
       before_action :skip_changing_canceled_orders, only: [:create, :update]
       after_action :update_order, only: [:create, :update, :destroy]
+      after_action :apply_tax, only: [:create, :update]
 
       private
 
@@ -41,19 +41,13 @@ module Spree
         redirect_to admin_order_adjustments_path(@order) if @order.canceled?
       end
 
-      def set_included_tax
-        included_tax = 0
-        if params[:tax_rate_id].present?
-          tax_rate = TaxRate.find params[:tax_rate_id]
-          amount = params[:adjustment][:amount].to_f
-          included_tax = tax_rate.compute_tax amount
-        end
-        params[:adjustment][:included_tax] = included_tax
+      def apply_tax
+        Spree::TaxRate.adjust(@order, [@adjustment])
       end
 
       def permitted_resource_params
         params.require(:adjustment).permit(
-          :label, :amount, :included_tax
+          :label, :amount, :tax_category_id
         )
       end
     end