diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py index 09ad6245ee..0b824a3f10 100644 --- a/src/pretix/base/models/orders.py +++ b/src/pretix/base/models/orders.py @@ -2281,9 +2281,9 @@ class OrderFee(models.Model): FEE_TYPE_OTHER = "other" FEE_TYPE_GIFTCARD = "giftcard" FEE_TYPES = ( + (FEE_TYPE_SERVICE, _("Service fee")), (FEE_TYPE_PAYMENT, _("Payment fee")), (FEE_TYPE_SHIPPING, _("Shipping fee")), - (FEE_TYPE_SERVICE, _("Service fee")), (FEE_TYPE_CANCELLATION, _("Cancellation fee")), (FEE_TYPE_INSURANCE, _("Insurance fee")), (FEE_TYPE_LATE, _("Late fee")), diff --git a/src/pretix/control/forms/orders.py b/src/pretix/control/forms/orders.py index 8c6edda123..f5be0b529d 100644 --- a/src/pretix/control/forms/orders.py +++ b/src/pretix/control/forms/orders.py @@ -612,7 +612,13 @@ class OrderFeeChangeForm(forms.Form): class OrderFeeAddForm(forms.Form): - fee_type = forms.ChoiceField(choices=OrderFee.FEE_TYPES) + fee_type = forms.ChoiceField( + choices=[("", ""), *OrderFee.FEE_TYPES], + help_text=_( + "Note that payment fees have a special semantic and might automatically be changed if the " + "payment method of the order is changed." + ) + ) value = forms.DecimalField( max_digits=13, decimal_places=2, localize=True,