Use deserialized data structures for mapping configuration

doc/api/resources/checkin.rst

@@ -359,65 +359,3 @@ Performing a ticket search
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer or check-in list does not exist **or** you have no permission to view this resource.
    :statuscode 404: The requested check-in list does not exist.
-
-.. _`rest-checkin-annul`:
-
-Annulment of a check-in
------------------------
-
-.. http:post:: /api/v1/organizers/(organizer)/checkinrpc/annul/
-
-   If a check-in was made in error and the person was not let in, it can be annulled. We do not recommend this to be used
-   in case of manual check-ins or user interfaces because it is too prone for human errors. It is mostly intended for
-   automated entry systems like a turnstile or automated door, where the check-in is first created, then the door is
-   opened, and then the check-in may be annulled if the system knows that the turnstile did not turn or was out of
-   order.
-
-   This endpoint supports passing multiple check-in lists for the context of a multi-event scan. However, each
-   check-in list passed needs to be from a distinct event.
-
-   Check-ins created by a device can only be annulled by the same device. The datetime of annulment may not be more than
-   15 minutes after the datetime of check-in (value subject to change).
-
-   A status code of 404 is returned if no check-in was found for the given nonce. A status code of 400 is returned when
-   multiple check-ins match the nonce, the input is invalid in another way, the annulment is made from the wrong device,
-   the check-in is already in an annulled or failed state, or the datetime constraint is not valid.
-
-   :<json string nonce: ``nonce`` value of the original check-in.
-   :<json array lists: List of check-in list IDs to search on. No two check-in lists may be from the same event.
-   :<json datetime datetime: Specifies the client-side datetime of the annulment. If not supplied, the current time will be used.
-   :<json string error_explanation: A human-readable description of why the check-in was annulled (optional).
-   :>json string status: ``"ok"``
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/checkinrpc/annul/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-      {
-        "lists": [1],
-        "nonce": "Pvrk50vUzQd0DhdpNRL4I4OcXsvg70uA",
-        "error_explanation": "Turnstile did not turn"
-      }
-
-   **Example successful response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "status": "ok",
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :statuscode 200: no error
-   :statuscode 400: Invalid or incomplete request, see above
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-   :statuscode 404: The requested nonce does not exist.

doc/development/api/general.rst

@@ -30,7 +30,7 @@ Check-ins
 
 .. automodule:: pretix.base.signals
    :no-index:
-   :members: checkin_created, checkin_annulled
+   :members: checkin_created
 
 
 Frontend

src/pretix/api/serializers/checkin.py

@@ -104,14 +104,3 @@ class MiniCheckinListSerializer(I18nAwareModelSerializer):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-
-
-class CheckinRPCAnnulInputSerializer(serializers.Serializer):
-    lists = serializers.PrimaryKeyRelatedField(required=True, many=True, queryset=CheckinList.objects.none())
-    nonce = serializers.CharField(required=True, allow_null=False)
-    datetime = serializers.DateTimeField(required=False, allow_null=True)
-    error_explanation = serializers.CharField(required=False, allow_null=True)
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['lists'].child_relation.queryset = CheckinList.objects.filter(event__in=self.context['events']).select_related('event')

src/pretix/api/urls.py

@@ -132,8 +132,6 @@ urlpatterns = [
             name="checkinrpc.redeem"),
     re_path(r'^organizers/(?P<organizer>[^/]+)/checkinrpc/search/$', checkin.CheckinRPCSearchView.as_view(),
             name="checkinrpc.search"),
-    re_path(r'^organizers/(?P<organizer>[^/]+)/checkinrpc/annul/$', checkin.CheckinRPCAnnulView.as_view(),
-            name="checkinrpc.annul"),
     re_path(r'^organizers/(?P<organizer>[^/]+)/settings/$', organizer.OrganizerSettingsView.as_view(),
             name="organizer.settings"),
     re_path(r'^organizers/(?P<organizer>[^/]+)/giftcards/(?P<giftcard>[^/]+)/', include(giftcard_router.urls)),

src/pretix/api/views/checkin.py

@@ -20,13 +20,12 @@
 # <https://www.gnu.org/licenses/>.
 #
 import operator
-from datetime import timedelta
 from functools import reduce
 
 import django_filters
 from django.conf import settings
 from django.core.exceptions import ValidationError as BaseValidationError
