Skip to content

Simplify Spree::TaxRate#compute_amount #684

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 12, 2016
Merged

Simplify Spree::TaxRate#compute_amount #684

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
10 changes: 3 additions & 7 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 @@ -173,13 +173,9 @@ def adjust(order_tax_zone, item)

# This method is used by Adjustment#update to recalculate the cost.
def compute_amount(item)
if included_in_price
if default_zone_or_zone_match?(item.order.tax_zone)
calculator.compute(item)
else
# In this case, it's a refund.
calculator.compute(item) * - 1
end
if included_in_price && !default_zone_or_zone_match?(item.order.tax_zone)
# In this case, it's a refund.
calculator.compute(item) * - 1
else
calculator.compute(item)
end
Expand Down