fix stuff that broke

src/pretix/base/services/orders.py

@@ -41,7 +41,6 @@ from collections import Counter, defaultdict, namedtuple
 from datetime import datetime, time, timedelta
 from decimal import Decimal
 from functools import reduce
-
 from time import sleep
 from typing import List, Optional
 
@@ -52,7 +51,7 @@ from django.core.exceptions import ValidationError
 from django.db import models, transaction
 from django.db.models import (
     Count, Exists, F, IntegerField, Max, Min, OuterRef, Prefetch, Q, QuerySet,
-    Sum, Value,
+    Subquery, Sum, Value,
 )
 from django.db.models.functions import Cast, Greatest
 from django.db.transaction import get_connection
@@ -68,14 +67,14 @@ from pretix.base.email import get_email_context
 from pretix.base.i18n import get_language_without_region, language
 from pretix.base.media import MEDIA_TYPES
 from pretix.base.models import (
-    CartPosition, Device, Event, GiftCard, Item, ItemVariation,
-    Membership, Order, OrderPayment, OrderPosition, Quota, Seat,
-    SeatCategoryMapping, User, Voucher,
+    CartPosition, Device, Event, GiftCard, Item, ItemVariation, Membership,
+    Order, OrderPayment, OrderPosition, Quota, Seat, SeatCategoryMapping, User,
+    Voucher,
 )
-from pretix.base.models.event import Event_SettingsStore, SubEvent
 from pretix.base.models.cancellation import (
     CancellationCheck, CheckResult, CheckTypes, PositionSet,
 )
+from pretix.base.models.event import Event_SettingsStore, SubEvent
 from pretix.base.models.orders import (
     BlockedTicketSecret, CheckoutSession, InvoiceAddress, OrderFee,
     OrderRefund, generate_secret,

src/pretix/plugins/ticketoutputpdf/signals.py

@@ -28,10 +28,9 @@ from django.utils.translation import gettext_lazy as _
 
 from pretix.base.logentrytypes import EventLogEntryType, log_entry_types
 from pretix.base.models import Event, SalesChannel
-from pretix.base.signals import EventPluginSignal  # NOQA: legacy import
-from pretix.base.signals import (
-    event_copy_data, item_copy_data, layout_text_variables, logentry_display,
-    logentry_object_link, register_data_exporters,
+from pretix.base.signals import (  # NOQA: legacy import
+    EventPluginSignal, event_copy_data, item_copy_data, layout_text_variables,
+    logentry_display, logentry_object_link, register_data_exporters,
     register_multievent_data_exporters, register_ticket_outputs,
 )
 from pretix.control.signals import item_forms, order_position_buttons
@@ -39,8 +38,9 @@ from pretix.plugins.ticketoutputpdf.forms import TicketLayoutItemForm
 from pretix.plugins.ticketoutputpdf.models import (
     TicketLayout, TicketLayoutItem,
 )
-from pretix.presale.style import get_fonts  # NOQA: legacy import
-from pretix.presale.style import register_event_fonts, register_fonts
+from pretix.presale.style import (  # NOQA: legacy import
+    get_fonts, register_event_fonts, register_fonts,
+)
 
 
 @receiver(register_ticket_outputs, dispatch_uid="output_pdf")