From 3550197fc4f20c9e4146ffca7d9ab47e0fe9e0d4 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 18 Feb 2022 16:18:23 +0100 Subject: [PATCH] Fix bug in previous commit --- src/pretix/base/services/seating.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/pretix/base/services/seating.py b/src/pretix/base/services/seating.py index 6ac4a3feb9..c5bf0bd9e7 100644 --- a/src/pretix/base/services/seating.py +++ b/src/pretix/base/services/seating.py @@ -45,9 +45,7 @@ def validate_plan_change(event, subevent, plan): seat=OuterRef('pk'), canceled=False, ).exclude( - order__event=event, - subevent=subevent, - order__status=(Order.STATUS_CANCELED, Order.STATUS_EXPIRED) + order__status__in=(Order.STATUS_CANCELED, Order.STATUS_EXPIRED) )) ).annotate(has_v=Count('vouchers')).filter( subevent=subevent, @@ -69,11 +67,9 @@ def generate_seats(event, subevent, plan, mapping, blocked_guids=None): for s in event.seats.select_related('product').annotate( has_op=Exists(OrderPosition.all.filter( seat=OuterRef('pk'), - order__event=event, - subevent=subevent, canceled=False, ).exclude( - order__status=Order.STATUS_CANCELED + order__status__in=(Order.STATUS_CANCELED, Order.STATUS_EXPIRED) )), has_v=Count('vouchers') ).filter(subevent=subevent).order_by(): @@ -138,7 +134,7 @@ def generate_seats(event, subevent, plan, mapping, blocked_guids=None): Seat.objects.bulk_create(create_seats) CartPosition.objects.filter(seat__in=[s.pk for s in current_seats.values()]).delete() OrderPosition.all.filter( - Q(canceled=True) | Q(order__status=Order.STATUS_CANCELED), + Q(canceled=True) | Q(order__status__in=(Order.STATUS_CANCELED, Order.STATUS_EXPIRED)), seat__in=[s.pk for s in current_seats.values()], ).update(seat=None) Seat.objects.filter(pk__in=[s.pk for s in current_seats.values()]).delete()