raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move taxing of admin adjustments out of customer details controller

Browse Source
This commit is contained in:
Matt-Yorkley
2023-06-02 14:13:56 +01:00
parent 65b6a75c9b
commit 13a22c56f4
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/spree/admin/orders/customer_details_controller.rb
View File

@@ -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

1
app/models/spree/order.rb
View File

@@ -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