Skip to content

Fix TaxRate.match under ruby 2.3 #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbrunsdon merged 1 commit into from
Jan 6, 2016
Merged

Fix TaxRate.match under ruby 2.3 #656

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions core/app/models/spree/tax_rate.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,17 @@ def self.match(order_tax_zone)
# This little bit of code at the end stops the Spanish refund from appearing.
#
# For further discussion, see #4397 and #4327.
rates.delete_if do |rate|
rate.included_in_price? &&
(rates - [rate]).map(&:tax_category).include?(rate.tax_category)

remaining_rates = rates.dup
rates.each do |rate|
if rate.included_in_price?
if remaining_rates.any?{|r| r != rate && r.tax_category == rate.tax_category }
remaining_rates.delete(rate)
end
end
end

remaining_rates
end

# Pre-tax amounts must be stored so that we can calculate
Expand Down