-from django.db import connection, transaction
+from django.db import transaction
 from django.db.models import (
     Count, Exists, F, Max, OrderBy, OuterRef, Prefetch, Q, Subquery,
     prefetch_related_objects,
@@ -40,19 +39,17 @@ from django.utils.translation import gettext
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
 from django_scopes import scopes_disabled
 from packaging.version import parse
-from rest_framework import status, views, viewsets
+from rest_framework import views, viewsets
 from rest_framework.decorators import action
-from rest_framework.exceptions import (
-    NotFound, PermissionDenied, ValidationError,
-)
+from rest_framework.exceptions import PermissionDenied, ValidationError
 from rest_framework.fields import DateTimeField
 from rest_framework.generics import ListAPIView
 from rest_framework.permissions import SAFE_METHODS
 from rest_framework.response import Response
 
 from pretix.api.serializers.checkin import (
-    CheckinListSerializer, CheckinRPCAnnulInputSerializer,
-    CheckinRPCRedeemInputSerializer, MiniCheckinListSerializer,
+    CheckinListSerializer, CheckinRPCRedeemInputSerializer,
+    MiniCheckinListSerializer,
 )
 from pretix.api.serializers.item import QuestionSerializer
 from pretix.api.serializers.order import (
@@ -69,8 +66,6 @@ from pretix.base.models.orders import PrintLog
 from pretix.base.services.checkin import (
     CheckInError, RequiredQuestionsError, SQLLogic, perform_checkin,
 )
-from pretix.base.signals import checkin_annulled
-from pretix.helpers import OF_SELF
 
 with scopes_disabled():
     class CheckinListFilter(FilterSet):
@@ -1004,79 +999,3 @@ class CheckinRPCSearchView(ListAPIView):
             qs = qs.none()
 
         return qs
-
-
-class CheckinRPCAnnulView(views.APIView):
-    def post(self, request, *args, **kwargs):
-        if isinstance(self.request.auth, (TeamAPIToken, Device)):
-            events = self.request.auth.get_events_with_permission(('can_change_orders', 'can_checkin_orders'))
-        elif self.request.user.is_authenticated:
-            events = self.request.user.get_events_with_permission(('can_change_orders', 'can_checkin_orders'), self.request).filter(
-                organizer=self.request.organizer
-            )
-        else:
-            raise ValueError("unknown authentication method")
-
-        s = CheckinRPCAnnulInputSerializer(data=request.data, context={'events': events})
-        s.is_valid(raise_exception=True)
-
-        with transaction.atomic():
-            try:
-                qs = Checkin.all.all()
-                if isinstance(request.auth, Device):
-                    qs = qs.filter(device=request.auth)
-                ci = qs.select_for_update(
-                    of=OF_SELF,
-                ).select_related("position", "position__order", "position__order__event").get(
-                    list__in=s.validated_data['lists'],
-                    nonce=s.validated_data['nonce'],
-                )
-                if connection.features.has_select_for_update_of and ci.position_id:
-                    # Lock position as well, can't do it with of= above because relation is nullable
-                    OrderPosition.objects.select_for_update(of=OF_SELF).get(pk=ci.position_id)
-
-                if not ci.successful or not ci.position:
-                    raise ValidationError("Cannot annul an unsuccessful checkin")
-            except Checkin.DoesNotExist:
-                raise NotFound("No check-in found based on nonce")
-            except Checkin.MultipleObjectsReturned:
-                raise ValidationError("Multiple check-ins found based on nonce")
-
-            annulment_time = s.validated_data.get("datetime") or now()
-
-            if annulment_time - ci.datetime > timedelta(minutes=15):
-                # Compare to sent datetime, which makes this cheatable, but allows offline annulment of checkins
-                ci.position.order.log_action('pretix.event.checkin.annulment.ignored', data={
-                    'checkin': ci.pk,
-                    'position': ci.position.id,
-                    'positionid': ci.position.positionid,
-                    'datetime': annulment_time,
-                    'error_explanation': s.validated_data.get("error_explanation"),
-                    'type': ci.type,
-                    'list': ci.list_id,
-                }, user=request.user, auth=request.auth)
-                return Response({
-                    "non_field_errors": ["Annulment is not allowed more than 15 minutes after check-in"]
-                }, status=status.HTTP_400_BAD_REQUEST)
-
-            if ci.device and ci.device != request.auth:
-                return Response({
-                    "non_field_errors": ["Annulment is only allowed from the same device"]
-                }, status=status.HTTP_400_BAD_REQUEST)
-
-            ci.successful = False
-            ci.error_reason = Checkin.REASON_ANNULLED
-            ci.error_explanation = s.validated_data.get("error_explanation")
-            ci.save(update_fields=["successful", "error_reason", "error_explanation"])
-            ci.position.order.log_action('pretix.event.checkin.annulled', data={
-                'checkin': ci.pk,
-                'position': ci.position.id,
-                'positionid': ci.position.positionid,
-                'datetime': annulment_time,
-                'error_explanation': s.validated_data.get("error_explanation"),
-                'type': ci.type,
-                'list': ci.list_id,
-            }, user=request.user, auth=request.auth)
-            checkin_annulled.send(ci.position.order.event, checkin=ci)
-
-        return Response({"status": "ok"}, status=status.HTTP_200_OK)

src/pretix/base/datasync/sourcefields.py

@@ -93,15 +93,6 @@ def split_name_on_last_space(name, part):
     return name_parts[part] if len(name_parts) > part else ""
 
 
-def normalize_email(email):
-    if email:
-        local, host = email.split("@")
-        host = host.encode("idna").decode()
-        return f"{local}@{host}"
-    else:
-        return None
-
-
 ORDER_POSITION = 'position'
 ORDER = 'order'
 EVENT = 'event'
@@ -182,10 +173,8 @@ def get_data_fields(event, for_model=None):
                 _("Attendee email"),
                 Question.TYPE_STRING,
                 None,
-                lambda position: normalize_email(
-                    position.attendee_email
-                    or (position.addon_to.attendee_email if position.addon_to else None)
-                ),
+                lambda position: position.attendee_email
+                or (position.addon_to.attendee_email if position.addon_to else None),
             ),
             DataFieldInfo(
                 ORDER_POSITION,
@@ -193,11 +182,9 @@ def get_data_fields(event, for_model=None):
                 _("Attendee or order email"),
                 Question.TYPE_STRING,
                 None,
-                lambda position: normalize_email(
-                    position.attendee_email
-                    or (position.addon_to.attendee_email if position.addon_to else None)
-                    or position.order.email
-                ),
+                lambda position: position.attendee_email
+                or (position.addon_to.attendee_email if position.addon_to else None)
+                or position.order.email,
             ),
             DataFieldInfo(
                 ORDER_POSITION,
@@ -314,7 +301,7 @@ def get_data_fields(event, for_model=None):
                 _("Order email"),
                 Question.TYPE_STRING,
                 None,
-                lambda order: normalize_email(order.email),
+                lambda order: order.email,
             ),
             DataFieldInfo(
                 ORDER,

src/pretix/base/invoice.py

@@ -48,7 +48,7 @@ from reportlab.pdfbase.ttfonts import TTFont
 from reportlab.pdfgen.canvas import Canvas
 from reportlab.platypus import (
     BaseDocTemplate, Flowable, Frame, KeepTogether, NextPageTemplate,
-    PageTemplate, Spacer, Table, TableStyle,
+    PageTemplate, Paragraph, Spacer, Table, TableStyle,
 )
 
 from pretix.base.decimal import round_decimal
@@ -56,9 +56,7 @@ from pretix.base.models import Event, Invoice, Order, OrderPayment
 from pretix.base.services.currencies import SOURCE_NAMES
 from pretix.base.signals import register_invoice_renderers
 from pretix.base.templatetags.money import money_filter
-from pretix.helpers.reportlab import (
-    FontFallbackParagraph, ThumbnailingImageReader, reshaper,
-)
+from pretix.helpers.reportlab import ThumbnailingImageReader, reshaper
 from pretix.presale.style import get_fonts
 
 logger = logging.getLogger(__name__)
@@ -237,17 +235,16 @@ class BaseReportlabInvoiceRenderer(BaseInvoiceRenderer):
                                       italic='OpenSansIt', boldItalic='OpenSansBI')
 
         for family, styles in get_fonts(event=self.event, pdf_support_required=True).items():
-            pdfmetrics.registerFont(TTFont(family, finders.find(styles['regular']['truetype'])))
             if family == self.event.settings.invoice_renderer_font:
+                pdfmetrics.registerFont(TTFont(family, finders.find(styles['regular']['truetype'])))
                 self.font_regular = family
+                if 'italic' in styles:
+                    pdfmetrics.registerFont(TTFont(family + ' I', finders.find(styles['italic']['truetype'])))
                 if 'bold' in styles:
+                    pdfmetrics.registerFont(TTFont(family + ' B', finders.find(styles['bold']['truetype'])))
                     self.font_bold = family + ' B'
-            if 'italic' in styles:
-                pdfmetrics.registerFont(TTFont(family + ' I', finders.find(styles['italic']['truetype'])))
-            if 'bold' in styles:
-                pdfmetrics.registerFont(TTFont(family + ' B', finders.find(styles['bold']['truetype'])))
-            if 'bolditalic' in styles:
-                pdfmetrics.registerFont(TTFont(family + ' B I', finders.find(styles['bolditalic']['truetype'])))
+                if 'bolditalic' in styles:
+                    pdfmetrics.registerFont(TTFont(family + ' B I', finders.find(styles['bolditalic']['truetype'])))
 
     def _normalize(self, text):
         # reportlab does not support unicode combination characters
@@ -396,8 +393,8 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
     invoice_to_top = 52 * mm
 
     def _draw_invoice_to(self, canvas):
-        p = FontFallbackParagraph(self._clean_text(self.invoice.address_invoice_to),
-                                  style=self.stylesheet['Normal'])
+        p = Paragraph(self._clean_text(self.invoice.address_invoice_to),
+                      style=self.stylesheet['Normal'])
         p.wrapOn(canvas, self.invoice_to_width, self.invoice_to_height)
         p_size = p.wrap(self.invoice_to_width, self.invoice_to_height)
         p.drawOn(canvas, self.invoice_to_left, self.pagesize[1] - p_size[1] - self.invoice_to_top)
@@ -408,7 +405,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
     invoice_from_top = 17 * mm
 
     def _draw_invoice_from(self, canvas):
-        p = FontFallbackParagraph(
+        p = Paragraph(
             self._clean_text(self.invoice.full_invoice_from),
             style=self.stylesheet['InvoiceFrom']
         )
@@ -526,12 +523,12 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
         def shorten(txt):
             txt = str(txt)
             txt = bleach.clean(txt, tags=set()).strip()
-            p = FontFallbackParagraph(self._normalize(txt.strip().replace('\n', '<br />\n')), style=self.stylesheet['Normal'])
+            p = Paragraph(self._normalize(txt.strip().replace('\n', '<br />\n')), style=self.stylesheet['Normal'])
             p_size = p.wrap(self.event_width, self.event_height)
 
             while p_size[1] > 2 * self.stylesheet['Normal'].leading:
                 txt = ' '.join(txt.replace('…', '').split()[:-1]) + '…'
-                p = FontFallbackParagraph(self._normalize(txt.strip().replace('\n', '<br />\n')), style=self.stylesheet['Normal'])
+                p = Paragraph(self._normalize(txt.strip().replace('\n', '<br />\n')), style=self.stylesheet['Normal'])
                 p_size = p.wrap(self.event_width, self.event_height)
             return txt
 
@@ -557,7 +554,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
         else:
             p_str = shorten(self.invoice.event.name)
 
-        p = FontFallbackParagraph(self._normalize(p_str.strip().replace('\n', '<br />\n')), style=self.stylesheet['Normal'])
+        p = Paragraph(self._normalize(p_str.strip().replace('\n', '<br />\n')), style=self.stylesheet['Normal'])
         p.wrapOn(canvas, self.event_width, self.event_height)
         p_size = p.wrap(self.event_width, self.event_height)
         p.drawOn(canvas, self.event_left, self.pagesize[1] - self.event_top - p_size[1])
@@ -611,7 +608,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
     def _get_intro(self):
         story = []
         if self.invoice.custom_field:
-            story.append(FontFallbackParagraph(
+            story.append(Paragraph(
                 '{}: {}'.format(
                     self._clean_text(str(self.invoice.event.settings.invoice_address_custom_field)),
                     self._clean_text(self.invoice.custom_field),
@@ -620,7 +617,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
             ))
 
         if self.invoice.internal_reference:
-            story.append(FontFallbackParagraph(
+            story.append(Paragraph(
                 self._normalize(pgettext('invoice', 'Customer reference: {reference}').format(
                     reference=self._clean_text(self.invoice.internal_reference),
                 )),
@@ -628,14 +625,14 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
             ))
 
         if self.invoice.invoice_to_vat_id:
-            story.append(FontFallbackParagraph(
+            story.append(Paragraph(
                 self._normalize(pgettext('invoice', 'Customer VAT ID')) + ': ' +
                 self._clean_text(self.invoice.invoice_to_vat_id),
                 self.stylesheet['Normal']
             ))
 
         if self.invoice.invoice_to_beneficiary:
-            story.append(FontFallbackParagraph(
+            story.append(Paragraph(
                 self._normalize(pgettext('invoice', 'Beneficiary')) + ':<br />' +
                 self._clean_text(self.invoice.invoice_to_beneficiary),
                 self.stylesheet['Normal']
@@ -647,7 +644,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
             if story:
                 story.append(Spacer(1, 5 * mm))
 
-            story.append(FontFallbackParagraph(
+            story.append(Paragraph(
                 self._clean_text(self.invoice.introductory_text, tags=['br']),
                 self.stylesheet['Normal']
             ))
@@ -660,7 +657,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
 
         story = [
             NextPageTemplate('FirstPage'),
-            FontFallbackParagraph(
+            Paragraph(
                 self._normalize(
                     pgettext('invoice', 'Tax Invoice') if str(self.invoice.invoice_from_country) == 'AU'
                     else pgettext('invoice', 'Invoice')
@@ -686,17 +683,17 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
         ]
         if has_taxes:
             tdata = [(
-                FontFallbackParagraph(self._normalize(pgettext('invoice', 'Description')), self.stylesheet['Bold']),
-                FontFallbackParagraph(self._normalize(pgettext('invoice', 'Qty')), self.stylesheet['BoldRightNoSplit']),
-                FontFallbackParagraph(self._normalize(pgettext('invoice', 'Tax rate')), self.stylesheet['BoldRightNoSplit']),
-                FontFallbackParagraph(self._normalize(pgettext('invoice', 'Net')), self.stylesheet['BoldRightNoSplit']),
-                FontFallbackParagraph(self._normalize(pgettext('invoice', 'Gross')), self.stylesheet['BoldRightNoSplit']),
+                Paragraph(self._normalize(pgettext('invoice', 'Description')), self.stylesheet['Bold']),
+                Paragraph(self._normalize(pgettext('invoice', 'Qty')), self.stylesheet['BoldRightNoSplit']),
+                Paragraph(self._normalize(pgettext('invoice', 'Tax rate')), self.stylesheet['BoldRightNoSplit']),
+                Paragraph(self._normalize(pgettext('invoice', 'Net')), self.stylesheet['BoldRightNoSplit']),
+                Paragraph(self._normalize(pgettext('invoice', 'Gross')), self.stylesheet['BoldRightNoSplit']),
             )]
         else:
             tdata = [(
-                FontFallbackParagraph(self._normalize(pgettext('invoice', 'Description')), self.stylesheet['Bold']),
-                FontFallbackParagraph(self._normalize(pgettext('invoice', 'Qty')), self.stylesheet['BoldRightNoSplit']),
-                FontFallbackParagraph(self._normalize(pgettext('invoice', 'Amount')), self.stylesheet['BoldRightNoSplit']),
+                Paragraph(self._normalize(pgettext('invoice', 'Description')), self.stylesheet['Bold']),
+                Paragraph(self._normalize(pgettext('invoice', 'Qty')), self.stylesheet['BoldRightNoSplit']),
+                Paragraph(self._normalize(pgettext('invoice', 'Amount')), self.stylesheet['BoldRightNoSplit']),
             )]
 
         def _group_key(line):
@@ -718,20 +715,14 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
                     )
                     description = description + "\n" + single_price_line
                 tdata.append((
-                    FontFallbackParagraph(
+                    Paragraph(
                         self._clean_text(description, tags=['br']),
                         self.stylesheet['Normal']
                     ),
                     str(len(lines)),
                     localize(tax_rate) + " %",
-                    FontFallbackParagraph(
-                        money_filter(net_value * len(lines), self.invoice.event.currency).replace('\xa0', ' '),
-                        self.stylesheet['NormalRight']
-                    ),
-                    FontFallbackParagraph(
-                        money_filter(gross_value * len(lines), self.invoice.event.currency).replace('\xa0', ' '),
-                        self.stylesheet['NormalRight']
-                    ),
+                    Paragraph(money_filter(net_value * len(lines), self.invoice.event.currency).replace('\xa0', ' '), self.stylesheet['NormalRight']),
+                    Paragraph(money_filter(gross_value * len(lines), self.invoice.event.currency).replace('\xa0', ' '), self.stylesheet['NormalRight']),
                 ))
             else:
                 if len(lines) > 1:
@@ -740,15 +731,12 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
                     )
                     description = description + "\n" + single_price_line
                 tdata.append((
-                    FontFallbackParagraph(
+                    Paragraph(
                         self._clean_text(description, tags=['br']),
                         self.stylesheet['Normal']
                     ),
                     str(len(lines)),
-                    FontFallbackParagraph(
-                        money_filter(gross_value * len(lines), self.invoice.event.currency).replace('\xa0', ' '),
-                        self.stylesheet['NormalRight']
-                    ),
+                    Paragraph(money_filter(gross_value * len(lines), self.invoice.event.currency).replace('\xa0', ' '), self.stylesheet['NormalRight']),
                 ))
             taxvalue_map[tax_rate, tax_name] += (gross_value - net_value) * len(lines)
             grossvalue_map[tax_rate, tax_name] += gross_value * len(lines)
@@ -756,13 +744,13 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
 
         if has_taxes:
             tdata.append([
-                FontFallbackParagraph(self._normalize(pgettext('invoice', 'Invoice total')), self.stylesheet['Bold']), '', '', '',
+                Paragraph(self._normalize(pgettext('invoice', 'Invoice total')), self.stylesheet['Bold']), '', '', '',
                 money_filter(total, self.invoice.event.currency)
             ])
             colwidths = [a * doc.width for a in (.50, .05, .15, .15, .15)]
         else:
             tdata.append([
-                FontFallbackParagraph(self._normalize(pgettext('invoice', 'Invoice total')), self.stylesheet['Bold']), '',
+                Paragraph(self._normalize(pgettext('invoice', 'Invoice total')), self.stylesheet['Bold']), '',
                 money_filter(total, self.invoice.event.currency)
             ])
             colwidths = [a * doc.width for a in (.65, .20, .15)]
@@ -772,12 +760,12 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
                 pending_sum = self.invoice.order.pending_sum
                 if pending_sum != total:
                     tdata.append(
-                        [FontFallbackParagraph(self._normalize(pgettext('invoice', 'Received payments')), self.stylesheet['Normal'])] +
+                        [Paragraph(self._normalize(pgettext('invoice', 'Received payments')), self.stylesheet['Normal'])] +
                         (['', '', ''] if has_taxes else ['']) +
                         [money_filter(pending_sum - total, self.invoice.event.currency)]
                     )
                     tdata.append(
-                        [FontFallbackParagraph(self._normalize(pgettext('invoice', 'Outstanding payments')), self.stylesheet['Bold'])] +
+                        [Paragraph(self._normalize(pgettext('invoice', 'Outstanding payments')), self.stylesheet['Bold'])] +
                         (['', '', ''] if has_taxes else ['']) +
                         [money_filter(pending_sum, self.invoice.event.currency)]
                     )
@@ -794,12 +782,12 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
                     s=Sum('amount')
                 )['s'] or Decimal('0.00')
                 tdata.append(
-                    [FontFallbackParagraph(self._normalize(pgettext('invoice', 'Paid by gift card')), self.stylesheet['Normal'])] +
+                    [Paragraph(self._normalize(pgettext('invoice', 'Paid by gift card')), self.stylesheet['Normal'])] +
                     (['', '', ''] if has_taxes else ['']) +
                     [money_filter(giftcard_sum, self.invoice.event.currency)]
                 )
                 tdata.append(
-                    [FontFallbackParagraph(self._normalize(pgettext('invoice', 'Remaining amount')), self.stylesheet['Bold'])] +
+                    [Paragraph(self._normalize(pgettext('invoice', 'Remaining amount')), self.stylesheet['Bold'])] +
                     (['', '', ''] if has_taxes else ['']) +
                     [money_filter(total - giftcard_sum, self.invoice.event.currency)]
                 )
@@ -822,7 +810,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
         story.append(Spacer(1, 10 * mm))
 
         if self.invoice.payment_provider_text:
-            story.append(FontFallbackParagraph(
+            story.append(Paragraph(
                 self._normalize(self.invoice.payment_provider_text),
                 self.stylesheet['Normal']
             ))
@@ -831,7 +819,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
             story.append(Spacer(1, 3 * mm))
 
         if self.invoice.additional_text:
-            story.append(FontFallbackParagraph(
+            story.append(Paragraph(
                 self._clean_text(self.invoice.additional_text, tags=['br']),
                 self.stylesheet['Normal']
             ))
@@ -847,10 +835,10 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
             ('FONTNAME', (0, 0), (-1, -1), self.font_regular),
         ]
         thead = [
-            FontFallbackParagraph(self._normalize(pgettext('invoice', 'Tax rate')), self.stylesheet['Fineprint']),
-            FontFallbackParagraph(self._normalize(pgettext('invoice', 'Net value')), self.stylesheet['FineprintRight']),
-            FontFallbackParagraph(self._normalize(pgettext('invoice', 'Gross value')), self.stylesheet['FineprintRight']),
-            FontFallbackParagraph(self._normalize(pgettext('invoice', 'Tax')), self.stylesheet['FineprintRight']),
+            Paragraph(self._normalize(pgettext('invoice', 'Tax rate')), self.stylesheet['Fineprint']),
+            Paragraph(self._normalize(pgettext('invoice', 'Net value')), self.stylesheet['FineprintRight']),
+            Paragraph(self._normalize(pgettext('invoice', 'Gross value')), self.stylesheet['FineprintRight']),
+            Paragraph(self._normalize(pgettext('invoice', 'Tax')), self.stylesheet['FineprintRight']),
             ''
         ]
         tdata = [thead]
@@ -861,7 +849,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
                 continue
             tax = taxvalue_map[idx]
             tdata.append([
-                FontFallbackParagraph(self._normalize(localize(rate) + " % " + name), self.stylesheet['Fineprint']),
+                Paragraph(self._normalize(localize(rate) + " % " + name), self.stylesheet['Fineprint']),
                 money_filter(gross - tax, self.invoice.event.currency),
                 money_filter(gross, self.invoice.event.currency),
                 money_filter(tax, self.invoice.event.currency),
@@ -880,7 +868,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
             table.setStyle(TableStyle(tstyledata))
             story.append(Spacer(5 * mm, 5 * mm))
             story.append(KeepTogether([
-                FontFallbackParagraph(self._normalize(pgettext('invoice', 'Included taxes')), self.stylesheet['FineprintHeading']),
+                Paragraph(self._normalize(pgettext('invoice', 'Included taxes')), self.stylesheet['FineprintHeading']),
                 table
             ]))
 
@@ -897,7 +885,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
                     net = gross - tax
 
                     tdata.append([
-                        FontFallbackParagraph(self._normalize(localize(rate) + " % " + name), self.stylesheet['Fineprint']),
+                        Paragraph(self._normalize(localize(rate) + " % " + name), self.stylesheet['Fineprint']),
                         fmt(net), fmt(gross), fmt(tax), ''
                     ])
 
@@ -906,7 +894,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
 
                 story.append(KeepTogether([
                     Spacer(1, height=2 * mm),
-                    FontFallbackParagraph(
+                    Paragraph(
                         self._normalize(pgettext(
                             'invoice', 'Using the conversion rate of 1:{rate} as published by the {authority} on '
                                        '{date}, this corresponds to:'
@@ -921,7 +909,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
         elif self.invoice.foreign_currency_display and self.invoice.foreign_currency_rate:
             foreign_total = round_decimal(total * self.invoice.foreign_currency_rate)
             story.append(Spacer(1, 5 * mm))
-            story.append(FontFallbackParagraph(self._normalize(
+            story.append(Paragraph(self._normalize(
                 pgettext(
                     'invoice', 'Using the conversion rate of 1:{rate} as published by the {authority} on '
                                '{date}, the invoice total corresponds to {total}.'
@@ -974,7 +962,7 @@ class Modern1Renderer(ClassicInvoiceRenderer):
             self._clean_text(l)
             for l in self.invoice.address_invoice_from.strip().split('\n')
         ]
-        p = FontFallbackParagraph(self._normalize(' · '.join(c)), style=self.stylesheet['Sender'])
+        p = Paragraph(self._normalize(' · '.join(c)), style=self.stylesheet['Sender'])
         p.wrapOn(canvas, self.invoice_to_width, 15.7 * mm)
         p.drawOn(canvas, self.invoice_to_left, self.pagesize[1] - self.invoice_to_top + 2 * mm)
         super()._draw_invoice_from(canvas)
@@ -1033,7 +1021,7 @@ class Modern1Renderer(ClassicInvoiceRenderer):
                 _draw(pgettext('invoice', 'Order code'), self.invoice.order.full_code, value_size, self.left_margin, 45 * mm, **kwargs)
             ]
 
-            p = FontFallbackParagraph(
+            p = Paragraph(
                 self._normalize(date_format(self.invoice.date, "DATE_FORMAT")),
                 style=ParagraphStyle(name=f'Normal{value_size}', fontName=self.font_regular, fontSize=value_size, leading=value_size * 1.2)
             )
@@ -1091,7 +1079,7 @@ class Modern1SimplifiedRenderer(Modern1Renderer):
         i = []
 
         if not self.invoice.event.has_subevents and self.invoice.event.settings.show_dates_on_frontpage:
-            i.append(FontFallbackParagraph(
+            i.append(Paragraph(
                 pgettext('invoice', 'Event date: {date_range}').format(
                     date_range=self.invoice.event.get_date_range_display(),
                 ),

src/pretix/base/models/checkin.py

@@ -350,7 +350,6 @@ class Checkin(models.Model):
     REASON_BLOCKED = 'blocked'
     REASON_UNAPPROVED = 'unapproved'
     REASON_INVALID_TIME = 'invalid_time'
-    REASON_ANNULLED = 'annulled'
     REASONS = (
         (REASON_CANCELED, _('Order canceled')),
         (REASON_INVALID, _('Unknown ticket')),
@@ -365,7 +364,6 @@ class Checkin(models.Model):
         (REASON_BLOCKED, _('Ticket blocked')),
         (REASON_UNAPPROVED, _('Order not approved')),
         (REASON_INVALID_TIME, _('Ticket not valid at this time')),
-        (REASON_ANNULLED, _('Check-in annulled')),
     )
 
     successful = models.BooleanField(

src/pretix/base/models/orders.py

@@ -3314,24 +3314,6 @@ class InvoiceAddress(models.Model):
                     kwargs['update_fields'] = {'name_cached', 'name_parts'}.union(kwargs['update_fields'])
         super().save(**kwargs)
 
-    def clear(self, except_name=False):
-        self.is_business = False
-        if not except_name:
-            self.name_cached = ""
-            self.name_parts = {}
-        self.company = ""
-        self.street = ""
-        self.zipcode = ""
-        self.city = ""
-        self.country_old = ""
-        self.country = ""
-        self.state = ""
-        self.vat_id = ""
-        self.vat_id_validated = False
-        self.custom_field = None
-        self.internal_reference = ""
-        self.beneficiary = ""
-
     def describe(self):
         parts = [
             self.company,

src/pretix/base/services/datasync.py

@@ -76,9 +76,7 @@ def sync_all():
 
             if not target_cls:
                 # sync plugin not found (plugin deactivated or uninstalled) -> drop outstanding jobs
-                num_deleted, _ = OrderSyncQueue.objects.filter(pk__in=[sq.pk for sq in queued_orders]).delete()
-                logger.info("Deleted %d queue entries from %r because plugin %s inactive", num_deleted, event, target)
-                continue
+                OrderSyncQueue.objects.filter(pk__in=[sq.pk for sq in queued_orders]).delete()
 
             with scope(organizer=event.organizer):
                 with target_cls(event=event) as p:

src/pretix/base/signals.py

@@ -668,16 +668,6 @@ For backwards compatibility reasons, this signal is only sent when a **successfu
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-checkin_annulled = EventPluginSignal()
-"""
-Arguments: ``checkin``
-
-This signal is sent out every time a check-in is annulled (i.e. changed to unsuccessful after it
-already was successful).
-
-As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
-"""
-
 logentry_display = EventPluginSignal()
 """
 Arguments: ``logentry``

src/pretix/control/logdisplay.py

@@ -321,14 +321,6 @@ class OrderChangedSplitFrom(OrderLogEntryType):
         _('Denied scan of position #{posid} at {datetime} for list "{list}", type "{type}", error code "{errorcode}".'),
         _('Denied scan of position #{posid} for list "{list}", type "{type}", error code "{errorcode}".'),
     ),
-    'pretix.event.checkin.annulled': (
-        _('Annulled scan of position #{posid} at {datetime} for list "{list}", type "{type}".'),
-        _('Annulled scan of position #{posid} for list "{list}", type "{type}".'),
-    ),
-    'pretix.event.checkin.annulment.ignored': (
-        _('Ignored annulment of position #{posid} at {datetime} for list "{list}", type "{type}".'),
-        _('Ignored annulment of position #{posid} for list "{list}", type "{type}".'),
-    ),
     'pretix.control.views.checkin.reverted': _('The check-in of position #{posid} on list "{list}" has been reverted.'),
     'pretix.event.checkin.reverted': _('The check-in of position #{posid} on list "{list}" has been reverted.'),
 })

src/pretix/helpers/reportlab.py

@@ -19,20 +19,11 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-import logging
-
 from arabic_reshaper import ArabicReshaper
 from django.conf import settings
 from django.utils.functional import SimpleLazyObject
 from PIL import Image
-from reportlab.lib.styles import ParagraphStyle
 from reportlab.lib.utils import ImageReader
-from reportlab.pdfbase import pdfmetrics
-from reportlab.platypus import Paragraph
-
-from pretix.presale.style import get_fonts
-
-logger = logging.getLogger(__name__)
 
 
 class ThumbnailingImageReader(ImageReader):
@@ -68,35 +59,3 @@ reshaper = SimpleLazyObject(lambda: ArabicReshaper(configuration={
     'delete_harakat': True,
     'support_ligatures': False,
 }))
-
-
-class FontFallbackParagraph(Paragraph):
-    def __init__(self, text, style=None, *args, **kwargs):
-        if style is None:
-            style = ParagraphStyle(name='paragraphImplicitDefaultStyle')
-
-        if not self._font_supports_text(text, style.fontName):
-            newFont = self._find_font(text, style.fontName)
-            if newFont:
-                logger.debug(f"replacing {style.fontName} with {newFont} for {text!r}")
-                style = style.clone(name=style.name + '_' + newFont, fontName=newFont)
-
-        super().__init__(text, style, *args, **kwargs)
-
-    def _font_supports_text(self, text, font_name):
-        if not text:
-            return True
-        font = pdfmetrics.getFont(font_name)
-        return all(
-            ord(c) in font.face.charToGlyph or not c.isprintable()
-            for c in text
-        )
-
-    def _find_font(self, text, original_font):
-        for family, styles in get_fonts(pdf_support_required=True).items():
-            if self._font_supports_text(text, family):
-                if (original_font.endswith("It") or original_font.endswith(" I")) and "italic" in styles:
-                    return family + " I"
-                if (original_font.endswith("Bd") or original_font.endswith(" B")) and "bold" in styles:
-                    return family + " B"
-                return family

src/pretix/locale/de/LC_MESSAGES/django.po

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-08-05 07:29+0000\n"
-"PO-Revision-Date: 2025-08-06 09:46+0000\n"
+"PO-Revision-Date: 2025-08-05 07:57+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix/de/"
 ">\n"
@@ -6163,7 +6163,7 @@ msgstr "Wert"
 
 #: pretix/base/models/orders.py:2546
 msgid "Order position"
-msgstr "Bestellposition"
+msgstr "Bestelltes Produkt"
 
 #: pretix/base/models/orders.py:3091
 msgid "Cart ID (e.g. session key)"

src/pretix/locale/de_Informal/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-08-05 07:29+0000\n"
-"PO-Revision-Date: 2025-08-06 09:46+0000\n"
+"PO-Revision-Date: 2025-08-05 07:58+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German (informal) <https://translate.pretix.eu/projects/"
 "pretix/pretix/de_Informal/>\n"
@@ -6159,7 +6159,7 @@ msgstr "Wert"
 
 #: pretix/base/models/orders.py:2546
 msgid "Order position"
-msgstr "Bestellposition"
+msgstr "Bestelltes Produkt"
 
 #: pretix/base/models/orders.py:3091
 msgid "Cart ID (e.g. session key)"

src/pretix/locale/ja/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-08-05 07:29+0000\n"
-"PO-Revision-Date: 2025-08-08 06:00+0000\n"
-"Last-Translator: Yasunobu YesNo Kawaguchi <kawaguti@gmail.com>\n"
+"PO-Revision-Date: 2025-08-05 20:00+0000\n"
+"Last-Translator: Ryo Tagami <rtagami@airstrip.jp>\n"
 "Language-Team: Japanese <https://translate.pretix.eu/projects/pretix/pretix/"
 "ja/>\n"
 "Language: ja\n"
@@ -16949,7 +16949,7 @@ msgstr "税金のルール"
 
 #: pretix/control/navigation.py:97
 msgid "Invoicing"
-msgstr "請求書作成"
+msgstr "請求書を作成します"
 
 #: pretix/control/navigation.py:105
 msgctxt "action"

src/pretix/plugins/checkinlists/exporters.py

@@ -49,7 +49,7 @@ from django.utils.translation import (
     gettext as _, gettext_lazy, pgettext, pgettext_lazy,
 )
 from reportlab.lib.units import mm
-from reportlab.platypus import Flowable, Spacer, Table, TableStyle
+from reportlab.platypus import Flowable, Paragraph, Spacer, Table, TableStyle
 
 from pretix.base.exporter import BaseExporter, ListExporter
 from pretix.base.models import (
@@ -64,7 +64,6 @@ from pretix.base.timeframes import (
 from pretix.control.forms.widgets import Select2
 from pretix.helpers.filenames import safe_for_filename
 from pretix.helpers.iter import chunked_iterable
-from pretix.helpers.reportlab import FontFallbackParagraph
 from pretix.helpers.templatetags.jsonfield import JSONExtract
 from pretix.plugins.reports.exporters import ReportlabExportMixin
 
@@ -344,7 +343,7 @@ class PDFCheckinList(ReportlabExportMixin, CheckInListMixin, BaseExporter):
         ]
 
         story = [
-            FontFallbackParagraph(
+            Paragraph(
                 cl.name,
                 headlinestyle
             ),
@@ -352,7 +351,7 @@ class PDFCheckinList(ReportlabExportMixin, CheckInListMixin, BaseExporter):
         if cl.subevent:
             story += [
                 Spacer(1, 3 * mm),
-                FontFallbackParagraph(
+                Paragraph(
                     '{} ({} {})'.format(
                         cl.subevent.name,
                         cl.subevent.get_date_range_display(),
@@ -382,10 +381,10 @@ class PDFCheckinList(ReportlabExportMixin, CheckInListMixin, BaseExporter):
         headrowstyle.fontName = 'OpenSansBd'
         for q in questions:
             txt = str(q.question)
-            p = FontFallbackParagraph(txt, headrowstyle)
+            p = Paragraph(txt, headrowstyle)
             while p.wrap(colwidths[len(tdata[0])], 5000)[1] > 30 * mm:
                 txt = txt[:len(txt) - 50] + "..."
-                p = FontFallbackParagraph(txt, headrowstyle)
+                p = Paragraph(txt, headrowstyle)
             tdata[0].append(p)
 
         qs = self._get_queryset(cl, form_data)
@@ -432,8 +431,8 @@ class PDFCheckinList(ReportlabExportMixin, CheckInListMixin, BaseExporter):
                 CBFlowable(bool(op.last_checked_in)) if not op.blocked else '—',
                 '✘' if op.order.status != Order.STATUS_PAID else '✔',
                 op.order.code,
-                FontFallbackParagraph(name, self.get_style()),
-                FontFallbackParagraph(bleach.clean(str(item), tags={'br'}).strip().replace('<br>', '<br/>'), self.get_style()),
+                Paragraph(name, self.get_style()),
+                Paragraph(bleach.clean(str(item), tags={'br'}).strip().replace('<br>', '<br/>'), self.get_style()),
             ]
             acache = {}
             if op.addon_to:
@@ -444,10 +443,10 @@ class PDFCheckinList(ReportlabExportMixin, CheckInListMixin, BaseExporter):
             for q in questions:
                 txt = acache.get(q.pk, '')
                 txt = bleach.clean(txt, tags={'br'}).strip().replace('<br>', '<br/>')
-                p = FontFallbackParagraph(txt, self.get_style())
+                p = Paragraph(txt, self.get_style())
                 while p.wrap(colwidths[len(row)], 5000)[1] > 50 * mm:
                     txt = txt[:len(txt) - 50] + "..."
-                    p = FontFallbackParagraph(txt, self.get_style())
+                    p = Paragraph(txt, self.get_style())
                 row.append(p)
             if op.order.status != Order.STATUS_PAID:
                 tstyledata += [

src/pretix/plugins/reports/accountingreport.py

@@ -49,7 +49,6 @@ from pretix.base.timeframes import (
     resolve_timeframe_to_datetime_start_inclusive_end_exclusive,
 )
 from pretix.control.forms.filter import get_all_payment_providers
-from pretix.helpers.reportlab import FontFallbackParagraph
 from pretix.plugins.reports.exporters import ReportlabExportMixin
 
 
@@ -311,13 +310,13 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
 
         tdata = [
             [
-                FontFallbackParagraph(self._transaction_group_header_label(), tstyle_bold),
-                FontFallbackParagraph(_("Price"), tstyle_bold_right),
-                FontFallbackParagraph(_("Tax rate"), tstyle_bold_right),
-                FontFallbackParagraph("#", tstyle_bold_right),
-                FontFallbackParagraph(_("Net total"), tstyle_bold_right),
-                FontFallbackParagraph(_("Tax total"), tstyle_bold_right),
-                FontFallbackParagraph(_("Gross total"), tstyle_bold_right),
+                Paragraph(self._transaction_group_header_label(), tstyle_bold),
+                Paragraph(_("Price"), tstyle_bold_right),
+                Paragraph(_("Tax rate"), tstyle_bold_right),
+                Paragraph("#", tstyle_bold_right),
+                Paragraph(_("Net total"), tstyle_bold_right),
+                Paragraph(_("Tax total"), tstyle_bold_right),
+                Paragraph(_("Gross total"), tstyle_bold_right),
             ]
         ]
 
@@ -352,7 +351,7 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
                     tdata[last_group_head_idx][6] = Paragraph(money_filter(sum_price_by_group, currency), tstyle_bold_right),
                 tdata.append(
                     [
-                        FontFallbackParagraph(
+                        Paragraph(
                             e,
                             tstyle_bold,
                         ),
@@ -375,7 +374,7 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
             text = self._transaction_row_label(r)
             tdata.append(
                 [
-                    FontFallbackParagraph(text, tstyle),
+                    Paragraph(text, tstyle),
                     Paragraph(
                         money_filter(r["price"], currency)
                         if "price" in r and r["price"] is not None
@@ -406,7 +405,7 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
             for tax_rate in sorted(sum_tax_by_tax_rate.keys(), reverse=True):
                 tdata.append(
                     [
-                        FontFallbackParagraph(_("Sum"), tstyle),
+                        Paragraph(_("Sum"), tstyle),
                         Paragraph("", tstyle_right),
                         Paragraph(localize(tax_rate.normalize()) + " %", tstyle_right),
                         Paragraph("", tstyle_right),
@@ -439,7 +438,7 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
 
         tdata.append(
             [
-                FontFallbackParagraph(_("Sum"), tstyle_bold),
+                Paragraph(_("Sum"), tstyle_bold),
                 Paragraph("", tstyle_right),
                 Paragraph("", tstyle_right),
                 Paragraph("", tstyle_bold_right),
@@ -493,10 +492,10 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
 
         tdata = [
             [
-                FontFallbackParagraph(_("Payment method"), tstyle_bold),
-                FontFallbackParagraph(_("Payments"), tstyle_bold_right),
-                FontFallbackParagraph(_("Refunds"), tstyle_bold_right),
-                FontFallbackParagraph(_("Total"), tstyle_bold_right),
+                Paragraph(_("Payment method"), tstyle_bold),
+                Paragraph(_("Payments"), tstyle_bold_right),
+                Paragraph(_("Refunds"), tstyle_bold_right),
+                Paragraph(_("Total"), tstyle_bold_right),
             ]
         ]
 
@@ -538,7 +537,7 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
             tdata.append(
                 [
                     Paragraph(provider_names.get(p, p), tstyle),
-                    FontFallbackParagraph(
+                    Paragraph(
                         money_filter(payments_by_provider[p], currency)
                         if p in payments_by_provider
                         else "",
@@ -563,7 +562,7 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
 
         tdata.append(
             [
-                FontFallbackParagraph(_("Sum"), tstyle_bold),
+                Paragraph(_("Sum"), tstyle_bold),
                 Paragraph(
                     money_filter(
                         sum(payments_by_provider.values(), Decimal("0.00")), currency
@@ -641,7 +640,7 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
             open_before = tx_before - p_before + r_before
             tdata.append(
                 [
-                    FontFallbackParagraph(
+                    Paragraph(
                         _("Pending payments at {datetime}").format(
                             datetime=date_format(
                                 df_start - datetime.timedelta.resolution,
@@ -668,21 +667,21 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
         ] or Decimal("0.00")
         tdata.append(
             [
-                FontFallbackParagraph(_("Orders"), tstyle),
+                Paragraph(_("Orders"), tstyle),
                 Paragraph("+", tstyle_center),
                 Paragraph(money_filter(tx_during, currency), tstyle_right),
             ]
         )
         tdata.append(
             [
-                FontFallbackParagraph(_("Payments"), tstyle),
+                Paragraph(_("Payments"), tstyle),
                 Paragraph("-", tstyle_center),
                 Paragraph(money_filter(p_during, currency), tstyle_right),
             ]
         )
         tdata.append(
             [
-                FontFallbackParagraph(_("Refunds"), tstyle),
+                Paragraph(_("Refunds"), tstyle),
                 Paragraph("+", tstyle_center),
                 Paragraph(money_filter(r_during, currency), tstyle_right),
             ]
@@ -768,7 +767,7 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
         ] or Decimal("0.00")
         tdata.append(
             [
-                FontFallbackParagraph(_("Gift card transactions (credit)"), tstyle),
+                Paragraph(_("Gift card transactions (credit)"), tstyle),
                 Paragraph(money_filter(tx_during_pos, currency), tstyle_right),
             ]
         )
@@ -778,7 +777,7 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
         ] or Decimal("0.00")
         tdata.append(
             [
-                FontFallbackParagraph(_("Gift card transactions (debit)"), tstyle),
+                Paragraph(_("Gift card transactions (debit)"), tstyle),
                 Paragraph(money_filter(tx_during_neg, currency), tstyle_right),
             ]
         )
@@ -846,9 +845,9 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
             style_small.leading = 10
 
             story = [
-                FontFallbackParagraph(self.verbose_name, style_h1),
+                Paragraph(self.verbose_name, style_h1),
                 Spacer(0, 3 * mm),
-                FontFallbackParagraph(
+                Paragraph(
                     "<br />".join(escape(f) for f in self.describe_filters(form_data)),
                     style_small,
                 ),
@@ -860,7 +859,7 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
                 c_head = f" [{c}]" if len(currencies) > 1 else ""
                 story += [
                     Spacer(0, 3 * mm),
-                    FontFallbackParagraph(_("Orders") + c_head, style_h2),
+                    Paragraph(_("Orders") + c_head, style_h2),
                     Spacer(0, 3 * mm),
                     *self._table_transactions(form_data, c),
                 ]
@@ -869,7 +868,7 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
                 c_head = f" [{c}]" if len(currencies) > 1 else ""
                 story += [
                     Spacer(0, 8 * mm),
-                    FontFallbackParagraph(_("Payments") + c_head, style_h2),
+                    Paragraph(_("Payments") + c_head, style_h2),
                     Spacer(0, 3 * mm),
                     *self._table_payments(form_data, c),
                 ]
@@ -880,7 +879,7 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
                     Spacer(0, 8 * mm),
                     KeepTogether(
                         [
-                            FontFallbackParagraph(_("Open items") + c_head, style_h2),
+                            Paragraph(_("Open items") + c_head, style_h2),
                             Spacer(0, 3 * mm),
                             *self._table_open_items(form_data, c),
                         ]
@@ -896,7 +895,7 @@ class ReportExporter(ReportlabExportMixin, BaseExporter):
                         Spacer(0, 8 * mm),
                         KeepTogether(
                             [
-                                FontFallbackParagraph(_("Gift cards") + c_head, style_h2),
+                                Paragraph(_("Gift cards") + c_head, style_h2),
                                 Spacer(0, 3 * mm),
                                 *self._table_gift_cards(form_data, c),
                             ]

src/pretix/plugins/reports/exporters.py

@@ -56,7 +56,7 @@ from reportlab.lib import colors
 from reportlab.lib.enums import TA_CENTER
 from reportlab.lib.units import mm
 from reportlab.pdfgen.canvas import Canvas
-from reportlab.platypus import PageBreak, Spacer, Table, TableStyle
+from reportlab.platypus import PageBreak, Paragraph, Spacer, Table, TableStyle
 
 from pretix.base.decimal import round_decimal
 from pretix.base.exporter import BaseExporter, MultiSheetListExporter
@@ -69,8 +69,6 @@ from pretix.base.timeframes import (
     resolve_timeframe_to_datetime_start_inclusive_end_exclusive,
 )
 from pretix.control.forms.filter import OverviewFilterForm
-from pretix.helpers.reportlab import FontFallbackParagraph
-from pretix.presale.style import get_fonts
 
 
 class NumberedCanvas(Canvas):
@@ -137,15 +135,6 @@ class ReportlabExportMixin:
         pdfmetrics.registerFont(TTFont('OpenSansIt', finders.find('fonts/OpenSans-Italic.ttf')))
         pdfmetrics.registerFont(TTFont('OpenSansBd', finders.find('fonts/OpenSans-Bold.ttf')))
 
-        for family, styles in get_fonts(None, pdf_support_required=True).items():
-            pdfmetrics.registerFont(TTFont(family, finders.find(styles['regular']['truetype'])))
-            if 'italic' in styles:
-                pdfmetrics.registerFont(TTFont(family + ' I', finders.find(styles['italic']['truetype'])))
-            if 'bold' in styles:
-                pdfmetrics.registerFont(TTFont(family + ' B', finders.find(styles['bold']['truetype'])))
-            if 'bolditalic' in styles:
-                pdfmetrics.registerFont(TTFont(family + ' B I', finders.find(styles['bolditalic']['truetype'])))
-
     def get_doc_template(self):
         from reportlab.platypus import BaseDocTemplate
 
@@ -283,7 +272,7 @@ class OverviewReport(Report):
         headlinestyle.fontSize = 15
         headlinestyle.fontName = 'OpenSansBd'
         story = [
-            FontFallbackParagraph(_('Orders by product') + ' ' + (_('(excl. taxes)') if net else _('(incl. taxes)')), headlinestyle),
+            Paragraph(_('Orders by product') + ' ' + (_('(excl. taxes)') if net else _('(incl. taxes)')), headlinestyle),
             Spacer(1, 5 * mm)
         ]
         return story
@@ -293,7 +282,7 @@ class OverviewReport(Report):
         if form_data.get('date_axis') and form_data.get('date_range'):
             d_start, d_end = resolve_timeframe_to_dates_inclusive(now(), form_data['date_range'], self.timezone)
             story += [
-                FontFallbackParagraph(_('{axis} between {start} and {end}').format(
+                Paragraph(_('{axis} between {start} and {end}').format(
                     axis=dict(OverviewFilterForm(event=self.event).fields['date_axis'].choices)[form_data.get('date_axis')],
                     start=date_format(d_start, 'SHORT_DATE_FORMAT') if d_start else '–',
                     end=date_format(d_end, 'SHORT_DATE_FORMAT') if d_end else '–',
@@ -306,13 +295,13 @@ class OverviewReport(Report):
                 subevent = self.event.subevents.get(pk=self.form_data.get('subevent'))
             except SubEvent.DoesNotExist:
                 subevent = self.form_data.get('subevent')
-            story.append(FontFallbackParagraph(pgettext('subevent', 'Date: {}').format(subevent), self.get_style()))
+            story.append(Paragraph(pgettext('subevent', 'Date: {}').format(subevent), self.get_style()))
             story.append(Spacer(1, 5 * mm))
 
         if form_data.get('subevent_date_range'):
             d_start, d_end = resolve_timeframe_to_datetime_start_inclusive_end_exclusive(now(), form_data['subevent_date_range'], self.timezone)
             story += [
-                FontFallbackParagraph(_('{axis} between {start} and {end}').format(
+                Paragraph(_('{axis} between {start} and {end}').format(
                     axis=_('Event date'),
                     start=date_format(d_start, 'SHORT_DATE_FORMAT') if d_start else '–',
                     end=date_format(d_end - timedelta(hours=1), 'SHORT_DATE_FORMAT') if d_end else '–',
@@ -384,13 +373,13 @@ class OverviewReport(Report):
         tdata = [
             [
                 _('Product'),
-                FontFallbackParagraph(_('Canceled'), tstyle_th),
+                Paragraph(_('Canceled'), tstyle_th),
                 '',
-                FontFallbackParagraph(_('Expired'), tstyle_th),
+                Paragraph(_('Expired'), tstyle_th),
                 '',
-                FontFallbackParagraph(_('Approval pending'), tstyle_th),
+                Paragraph(_('Approval pending'), tstyle_th),
                 '',
-                FontFallbackParagraph(_('Purchased'), tstyle_th),
+                Paragraph(_('Purchased'), tstyle_th),
                 '', '', '', '', ''
             ],
             [
@@ -421,14 +410,14 @@ class OverviewReport(Report):
         for tup in items_by_category:
             if tup[0]:
                 tdata.append([
-                    FontFallbackParagraph(str(tup[0]), tstyle_bold)
+                    Paragraph(str(tup[0]), tstyle_bold)
                 ])
                 for l, s in states:
                     tdata[-1].append(str(tup[0].num[l][0]))
                     tdata[-1].append(floatformat(tup[0].num[l][2 if net else 1], places))
             for item in tup[1]:
                 tdata.append([
-                    FontFallbackParagraph(str(item), tstyle)
+                    Paragraph(str(item), tstyle)
                 ])
                 for l, s in states:
                     tdata[-1].append(str(item.num[l][0]))
@@ -436,7 +425,7 @@ class OverviewReport(Report):
                 if item.has_variations:
                     for var in item.all_variations:
                         tdata.append([
-                            FontFallbackParagraph("          " + str(var), tstyle)
+                            Paragraph("          " + str(var), tstyle)
                         ])
                         for l, s in states:
                             tdata[-1].append(str(var.num[l][0]))
@@ -523,7 +512,7 @@ class OrderTaxListReportPDF(Report):
 
     def get_story(self, doc, form_data):
         from reportlab.lib.units import mm
-        from reportlab.platypus import Spacer, Table, TableStyle
+        from reportlab.platypus import Paragraph, Spacer, Table, TableStyle
 
         headlinestyle = self.get_style()
         headlinestyle.fontSize = 15
@@ -564,7 +553,7 @@ class OrderTaxListReportPDF(Report):
             tstyledata.append(('SPAN', (5 + 2 * i, 0), (6 + 2 * i, 0)))
 
         story = [
-            FontFallbackParagraph(_('Orders by tax rate ({currency})').format(currency=self.event.currency), headlinestyle),
+            Paragraph(_('Orders by tax rate ({currency})').format(currency=self.event.currency), headlinestyle),
             Spacer(1, 5 * mm)
         ]
         tdata = [

src/pretix/presale/checkoutflow.py

@@ -959,10 +959,6 @@ class QuestionsStep(QuestionsViewMixin, CartMixin, TemplateFlowStep):
             d['phone'] = str(d['phone'])
         self.cart_session['contact_form_data'] = d
         if self.address_asked or self.request.event.settings.invoice_name_required:
-            if not self.address_asked:
-                # Invoice address was there, but is no longer asked for, however, name is still required
-                self.invoice_form.instance.clear(except_name=True)
-
             addr = self.invoice_form.save()
 
             if self.cart_customer and self.invoice_form.cleaned_data.get('save'):
@@ -1001,10 +997,6 @@ class QuestionsStep(QuestionsViewMixin, CartMixin, TemplateFlowStep):
                                          'rate to your purchase and the price of the products in your cart has '
                                          'changed accordingly.'))
                 return redirect_to_url(self.get_next_url(request) + '?open_cart=true')
-        elif 'invoice_address' in self.cart_session:
-            # Invoice address was there, but is no longer asked for
-            self.invoice_address.delete()
-            del self.cart_session['invoice_address']
 
         try:
             validate_memberships_in_order(self.cart_customer, self.positions, self.request.event, lock=False,

src/pretix/presale/templates/pretixpresale/event/fragment_cart.html

@@ -437,7 +437,7 @@
     {% if not hide_prices %}
         <div role="rowgroup" class="cart-rowgroup-total">
         {% if event.settings.display_net_prices and cart.tax_total %}
-            <div role="row" class="row cart-row subtotal">
+            <div role="row" class="row cart-row">
                 <div role="cell" class="product">
                     <strong>{% trans "Net total" %}</strong>
                 </div>
@@ -448,7 +448,7 @@
                 </div>
                 <div class="clearfix"></div>
             </div>
-            <div role="row" class="row cart-row subtotal">
+            <div role="row" class="row cart-row">
                 <div role="cell" class="product">
                     <strong>{% trans "Taxes" %}</strong>
                 </div>

src/pretix/static/pretixcontrol/js/ui/main.js

@@ -594,7 +594,7 @@ var form_handlers = function (el) {
                     }
                 }
             },
-            placeholder: $(this).attr("data-placeholder") || "",
+            placeholder: $(this).attr("data-placeholder") | "",
             templateResult: function (res) {
                 if (!res.id) {
                     return res.text;

src/pretix/static/pretixpresale/scss/_cart.scss

@@ -221,7 +221,7 @@
         &.has-downloads.hide-prices .download-desktop {
             margin-left: 50%;
         }
-        &.subtotal .product, &.total .product {
+        &.total .product {
             width: 50%;
         }
         .count {

src/tests/api/test_checkinrpc.py

@@ -1077,97 +1077,3 @@ def test_reason_explanation_localization(token_client, organizer, clist, other_i
         assert resp.data["status"] == "error"
         assert resp.data["reason"] == "invalid_time"
         assert resp.data["reason_explanation"] == "Erst ab 01.01.2020 12:00 gültig."
-
-
-@pytest.mark.django_db
-def test_annul_simple(token_client, organizer, clist, event, order):
-    with scopes_disabled():
-        p = order.positions.first()
-    resp = _redeem(token_client, organizer, clist, p.secret, {
-        'nonce': 'nooooonce'
-    })
-    assert resp.status_code == 201
-    assert resp.data['status'] == 'ok'
-
-    resp = token_client.post('/api/v1/organizers/{}/checkinrpc/annul/'.format(organizer.slug), {
-        'lists': [clist.pk],
-        'nonce': 'nooooonce',
-        'error_explanation': 'Turnstile did not turn',
-    }, format='json', headers={})
-    assert resp.status_code == 200
-
-    with scopes_disabled():
-        ci = p.all_checkins.get()
-        assert not ci.successful
-        assert ci.error_reason == Checkin.REASON_ANNULLED
-        assert ci.error_explanation == "Turnstile did not turn"
-
-
-@pytest.mark.django_db
-def test_annul_failures(device_client, team, organizer, clist, clist_event2, event, order):
-    with scopes_disabled():
-        p = order.positions.first()
-    resp = _redeem(device_client, organizer, clist, p.secret, {
-        'nonce': 'nooooonce',
-        'datetime': '2025-04-01T12:23:45Z',
-    })
-    assert resp.status_code == 201
-    assert resp.data['status'] == 'ok'
-
-    resp = device_client.post('/api/v1/organizers/{}/checkinrpc/annul/'.format(organizer.slug), {
-        'lists': [clist.pk],
-    }, format='json', headers={})
-    assert resp.status_code == 400
-    assert resp.data == {"nonce": ["This field is required."]}
-
-    resp = device_client.post('/api/v1/organizers/{}/checkinrpc/annul/'.format(organizer.slug), {
-        'lists': [clist_event2.pk],
-        'nonce': 'nooooonce',
-        'error_explanation': 'Turnstile did not turn',
-    }, format='json', headers={})
-    assert resp.status_code == 404
-    assert resp.data == {"detail": "No check-in found based on nonce"}
-
-    resp = device_client.post('/api/v1/organizers/{}/checkinrpc/annul/'.format(organizer.slug), {
-        'lists': [clist.pk],
-        'nonce': 'notfound',
-        'error_explanation': 'Turnstile did not turn',
-    }, format='json', headers={})
-    assert resp.status_code == 404
-    assert resp.data == {"detail": "No check-in found based on nonce"}
-
-    with scopes_disabled():
-        lcnt = order.all_logentries().count()
-
-    resp = device_client.post('/api/v1/organizers/{}/checkinrpc/annul/'.format(organizer.slug), {
-        'lists': [clist.pk],
-        'nonce': 'nooooonce',
-        'error_explanation': 'Turnstile did not turn',
-    }, format='json', headers={})
-    assert resp.status_code == 400
-    assert resp.data == {
-        'non_field_errors': ['Annulment is not allowed more than 15 minutes after check-in']
-    }
-
-    with scopes_disabled():
-        assert order.all_logentries().count() == lcnt + 1
-
-    t = team.tokens.create(name='Foo')
-    team.all_events = True
-    team.save()
-    device_client.credentials(HTTP_AUTHORIZATION='Token ' + t.token)
-
-    resp = device_client.post('/api/v1/organizers/{}/checkinrpc/annul/'.format(organizer.slug), {
-        'lists': [clist.pk],
-        'nonce': 'nooooonce',
-        'error_explanation': 'Turnstile did not turn',
-        'datetime': '2025-04-01T12:24:45Z',
-    }, format='json', headers={})
-    assert resp.status_code == 400
-    assert resp.data == {
-        'non_field_errors': ['Annulment is only allowed from the same device']
-    }
-
-    with scopes_disabled():
-        ci = p.all_checkins.get()
-        assert ci.successful

src/tests/base/test_datasync.py

@@ -61,7 +61,7 @@ def event():
         option2 = question2.options.create(identifier="F2", answer="vegan")
 
         o1 = Order.objects.create(
-            code='1AAA', event=event, email='anonymous@🌈.example.org',
+            code='1AAA', event=event, email='anonymous@example.org',
             status=Order.STATUS_PENDING, locale='en',
             datetime=now(), expires=now() + timedelta(days=10),
             total=46,
@@ -100,7 +100,7 @@ def expected_order_sync_result():
             {
                 '_id': 0,
                 'ordernumber': 'DUMMY-1AAA',
-                'orderemail': 'anonymous@xn--og8h.example.org',
+                'orderemail': 'anonymous@example.org',
                 'status': 'pending',
                 'total': '46.00',
                 'payment_date': None,
@@ -158,7 +158,7 @@ def expected_sync_result_with_associations():
             {
                 '_id': 0,
                 'ordernumber': 'DUMMY-1AAA',
-                'orderemail': 'anonymous@xn--og8h.example.org',
+                'orderemail': 'anonymous@example.org',
                 'firstname': '',
                 'lastname': '',
                 'status': 'pending',

src/tests/presale/test_checkout.py

@@ -1337,57 +1337,6 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
         self.assertRedirects(response, '/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug),
                              target_status_code=200)
 
-    def test_invoice_address_discarded_for_free(self):
-        self.event.settings.invoice_address_asked = True
-        self.event.settings.invoice_address_required = True
-        self.event.settings.invoice_address_not_asked_free = True
-        self.event.settings.set('name_scheme', 'title_given_middle_family')
-
-        with scopes_disabled():
-            cp = CartPosition.objects.create(
-                event=self.event, cart_id=self.session_key, item=self.ticket,
-                price=23, expires=now() + timedelta(minutes=10)
-            )
-        response = self.client.get('/%s/%s/checkout/questions/' % (self.orga.slug, self.event.slug), follow=True)
-        doc = BeautifulSoup(response.content.decode(), "lxml")
-        self.assertEqual(len(doc.select('input[name="city"]')), 1)
-
-        # Corrected request
-        response = self.client.post('/%s/%s/checkout/questions/' % (self.orga.slug, self.event.slug), {
-            'is_business': 'business',
-            'company': 'Foo',
-            'name_parts_0': 'Mr',
-            'name_parts_1': 'John',
-            'name_parts_2': '',
-            'name_parts_3': 'Kennedy',
-            'street': 'Baz',
-            'zipcode': '12345',
-            'city': 'Here',
-            'country': 'DE',
-            'vat_id': 'DE123456',
-            'email': 'admin@localhost'
-        }, follow=True)
-        self.assertRedirects(response, '/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug),
-                             target_status_code=200)
-        with scopes_disabled():
-            assert InvoiceAddress.objects.exists()
-
-        cp.price = Decimal("0.00")
-        cp.save()
-
-        response = self.client.get('/%s/%s/checkout/questions/' % (self.orga.slug, self.event.slug), follow=True)
-        doc = BeautifulSoup(response.content.decode(), "lxml")
-        self.assertEqual(len(doc.select('input[name="city"]')), 0)
-
-        # Corrected request
-        response = self.client.post('/%s/%s/checkout/questions/' % (self.orga.slug, self.event.slug), {
-            'email': 'admin@localhost'
-        }, follow=True)
-        self.assertRedirects(response, '/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug),
-                             target_status_code=200)
-        with scopes_disabled():
-            assert not InvoiceAddress.objects.exists()
-
     def test_invoice_address_optional(self):
         self.event.settings.invoice_address_asked = True
         self.event.settings.invoice_address_required = False