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

Allow to cancel expired orders

Browse Source
This commit is contained in:
Raphael Michel
2020-02-26 11:23:38 +01:00
parent cf06712eca
commit 4a2516e303
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -426,7 +426,7 @@ class Order(LockModel, LoggedModel):
def cancel_allowed(self): def cancel_allowed(self):
return ( return (
self.status in (Order.STATUS_PENDING, Order.STATUS_PAID) and self.count_positions self.status in (Order.STATUS_PENDING, Order.STATUS_PAID, Order.STATUS_EXPIRED) and self.count_positions
) )
@cached_property @cached_property

4
src/pretix/base/services/orders.py
View File

@@ -294,8 +294,8 @@ def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device
if not order.cancel_allowed(): if not order.cancel_allowed():
raise OrderError(_('You cannot cancel this order.')) raise OrderError(_('You cannot cancel this order.'))
invoices = [] invoices = []
i = order.invoices.filter(is_cancellation=False, refered__isnull=True).last() i = order.invoices.filter(is_cancellation=False).last()
if i: if i and not i.refered.exists():
invoices.append(generate_cancellation(i)) invoices.append(generate_cancellation(i))
for position in order.positions.all(): for position in order.positions.all():