CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-06 15:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash related to vouchers and seats

Browse Source 
PRETIXEU-2PY
This commit is contained in:
Raphael Michel
2020-08-21 16:12:04 +02:00
parent e9a4c3845a
commit d90fcee5e1
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pretix/base/models/seating.py
View File

@@ -253,15 +253,18 @@ class Seat(models.Model):
ignore_order_id=ignore_orderpos.order_id if ignore_orderpos else None, ignore_order_id=ignore_orderpos.order_id if ignore_orderpos else None,
ignore_cart_id=( ignore_cart_id=(
distance_ignore_cart_id or distance_ignore_cart_id or
(ignore_cart.cart_id if ignore_cart else None) (ignore_cart.cart_id if ignore_cart and ignore_cart is not True else None)
)) ))
q = Q(has_order=True) | Q(has_voucher=True)
if ignore_cart is not True:
q |= Q(has_cart=True)
qs_closeby_taken = qs_annotated.annotate( qs_closeby_taken = qs_annotated.annotate(
distance=( distance=(
Power(F('x') - Value(self.x), Value(2), output_field=models.FloatField()) + Power(F('x') - Value(self.x), Value(2), output_field=models.FloatField()) +
Power(F('y') - Value(self.y), Value(2), output_field=models.FloatField()) Power(F('y') - Value(self.y), Value(2), output_field=models.FloatField())
) )
).exclude(pk=self.pk).filter( ).exclude(pk=self.pk).filter(
Q(has_order=True) | Q(has_cart=True) | Q(has_voucher=True), q,
distance__lt=self.event.settings.seating_minimal_distance ** 2 distance__lt=self.event.settings.seating_minimal_distance ** 2
) )
if self.event.settings.seating_distance_within_row: if self.event.settings.seating_distance_within_row: