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

Self-service cancellation: Never suggest cancellation fee higher than order total

Browse Source
This commit is contained in:
Raphael Michel
2021-08-16 14:43:08 +02:00
parent e191988b81
commit 53e3619140
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -541,7 +541,7 @@ class Order(LockModel, LoggedModel):
fee += self.event.settings.cancel_allow_user_paid_keep_percentage / Decimal('100.0') * (self.total - fee)
if self.event.settings.cancel_allow_user_paid_keep:
fee += self.event.settings.cancel_allow_user_paid_keep
return round_decimal(fee, self.event.currency)
return round_decimal(min(fee, self.total), self.event.currency)
@property
@scopes_disabled()

4
src/tests/base/test_models.py
View File

@@ -1417,6 +1417,10 @@ class OrderTestCase(BaseQuotaTestCase):
self.order = Order.objects.get(pk=self.order.pk)
assert self.order.user_cancel_fee == Decimal('9.10')
self.event.settings.cancel_allow_user_paid_keep = Decimal('100.00')
self.order = Order.objects.get(pk=self.order.pk)
assert self.order.user_cancel_fee == Decimal('48.00')
@classscope(attr='o')
def test_paid_order_underpaid(self):
self.order.status = Order.STATUS_PAID