diff --git a/src/pretix/control/forms/orders.py b/src/pretix/control/forms/orders.py index 39a6e24f36..daea5ae6ad 100644 --- a/src/pretix/control/forms/orders.py +++ b/src/pretix/control/forms/orders.py @@ -5,6 +5,7 @@ from django import forms from django.conf import settings from django.core.exceptions import ValidationError from django.db import models +from django.template.defaultfilters import floatformat from django.urls import reverse from django.utils.timezone import make_aware, now from django.utils.translation import ( @@ -121,7 +122,10 @@ class CancelForm(ConfirmPaymentForm): prs = self.instance.payment_refund_sum if prs > 0: change_decimal_field(self.fields['cancellation_fee'], self.instance.event.currency) - self.fields['cancellation_fee'].initial = Decimal('0.00') + self.fields['cancellation_fee'].widget.attrs['placeholder'] = floatformat( + Decimal('0.00'), + settings.CURRENCY_PLACES.get(self.instance.event.currency, 2) + ) self.fields['cancellation_fee'].max_value = prs else: del self.fields['cancellation_fee'] diff --git a/src/pretix/control/templates/pretixcontrol/order/refund_choose.html b/src/pretix/control/templates/pretixcontrol/order/refund_choose.html index 8f0155ae60..389e4c255f 100644 --- a/src/pretix/control/templates/pretixcontrol/order/refund_choose.html +++ b/src/pretix/control/templates/pretixcontrol/order/refund_choose.html @@ -45,7 +45,11 @@ {% trans "Automatically refund" context "amount_label" %}
{{ request.event.currency }} @@ -73,7 +77,7 @@ {% trans "Transfer" context "amount_label" %}
+ title="" class="form-control" placeholder="{{ 0|floatformat:2 }}"> {{ request.event.currency }} @@ -94,7 +98,7 @@
+ title="" class="form-control" placeholder="{{ giftcard_proposal|floatformat:2 }}"> {{ request.event.currency }} @@ -114,7 +118,11 @@ {% trans "Manually refund" context "amount_label" %}
{{ request.event.currency }} diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py index c396fbf6d6..4b7513138c 100644 --- a/src/pretix/control/views/orders.py +++ b/src/pretix/control/views/orders.py @@ -968,7 +968,7 @@ class OrderTransition(OrderView): instance=self.order, data=self.request.POST if self.request.method == "POST" else None, initial={ - 'cancellation_fee': self.req.cancellation_fee if self.req else Decimal('0.00') + 'cancellation_fee': self.req.cancellation_fee if self.req else None } )