Skip to content

Commit

Permalink
fix: remove obsolete strip of % from tax_rate and fix type conversion
Browse files Browse the repository at this point in the history
  • Loading branch information
henri-hulski committed Mar 25, 2022
1 parent fa77fac commit a018748
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions cartridge/shop/checkout.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ def default_tax_handler(request, order_form):
"""
settings.clear_cache()
if settings.SHOP_DEFAULT_TAX_RATE:
tax_rate = settings.SHOP_DEFAULT_TAX_RATE.strip("%")
tax_rate = (settings.SHOP_DEFAULT_TAX_RATE)
if settings.SHOP_TAX_INCLUDED:
tax = request.cart.total_price() - (
request.cart.total_price() / decimal.Decimal(1 + float(tax_rate) / 100)
request.cart.total_price() / decimal.Decimal(1 + tax_rate / 100)
)
tax_type = _("Incl.") + " " + tax_rate + "% " + _("VAT")
tax_type = _("Incl.") + " " + str(tax_rate) + "% " + _("VAT")
else:
tax = request.cart.total_price() * decimal.Decimal(float(tax_rate) / 100)
tax_type = _("VAT") + " (" + tax_rate + "%)"
tax = request.cart.total_price() * decimal.Decimal(tax_rate / 100)
tax_type = _("VAT") + " (" + str(tax_rate) + "%)"
set_tax(request, tax_type, f"{tax:.2f}")


Expand Down

0 comments on commit a018748

Please sign in to comment.