Add decimal support for email tax percentages

Author: ranta

email_notification/admin/email_template_tester.py

@@ -84,7 +84,7 @@ class EmailTemplateTesterForm(forms.Form):
     price = forms.DecimalField(decimal_places=2, initial=Decimal("12.30"), widget=forms.NumberInput())
     non_subsidised_price = forms.DecimalField(decimal_places=2, initial=Decimal("15.00"), widget=forms.NumberInput())
     subsidised_price = forms.DecimalField(decimal_places=2, initial=Decimal("5.00"), widget=forms.NumberInput)
-    tax_percentage = forms.IntegerField(initial=24, widget=forms.NumberInput)
+    tax_percentage = forms.DecimalField(decimal_places=2, initial=Decimal("25.5"), widget=forms.NumberInput)
     confirmed_instructions_fi = forms.CharField(initial="[lisäohje: hyväksytty]", widget=forms.Textarea)
     confirmed_instructions_sv = forms.CharField(initial="[mer information: bekräftats]", widget=forms.Textarea)
     confirmed_instructions_en = forms.CharField(initial="[additional info: confirmed]", widget=forms.Textarea)

email_notification/helpers/email_builder_reservation.py

@@ -40,7 +40,7 @@ class ReservationEmailContext(BaseEmailContext):
     price: Decimal
     non_subsidised_price: Decimal
     subsidised_price: Decimal
-    tax_percentage: int
+    tax_percentage: Decimal
 
     confirmed_instructions: str
     pending_instructions: str
@@ -89,7 +89,7 @@ def from_reservation(
             price=reservation.price,
             non_subsidised_price=reservation.non_subsidised_price,
             subsidised_price=cls._get_reservation_subsidised_price(reservation),
-            tax_percentage=int(reservation.tax_percentage_value),
+            tax_percentage=reservation.tax_percentage_value,
             # Instructions
             confirmed_instructions=cls._get_instruction_field(reservation, "confirmed", language),
             pending_instructions=cls._get_instruction_field(reservation, "pending", language),
@@ -162,7 +162,7 @@ def from_mock_data(cls) -> ReservationEmailContext:
             price=Decimal("12.30"),
             non_subsidised_price=Decimal("15.00"),
             subsidised_price=Decimal("5.00"),
-            tax_percentage=24,
+            tax_percentage=Decimal("25.5"),
             # Instructions
             confirmed_instructions="[lisäohje: hyväksytty]",
             pending_instructions="[lisäohje: käsittelyssä]",

tests/test_email/test_email_builder_render_reservation.py

@@ -242,7 +242,7 @@ def test_email_builder__subsidised_price(email_template, reservation):
 
 def test_email_builder__get_content__subsidised_price_from_price_calc(email_template, reservation):
     reservation.price = 52
-    reservation.tax_percentage_value = 10
+    reservation.tax_percentage_value = Decimal("25.5")
     reservation.applying_for_free_of_charge = True
     email_template.content = (
         "{% if price > 0 %}{% if subsidised_price < price %}"
@@ -254,7 +254,7 @@ def test_email_builder__get_content__subsidised_price_from_price_calc(email_temp
         "Varauksen hinta: 0 €"
         "{% endif %}"
     )
-    compiled_content = "Varauksen hinta: 0,00 - 52,00 € (sis. alv 10%)"
+    compiled_content = "Varauksen hinta: 0,00 - 52,00 € (sis. alv 25.5%)"
 
     builder = ReservationEmailBuilder.from_reservation(template=email_template, reservation=reservation)
 

tests/test_email/test_email_sender_reservation.py

@@ -189,7 +189,7 @@ def test_email_sender__test_emails(outbox, email_template):
         "price": Decimal("10.00"),
         "non_subsidised_price": Decimal("10.00"),
         "subsidised_price": Decimal("5.00"),
-        "tax_percentage": 24,
+        "tax_percentage": Decimal("25.5"),
         "confirmed_instructions_fi": "Confirmed FI",
         "confirmed_instructions_en": "Confirmed EN",
         "confirmed_instructions_sv": "Confirmed SV",