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

Do not allow customers to cancel checked-in orders

Browse Source
This commit is contained in:
Raphael Michel
2019-01-21 09:04:06 +01:00
parent cdea6eb55e
commit 3703fbcacf
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -395,8 +395,14 @@ class Order(LockModel, LoggedModel):
""" """
Returns whether or not this order can be canceled by the user. Returns whether or not this order can be canceled by the user.
""" """
positions = list(self.positions.all().select_related('item')) from .checkin import Checkin
cancelable = all([op.item.allow_cancel for op in positions])
positions = list(
self.positions.all().annotate(
has_checkin=Exists(Checkin.objects.filter(position_id=OuterRef('pk')))
).select_related('item')
)
cancelable = all([op.item.allow_cancel and not op.has_checkin for op in positions])
if not cancelable or not positions: if not cancelable or not positions:
return False return False
if self.user_cancel_deadline and now() > self.user_cancel_deadline: if self.user_cancel_deadline and now() > self.user_cancel_deadline:

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

@@ -15,7 +15,7 @@ from django.utils.timezone import now
from pretix.base.i18n import language from pretix.base.i18n import language
from pretix.base.models import ( from pretix.base.models import (
CachedFile, CartPosition, CheckinList, Event, Item, ItemCategory, CachedFile, CartPosition, Checkin, CheckinList, Event, Item, ItemCategory,
ItemVariation, Order, OrderFee, OrderPayment, OrderPosition, OrderRefund, ItemVariation, Order, OrderFee, OrderPayment, OrderPosition, OrderRefund,
Organizer, Question, Quota, User, Voucher, WaitingListEntry, Organizer, Question, Quota, User, Voucher, WaitingListEntry,
) )
@@ -865,6 +865,18 @@ class OrderTestCase(BaseQuotaTestCase):
self.event.settings.cancel_allow_user_paid = True self.event.settings.cancel_allow_user_paid = True
assert self.order.user_cancel_allowed assert self.order.user_cancel_allowed
def test_can_cancel_checked_in(self):
self.order.status = Order.STATUS_PAID
self.order.save()
self.event.settings.cancel_allow_user = False
self.event.settings.cancel_allow_user_paid = True
assert self.order.user_cancel_allowed
Checkin.objects.create(
position=self.order.positions.first(),
list=CheckinList.objects.create(event=self.event, name='Default')
)
assert not self.order.user_cancel_allowed
def test_can_cancel_order_multiple(self): def test_can_cancel_order_multiple(self):
item1 = Item.objects.create(event=self.event, name="Ticket", default_price=23, item1 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
admission=True, allow_cancel=True) admission=True, allow_cancel=True)