CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Order change form: No default fee type, use most generic fee type first (Z#23179634) (#4771)

Browse Source
This commit is contained in:
Raphael Michel
2025-01-21 17:48:31 +01:00
committed by GitHub
parent 1f49b577f0
commit 46aefc10f3
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/base/models/orders.py
View File

@@ -2281,9 +2281,9 @@ class OrderFee(models.Model):
FEE_TYPE_OTHER = "other" FEE_TYPE_OTHER = "other"
FEE_TYPE_GIFTCARD = "giftcard" FEE_TYPE_GIFTCARD = "giftcard"
FEE_TYPES = ( FEE_TYPES = (
(FEE_TYPE_SERVICE, _("Service fee")),
(FEE_TYPE_PAYMENT, _("Payment fee")), (FEE_TYPE_PAYMENT, _("Payment fee")),
(FEE_TYPE_SHIPPING, _("Shipping fee")), (FEE_TYPE_SHIPPING, _("Shipping fee")),
(FEE_TYPE_SERVICE, _("Service fee")),
(FEE_TYPE_CANCELLATION, _("Cancellation fee")), (FEE_TYPE_CANCELLATION, _("Cancellation fee")),
(FEE_TYPE_INSURANCE, _("Insurance fee")), (FEE_TYPE_INSURANCE, _("Insurance fee")),
(FEE_TYPE_LATE, _("Late fee")), (FEE_TYPE_LATE, _("Late fee")),

8
src/pretix/control/forms/orders.py
View File

@@ -612,7 +612,13 @@ class OrderFeeChangeForm(forms.Form):
class OrderFeeAddForm(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( value = forms.DecimalField(
max_digits=13, decimal_places=2, max_digits=13, decimal_places=2,
localize=True, localize=True,