From 13a22c56f4bcd873dadaffc989ae468ea4bd23b8 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Fri, 2 Jun 2023 14:13:56 +0100 Subject: [PATCH] Move taxing of admin adjustments out of customer details controller --- .../spree/admin/orders/customer_details_controller.rb | 2 -- app/models/spree/order.rb | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/spree/admin/orders/customer_details_controller.rb b/app/controllers/spree/admin/orders/customer_details_controller.rb index ed13ae4e52..53d08434f5 100644 --- a/app/controllers/spree/admin/orders/customer_details_controller.rb +++ b/app/controllers/spree/admin/orders/customer_details_controller.rb @@ -56,8 +56,6 @@ module Spree # If the order's address has been changed, the tax zone could be different, # which means a different set of tax rates might be applicable. @order.create_tax_charge! - Spree::TaxRate.adjust(@order, @order.adjustments.admin) - @order.update_totals_and_states end diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index 62717fe328..e7e87415d1 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -322,6 +322,7 @@ module Spree Spree::TaxRate.adjust(self, line_items) Spree::TaxRate.adjust(self, shipments) if shipments.any? + Spree::TaxRate.adjust(self, adjustments.admin) if adjustments.admin.any? fee_handler.tax_enterprise_fees! end