Utilize variant tax category when calculating taxes if possible

In the default tax_calculator, this change ensures that the variant’s current tax_category is considered when calculating taxes. In the case of the item_rates method, only line_item items will have this method, so it is accessed with `try` first, with a fallback to without `variant_` Co-authored-by: Adam Mueller <[email protected]>
solidusio · Jan 7, 2025 · 5768c53 · 5768c53
1 parent 3a39c53
commit 5768c53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/app/models/spree/tax/tax_helpers.rb b/core/app/models/spree/tax/tax_helpers.rb
@@ -9,7 +9,7 @@ def rates_for_item(item)
         @rates_for_item ||= Spree::TaxRate.item_level.for_address(item.order.tax_address)
 
         @rates_for_item.select do |rate|
-          rate.active? && rate.tax_categories.map(&:id).include?(item.tax_category_id)
+          rate.active? && rate.tax_categories.map(&:id).include?(item.try(:variant_tax_category_id) || item.tax_category_id)
         end
       end
     end

diff --git a/core/app/models/spree/tax_calculator/default.rb b/core/app/models/spree/tax_calculator/default.rb
@@ -99,7 +99,7 @@ def calculate_rates(item)
       # @return [Array<Spree::TaxRate>] rates that apply to an order
       def rates_for_order
         tax_category_ids = Set[
-          *@order.line_items.map(&:tax_category_id),
+          *@order.line_items.map(&:variant_tax_category_id),
           *@order.shipments.map(&:tax_category_id)
         ]
         rates = Spree::TaxRate.active.order_level.for_address(@order.tax_address)