From 6c8b1753449a17bc1c919c09ff1e6d2e72b06f3b Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Tue, 3 Mar 2020 09:29:02 +0000 Subject: [PATCH] Merge match and its alias method --- app/models/spree/tax_rate_decorator.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/models/spree/tax_rate_decorator.rb b/app/models/spree/tax_rate_decorator.rb index 79a7da9679..f15ded6de8 100644 --- a/app/models/spree/tax_rate_decorator.rb +++ b/app/models/spree/tax_rate_decorator.rb @@ -2,18 +2,13 @@ module Spree TaxRate.class_eval do class << self def match(order) + return [] if order.distributor && !order.distributor.charges_sales_tax return [] unless order.tax_zone + all.select do |rate| rate.zone == order.tax_zone || rate.zone.contains?(order.tax_zone) || rate.zone.default_tax end end - - def match_with_sales_tax_registration(order) - return [] if order.distributor && !order.distributor.charges_sales_tax - - match_without_sales_tax_registration(order) - end - alias_method_chain :match, :sales_tax_registration end def adjust_with_included_tax(order)