SMTP SSRF protection: Edge case handling for CGNAT and v4/v6 mapping (#6264)

---
updated-dependencies:
- dependency-name: aiohttp
  dependency-version: 3.14.0
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

doc/api/resources/carts.rst

@@ -192,7 +192,7 @@ Cart position endpoints
    * ``attendee_email`` (optional)
    * ``subevent`` (optional)
    * ``expires`` (optional)
-   * ``includes_tax`` (optional, **deprecated**, do not use, will be removed)
+   * ``includes_tax`` (optional, **DEPRECATED**, do not use, will be removed)
    * ``sales_channel`` (optional)
    * ``voucher`` (optional, expect a voucher code)
    * ``addons`` (optional, expect a list of nested objects of cart positions)

doc/api/resources/orders.rst

@@ -1070,6 +1070,7 @@ Creating orders
       * ``valid_until`` (optional, if both ``valid_from`` and ``valid_until`` are **missing** (not ``null``) the availability will be computed from the given product)
       * ``requested_valid_from`` (optional, can be set **instead** of ``valid_from`` and ``valid_until`` to signal a user choice for the start time that may or may not be respected)
       * ``use_reusable_medium`` (optional, causes the new ticket to take over the given reusable medium, identified by its ID)
+      * ``add_to_reusable_medium`` (optional, causes the new ticket to be added to the given reusable medium, identified by its ID)
       * ``discount`` (optional, only possible if ``price`` is set; attention: if this is set to not-``null`` on any position, automatic calculation of discounts will not run)
       * ``answers``
 

doc/api/resources/reusablemedia.rst

@@ -21,12 +21,16 @@ id                                    integer                    Internal ID of
 type                                  string                     Type of medium, e.g. ``"barcode"``, ``"nfc_uid"`` or ``"nfc_mf0aes"``.
 organizer                             string                     Organizer slug of the organizer who "owns" this medium.
 identifier                            string                     Unique identifier of the medium. The format depends on the ``type``.
+claim_token                           string                     Secret token to claim ownership of the medium (or ``null``)
+label                                 string                     Label to identify the medium, usually something human readable (or ``null``)
 active                                boolean                    Whether this medium may be used.
 created                               datetime                   Date of creation
 updated                               datetime                   Date of last modification
 expires                               datetime                   Expiry date (or ``null``)
 customer                              string                     Identifier of a customer account this medium belongs to.
-linked_orderposition                  integer                    Internal ID of a ticket this medium is linked to.
+linked_orderpositions                 list of integers           Internal IDs of tickets this medium is linked to.
+linked_orderposition                  integer                    **DEPRECATED.** ID of the ticket the medium is linked to, if it is linked to 
+                                                                 only one ticket. ``null``, if the medium is linked to none or multiple tickets.
 linked_giftcard                       integer                    Internal ID of a gift card this medium is linked to.
 info                                  object                     Additional data, content depends on the ``type``. Consider
                                                                  this internal to the system and don't use it for your own data.
@@ -39,6 +43,14 @@ Existing media types are:
 - ``nfc_uid``
 - ``nfc_mf0aes``
 
+
+.. versionchanged:: 2026.5
+
+   The ``claim_token``, ``label``, ``linked_orderpositions`` attributes have been added, the ``linked_orderposition`` attribute has been
+   deprecated. Note: To maintain backwards compatibility ``linked_orderposition`` contains the internal ID of the linked order position
+   if the medium has exactly one order position in ``linked_orderpositions``.
+
+
 Endpoints
 ---------
 
@@ -77,6 +89,7 @@ Endpoints
             "active": True,
             "expires": None,
             "customer": None,
+            "linked_orderpositions": [],
             "linked_orderposition": None,
             "linked_giftcard": None,
             "notes": None,
@@ -92,10 +105,13 @@ Endpoints
    :query string customer: Only show media linked to the given customer.
    :query string created_since: Only show media created since a given date.
    :query string updated_since: Only show media updated since a given date.
+   :query integer linked_orderpositions: Only show media linked to the given tickets. Note: you can pass multiple ticket IDs by passing
+                                         ``linked_orderpositions`` multiple times. Any medium matching any linked orderposition will be returned.
    :query integer linked_orderposition: Only show media linked to the given ticket.
    :query integer linked_giftcard: Only show media linked to the given gift card.
-   :query string expand: If you pass ``"linked_giftcard"``, ``"linked_giftcard.owner_ticket"``, ``"linked_orderposition"``,
-                         or ``"customer"``, the respective field will be shown as a nested value instead of just an ID.
+   :query string expand: If you pass ``"linked_giftcard"``, ``"linked_giftcard.owner_ticket"``, ``"linked_orderpositions"``,
+                         ``"linked_orderposition"`` (**DEPRECATED**), or ``"customer"``, the respective field will be shown 
+                         as a nested value instead of just an ID.
                          The nested objects are identical to the respective resources, except that order positions
                          will have an attribute of the format ``"order": {"code": "ABCDE", "event": "eventslug"}`` to make
                          matching easier. The parameter can be given multiple times.
@@ -134,6 +150,7 @@ Endpoints
         "active": True,
         "expires": None,
         "customer": None,
+        "linked_orderpositions": [],
         "linked_orderposition": None,
         "linked_giftcard": None,
         "notes": None,
@@ -191,6 +208,7 @@ Endpoints
         "active": True,
         "expires": None,
         "customer": None,
+        "linked_orderpositions": [],
         "linked_orderposition": None,
         "linked_giftcard": None,
         "notes": None,
@@ -198,9 +216,9 @@ Endpoints
       }
 
    :param organizer: The ``slug`` field of the organizer to look up a medium for
-   :query string expand: If you pass ``"linked_giftcard"``, ``"linked_orderposition"``, oder ``"customer"``, the respective
+   :query string expand: If you pass ``"linked_giftcard"``, ``"linked_orderpositions"``, or ``"customer"``, the respective
                          field will be shown as a nested value instead of just an ID. The nested objects are identical to
-                         the respective resources, except that the ``linked_orderposition`` will have an attribute of the
+                         the respective resources, except that the ``linked_orderpositions`` each will have an attribute of the
                          format ``"order": {"code": "ABCDE", "event": "eventslug"}`` to make matching easier. The parameter
                          can be given multiple times.
    :statuscode 201: no error
@@ -227,6 +245,7 @@ Endpoints
         "active": True,
         "expires": None,
         "customer": None,
+        "linked_orderpositions": [],
         "linked_orderposition": None,
         "linked_giftcard": None,
         "notes": None,
@@ -251,6 +270,7 @@ Endpoints
         "active": True,
         "expires": None,
         "customer": None,
+        "linked_orderpositions": [],
         "linked_orderposition": None,
         "linked_giftcard": None,
         "notes": None,
@@ -258,7 +278,7 @@ Endpoints
       }
 
    :param organizer: The ``slug`` field of the organizer to create a medium for
-   :query string expand: If you pass ``"linked_giftcard"``, ``"linked_orderposition"``, oder ``"customer"``, the respective
+   :query string expand: If you pass ``"linked_giftcard"``, ``"linked_orderpositions"``, or ``"customer"``, the respective
                          field will be shown as a nested value instead of just an ID. The nested objects are identical to
                          the respective resources, except that the ``linked_orderposition`` will have an attribute of the
                          format ``"order": {"code": "ABCDE", "event": "eventslug"}`` to make matching easier. The parameter
@@ -287,7 +307,7 @@ Endpoints
       Content-Length: 94
 
       {
-        "linked_orderposition": 13
+        "linked_orderpositions": [13, 29]
       }
 
    **Example response**:
@@ -308,7 +328,8 @@ Endpoints
         "active": True,
         "expires": None,
         "customer": None,
-        "linked_orderposition": 13,
+        "linked_orderpositions": [13, 29],
+        "linked_orderposition": None,
         "linked_giftcard": None,
         "notes": None,
         "info": {}
@@ -316,7 +337,7 @@ Endpoints
 
    :param organizer: The ``slug`` field of the organizer to modify
    :param id: The ``id`` field of the medium to modify
-   :query string expand: If you pass ``"linked_giftcard"``, ``"linked_orderposition"``, oder ``"customer"``, the respective
+   :query string expand: If you pass ``"linked_giftcard"``, ``"linked_orderpositions"``, or ``"customer"``, the respective
                          field will be shown as a nested value instead of just an ID. The nested objects are identical to
                          the respective resources, except that the ``linked_orderposition`` will have an attribute of the
                          format ``"order": {"code": "ABCDE", "event": "eventslug"}`` to make matching easier. The parameter

doc/development/api/general.rst

@@ -64,8 +64,8 @@ Backend
 
 .. automodule:: pretix.control.signals
    :members: nav_event, html_head, html_page_start, quota_detail_html, nav_topbar, nav_global, nav_organizer, nav_event_settings,
-             order_info, event_settings_widget, oauth_application_registered, order_position_buttons, subevent_forms,
-             item_formsets, order_search_filter_q, order_search_forms
+             order_info, order_approve_info, event_settings_widget, oauth_application_registered,
+             order_position_buttons, subevent_forms, item_formsets, order_search_filter_q, order_search_forms, subevent_detail_html
 
 .. automodule:: pretix.base.signals
    :no-index:

package.json

@@ -23,7 +23,7 @@
     "build": "npm run build:control -s && npm run build:widget -s",
     "build:control": "vite build",
     "build:widget": "vite build src/pretix/static/pretixpresale/widget",
-    "lint:eslint": "eslint src/pretix/static/pretixpresale/widget src/pretix/static/pretixcontrol/js/ui/checkinrules src/pretix/plugins/webcheckin src/pretix/plugins/wallet",
+    "lint:eslint": "eslint src/pretix/static/pretixpresale/widget src/pretix/static/pretixcontrol/js/ui/checkinrules src/pretix/plugins/webcheckin",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {

pyproject.toml

@@ -93,7 +93,7 @@ dependencies = [
   "redis==7.4.*",
   "reportlab==4.5.*",
   "requests==2.32.*",
-  "sentry-sdk==2.60.*",
+  "sentry-sdk==2.61.*",
   "sepaxml==2.7.*",
   "stripe==7.9.*",
   "text-unidecode==1.*",
@@ -108,7 +108,7 @@ dependencies = [
 [project.optional-dependencies]
 memcached = ["pylibmc"]
 dev = [
-  "aiohttp==3.13.*",
+  "aiohttp==3.14.*",
   "coverage",
   "coveralls",
   "fakeredis==2.36.*",

setup.cfg

@@ -32,7 +32,6 @@ ignore =
     src/tests/plugins/stripe/*
     src/tests/plugins/sendmail/*
     src/tests/plugins/ticketoutputpdf/*
-    src/tests/plugins/wallet/*
     .*
     CODE_OF_CONDUCT.md
     CONTRIBUTING.md

src/pretix/_base_settings.py

@@ -66,7 +66,6 @@ INSTALLED_APPS = [
     'pretix.plugins.returnurl',
     'pretix.plugins.autocheckin',
     'pretix.plugins.webcheckin',
-    'pretix.plugins.wallet',
     'django_countries',
     'oauth2_provider',
     'phonenumber_field',

src/pretix/api/serializers/media.py

@@ -66,13 +66,14 @@ class ReusableMediaSerializer(I18nAwareModelSerializer):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        expand_nested = self.context['request'].query_params.getlist('expand')
 
-        if 'linked_giftcard' in self.context['request'].query_params.getlist('expand'):
+        if 'linked_giftcard' in expand_nested:
             if not self.context["can_read_giftcards"]:
                 raise PermissionDenied("No permission to access gift card details.")
 
             self.fields['linked_giftcard'] = NestedGiftCardSerializer(read_only=True, context=self.context)
-            if 'linked_giftcard.owner_ticket' in self.context['request'].query_params.getlist('expand'):
+            if 'linked_giftcard.owner_ticket' in expand_nested:
                 self.fields['linked_giftcard'].fields['owner_ticket'] = NestedOrderPositionSerializer(read_only=True, context=self.context)
         else:
             self.fields['linked_giftcard'] = serializers.PrimaryKeyRelatedField(
@@ -81,17 +82,27 @@ class ReusableMediaSerializer(I18nAwareModelSerializer):
                 queryset=self.context['organizer'].issued_gift_cards.all()
             )
 
-        if 'linked_orderposition' in self.context['request'].query_params.getlist('expand'):
-            # Permission Check performed in to_representation
-            self.fields['linked_orderposition'] = NestedOrderPositionSerializer(read_only=True)
+        # keep linked_orderposition (singular) for backwards compatibility, will be overwritten in self.validate
+        self.fields['linked_orderposition'] = serializers.PrimaryKeyRelatedField(
+            required=False,
+            allow_null=True,
+            queryset=OrderPosition.all.filter(order__event__organizer=self.context['organizer']),
+        )
+
+        if 'linked_orderposition' in expand_nested or 'linked_orderpositions' in expand_nested:
+            self.fields['linked_orderpositions'] = NestedOrderPositionSerializer(
+                many=True,
+                read_only=True
+            )
         else:
-            self.fields['linked_orderposition'] = serializers.PrimaryKeyRelatedField(
+            self.fields['linked_orderpositions'] = serializers.PrimaryKeyRelatedField(
+                many=True,
                 required=False,
                 allow_null=True,
                 queryset=OrderPosition.all.filter(order__event__organizer=self.context['organizer']),
             )
 
-        if 'customer' in self.context['request'].query_params.getlist('expand'):
+        if 'customer' in expand_nested:
             if not self.context["can_read_customers"]:
                 raise PermissionDenied("No permission to access customer details.")
 
@@ -106,6 +117,21 @@ class ReusableMediaSerializer(I18nAwareModelSerializer):
 
     def validate(self, data):
         data = super().validate(data)
+        if 'linked_orderposition' in data:
+            linked_orderposition = data['linked_orderposition']
+            # backwards-compatibility
+            if 'linked_orderpositions' in data:
+                raise ValidationError({
+                    'linked_orderposition': 'You cannot use linked_orderposition and linked_orderpositions at the same time.'
+                })
+            if self.instance and self.instance.linked_orderpositions.count() > 1:
+                raise ValidationError({
+                    'linked_orderposition': 'There are more than one linked_orderposition. You need to use linked_orderpositions.'
+                })
+
+            data['linked_orderpositions'] = [linked_orderposition] if linked_orderposition else []
+            del data['linked_orderposition']
+
         if 'type' in data and 'identifier' in data:
             qs = self.context['organizer'].reusable_media.filter(
                 identifier=data['identifier'], type=data['type']
@@ -121,14 +147,28 @@ class ReusableMediaSerializer(I18nAwareModelSerializer):
     def to_representation(self, instance):
         r = super().to_representation(instance)
         request = self.context.get('request')
+
+        ops = r.get('linked_orderpositions', [])
         # late permission evaluations for checks that depend on the actual linked events
         expand_nested = self.context['request'].query_params.getlist('expand')
         perm_holder = request.auth if isinstance(request.auth, (Device, TeamAPIToken)) else request.user
-        if 'linked_orderposition' in expand_nested:
-            if instance.linked_orderposition is not None:
-                event = instance.linked_orderposition.order.event
+        if ops and 'linked_orderposition' in expand_nested or 'linked_orderpositions' in expand_nested:
+            ops_noperm = []
+            for lop in instance.linked_orderpositions.all():
+                event = lop.order.event
                 if not perm_holder.has_event_permission(event.organizer, event, 'event.orders:read', request):
-                    r['linked_orderposition'] = {'id': instance.linked_orderposition.id}
+                    ops_noperm.append(lop.id)
+            if ops_noperm:
+                ops = [
+                    {'id': op['id']} if op['id'] in ops_noperm
+                    else op
+                    for op in ops
+                ]
+                r['linked_orderpositions'] = ops
+
+        # add linked_orderposition (singular) for backwards compatibility
+        if len(ops) < 2:
+            r['linked_orderposition'] = ops[0] if ops else None
 
         if 'linked_giftcard.owner_ticket' in expand_nested:
             gc = instance.linked_giftcard
@@ -148,10 +188,12 @@ class ReusableMediaSerializer(I18nAwareModelSerializer):
             'updated',
             'type',
             'identifier',
+            'claim_token',
+            'label',
             'active',
             'expires',
             'customer',
-            'linked_orderposition',
+            'linked_orderpositions',
             'linked_giftcard',
             'info',
             'notes',

src/pretix/api/serializers/order.py

@@ -1043,13 +1043,15 @@ class OrderPositionCreateSerializer(I18nAwareModelSerializer):
     requested_valid_from = serializers.DateTimeField(required=False, allow_null=True)
     use_reusable_medium = serializers.PrimaryKeyRelatedField(queryset=ReusableMedium.objects.none(),
                                                              required=False, allow_null=True)
+    add_to_reusable_medium = serializers.PrimaryKeyRelatedField(queryset=ReusableMedium.objects.none(),
+                                                                required=False, allow_null=True)
 
     class Meta:
         model = OrderPosition
         fields = ('positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts', 'attendee_email',
                   'company', 'street', 'zipcode', 'city', 'country', 'state', 'is_bundled',
                   'secret', 'addon_to', 'subevent', 'answers', 'seat', 'voucher', 'valid_from', 'valid_until',
-                  'requested_valid_from', 'use_reusable_medium', 'discount')
+                  'requested_valid_from', 'use_reusable_medium', 'add_to_reusable_medium', 'discount')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -1061,6 +1063,8 @@ class OrderPositionCreateSerializer(I18nAwareModelSerializer):
         with scopes_disabled():
             if 'use_reusable_medium' in self.fields:
                 self.fields['use_reusable_medium'].queryset = ReusableMedium.objects.all()
+            if 'add_to_reusable_medium' in self.fields:
+                self.fields['add_to_reusable_medium'].queryset = ReusableMedium.objects.all()
 
     def validate_secret(self, secret):
         if secret and OrderPosition.all.filter(order__event=self.context['event'], secret=secret).exists():
@@ -1076,6 +1080,9 @@ class OrderPositionCreateSerializer(I18nAwareModelSerializer):
             )
         return m
 
+    def validate_add_to_reusable_medium(self, m):
+        return self.validate_use_reusable_medium(m)
+
     def validate_item(self, item):
         if item.event != self.context['event']:
             raise ValidationError(
@@ -1149,6 +1156,13 @@ class OrderPositionCreateSerializer(I18nAwareModelSerializer):
             raise ValidationError(
                 {'discount': ['You can only specify a discount if you do the price computation, but price is not set.']}
             )
+
+        if 'use_reusable_medium' in data and 'add_to_reusable_medium' in data:
+            raise ValidationError({
+                'use_reusable_medium': ['You can only specify either use_reusable_medium or add_to_reusable_medium.'],
+                'add_to_reusable_medium': ['You can only specify either use_reusable_medium or add_to_reusable_medium.'],
+            })
+
         return data
 
 
@@ -1588,7 +1602,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                 pos_data['attendee_name_parts'] = {
                     '_legacy': attendee_name
                 }
-            pos = OrderPosition(**{k: v for k, v in pos_data.items() if k != 'answers' and k != '_quotas' and k != 'use_reusable_medium'})
+            pos = OrderPosition(**{k: v for k, v in pos_data.items() if k not in ('answers', '_quotas', 'use_reusable_medium', 'add_to_reusable_medium')})
             if simulate:
                 pos.order = order._wrapped
             else:
@@ -1662,6 +1676,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         for pos_data in positions_data:
             answers_data = pos_data.pop('answers', [])
             use_reusable_medium = pos_data.pop('use_reusable_medium', None)
+            add_to_reusable_medium = pos_data.pop('add_to_reusable_medium', None)
             pos = pos_data['__instance']
             pos._calculate_tax(invoice_address=ia)
 
@@ -1703,10 +1718,25 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                         answ.options.add(*options)
 
                 if use_reusable_medium:
-                    use_reusable_medium.linked_orderposition = pos
-                    use_reusable_medium.save(update_fields=['linked_orderposition'])
+                    for op_pk in use_reusable_medium.linked_orderpositions.values_list('pk', flat=True):
+                        use_reusable_medium.log_action(
+                            'pretix.reusable_medium.linked_orderposition.removed',
+                            data={
+                                'linked_orderposition': op_pk,
+                            }
+                        )
+                    use_reusable_medium.linked_orderpositions.set([pos])
                     use_reusable_medium.log_action(
-                        'pretix.reusable_medium.linked_orderposition.changed',
+                        'pretix.reusable_medium.linked_orderposition.added',
+                        data={
+                            'by_order': order.code,
+                            'linked_orderposition': pos.pk,
+                        }
+                    )
+                elif add_to_reusable_medium:
+                    add_to_reusable_medium.linked_orderpositions.add(pos)
+                    add_to_reusable_medium.log_action(
+                        'pretix.reusable_medium.linked_orderposition.added',
                         data={
                             'by_order': order.code,
                             'linked_orderposition': pos.pk,

src/pretix/api/views/checkin.py

@@ -491,6 +491,7 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
     )
     raw_barcode_for_checkin = None
     from_revoked_secret = False
+    reusable_medium_used = None
     if simulate:
         common_checkin_args['__fake_arg_to_prevent_this_from_being_saved'] = True
 
@@ -521,11 +522,12 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
     #    with respecting the force option), or it's a reusable medium (-> proceed with that)
     if not op_candidates:
         try:
-            media = ReusableMedium.objects.select_related('linked_orderposition').active().get(
+            media = ReusableMedium.objects.active().filter(
+                Exists(ReusableMedium.linked_orderpositions.through.objects.filter(reusablemedium_id=OuterRef('pk')))
+            ).get(
                 organizer_id=checkinlists[0].event.organizer_id,
                 type=source_type,
                 identifier=raw_barcode,
-                linked_orderposition__isnull=False,
             )
             raw_barcode_for_checkin = raw_barcode
         except ReusableMedium.DoesNotExist:
@@ -628,7 +630,9 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
                     'list': MiniCheckinListSerializer(list_by_event[revoked_matches[0].event_id]).data,
                 }, status=400)
         else:
-            if media.linked_orderposition.order.event_id not in list_by_event:
+            linked_ops = media.linked_orderpositions.all().select_related("order").prefetch_related("addons")
+            linked_event_ids = {op.order.event_id for op in linked_ops}
+            if not any(event_id in list_by_event for event_id in linked_event_ids):
                 # Medium exists but connected ticket is for the wrong event
                 if not simulate:
                     checkinlists[0].event.log_action('pretix.event.checkin.unknown', data={
@@ -654,28 +658,91 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
                     'checkin_texts': [],
                     'list': MiniCheckinListSerializer(checkinlists[0]).data,
                 }, status=404)
-            op_candidates = [media.linked_orderposition]
-            if list_by_event[media.linked_orderposition.order.event_id].addon_match:
-                op_candidates += list(media.linked_orderposition.addons.all())
+            op_candidates = []
+            for op in linked_ops:
+                if op.order.event_id in list_by_event:
+                    reusable_medium_used = media
+                    op_candidates.append(op)
+                    if list_by_event[op.order.event_id].addon_match:
+                        op_candidates += list(op.addons.all())
 
     # 3. Handle the "multiple options found" case: Except for the unlikely case of a secret being also a valid primary
-    #    key on the same list, we're probably dealing with the ``addon_match`` case here and need to figure out
-    #    which add-on has the right product.
+    #    key on the same list, we're probably dealing with multiple linked_orderpositions or the ``addon_match`` case
+    #    here and need to figure out which op has the right product. This basically is a valid-for-checkin-test on every op.
     if len(op_candidates) > 1:
-        op_candidates_matching_product = [
-            op for op in op_candidates
-            if (
-                (list_by_event[op.order.event_id].addon_match or op.secret == raw_barcode or legacy_url_support) and
-                (list_by_event[op.order.event_id].all_products or op.item_id in {i.pk for i in list_by_event[op.order.event_id].limit_products.all()})
-            )
-        ]
 
-        if len(op_candidates_matching_product) == 0:
-            # None of the found add-ons has the correct product, too bad! We could just error out here, but
+        if not reusable_medium_used:
+            # 3a. First, we clean up that we made an imprecise query above. If a scan is made for multiple check-in lists,
+            # we have queried ``addon_to__secret=raw_barcode``, even if some of the lists in question do not allow addon
+            # matching. So we accept all candidates that match one of these cases:
+            # - Exactly the ticket secret we scanned (because that's always a possible result)
+            # - Exactly the ticket pk we scanned (on legacy endpoints)
+            # - An add-on on a list that allows add-on matching
+            # This is not necessary when a reusable media was used, since in that case we already obeyed list.addon_match
+            # correctly above.
+            op_candidates_filtered = [
+                op for op in op_candidates
+                if (
+                    op.secret == raw_barcode or
+                    list_by_event[op.order.event_id].addon_match or
+                    (str(op.pk) == raw_barcode and legacy_url_support and not untrusted_input)
+                )
+            ]
+        else:
+            op_candidates_filtered = op_candidates
+
+        if len(op_candidates_filtered) > 1:
+            # 3b. If we still have multiple candidates, we filter by product based on the check-in list configuration.
+            # This is relevant for the addon_match scenario where the scanned ticket has multiple add-ons, but only
+            # one is contained in the check-in list used to scan. It makes sense to filter this first, since it is a
+            # "static" check, i.e. scanning the same QR code on the same check-in list will always do the same, no matter
+            # when I scan it, and it is "intentional" filtering in the sense that the admin configured this behaviour
+            # into the check-in list.
+            op_candidates_filtered = [
+                op for op in op_candidates_filtered
+                if list_by_event[op.order.event_id].all_products or op.item_id in {i.pk for i in list_by_event[op.order.event_id].limit_products.all()}
+            ]
+
+        if len(op_candidates_filtered) > 1:
+            # 3c. If we still have multiple candidates, we filter by validity date. This was introduced for the case where
+            # a reusable media refers to two tickets, one currently valid and one expired or in the future. Howeer,
+            # it could in theory also happen with two add-ons being on the same check-in list but without overlapping
+            # validity. It makes sense to filter this "after" the previous checks since it is not "intentional" filtering
+            # configured by the admin but "accidental" filtering that depends on the time of execution.
+            op_candidates_filtered = [
+                op for op in op_candidates_filtered
+                if (
+                    (not op.valid_from or op.valid_from <= datetime) and
+                    (not op.valid_until or op.valid_until > datetime)
+                )
+            ]
+
+        if len(op_candidates_filtered) == 0:
+            # None of the ops is valid today or has the correct product, too bad! We could just error out here, but
             # instead we just continue with *any* product and have it rejected by the check in perform_checkin.
-            # This has the advantage of a better error message.
-            op_candidates = [op_candidates[0]]
-        elif len(op_candidates_matching_product) > 1:
+            # To improve the error message, we select the op that will "work next" or - if none matches - "worked last".
+            op_candidate = None
+            for op in op_candidates:
+                if (
+                    op.valid_from and op.valid_from > datetime and
+                    (not op_candidate or op.valid_from < op_candidate.valid_from)
+                ):
+                    op_candidate = op
+
+            if not op_candidate:
+                # no candidate in the future, get closest in the past
+                for op in op_candidates:
+                    if (
+                        op.valid_until and op.valid_until < datetime and
+                        (not op_candidate or op.valid_until > op_candidate.valid_until)
+                    ):
+                        op_candidate = op
+
+            if not op_candidate:
+                op_candidate = op_candidates[0]
+
+            op_candidates = [op_candidate]
+        elif len(op_candidates_filtered) > 1:
             # It's still ambiguous, we'll error out.
             # We choose the first match (regardless of product) for the logging since it's most likely to be the
             # base product according to our order_by above.
@@ -709,7 +776,7 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
                 'list': MiniCheckinListSerializer(list_by_event[op.order.event_id]).data,
             }, status=400)
         else:
-            op_candidates = op_candidates_matching_product
+            op_candidates = op_candidates_filtered
 
     op = op_candidates[0]
     common_checkin_args['list'] = list_by_event[op.order.event_id]

src/pretix/api/views/media.py

@@ -53,10 +53,12 @@ with scopes_disabled():
         customer = django_filters.CharFilter(field_name='customer__identifier')
         updated_since = django_filters.IsoDateTimeFilter(field_name='updated', lookup_expr='gte')
         created_since = django_filters.IsoDateTimeFilter(field_name='created', lookup_expr='gte')
+        # backwards-compatible
+        linked_orderposition = django_filters.NumberFilter(field_name='linked_orderpositions__id')
 
         class Meta:
             model = ReusableMedium
-            fields = ['identifier', 'type', 'active', 'customer', 'linked_orderposition', 'linked_giftcard']
+            fields = ['identifier', 'type', 'active', 'customer', 'linked_orderpositions', 'linked_giftcard']
 
 
 class ReusableMediaViewSet(viewsets.ModelViewSet):
@@ -75,7 +77,7 @@ class ReusableMediaViewSet(viewsets.ModelViewSet):
         ).order_by().values('card').annotate(s=Sum('value')).values('s')
         return self.request.organizer.reusable_media.prefetch_related(
             Prefetch(
-                'linked_orderposition',
+                'linked_orderpositions',
                 queryset=OrderPosition.objects.select_related(
                     'order', 'order__event', 'order__event__organizer', 'seat',
                 ).prefetch_related(
@@ -117,14 +119,38 @@ class ReusableMediaViewSet(viewsets.ModelViewSet):
 
     @transaction.atomic()
     def perform_update(self, serializer):
-        ReusableMedium.objects.select_for_update(of=OF_SELF).get(pk=self.get_object().pk)
+        rm = ReusableMedium.objects.select_for_update(of=OF_SELF).get(pk=self.get_object().pk)
+        prev_linked_ops_pks = list(rm.linked_orderpositions.values_list("pk", flat=True))
         inst = serializer.save(identifier=serializer.instance.identifier, type=serializer.instance.type)
-        inst.log_action(
-            'pretix.reusable_medium.changed',
-            user=self.request.user,
-            auth=self.request.auth,
-            data=self.request.data,
-        )
+        linked_ops_pks = inst.linked_orderpositions.values_list("pk", flat=True)
+        for op_pk in prev_linked_ops_pks:
+            if op_pk not in linked_ops_pks:
+                inst.log_action(
+                    'pretix.reusable_medium.linked_orderposition.removed',
+                    user=self.request.user,
+                    auth=self.request.auth,
+                    data={
+                        'linked_orderposition': op_pk,
+                    }
+                )
+        for op_pk in linked_ops_pks:
+            if op_pk not in prev_linked_ops_pks:
+                inst.log_action(
+                    'pretix.reusable_medium.linked_orderposition.added',
+                    user=self.request.user,
+                    auth=self.request.auth,
+                    data={
+                        'linked_orderposition': op_pk,
+                    }
+                )
+        data = {k: v for k, v in self.request.data.items() if k not in ('linked_orderposition', 'linked_orderpositions')}
+        if data:
+            inst.log_action(
+                'pretix.reusable_medium.changed',
+                user=self.request.user,
+                auth=self.request.auth,
+                data=data,
+            )
         return inst
 
     def perform_destroy(self, instance):
@@ -157,7 +183,6 @@ class ReusableMediaViewSet(viewsets.ModelViewSet):
                         type=s.validated_data["type"],
                         identifier=s.validated_data["identifier"],
                     )
-                m.linked_orderposition = None  # not relevant for cross-organizer
                 m.customer = None  # not relevant for cross-organizer
                 s = self.get_serializer(m)
                 return Response({"result": s.data})

src/pretix/api/views/order.py

@@ -194,7 +194,7 @@ with scopes_disabled():
                 )
             ).values('id')
 
-            matching_media = ReusableMedium.objects.filter(identifier=u).values_list('linked_orderposition__order_id', flat=True)
+            matching_media = ReusableMedium.objects.filter(identifier=u).values_list('linked_orderpositions__order_id', flat=True)
 
             mainq = (
                 code
@@ -1034,7 +1034,7 @@ with scopes_disabled():
         search = django_filters.CharFilter(method='search_qs')
 
         def search_qs(self, queryset, name, value):
-            matching_media = ReusableMedium.objects.filter(identifier=value).values_list('linked_orderposition', flat=True)
+            matching_media = ReusableMedium.objects.filter(identifier=value).values_list('linked_orderpositions', flat=True)
             return queryset.filter(
                 Q(secret__istartswith=value)
                 | Q(attendee_name_cached__icontains=value)

src/pretix/base/email.py

@@ -57,6 +57,8 @@ logger = logging.getLogger('pretix.base.email')
 
 T = TypeVar("T", bound=EmailBackend)
 
+_cgnat_net = ipaddress.ip_network('100.64.0.0/10')
+
 
 def test_custom_smtp_backend(backend: T, from_addr: str) -> None:
     try:
@@ -253,12 +255,15 @@ def create_connection(address, timeout=socket.getdefaulttimeout(),
 
         if not getattr(settings, "MAIL_CUSTOM_SMTP_ALLOW_PRIVATE_NETWORKS", False):
             ip_addr = ipaddress.ip_address(sa[0])
+            check_ip4 = ip_addr.ipv4_mapped if getattr(ip_addr, "ipv4_mapped", None) else ip_addr
             if ip_addr.is_multicast:
                 raise socket.error(f"Request to multicast address {sa[0]} blocked")
             if ip_addr.is_loopback or ip_addr.is_link_local:
                 raise socket.error(f"Request to local address {sa[0]} blocked")
             if ip_addr.is_private:
                 raise socket.error(f"Request to private address {sa[0]} blocked")
+            if check_ip4 in _cgnat_net:
+                raise socket.error(f"Request to RFC 6598 address {sa[0]} blocked")
 
         sock = None
         try:

src/pretix/base/exporters/reusablemedia.py

@@ -20,12 +20,13 @@
 # <https://www.gnu.org/licenses/>.
 #
 
+from django.db.models import Prefetch
 from django.dispatch import receiver
 from django.utils.formats import date_format
 from django.utils.translation import gettext_lazy as _, pgettext, pgettext_lazy
 
 from ..exporter import ListExporter, OrganizerLevelExportMixin
-from ..models import ReusableMedium
+from ..models import OrderPosition, ReusableMedium
 from ..signals import register_multievent_data_exporters
 
 
@@ -44,7 +45,9 @@ class ReusableMediaExporter(OrganizerLevelExportMixin, ListExporter):
         media = ReusableMedium.objects.filter(
             organizer=self.organizer,
         ).select_related(
-            'customer', 'linked_orderposition', 'linked_giftcard',
+            'customer', 'linked_giftcard',
+        ).prefetch_related(
+            Prefetch('linked_orderpositions', queryset=OrderPosition.objects.select_related("order"))
         ).order_by('created')
 
         headers = [
@@ -62,17 +65,16 @@ class ReusableMediaExporter(OrganizerLevelExportMixin, ListExporter):
         yield self.ProgressSetTotal(total=media.count())
 
         for medium in media.iterator(chunk_size=1000):
-            row = [
+            yield [
                 medium.type,
                 medium.identifier,
                 _('Yes') if medium.active else _('No'),
                 date_format(medium.expires, 'SHORT_DATETIME_FORMAT') if medium.expires else '',
                 medium.customer.identifier if medium.customer_id else '',
-                f"{medium.linked_orderposition.order.code}-{medium.linked_orderposition.positionid}" if medium.linked_orderposition_id else '',
+                ', '.join([f"{op.order.code}-{op.positionid}" for op in medium.linked_orderpositions.all()]),
                 medium.linked_giftcard.secret if medium.linked_giftcard_id else '',
                 medium.notes,
             ]
-            yield row
 
     def get_filename(self):
         return f'{self.organizer.slug}_media'

src/pretix/base/migrations/0300_add_reusablemedium_label.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.2.26 on 2025-11-24 11:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("pretixbase", "0299_itemprogramtime_location"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="reusablemedium",
+            name="claim_token",
+            field=models.CharField(max_length=200, null=True),
+        ),
+        migrations.AddField(
+            model_name="reusablemedium",
+            name="label",
+            field=models.CharField(max_length=200, null=True),
+        ),
+        # use temporary related_name "linked_mediums" for ManyToManyField, so we can migrate existing data
+        migrations.AddField(
+            model_name="reusablemedium",
+            name="linked_orderpositions",
+            field=models.ManyToManyField(
+                related_name="linked_mediums", to="pretixbase.orderposition"
+            ),
+        ),
+        migrations.RunSQL(
+            sql="INSERT INTO pretixbase_reusablemedium_linked_orderpositions (reusablemedium_id, orderposition_id) SELECT id, linked_orderposition_id FROM pretixbase_reusablemedium WHERE linked_orderposition_id IS NOT NULL;",
+            reverse_sql="DELETE FROM pretixbase_reusablemedium_linked_orderpositions;",
+        ),
+    ]

src/pretix/base/migrations/0301_reusablemedium_remove_orderposition.py

@@ -0,0 +1,44 @@
+# Generated by Django 4.2.26 on 2025-11-24 11:32
+
+from django.db import migrations, models
+
+
+def reverse(apps, schema_editor):
+    ReusableMedium = apps.get_model('pretixbase', 'ReusableMedium')
+
+    qs = ReusableMedium.linked_orderpositions.through.objects
+    objs = []
+    # get last added orderposition from linked_orderpositions
+    for rm_id, op_id in qs.filter(id__in=qs.values("reusablemedium_id").annotate(max_id=models.Max('id')).values('max_id')).values_list("reusablemedium_id", "orderposition_id"):
+        obj = ReusableMedium(
+            id=rm_id,
+            linked_orderposition_id=op_id,
+        )
+        objs.append(obj)
+
+    ReusableMedium.objects.bulk_update(objs, ['linked_orderposition_id'])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("pretixbase", "0300_add_reusablemedium_label"),
+    ]
+
+    operations = [
+        # according to the docs, UPDATE FROM should run similarly on sqlite and postgres, but I could not get it to work
+        # so roll back the data migration with code before deleting data from through-table in 0297
+        migrations.RunPython(migrations.RunPython.noop, reverse),
+        migrations.RemoveField(
+            model_name="reusablemedium",
+            name="linked_orderposition",
+        ),
+        # change related_name for new ManyToManyField to previously used linked_media
+        migrations.AlterField(
+            model_name="reusablemedium",
+            name="linked_orderpositions",
+            field=models.ManyToManyField(
+                related_name="linked_media", to="pretixbase.orderposition"
+            ),
+        ),
+    ]

src/pretix/base/models/media.py

@@ -72,6 +72,16 @@ class ReusableMedium(LoggedModel):
         max_length=200,
         verbose_name=pgettext_lazy('reusable_medium', 'Identifier'),
     )
+    claim_token = models.CharField(
+        max_length=200,
+        verbose_name=pgettext_lazy('reusable_medium', 'Claim token'),
+        null=True, blank=True
+    )
+    label = models.CharField(
+        max_length=200,
+        verbose_name=pgettext_lazy('reusable_medium', 'Label'),
+        null=True, blank=True
+    )
 
     active = models.BooleanField(
         verbose_name=_('Active'),
@@ -89,12 +99,14 @@ class ReusableMedium(LoggedModel):
         on_delete=models.SET_NULL,
         verbose_name=_('Customer account'),
     )
-    linked_orderposition = models.ForeignKey(
+    linked_orderpositions = models.ManyToManyField(
         OrderPosition,
-        null=True, blank=True,
         related_name='linked_media',
-        on_delete=models.SET_NULL,
-        verbose_name=_('Linked ticket'),
+        verbose_name=_('Linked tickets'),
+        help_text=_(
+            'If you link to more than one ticket, make sure there is no overlap in validity. '
+            'If multiple tickets are valid at once, this will lead to failed check-ins.'
+        )
     )
     linked_giftcard = models.ForeignKey(
         GiftCard,

src/pretix/base/services/orders.py

@@ -3515,8 +3515,8 @@ def signal_listener_issue_media(sender: Event, order: Order, **kwargs):
                     identifier=mt.generate_identifier(sender.organizer),
                     active=True,
                     customer=order.customer,
-                    linked_orderposition=p,
                 )
+                rm.linked_orderpositions.add(p)
                 rm.log_action(
                     'pretix.reusable_medium.created',
                     data={

src/pretix/base/ticketoutput.py

@@ -114,7 +114,7 @@ class BaseTicketOutput:
         If you override this method, make sure that positions that are addons (i.e. ``addon_to``
         is set) are only outputted if the event setting ``ticket_download_addons`` is active.
         Do the same for positions that are non-admission without ``ticket_download_nonadm`` active.
-        If you want, you can just iterate over ``self.get_tickets_to_print`` which applies the
+        If you want, you can just iterate over ``order.positions_with_tickets`` which applies the
         appropriate filters for you.
         """
         with tempfile.TemporaryDirectory() as d:
@@ -192,17 +192,6 @@ class BaseTicketOutput:
         """
         pass
 
-    @property
-    def is_meta(self) -> bool:
-        """
-        Returns whether or whether not this output is a "meta" output that only works as a settings holder
-        and should never be used directly. This is a trick to implement outputs with multiple formats but
-        unified settings.
-
-        .. note:: You should set is_enabled to False for meta outputs.
-        """
-        return False
-
     @property
     def download_button_text(self) -> str:
         """

src/pretix/control/forms/__init__.py

@@ -461,3 +461,31 @@ class SalesChannelCheckboxSelectMultiple(forms.CheckboxSelectMultiple):
             **super().create_option(name, value, label, selected, index, subindex, attrs),
             "plugin_missing": plugin and plugin not in self.event.get_plugins(),
         }
+
+
+class ModelChoiceIteratorWithNone(forms.models.ModelChoiceIterator):
+    # see django.forms.models.ModelChoiceIterator for original implementation
+    def __iter__(self):
+        if self.field.empty_label is not None:
+            yield ("", self.field.empty_label)
+        if self.field.none_label is not None:
+            yield ("_none", self.field.none_label)
+        queryset = self.queryset
+        # Can't use iterator() when queryset uses prefetch_related()
+        if not queryset._prefetch_related_lookups:
+            queryset = queryset.iterator()
+        for obj in queryset:
+            yield self.choice(obj)
+
+
+class ModelChoiceFieldWithNone(forms.ModelChoiceField):
+    iterator = ModelChoiceIteratorWithNone
+
+    def __init__(self, *args, **kwargs):
+        self.none_label = kwargs.pop("none_label", None)
+        super().__init__(*args, **kwargs)
+
+    def to_python(self, value):
+        if value == "_none":
+            return value
+        return super().to_python(value)

src/pretix/control/forms/event.py

@@ -945,7 +945,7 @@ class TaxSettingsForm(EventSettingsValidationMixin, SettingsForm):
 class ProviderForm(SettingsForm):
     """
     This is a SettingsForm, but if fields are set to required=True, validation
-    errors are only raised if the provider is enabled.
+    errors are only raised if the payment method is enabled.
     """
 
     def __init__(self, *args, **kwargs):

src/pretix/control/forms/filter.py

@@ -1871,7 +1871,7 @@ class ReusableMediaFilterForm(FilterForm):
                 Q(identifier__icontains=query)
                 | Q(customer__identifier__icontains=query)
                 | Q(customer__external_identifier__istartswith=query)
-                | Q(linked_orderposition__order__code__icontains=query)
+                | Q(linked_orderpositions__order__code__icontains=query)
                 | Q(linked_giftcard__secret__icontains=query)
             )
 

src/pretix/control/forms/organizer.py

@@ -86,7 +86,7 @@ from pretix.control.forms import ExtFileField, SplitDateTimeField
 from pretix.control.forms.event import (
     SafeEventMultipleChoiceField, multimail_validate,
 )
-from pretix.control.forms.widgets import Select2
+from pretix.control.forms.widgets import Select2, Select2Multiple
 from pretix.multidomain.models import KnownDomain
 from pretix.multidomain.urlreverse import build_absolute_uri
 
@@ -249,6 +249,15 @@ class SafeOrderPositionChoiceField(forms.ModelChoiceField):
         return f'{op.order.code}-{op.positionid} ({str(op.item) + ((" - " + str(op.variation)) if op.variation else "")})'
 
 
+class SafeOrderPositionMultipleChoiceField(forms.ModelMultipleChoiceField):
+    def __init__(self, queryset, **kwargs):
+        queryset = queryset.model.all.none()
+        super().__init__(queryset, **kwargs)
+
+    def label_from_instance(self, op):
+        return f'{op.order.code}-{op.positionid} ({str(op.item) + ((" - " + str(op.variation)) if op.variation else "")})'
+
+
 class EventMetaPropertyForm(I18nModelForm):
     class Meta:
         model = EventMetaProperty
@@ -963,12 +972,12 @@ class ReusableMediumUpdateForm(forms.ModelForm):
 
     class Meta:
         model = ReusableMedium
-        fields = ['active', 'expires', 'customer', 'linked_giftcard', 'linked_orderposition', 'notes']
+        fields = ['active', 'expires', 'customer', 'linked_giftcard', 'linked_orderpositions', 'notes']
         field_classes = {
             'expires': SplitDateTimeField,
             'customer': SafeModelChoiceField,
             'linked_giftcard': SafeModelChoiceField,
-            'linked_orderposition': SafeOrderPositionChoiceField,
+            'linked_orderpositions': SafeOrderPositionMultipleChoiceField,
         }
         widgets = {
             'expires': SplitDateTimePickerWidget,
@@ -978,8 +987,8 @@ class ReusableMediumUpdateForm(forms.ModelForm):
         super().__init__(*args, **kwargs)
         organizer = self.instance.organizer
 
-        self.fields['linked_orderposition'].queryset = OrderPosition.all.filter(order__event__organizer=organizer).all()
-        self.fields['linked_orderposition'].widget = Select2(
+        self.fields['linked_orderpositions'].queryset = OrderPosition.all.filter(order__event__organizer=organizer).all()
+        self.fields['linked_orderpositions'].widget = Select2Multiple(
             attrs={
                 'data-model-select2': 'generic',
                 'data-select2-url': reverse('control:organizer.ticket_select2', kwargs={
@@ -987,8 +996,8 @@ class ReusableMediumUpdateForm(forms.ModelForm):
                 }),
             }
         )
-        self.fields['linked_orderposition'].widget.choices = self.fields['linked_orderposition'].choices
-        self.fields['linked_orderposition'].required = False
+        self.fields['linked_orderpositions'].widget.choices = self.fields['linked_orderpositions'].choices
+        self.fields['linked_orderpositions'].required = False
 
         self.fields['linked_giftcard'].queryset = organizer.issued_gift_cards.all()
         self.fields['linked_giftcard'].widget = Select2(
@@ -1042,12 +1051,12 @@ class ReusableMediumCreateForm(ReusableMediumUpdateForm):
 
     class Meta:
         model = ReusableMedium
-        fields = ['active', 'type', 'identifier', 'expires', 'linked_orderposition', 'linked_giftcard', 'customer', 'notes']
+        fields = ['active', 'type', 'identifier', 'expires', 'linked_orderpositions', 'linked_giftcard', 'customer', 'notes']
         field_classes = {
             'expires': SplitDateTimeField,
             'customer': SafeModelChoiceField,
             'linked_giftcard': SafeModelChoiceField,
-            'linked_orderposition': SafeOrderPositionChoiceField,
+            'linked_orderpositions': SafeOrderPositionMultipleChoiceField,
         }
         widgets = {
             'expires': SplitDateTimePickerWidget,

src/pretix/control/forms/widgets.py

@@ -29,17 +29,30 @@ class Select2Mixin:
         super().__init__(*args, **kwargs)
 
     def options(self, name, value, attrs=None):
-        if value and value[0]:
-            for i, selected in enumerate(self.choices.queryset.filter(pk__in=value)):
-                yield self.create_option(
-                    None,
-                    self.choices.field.prepare_value(selected),
-                    self.choices.field.label_from_instance(selected),
-                    True,
-                    i,
-                    subindex=None,
-                    attrs=attrs
-                )
+        if not value or not value[0]:
+            return
+        has_none = "_none" in value
+        if has_none:
+            value = [v for v in value if v != "_none"]
+            yield self.create_option(
+                None,
+                "_none",
+                self.choices.field.none_label,
+                True,
+                0,
+                subindex=None,
+                attrs=attrs
+            )
+        for i, selected in enumerate(self.choices.queryset.filter(pk__in=value)):
+            yield self.create_option(
+                None,
+                self.choices.field.prepare_value(selected),
+                self.choices.field.label_from_instance(selected),
+                True,
+                i + (1 if has_none else 0),
+                subindex=None,
+                attrs=attrs
+            )
         return
 
     def optgroups(self, name, value, attrs=None):

src/pretix/control/logdisplay.py

@@ -743,6 +743,8 @@ class CoreUserImpersonatedLogEntryType(UserImpersonatedLogEntryType):
     'pretix.reusable_medium.created': _('The reusable medium has been created.'),
     'pretix.reusable_medium.created.auto': _('The reusable medium has been created automatically.'),
     'pretix.reusable_medium.changed': _('The reusable medium has been changed.'),
+    'pretix.reusable_medium.linked_orderposition.added': _('A new ticket has been added to the medium.'),
+    'pretix.reusable_medium.linked_orderposition.removed': _('A ticket has been removed from the medium.'),
     'pretix.reusable_medium.linked_orderposition.changed': _('The medium has been connected to a new ticket.'),
     'pretix.reusable_medium.linked_giftcard.changed': _('The medium has been connected to a new gift card.'),
     'pretix.email.error': _('Sending of an email has failed.'),

src/pretix/control/signals.py

@@ -213,6 +213,16 @@ quota as argument in the ``quota`` keyword argument.
 As with all event plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
+subevent_detail_html = EventPluginSignal()
+"""
+Arguments: 'subevent'
+
+This signal allows you to append HTML to a SubEvent's detail view. You receive the
+subevent as argument in the ``subevent`` keyword argument.
+
+As with all event plugin signals, the ``sender`` keyword argument will contain the event.
+"""
+
 organizer_edit_tabs = DeprecatedSignal()
 """
 Arguments: 'organizer', 'request'
@@ -261,6 +271,16 @@ As with all event plugin signals, the ``sender`` keyword argument will contain t
 Additionally, the argument ``order`` and ``request`` are available.
 """
 
+order_approve_info = EventPluginSignal()
+"""
+Arguments: ``order``, ``request``
+
+This signal is sent out to display additional information on the order approve page
+
+As with all event plugin signals, the ``sender`` keyword argument will contain the event.
+Additionally, the argument ``order`` and ``request`` are available.
+"""
+
 order_position_buttons = EventPluginSignal()
 """
 Arguments: ``order``, ``position``, ``request``

src/pretix/control/templates/pretixcontrol/event/dangerzone.html

@@ -9,23 +9,24 @@
             <h3 class="panel-title">{% trans "Go offline" %}</h3>
         </div>
         <div class="row panel-body">
-            <div class="col-sm-12 col-md-9 nomargin-bottom">
+            <div class="col-sm-12 col-lg-6">
+                <p>
                 {% blocktrans trimmed %}
                     You can take your event offline. Nobody except your team will be able to see or access it any more.
                 {% endblocktrans %}
-            </div>
-            <div class="col-sm-12 col-md-3">
-                <form action="{% url "control:event.live" event=request.event.slug organizer=request.organizer.slug %}"
-                        method="post">
-                    {% csrf_token %}
-                    <input type="hidden" name="live" value="false">
+                </p>
+            </div>            
+            <form class="col-sm-12 col-lg-6 text-right"
+                    action="{% url "control:event.live" event=request.event.slug organizer=request.organizer.slug %}"
+                    method="post">
+                {% csrf_token %}
+                <input type="hidden" name="live" value="false">
 
-                    <button type="submit" class="btn btn-primary btn-lg btn-block">
-                        <span class="fa fa-power-off"></span>
-                        {% trans "Go offline" %}
-                    </button>
-                </form>
-            </div>
+                <button type="submit" class="btn btn-primary btn-lg">
+                    <span class="fa fa-power-off"></span>
+                    {% trans "Go offline" %}
+                </button>
+            </form>
         </div>
     </div>
 
@@ -34,22 +35,24 @@
             <h3 class="panel-title">{% trans "Cancel event" %}</h3>
         </div>
         <div class="row panel-body">
-            <div class="col-sm-12 col-md-9 nomargin-bottom">
+            <div class="col-sm-12 col-lg-6">
+                <p>
                 {% blocktrans trimmed %}
                     If you need to call off your event you want to cancel and refund all tickets, you can do so through
                     this option.
                 {% endblocktrans %}
+                </p>
             </div>
-            <div class="col-sm-12 col-md-3 text-center">
-                {% if "event:cancel" in request.eventpermset %}
-                    <a href="{% url "control:event.cancel" organizer=request.organizer.slug event=request.event.slug %}"
-                            class="btn btn-danger btn-block btn-lg">
-                        <span class="fa fa-ban"></span>
+            <div class="col-sm-12 col-lg-6 text-right">
+                <a href="{% url "control:event.cancel" organizer=request.organizer.slug event=request.event.slug %}"
+                        class="btn btn-danger btn-lg pull-right {% if "event:cancel" not in request.eventpermset %}disabled{% endif %}">
+                    <span class="fa fa-ban"></span>
+                    {% if "event:cancel" in request.eventpermset %}
                         {% trans "Cancel event" %}
-                    </a>
-                {% else %}
-                    {% trans "No permission" %}
-                {% endif %}
+                    {% else %}
+                        {% trans "No permission" %}
+                    {% endif %}
+                </a>
             </div>
         </div>
     </div>
@@ -59,15 +62,16 @@
             <h3 class="panel-title">{% trans "Delete personal data" %}</h3>
         </div>
         <div class="row panel-body">
-            <div class="col-sm-12 col-md-9 nomargin-bottom">
+            <div class="col-sm-12 col-lg-6">
+                <p>
                 {% blocktrans trimmed %}
                     You can remove personal data such as names and email addresses from your event and only retain the
                     financial information such as the number and type of tickets sold.
                 {% endblocktrans %}
+                </p>
             </div>
-            <div class="col-sm-12 col-md-3">
-                <a href="
-{% url "control:event.shredder.start" event=request.event.slug organizer=request.organizer.slug %}" class="btn btn-danger btn-lg btn-block">
+            <div class="col-sm-12 col-lg-6 text-right">
+                <a href="{% url "control:event.shredder.start" event=request.event.slug organizer=request.organizer.slug %}" class="btn btn-danger btn-lg">
                     <span class="fa fa-eraser"></span>
                     {% trans "Delete personal data" %}
                 </a>
@@ -80,15 +84,17 @@
             <h3 class="panel-title">{% trans "Delete event" %}</h3>
         </div>
         <div class="row panel-body">
-            <div class="col-sm-12 col-md-9 nomargin-bottom">
+            <div class="col-sm-12 col-lg-6">
+                <p>
                 {% blocktrans trimmed %}
                     You can delete your event completely only as long as it does not contain any undeletable data, such as
                     orders not performed in test mode.
                 {% endblocktrans %}
+                </p>
             </div>
-            <div class="col-sm-12 col-md-3">
+            <div class="col-sm-12 col-lg-6 text-right">
                 <a href="{% url "control:event.delete" organizer=request.organizer.slug event=request.event.slug %}"
-                        class="btn btn-danger btn-block btn-lg {% if not request.event.allow_delete %}disabled{% endif %}">
+                        class="btn btn-danger btn-lg {% if not request.event.allow_delete %}disabled{% endif %}">
                     <span class="fa fa-trash"></span>
                     {% trans "Delete event" %}
                 </a>

src/pretix/control/templates/pretixcontrol/order/approve.html

@@ -1,4 +1,5 @@
 {% extends "pretixcontrol/event/base.html" %}
+{% load eventsignal %}
 {% load i18n %}
 {% block title %}
     {% trans "Approve order" %}
@@ -7,6 +8,9 @@
     <h1>
         {% trans "Approve order" %}
     </h1>
+
+    {% eventsignal request.event "pretix.control.signals.order_approve_info" order=order request=request %}
+
     <p>{% blocktrans trimmed %}
         Do you really want to approve this order?
     {% endblocktrans %}</p>

src/pretix/control/templates/pretixcontrol/organizers/reusable_media.html

@@ -58,8 +58,8 @@
                         <a href="?{% url_replace request 'ordering' 'identifier' %}"><i class="fa fa-caret-up"></i></a>
                     </th>
                     <th>{% trans "Media type" context "reusable_media" %}
-                        <a href="?{% url_replace request 'ordering' '-email' %}"><i class="fa fa-caret-down"></i></a>
-                        <a href="?{% url_replace request 'ordering' 'email' %}"><i class="fa fa-caret-up"></i></a></th>
+                        <a href="?{% url_replace request 'ordering' '-type' %}"><i class="fa fa-caret-down"></i></a>
+                        <a href="?{% url_replace request 'ordering' 'type' %}"><i class="fa fa-caret-up"></i></a></th>
                     <th>{% trans "Connections" context "reusable_media" %}</th>
                     <th></th>
                 </tr>
@@ -90,13 +90,13 @@
                                     {% endif %}
                                 </span>
                             {% endif %}
-                            {% if m.linked_orderposition %}
+                            {% for op in m.linked_orderpositions.all %}
                                 <span class="helper-display-block">
                                     <span class="fa fa-ticket fa-fw"></span>
-                                    <a href="{% url "control:event.order" event=m.linked_orderposition.order.event.slug organizer=request.organizer.slug code=m.linked_orderposition.order.code %}">
-                                        {{ m.linked_orderposition.order.code }}</a>-{{ m.linked_orderposition.positionid }}
+                                    <a href="{% url "control:event.order" event=op.order.event.slug organizer=request.organizer.slug code=op.order.code %}">
+                                        {{ op.order.code }}</a>-{{ op.positionid }}
                                 </span>
-                            {% endif %}
+                            {% endfor %}
                             {% if m.linked_giftcard %}
                                 <span class="helper-display-block">
                                     <span class="fa fa-credit-card fa-fw"></span>

src/pretix/control/templates/pretixcontrol/organizers/reusable_medium.html

@@ -26,7 +26,19 @@
                         <dt>{% trans "Media type" context "reusable_media" %}</dt>
                         <dd>{{ medium.get_type_display }}</dd>
                         <dt>{% trans "Identifier" context "reusable_media" %}</dt>
-                        <dd><code>{{ medium.identifier }}</code></dd>
+                        <dd>
+                            <code id="medium_identifier">{{ medium.identifier }}</code>
+                            <button type="button" class="btn btn-default btn-xs btn-clipboard js-only" data-clipboard-target="#medium_identifier">
+                                <i class="fa fa-clipboard" aria-hidden="true"></i>
+                                <span class="sr-only">{% trans "Copy to clipboard" %}</span>
+                            </button>
+                            {% if medium.type == "barcode" %}
+                            <button type="button" class="btn btn-default btn-xs js-only" data-toggle="qrcode" data-qrcode="{{ medium.identifier }}">
+                                <i class="fa fa-qrcode" aria-hidden="true"></i>
+                                <span class="sr-only">{% trans "Create QR code" %}</span>
+                            </button>
+                            {% endif %}
+                        </dd>
                         <dt>{% trans "Status" %}</dt>
                         <dd>
                             {% if not medium.active %}
@@ -41,34 +53,34 @@
                         <dd>
                             {% if medium.customer %}
                                 <span class="helper-display-block">
-                                <span class="fa fa-user fa-fw"></span>
-                                {% if "organizer.customers:read" in request.orgapermset %}
-                                    <a href="{% url "control:organizer.customer" organizer=request.organizer.slug customer=medium.customer.identifier %}">
+                                    <span class="fa fa-user fa-fw"></span>
+                                    {% if "organizer.customers:read" in request.orgapermset %}
+                                        <a href="{% url "control:organizer.customer" organizer=request.organizer.slug customer=medium.customer.identifier %}">
+                                            {{ medium.customer }}
+                                        </a>
+                                    {% else %}
                                         {{ medium.customer }}
-                                    </a>
-                                {% else %}
-                                    {{ medium.customer }}
-                                {% endif %}
-                            </span>
+                                    {% endif %}
+                                </span>
                             {% endif %}
-                            {% if medium.linked_orderposition %}
+                            {% for op in medium.linked_orderpositions.all %}
                                 <span class="helper-display-block">
-                                <span class="fa fa-ticket fa-fw"></span>
-                                <a href="{% url "control:event.order" event=medium.linked_orderposition.order.event.slug organizer=request.organizer.slug code=medium.linked_orderposition.order.code %}">
-                                    {{ medium.linked_orderposition.order.code }}</a>-{{ medium.linked_orderposition.positionid }}
-                            </span>
-                            {% endif %}
+                                    <span class="fa fa-ticket fa-fw"></span>
+                                    <a href="{% url "control:event.order" event=op.order.event.slug organizer=request.organizer.slug code=op.order.code %}">
+                                        {{ op.order.code }}</a>-{{ op.positionid }}
+                                </span>
+                            {% endfor %}
                             {% if medium.linked_giftcard %}
                                 <span class="helper-display-block">
-                                <span class="fa fa-credit-card fa-fw"></span>
-                                {% if "organizer.giftcards:read" in request.orgapermset %}
-                                    <a href="{% url "control:organizer.giftcard" organizer=request.organizer.slug giftcard=medium.linked_giftcard.id %}">
-                                        {{ medium.linked_giftcard.secret }}
-                                    </a>
-                                {% else %}
-                                    {{ medium.linked_giftcard.secret|slice:":3" }}…
-                                {% endif %}
-                            </span>
+                                    <span class="fa fa-credit-card fa-fw"></span>
+                                    {% if "organizer.giftcards:read" in request.orgapermset %}
+                                        <a href="{% url "control:organizer.giftcard" organizer=request.organizer.slug giftcard=medium.linked_giftcard.id %}">
+                                            {{ medium.linked_giftcard.secret }}
+                                        </a>
+                                    {% else %}
+                                        {{ medium.linked_giftcard.secret|slice:":3" }}…
+                                    {% endif %}
+                                </span>
                             {% endif %}
                         </dd>
                         {% if medium.notes %}

src/pretix/control/templates/pretixcontrol/subevents/detail.html

@@ -4,290 +4,306 @@
 {% load formset_tags %}
 {% load eventsignal %}
 {% load static %}
-{% block title %}{% trans "Date" context "subevent" %}{% endblock %}
+{% load money %}
+{% load icon %}
+{% block title %}{% blocktrans trimmed with name=subevent.name context "subevent" %}Date: {{ name }}
+{% endblocktrans %}{% endblock %}
 {% block content %}
-    {% if not subevent.pk %}
-        <h1>{% trans "Create date" context "subevent" %}</h1>
-    {% else %}
-        <h1>{% trans "Date" context "subevent" %}</h1>
-    {% endif %}
-    <form action="" method="post" class="form-horizontal" enctype="multipart/form-data">
-        {% csrf_token %}
-        {% bootstrap_form_errors form %}
-        {% for f in itemvar_forms %}
-            {% bootstrap_form_errors f %}
-        {% endfor %}
-        <div class="row">
-            <div class="col-xs-12 {% if subevent.pk %}col-lg-10{% endif %}">
-                <fieldset>
-                    <legend>{% trans "General information" %}</legend>
-                    {% bootstrap_field form.name layout="control" %}
-                    {% bootstrap_field form.active layout="control" %}
-                    {% bootstrap_field form.date_from layout="control" %}
-                    {% bootstrap_field form.date_to layout="control" %}
-                    {% include "pretixcontrol/event/fragment_geodata.html" %}
-                    {% bootstrap_field form.date_admission layout="control" %}
-                    {% bootstrap_field form.frontpage_text layout="control" %}
-                    {% bootstrap_field form.is_public layout="control" %}
-                    {% bootstrap_field form.comment layout="control" %}
-                    {% if meta_forms %}
-                        <div class="form-group metadata-group">
-                            <label class="col-md-3 control-label">{% trans "Meta data" %}</label>
-                            <div class="col-md-9">
-                                {% for form in meta_forms %}
-                                    <div class="row">
-                                        <div class="col-md-4">
-                                            <label for="{{ form.value.id_for_label }}">
-                                                {{ form.property.name }}
-                                            </label>
-                                        </div>
-                                        <div class="col-md-8">
-                                            {% bootstrap_form form layout="inline" error_types="all" %}
-                                        </div>
-                                    </div>
-                                {% endfor %}
-                            </div>
-                        </div>
+    <h1>
+        {% blocktrans trimmed with name=subevent.name context "subevent" %}Date: {{ name }}{% endblocktrans %}
+        {% if 'event.subevents:write' in request.eventpermset %}
+            <a href="{% url "control:event.subevent.edit" event=request.event.slug organizer=request.event.organizer.slug subevent=subevent.pk %}"
+               class="btn btn-default">
+                <span class="fa fa-edit"></span>
+                {% trans "Edit" %}
+            </a>
+        {% endif %}
+    </h1>
+    <div class="row">
+        <div class="{% if "event.orders:read" in request.eventpermset %}col-md-5{% else %}col-md-10{% endif %} col-xs-12">
+            <fieldset>
+                <legend>{% trans "General information" %}</legend>
+                <dl class="dl-horizontal">
+                    <dt>{% trans "Name" %}</dt>
+                    <dd>{{ subevent.name }}</dd>
+                    <dt>{% trans "ID" %}</dt>
+                    <dd>#{{ subevent.pk }}</dd>
+                    <dt>{% trans "Status" %}</dt>
+                    <dd>
+                        {% if not subevent.active %}
+                            <span class="label label-danger">{% trans "Disabled" %}</span>
+                        {% elif subevent.presale_has_ended %}
+                            <span class="label label-warning">{% trans "Presale over" %}</span>
+                        {% elif not subevent.presale_is_running %}
+                            <span class="label label-warning">{% trans "Presale not started" %}</span>
+                        {% else %}
+                            <span class="label label-success">{% trans "On sale" %}</span>
+                        {% endif %}
+                    </dd>
+                    <dt>{% trans "Event start time" %}</dt>
+                    <dd>{{ subevent.date_from|date:"SHORT_DATETIME_FORMAT" }}</dd>
+                    <dt>{% trans "Event end time" %}</dt>
+                    <dd>{{ subevent.date_to|date:"SHORT_DATETIME_FORMAT" }}</dd>
+                    {% if subevent.date_admission %}
+                        <dt>{% trans "Admission time" %}</dt>
+                        <dd>{{ subevent.date_admission|date:"SHORT_DATETIME_FORMAT" }}</dd>
                     {% endif %}
-                </fieldset>
-                <fieldset>
-                    <legend>{% trans "Timeline" %}</legend>
-                    {% bootstrap_field form.presale_start layout="control" %}
-                    {% bootstrap_field form.presale_end layout="control" %}
-                </fieldset>
-                <fieldset>
-                    <legend>{% trans "Quotas" %}</legend>
-                    <div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}">
-                        {{ formset.management_form }}
-                        {% bootstrap_formset_errors formset %}
-                        <div data-formset-body>
-                            {% for form in formset %}
-                                <div class="panel panel-default" data-formset-form>
-                                    <div class="sr-only">
-                                        {{ form.id }}
-                                        {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
-                                    </div>
-                                    <div class="panel-heading">
-                                        <h4 class="panel-title">
-                                            <div class="row">
-                                                <div class="col-md-10">
-                                                    {% bootstrap_field form.name layout='inline' form_group_class="" %}
-                                                </div>
-                                                <div class="col-md-2 text-right flip">
-                                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                                        <i class="fa fa-trash"></i></button>
-                                                </div>
-                                            </div>
-                                        </h4>
-                                    </div>
-                                    <div class="panel-body form-horizontal">
-                                        {% bootstrap_form_errors form %}
-                                        {% bootstrap_field form.size layout="control" %}
-                                        {% bootstrap_field form.itemvars layout="control" %}
-                                        {% bootstrap_field form.release_after_exit layout="control" %}
-                                        {% bootstrap_field form.ignore_for_event_availability layout="control" %}
-                                    </div>
-                                </div>
-                            {% endfor %}
-                        </div>
-                        <script type="form-template" data-formset-empty-form>
-                            {% escapescript %}
-                                <div class="panel panel-default" data-formset-form>
-                                    <div class="sr-only">
-                                        {{ formset.empty_form.id }}
-                                        {% bootstrap_field formset.empty_form.DELETE form_group_class="" layout="inline" %}
-                                    </div>
-                                    <div class="panel-heading">
-                                        <h4 class="panel-title">
-                                            <div class="row">
-                                                <div class="col-md-10">
-                                                    {% bootstrap_field formset.empty_form.name layout='inline' form_group_class="" %}
-                                                </div>
-                                                <div class="col-md-2 text-right flip">
-                                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                                        <i class="fa fa-trash"></i></button>
-                                                </div>
-                                            </div>
-                                        </h4>
-                                    </div>
-                                    <div class="panel-body form-horizontal">
-                                        {% bootstrap_field formset.empty_form.size layout="control" %}
-                                        {% bootstrap_field formset.empty_form.itemvars layout="control" %}
-                                        {% bootstrap_field formset.empty_form.release_after_exit layout="control" %}
-                                        {% bootstrap_field formset.empty_form.ignore_for_event_availability layout="control" %}
-                                    </div>
-                                </div>
-                            {% endescapescript %}
-                        </script>
-                        <p>
-                            <button type="button" class="btn btn-default" data-formset-add>
-                                <i class="fa fa-plus"></i> {% trans "Add a new quota" %}</button>
-                        </p>
-                </fieldset>
-                <fieldset>
-                    <legend>{% trans "Product settings" %}</legend>
-                    <p class="text-muted">
-                        {% trans "These settings are optional, if you leave them empty, the default values from the product settings will be used." %}
-                    </p>
-                    {% for f in itemvar_forms %}
-                        <div data-itemvar="{{ f.item.id }}{% if f.variation %}-{{ f.variation.id }}{% endif %}">
-                            {% bootstrap_form_errors f %}
-                            <div class="form-group subevent-itemvar-group">
-                                <label class="col-md-3 control-label" for="id_{{ f.prefix }}-price">
-                                    {% if f.variation %}{{ f.item }} – {{ f.variation }}{% else %}{{ f.item }}{% endif %}
-                                </label>
-                                <div class="col-md-4">
-                                    <label for="{{ f.price.id_for_label }}" class="text-muted">{% trans "Price" %}</label><br>
-                                    {% bootstrap_field f.price addon_after=request.event.currency form_group_class="" layout="inline" %}
-                                </div>
-                                <div class="col-md-4">
-                                    <br>
-                                    {% bootstrap_field f.disabled layout="inline" form_group_class="" %}
-                                </div>
-                            </div>
-                            <div class="form-group subevent-itemvar-group">
-                                <div class="col-md-4 col-md-offset-3">
-                                    <label for="{{ f.available_from.id_for_label }}" class="text-muted">{% trans "Available from" %}</label>
-                                    {% include "pretixcontrol/subevents/fragment_unavail_mode_indicator.html" with mode=f.available_from_mode %}<br>
-                                    {% bootstrap_field f.available_from form_group_class="foo" layout="inline" %}
-                                </div>
-                                <div class="col-md-4">
-                                    <label for="{{ f.available_until.id_for_label }}" class="text-muted">{% trans "Available until" %}</label>
-                                    {% include "pretixcontrol/subevents/fragment_unavail_mode_indicator.html" with mode=f.available_until_mode %}<br>
-                                    {% bootstrap_field f.available_until form_group_class="" layout="inline" %}
-                                </div>
-                            </div>
-                        </div>
+                    {% if subevent.presale_start %}
+                        <dt>{% trans "Start of presale" %}</dt>
+                        <dd>{{ subevent.presale_start|date:"SHORT_DATETIME_FORMAT" }}</dd>
+                    {% endif %}
+                    {% if subevent.presale_end %}
+                        <dt>{% trans "End of presale" %}</dt>
+                        <dd>{{ subevent.presale_end|date:"SHORT_DATETIME_FORMAT" }}</dd>
+                    {% endif %}
+                    {% if subevent.location %}
+                        <dt>{% trans "Location" %}</dt>
+                        <dd>{{ subevent.location|linebreaksbr }}</dd>
+                    {% endif %}
+                    <dt>{% trans "Show in lists" %}</dt>
+                    <dd>{{ subevent.is_public|yesno }}</dd>
+                    {% for k, v in subevent.meta_data.items %}
+                        <dt>{{ k }}</dt>
+                        <dd>{{ v }}</dd>
                     {% endfor %}
-                </fieldset>
+                    {% if subevent.comment %}
+                        <dt>{% trans "Internal comment" %}</dt>
+                        <dd>{{ subevent.comment|linebreaksbr }}</dd>
+                    {% endif %}
+                </dl>
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Quotas" %}</legend>
+                <div class="table-responsive">
+                    <table class="table table-hover table-quotas">
+                        <thead>
+                        <tr>
+                            <th>{% trans "Quota name" %}</th>
+                            <th>{% trans "Products" %}</th>
+                            <th>{% trans "Total capacity" %}</th>
+                            <th>{% trans "Capacity left" %}</th>
+                            <th class="action-col-2"></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {% for q in quotas %}
+                            <tr>
+                                <td>
+                                    <strong><a
+                                            href="{% url "control:event.items.quotas.show" organizer=request.event.organizer.slug event=request.event.slug quota=q.id %}">{{ q.name }}</a></strong>
+                                    {% if q.ignore_for_event_availability %}
+                                        <span class="fa fa-eye-slash text-muted" data-toggle="tooltip"
+                                              title="{% trans "Ignore this quota when determining event availability" %}"></span>
+                                    {% endif %}
+                                </td>
+                                <td>
+                                    <ul>
+                                        {% for item in q.cached_items %}
+                                            {% if not item.has_variations %}
+                                                <li>
+                                                    <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.id %}">{{ item }}</a>
+                                                </li>
+                                            {% endif %}
+                                        {% endfor %}
+                                        {% for v in q.variations.all %}
+                                            <li>
+                                                <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=v.item.id %}#tab-0-3-open">
+                                                    {{ v.item }} – {{ v }}</a></li>
+                                        {% endfor %}
+                                    </ul>
+                                </td>
+                                <td>{% if q.size == None %}Unlimited{% else %}{{ q.size }}{% endif %}</td>
+                                <td>{% include "pretixcontrol/items/fragment_quota_availability.html" with availability=q.cached_avail closed=q.closed %}</td>
+                                <td class="text-right flip">
+                                    {% if 'event.items:write' in request.eventpermset %}
+                                        <a href="{% url "control:event.items.quotas.edit" organizer=request.event.organizer.slug event=request.event.slug quota=q.id %}"
+                                           class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </fieldset>
+            {% if checkinlists %}
                 <fieldset>
                     <legend>{% trans "Check-in lists" %}</legend>
-                    <p class="help-block">
-                        {% blocktrans trimmed %}
-                            You can choose to either add one or more check-in lists for every date in your series individually,
-                            or use just one check-in list for all your dates and limit admission through check-in rules. Which
-                            approach is better depends on multiple factors, such as the number of dates in your series. For a
-                            series with one or less event date per day, individual lists are usually more helpful. If you
-                            use dates to represent many time slots on the same day, or even overlapping time slots, working with
-                            just one large check-in list will be easier.
-                        {% endblocktrans %}
-                    </p>
-                    <div class="formset" data-formset data-formset-prefix="{{ cl_formset.prefix }}">
-                        {{ cl_formset.management_form }}
-                        {% bootstrap_formset_errors cl_formset %}
-                        <div data-formset-body>
-                            {% for form in cl_formset %}
-                                <div class="panel panel-default" data-formset-form>
-                                    <div class="sr-only">
-                                        {{ form.id }}
-                                        {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
-                                    </div>
-                                    <div class="panel-heading">
-                                        <h4 class="panel-title">
-                                            <div class="row">
-                                                <div class="col-md-10">
-                                                    {% bootstrap_field form.name layout='inline' form_group_class="" %}
+                    <div class="table-responsive">
+                        <table class="table table-hover table-quotas">
+                            <thead>
+                            <tr>
+                                <th>{% trans "Name" %}</th>
+                                {% if "event.orders:read" in request.eventpermset %}
+                                    <th>{% trans "Checked in" %}</th>
+                                {% endif %}
+                                <th>{% trans "Products" %}</th>
+                                <th class="action-col-2"></th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            {% for cl in checkinlists %}
+                                <tr>
+                                    <td>
+                                        <strong><a
+                                                href="{% url "control:event.orders.checkinlists.show" organizer=request.event.organizer.slug event=request.event.slug list=cl.id %}">{{ cl.name }}</a></strong>
+                                    </td>
+                                    {% if "event.orders:read" in request.eventpermset %}
+                                        <td>
+                                            <div class="quotabox availability">
+                                                <div class="progress">
+                                                    <div class="progress-bar progress-bar-success progress-bar-{{ cl.percent }}">
+                                                    </div>
                                                 </div>
-                                                <div class="col-md-2 text-right flip">
-                                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                                        <i class="fa fa-trash"></i></button>
+                                                <div class="numbers">
+                                                    {{ cl.checkin_count|default_if_none:"0" }} /
+                                                    {{ cl.position_count|default_if_none:"0" }}
                                                 </div>
                                             </div>
-                                        </h4>
-                                    </div>
-                                    <div class="panel-body form-horizontal">
-                                        {% bootstrap_form_errors form %}
-                                        {% bootstrap_field form.include_pending layout="control" %}
-                                        {% bootstrap_field form.all_products layout="control" %}
-                                        {% bootstrap_field form.limit_products layout="control" %}
-                                        {% bootstrap_field form.allow_entry_after_exit layout="control" %}
-                                        {% if form.gates %}
-                                            {% bootstrap_field form.gates layout="control" %}
+                                        </td>
+                                    {% endif %}
+                                    <td>
+                                        {% if cl.all_products %}
+                                            <em>{% trans "All" %}</em>
+                                        {% else %}
+                                            <ul>
+                                                {% for item in cl.limit_products.all %}
+                                                    <li>
+                                                        <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.id %}">{{ item }}</a>
+                                                    </li>
+                                                {% endfor %}
+                                            </ul>
                                         {% endif %}
-                                    </div>
-                                </div>
+                                    </td>
+                                    <td class="text-right flip">
+                                        {% if "event.orders:read" in request.eventpermset %}
+                                            <a href="{% url "control:event.orders.checkinlists.show" organizer=request.event.organizer.slug event=request.event.slug list=cl.id %}"
+                                               class="btn btn-default btn-sm"><i class="fa fa-eye"></i></a>
+                                        {% endif %}
+                                        {% if "event.settings.general:write" in request.eventpermset %}
+                                            <a href="{% url "control:event.orders.checkinlists.add" organizer=request.event.organizer.slug event=request.event.slug %}?copy_from={{ cl.id }}"
+                                               class="btn btn-sm btn-default" title="{% trans "Clone" %}"
+                                               data-toggle="tooltip">
+                                                <span class="fa fa-copy"></span>
+                                            </a>
+                                        {% endif %}
+                                    </td>
+                                </tr>
                             {% endfor %}
-                        </div>
-                        <script type="form-template" data-formset-empty-form>
-                            {% escapescript %}
-                                <div class="panel panel-default" data-formset-form>
-                                    <div class="sr-only">
-                                        {{ cl_formset.empty_form.id }}
-                                        {% bootstrap_field cl_formset.empty_form.DELETE form_group_class="" layout="inline" %}
-                                    </div>
-                                    <div class="panel-heading">
-                                        <h4 class="panel-title">
-                                            <div class="row">
-                                                <div class="col-md-10">
-                                                    {% bootstrap_field cl_formset.empty_form.name layout='inline' form_group_class="" %}
-                                                </div>
-                                                <div class="col-md-2 text-right flip">
-                                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                                        <i class="fa fa-trash"></i></button>
-                                                </div>
-                                            </div>
-                                        </h4>
-                                    </div>
-                                    <div class="panel-body form-horizontal">
-                                        {% bootstrap_field cl_formset.empty_form.include_pending layout="control" %}
-                                        {% bootstrap_field cl_formset.empty_form.all_products layout="control" %}
-                                        {% bootstrap_field cl_formset.empty_form.limit_products layout="control" %}
-                                        {% bootstrap_field cl_formset.empty_form.allow_entry_after_exit layout="control" %}
-                                        {% if cl_formset.empty_form.gates %}
-                                            {% bootstrap_field cl_formset.empty_form.gates layout="control" %}
-                                        {% endif %}
-                                    </div>
-                                </div>
-                            {% endescapescript %}
-                        </script>
-                        <p>
-                            <button type="button" class="btn btn-default" data-formset-add>
-                                <i class="fa fa-plus"></i> {% trans "Add a new check-in list" %}
-                            </button>
-                        </p>
+                            </tbody>
+                        </table>
                 </fieldset>
-                {% for f in plugin_forms %}
-                    {% if f.title %}
-                        <fieldset>
-                            <legend>{{ f.title }}</legend>
-                            {% if f.template %}
-                                {% include f.template with form=f %}
-                            {% else %}
-                                {% bootstrap_form f layout="control" %}
-                            {% endif %}
-                        </fieldset>
-                    {% endif %}
-                {% endfor %}
+            {% endif %}
+            {% eventsignal request.event "pretix.control.signals.subevent_detail_html" subevent=subevent %}
+        </div>
+        {% if "event.orders:read" in request.eventpermset %}
+            <div class="col-md-5 col-xs-12">
                 <fieldset>
-                    <legend>{% trans "Additional settings" %}</legend>
-                    {% for f in plugin_forms %}
-                        {% if not f.title %}
-                            {% if f.template %}
-                                {% include f.template with form=f %}
-                            {% else %}
-                                {% bootstrap_form f layout="control" %}
-                            {% endif %}
+                    <legend>
+                        {% trans "Orders" %}
+                        <span class="badge">
+                            {{ order_count }}
+                        </span>
+                    </legend>
+                    {% if order_count %}
+                        <div class="table-responsive">
+                            <table class="table table-condensed table-hover table-orders">
+                                <thead>
+                                <tr>
+                                    <th>{% trans "Order code" %}</th>
+                                    <th>{% trans "Details" %}</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                {% for o in orders %}
+                                    <tr>
+                                        <td>
+                                            <strong>
+                                                <a href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=o.code %}">
+                                                    {{ o.code }}
+                                                </a>
+                                            </strong>
+                                            <br>
+                                            {% if o.testmode %}
+                                                <span class="label label-warning">{% trans "TEST MODE" %}</span>
+                                            {% endif %}
+                                            {% if o.status == "p" and o.pcnt == 0 %}
+                                                {# Everything related to this subevent is canceled #}
+                                                <span class="label label-danger">
+                                                <span class="fa fa-times"></span>
+                                                {% trans "partially canceled" %}
+                                            </span>
+                                            {% else %}
+                                                {% include "pretixcontrol/orders/fragment_order_status.html" with order=o %}
+                                            {% endif %}
+                                        </td>
+                                        <td>
+                                            {% if "." in o.sales_channel.icon %}
+                                                <img src="{% static o.sales_channel.icon %}" class="fa-like-image"
+                                                     data-toggle="tooltip" title="{{ o.sales_channel.label }}">
+                                            {% else %}
+                                                <span class="fa fa-fw fa-{{ o.sales_channel.icon }} text-muted"
+                                                      data-toggle="tooltip" title="{{ o.sales_channel.label }}"></span>
+                                            {% endif %}
+                                            {{ o.datetime|date:"SHORT_DATETIME_FORMAT" }}
+                                            {% if o.email %}
+                                                <br>{% icon "envelope-o fa-fw text-muted" %}
+                                                {{ o.email|default_if_none:"" }}
+                                            {% endif %}
+                                            {% if o.invoice_address.name %}
+                                                <br>{% icon "user fa-fw text-muted" %} {{ o.invoice_address.name }}
+                                            {% endif %}
+                                            <br>{% icon "ticket text-muted fa-fw" %} {{ o.pcnt }}
+                                            {% if o.comment %}
+                                                <br>
+                                                <span class="text-muted">
+                                                {{ o.comment|linebreaksbr }}
+                                            </span>
+                                            {% endif %}
+                                            {% if o.custom_followup_due %}
+                                                <br>
+                                                <span class="label label-danger">{% blocktrans trimmed with date=o.custom_followup_at|date:"SHORT_DATE_FORMAT" context "followup" %}
+                                                    TODO {{ date }}{% endblocktrans %}</span>
+                                            {% elif o.custom_followup_at %}
+                                                <br>
+                                                <span class="label label-default">{% blocktrans trimmed with date=o.custom_followup_at|date:"SHORT_DATE_FORMAT" context "followup" %}
+                                                    TODO {{ date }}{% endblocktrans %}</span>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endfor %}
+                                </tbody>
+                            </table>
+                        </div>
+                        {% if order_count > 10 %}
+                            <p class="text-center">
+                                <a href="{% url "control:event.orders" organizer=request.organizer.slug event=request.event.slug %}?subevent={{ subevent.pk }}"
+                                   class="btn btn-default">
+                                    {% trans "View all" %}
+                                </a>
+                            </p>
                         {% endif %}
-                    {% endfor %}
+                    {% else %}
+                        <div class="empty-collection">
+                            <p>
+                                {% blocktrans trimmed %}
+                                    No orders found.
+                                {% endblocktrans %}
+                            </p>
+                        </div>
+                    {% endif %}
                 </fieldset>
             </div>
-            {% if subevent.pk %}
-                <div class="col-xs-12 col-lg-2">
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <h3 class="panel-title">
-                                {% trans "Date history" context "subevent" %}
-                            </h3>
-                        </div>
-                        {% include "pretixcontrol/includes/logs.html" with obj=subevent %}
-                    </div>
+        {% endif %}
+        <div class="col-md-2 col-xs-12">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h3 class="panel-title">
+                        {% trans "Date history" context "subevent" %}
+                    </h3>
                 </div>
-            {% endif %}
+                {% include "pretixcontrol/includes/logs.html" with obj=subevent %}
+            </div>
         </div>
-        <div class="form-group submit-group submit-group-sticky">
-            <button type="submit" class="btn btn-primary btn-save">
-                {% trans "Save" %}
-            </button>
-        </div>
-    </form>
+    </div>
 {% endblock %}

src/pretix/control/templates/pretixcontrol/subevents/edit.html

@@ -0,0 +1,296 @@
+{% extends "pretixcontrol/event/base.html" %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% load formset_tags %}
+{% load eventsignal %}
+{% load static %}
+{% block title %}{% trans "Date" context "subevent" %}{% endblock %}
+{% block content %}
+    {% if not subevent.pk %}
+        <h1>{% trans "Create date" context "subevent" %}</h1>
+    {% else %}
+        <h1>{% trans "Date" context "subevent" %}</h1>
+    {% endif %}
+    <form action="" method="post" class="form-horizontal" enctype="multipart/form-data">
+        {% csrf_token %}
+        {% bootstrap_form_errors form %}
+        {% for f in itemvar_forms %}
+            {% bootstrap_form_errors f %}
+        {% endfor %}
+        <div class="row">
+            <div class="col-xs-12 {% if subevent.pk %}col-lg-10{% endif %}">
+                <fieldset>
+                    <legend>{% trans "General information" %}</legend>
+                    {% bootstrap_field form.name layout="control" %}
+                    {% bootstrap_field form.active layout="control" %}
+                    {% bootstrap_field form.date_from layout="control" %}
+                    {% bootstrap_field form.date_to layout="control" %}
+                    {% include "pretixcontrol/event/fragment_geodata.html" %}
+                    {% bootstrap_field form.date_admission layout="control" %}
+                    {% bootstrap_field form.frontpage_text layout="control" %}
+                    {% bootstrap_field form.is_public layout="control" %}
+                    {% bootstrap_field form.comment layout="control" %}
+                    {% if meta_forms %}
+                        <div class="form-group metadata-group">
+                            <label class="col-md-3 control-label">{% trans "Meta data" %}</label>
+                            <div class="col-md-9">
+                                {% for form in meta_forms %}
+                                    <div class="row">
+                                        <div class="col-md-4">
+                                            <label for="{{ form.value.id_for_label }}">
+                                                {{ form.property.name }}
+                                            </label>
+                                        </div>
+                                        <div class="col-md-8">
+                                            {% bootstrap_form form layout="inline" error_types="all" %}
+                                        </div>
+                                    </div>
+                                {% endfor %}
+                            </div>
+                        </div>
+                    {% endif %}
+                </fieldset>
+                <fieldset>
+                    <legend>{% trans "Timeline" %}</legend>
+                    {% bootstrap_field form.presale_start layout="control" %}
+                    {% bootstrap_field form.presale_end layout="control" %}
+                </fieldset>
+                <fieldset>
+                    <legend>{% trans "Quotas" %}</legend>
+                    <div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}">
+                        {{ formset.management_form }}
+                        {% bootstrap_formset_errors formset %}
+                        <div data-formset-body>
+                            {% for form in formset %}
+                                <div class="panel panel-default" data-formset-form>
+                                    <div class="sr-only">
+                                        {{ form.id }}
+                                        {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
+                                    </div>
+                                    <div class="panel-heading">
+                                        <h4 class="panel-title">
+                                            <div class="row">
+                                                <div class="col-md-10">
+                                                    {% bootstrap_field form.name layout='inline' form_group_class="" %}
+                                                </div>
+                                                <div class="col-md-2 text-right flip">
+                                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
+                                                        <i class="fa fa-trash"></i></button>
+                                                </div>
+                                            </div>
+                                        </h4>
+                                    </div>
+                                    <div class="panel-body form-horizontal">
+                                        {% bootstrap_form_errors form %}
+                                        {% bootstrap_field form.size layout="control" %}
+                                        {% bootstrap_field form.itemvars layout="control" %}
+                                        {% bootstrap_field form.release_after_exit layout="control" %}
+                                        {% bootstrap_field form.ignore_for_event_availability layout="control" %}
+                                    </div>
+                                </div>
+                            {% endfor %}
+                        </div>
+                        <script type="form-template" data-formset-empty-form>
+                            {% escapescript %}
+                                <div class="panel panel-default" data-formset-form>
+                                    <div class="sr-only">
+                                        {{ formset.empty_form.id }}
+                                        {% bootstrap_field formset.empty_form.DELETE form_group_class="" layout="inline" %}
+                                    </div>
+                                    <div class="panel-heading">
+                                        <h4 class="panel-title">
+                                            <div class="row">
+                                                <div class="col-md-10">
+                                                    {% bootstrap_field formset.empty_form.name layout='inline' form_group_class="" %}
+                                                </div>
+                                                <div class="col-md-2 text-right flip">
+                                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
+                                                        <i class="fa fa-trash"></i></button>
+                                                </div>
+                                            </div>
+                                        </h4>
+                                    </div>
+                                    <div class="panel-body form-horizontal">
+                                        {% bootstrap_field formset.empty_form.size layout="control" %}
+                                        {% bootstrap_field formset.empty_form.itemvars layout="control" %}
+                                        {% bootstrap_field formset.empty_form.release_after_exit layout="control" %}
+                                        {% bootstrap_field formset.empty_form.ignore_for_event_availability layout="control" %}
+                                    </div>
+                                </div>
+                            {% endescapescript %}
+                        </script>
+                        <p>
+                            <button type="button" class="btn btn-default" data-formset-add>
+                                <i class="fa fa-plus"></i> {% trans "Add a new quota" %}</button>
+                        </p>
+                </fieldset>
+                <fieldset>
+                    <legend>{% trans "Product settings" %}</legend>
+                    <p class="text-muted">
+                        {% trans "These settings are optional, if you leave them empty, the default values from the product settings will be used." %}
+                    </p>
+                    {% for f in itemvar_forms %}
+                        <div data-itemvar="{{ f.item.id }}{% if f.variation %}-{{ f.variation.id }}{% endif %}">
+                            {% bootstrap_form_errors f %}
+                            <div class="form-group subevent-itemvar-group">
+                                <label class="col-md-3 control-label" for="id_{{ f.prefix }}-price">
+                                    {% if f.variation %}{{ f.item }} – {{ f.variation }}{% else %}{{ f.item }}{% endif %}
+                                </label>
+                                <div class="col-md-4">
+                                    <label for="{{ f.price.id_for_label }}" class="text-muted">{% trans "Price" %}</label><br>
+                                    {% bootstrap_field f.price addon_after=request.event.currency form_group_class="" layout="inline" %}
+                                </div>
+                                <div class="col-md-4">
+                                    <br>
+                                    {% bootstrap_field f.disabled layout="inline" form_group_class="" %}
+                                </div>
+                            </div>
+                            <div class="form-group subevent-itemvar-group">
+                                <div class="col-md-4 col-md-offset-3">
+                                    <label for="{{ f.available_from.id_for_label }}" class="text-muted">{% trans "Available from" %}</label>
+                                    {% include "pretixcontrol/subevents/fragment_unavail_mode_indicator.html" with mode=f.available_from_mode %}<br>
+                                    {% bootstrap_field f.available_from form_group_class="foo" layout="inline" %}
+                                </div>
+                                <div class="col-md-4">
+                                    <label for="{{ f.available_until.id_for_label }}" class="text-muted">{% trans "Available until" %}</label>
+                                    {% include "pretixcontrol/subevents/fragment_unavail_mode_indicator.html" with mode=f.available_until_mode %}<br>
+                                    {% bootstrap_field f.available_until form_group_class="" layout="inline" %}
+                                </div>
+                            </div>
+                        </div>
+                    {% endfor %}
+                </fieldset>
+                <fieldset>
+                    <legend>{% trans "Check-in lists" %}</legend>
+                    <p class="help-block">
+                        {% blocktrans trimmed %}
+                            You can choose to either add one or more check-in lists for every date in your series individually,
+                            or use just one check-in list for all your dates and limit admission through check-in rules. Which
+                            approach is better depends on multiple factors, such as the number of dates in your series. For a
+                            series with one or less event date per day, individual lists are usually more helpful. If you
+                            use dates to represent many time slots on the same day, or even overlapping time slots, working with
+                            just one large check-in list will be easier.
+                        {% endblocktrans %}
+                    </p>
+                    <div class="formset" data-formset data-formset-prefix="{{ cl_formset.prefix }}">
+                        {{ cl_formset.management_form }}
+                        {% bootstrap_formset_errors cl_formset %}
+                        <div data-formset-body>
+                            {% for form in cl_formset %}
+                                <div class="panel panel-default" data-formset-form>
+                                    <div class="sr-only">
+                                        {{ form.id }}
+                                        {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
+                                    </div>
+                                    <div class="panel-heading">
+                                        <h4 class="panel-title">
+                                            <div class="row">
+                                                <div class="col-md-10">
+                                                    {% bootstrap_field form.name layout='inline' form_group_class="" %}
+                                                </div>
+                                                <div class="col-md-2 text-right flip">
+                                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
+                                                        <i class="fa fa-trash"></i></button>
+                                                </div>
+                                            </div>
+                                        </h4>
+                                    </div>
+                                    <div class="panel-body form-horizontal">
+                                        {% bootstrap_form_errors form %}
+                                        {% bootstrap_field form.include_pending layout="control" %}
+                                        {% bootstrap_field form.all_products layout="control" %}
+                                        {% bootstrap_field form.limit_products layout="control" %}
+                                        {% bootstrap_field form.allow_entry_after_exit layout="control" %}
+                                        {% if form.gates %}
+                                            {% bootstrap_field form.gates layout="control" %}
+                                        {% endif %}
+                                    </div>
+                                </div>
+                            {% endfor %}
+                        </div>
+                        <script type="form-template" data-formset-empty-form>
+                            {% escapescript %}
+                                <div class="panel panel-default" data-formset-form>
+                                    <div class="sr-only">
+                                        {{ cl_formset.empty_form.id }}
+                                        {% bootstrap_field cl_formset.empty_form.DELETE form_group_class="" layout="inline" %}
+                                    </div>
+                                    <div class="panel-heading">
+                                        <h4 class="panel-title">
+                                            <div class="row">
+                                                <div class="col-md-10">
+                                                    {% bootstrap_field cl_formset.empty_form.name layout='inline' form_group_class="" %}
+                                                </div>
+                                                <div class="col-md-2 text-right flip">
+                                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
+                                                        <i class="fa fa-trash"></i></button>
+                                                </div>
+                                            </div>
+                                        </h4>
+                                    </div>
+                                    <div class="panel-body form-horizontal">
+                                        {% bootstrap_field cl_formset.empty_form.include_pending layout="control" %}
+                                        {% bootstrap_field cl_formset.empty_form.all_products layout="control" %}
+                                        {% bootstrap_field cl_formset.empty_form.limit_products layout="control" %}
+                                        {% bootstrap_field cl_formset.empty_form.allow_entry_after_exit layout="control" %}
+                                        {% if cl_formset.empty_form.gates %}
+                                            {% bootstrap_field cl_formset.empty_form.gates layout="control" %}
+                                        {% endif %}
+                                    </div>
+                                </div>
+                            {% endescapescript %}
+                        </script>
+                        <p>
+                            <button type="button" class="btn btn-default" data-formset-add>
+                                <i class="fa fa-plus"></i> {% trans "Add a new check-in list" %}
+                            </button>
+                        </p>
+                </fieldset>
+                {% for f in plugin_forms %}
+                    {% if f.title %}
+                        <fieldset>
+                            <legend>{{ f.title }}</legend>
+                            {% if f.template %}
+                                {% include f.template with form=f %}
+                            {% else %}
+                                {% bootstrap_form f layout="control" %}
+                            {% endif %}
+                        </fieldset>
+                    {% endif %}
+                {% endfor %}
+                <fieldset>
+                    <legend>{% trans "Additional settings" %}</legend>
+                    {% for f in plugin_forms %}
+                        {% if not f.title %}
+                            {% if f.template %}
+                                {% include f.template with form=f %}
+                            {% else %}
+                                {% bootstrap_form f layout="control" %}
+                            {% endif %}
+                        {% endif %}
+                    {% endfor %}
+                </fieldset>
+            </div>
+            {% if subevent.pk %}
+                <div class="col-xs-12 col-lg-2">
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <h3 class="panel-title">
+                                {% trans "Date history" context "subevent" %}
+                            </h3>
+                        </div>
+                        {% include "pretixcontrol/includes/logs.html" with obj=subevent %}
+                    </div>
+                </div>
+            {% endif %}
+        </div>
+        <div class="form-group submit-group submit-group-sticky">
+            <a href="{{ next_url }}" class="btn btn-default btn-cancel">
+                {% trans "Cancel" %}
+            </a>
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
+        </div>
+    </form>
+{% endblock %}

src/pretix/control/templates/pretixcontrol/subevents/index.html

@@ -133,7 +133,7 @@
                                 </td>
                             {% endif %}
                             <td>
-                                <strong><a href="{% url "control:event.subevent" organizer=request.event.organizer.slug event=request.event.slug subevent=s.id %}?returnto={{ request.GET.urlencode|urlencode }}">
+                                <strong><a href="{% url "control:event.subevent" organizer=request.event.organizer.slug event=request.event.slug subevent=s.id %}">
                                     {{ s.name }}</a></strong><br>
                                 <small class="text-muted">
                                     #{{ s.pk }}
@@ -182,7 +182,7 @@
                                 {% endif %}
 
                                 {% if "event.subevents:write" in request.eventpermset %}
-                                    <a href="{% url "control:event.subevent" organizer=request.event.organizer.slug event=request.event.slug subevent=s.id %}?returnto={{ request.GET.urlencode|urlencode }}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
+                                    <a href="{% url "control:event.subevent.edit" organizer=request.event.organizer.slug event=request.event.slug subevent=s.id %}?next={{ request.get_full_path|urlencode }}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
                                     <div class="btn-group {% if forloop.revcounter0 < 2 %}dropup{% endif %}">
                                         <button type="button" class="btn btn-default btn-sm dropdown-toggle"
                                                 data-toggle="dropdown">
@@ -201,7 +201,7 @@
                                             </li>
                                         </ul>
                                     </div>
-                                    <a href="{% url "control:event.subevent.delete" organizer=request.event.organizer.slug event=request.event.slug subevent=s.id %}?returnto={{ request.GET.urlencode|urlencode }}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
+                                    <a href="{% url "control:event.subevent.delete" organizer=request.event.organizer.slug event=request.event.slug subevent=s.id %}?next={{ request.get_full_path|urlencode }}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
                                 {% endif %}
                             </td>
                         </tr>

src/pretix/control/urls.py

@@ -308,7 +308,8 @@ urlpatterns = [
         re_path(r'^pdf/editor/(?P<filename>[^/]+).pdf$', pdf.PdfView.as_view(), name='pdf.background'),
         re_path(r'^subevents/$', subevents.SubEventList.as_view(), name='event.subevents'),
         re_path(r'^subevents/select2$', typeahead.subevent_select2, name='event.subevents.select2'),
-        re_path(r'^subevents/(?P<subevent>\d+)/$', subevents.SubEventUpdate.as_view(), name='event.subevent'),
+        re_path(r'^subevents/(?P<subevent>\d+)/$', subevents.SubEventDetail.as_view(), name='event.subevent'),
+        re_path(r'^subevents/(?P<subevent>\d+)/edit$', subevents.SubEventUpdate.as_view(), name='event.subevent.edit'),
         re_path(r'^subevents/(?P<subevent>\d+)/delete$', subevents.SubEventDelete.as_view(),
                 name='event.subevent.delete'),
         re_path(r'^subevents/add$', subevents.SubEventCreate.as_view(), name='event.subevents.add'),

src/pretix/control/views/discounts.py

@@ -44,7 +44,7 @@ from pretix.control.permissions import (
 from pretix.helpers.models import modelcopy
 
 from ...helpers.compat import CompatDeleteView
-from . import CreateView, PaginationMixin, UpdateView
+from . import CreateView, UpdateView
 
 
 class DiscountDelete(EventPermissionRequiredMixin, CompatDeleteView):
@@ -183,7 +183,7 @@ class DiscountCreate(EventPermissionRequiredMixin, CreateView):
         return super().form_invalid(form)
 
 
-class DiscountList(PaginationMixin, ListView):
+class DiscountList(ListView):
     model = Discount
     context_object_name = 'discounts'
     template_name = 'pretixcontrol/items/discounts.html'

src/pretix/control/views/event.py

@@ -965,7 +965,7 @@ class TicketSettingsPreview(EventPermissionRequiredMixin, View):
         responses = register_ticket_outputs.send(self.request.event)
         for receiver, response in responses:
             provider = response(self.request.event)
-            if provider.identifier == self.kwargs.get('output') and not provider.is_meta:
+            if provider.identifier == self.kwargs.get('output'):
                 return provider
 
     def get(self, request, *args, **kwargs):
@@ -1068,11 +1068,6 @@ class TicketSettings(EventSettingsViewMixin, EventPermissionRequiredMixin, FormV
         responses = register_ticket_outputs.send(self.request.event)
         for receiver, response in responses:
             provider = response(self.request.event)
-            provider_settings_fields = provider.settings_form_fields
-            provider_settings_content = provider.settings_content_render(self.request)
-            if not provider_settings_fields and not provider_settings_content:
-                continue
-
             provider.form = ProviderForm(
                 obj=self.request.event,
                 settingspref='ticketoutput_%s_' % provider.identifier,
@@ -1082,17 +1077,17 @@ class TicketSettings(EventSettingsViewMixin, EventPermissionRequiredMixin, FormV
             provider.form.fields = OrderedDict(
                 [
                     ('ticketoutput_%s_%s' % (provider.identifier, k), v)
-                    for k, v in provider_settings_fields.items()
+                    for k, v in provider.settings_form_fields.items()
                 ]
             )
-            provider.settings_content = provider_settings_content
+            provider.settings_content = provider.settings_content_render(self.request)
             provider.form.prepare_fields()
 
             provider.evaluated_preview_allowed = True
             if not provider.preview_allowed:
                 provider.evaluated_preview_allowed = False
             else:
-                for k, v in provider_settings_fields.items():
+                for k, v in provider.settings_form_fields.items():
                     if v.required and not self.request.event.settings.get('ticketoutput_%s_%s' % (provider.identifier, k)):
                         provider.evaluated_preview_allowed = False
                         break

src/pretix/control/views/item.py

@@ -335,7 +335,7 @@ class CategoryCreate(EventPermissionRequiredMixin, CreateView):
         return super().form_invalid(form)
 
 
-class CategoryList(PaginationMixin, ListView):
+class CategoryList(ListView):
     model = ItemCategory
     context_object_name = 'categories'
     template_name = 'pretixcontrol/items/categories.html'

src/pretix/control/views/orders.py

@@ -567,8 +567,6 @@ class OrderDetail(OrderView):
         responses = register_ticket_outputs.send(self.request.event)
         for receiver, response in responses:
             provider = response(self.request.event)
-            if provider.is_meta:
-                continue
             buttons.append({
                 'text': provider.download_button_text or 'Ticket',
                 'icon': provider.download_button_icon or 'fa-download',

src/pretix/control/views/organizer.py

@@ -3384,8 +3384,10 @@ class ReusableMediaListView(OrganizerDetailViewMixin, OrganizerPermissionRequire
 
     def get_queryset(self):
         qs = self.request.organizer.reusable_media.select_related(
-            'customer', 'linked_orderposition', 'linked_orderposition__order', 'linked_orderposition__order__event',
-            'linked_giftcard'
+            'customer',
+            'linked_giftcard',
+        ).prefetch_related(
+            Prefetch('linked_orderpositions', queryset=OrderPosition.objects.select_related("order", "order__event"))
         )
         if self.filter_form.is_valid():
             qs = self.filter_form.filter_qs(qs)
@@ -3433,10 +3435,14 @@ class ReusableMediumCreateView(OrganizerDetailViewMixin, OrganizerPermissionRequ
     @transaction.atomic
     def form_valid(self, form):
         r = super().form_valid(form)
-        form.instance.log_action('pretix.reusable_medium.created', user=self.request.user, data={
+
+        data = {
             k: getattr(form.instance, k)
             for k in form.changed_data
-        })
+        }
+        if "linked_orderpositions" in data:
+            data["linked_orderpositions"] = data["linked_orderpositions"].values_list("pk", flat=True)
+        form.instance.log_action('pretix.reusable_medium.created', user=self.request.user, data=data)
         messages.success(self.request, _('Your changes have been saved.'))
         return r
 
@@ -3461,13 +3467,40 @@ class ReusableMediumUpdateView(OrganizerDetailViewMixin, OrganizerPermissionRequ
 
     @transaction.atomic
     def form_valid(self, form):
+        prev_linked_ops_pks = list(getattr(self.object, "linked_orderpositions").values_list("pk", flat=True))
+        result = super().form_valid(form)
         if form.has_changed():
-            self.object.log_action('pretix.reusable_medium.changed', user=self.request.user, data={
+            data = {
                 k: getattr(self.object, k)
                 for k in form.changed_data
-            })
+            }
+            if "linked_orderpositions" in data:
+                # handle changes to linked_orderpositions separately
+                linked_ops_pks = data["linked_orderpositions"].values_list("pk", flat=True)
+                del data["linked_orderpositions"]
+                for op_pk in prev_linked_ops_pks:
+                    if op_pk not in linked_ops_pks:
+                        self.object.log_action(
+                            'pretix.reusable_medium.linked_orderposition.removed',
+                            user=self.request.user,
+                            data={
+                                'linked_orderposition': op_pk,
+                            }
+                        )
+                for op_pk in linked_ops_pks:
+                    if op_pk not in prev_linked_ops_pks:
+                        self.object.log_action(
+                            'pretix.reusable_medium.linked_orderposition.added',
+                            user=self.request.user,
+                            data={
+                                'linked_orderposition': op_pk,
+                            }
+                        )
+            if data:
+                # log change-action only for changes other than linked_orderpositions
+                self.object.log_action('pretix.reusable_medium.changed', user=self.request.user, data=data)
         messages.success(self.request, _('Your changes have been saved.'))
-        return super().form_valid(form)
+        return result
 
     def get_success_url(self):
         return reverse('control:organizer.reusable_medium', kwargs={

src/pretix/control/views/subevents.py

@@ -41,7 +41,9 @@ from django.contrib import messages
 from django.core.exceptions import ValidationError
 from django.core.files import File
 from django.db import transaction
-from django.db.models import Count, F, Prefetch, ProtectedError
+from django.db.models import (
+    Count, Exists, F, OuterRef, Prefetch, ProtectedError, Subquery,
+)
 from django.db.models.functions import Coalesce, TruncDate, TruncTime
 from django.forms import inlineformset_factory
 from django.http import Http404, HttpResponse, HttpResponseRedirect
@@ -49,17 +51,21 @@ from django.shortcuts import redirect, render
 from django.urls import reverse
 from django.utils.formats import get_format
 from django.utils.functional import cached_property
+from django.utils.http import url_has_allowed_host_and_scheme
 from django.utils.timezone import make_aware, now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django.views import View
-from django.views.generic import CreateView, FormView, ListView, UpdateView
+from django.views.generic import (
+    CreateView, DetailView, FormView, ListView, UpdateView,
+)
 
-from pretix.base.models import CartPosition, LogEntry
+from pretix.base.models import CartPosition, LogEntry, OrderPosition
 from pretix.base.models.checkin import CheckinList
 from pretix.base.models.event import SubEvent, SubEventMetaValue
 from pretix.base.models.items import (
-    ItemVariation, Quota, SubEventItem, SubEventItemVariation,
+    Item, ItemVariation, Quota, SubEventItem, SubEventItemVariation,
 )
+from pretix.base.models.orders import CancellationRequest
 from pretix.base.reldate import RelativeDate, RelativeDateWrapper
 from pretix.base.services import tickets
 from pretix.base.services.quotas import QuotaAvailability
@@ -505,9 +511,68 @@ class SubEventEditorMixin(MetaDataEditorMixin):
         ) and self.cl_formset.is_valid() and all(f.is_valid() for f in self.plugin_forms)
 
 
-class SubEventUpdate(EventPermissionRequiredMixin, SubEventEditorMixin, UpdateView):
+class SubEventDetail(EventPermissionRequiredMixin, DetailView):
     model = SubEvent
     template_name = 'pretixcontrol/subevents/detail.html'
+    permission = None
+    context_object_name = 'subevent'
+
+    def get_object(self, queryset=None) -> SubEvent:
+        try:
+            return self.request.event.subevents.get(
+                id=self.kwargs['subevent']
+            )
+        except SubEvent.DoesNotExist:
+            raise Http404(pgettext_lazy("subevent", "The requested date does not exist."))
+
+    def get_context_data(self, **kwargs):
+        oqs = self.request.event.orders.filter(
+            Exists(
+                OrderPosition.objects.filter(
+                    subevent=self.object,
+                    order_id=OuterRef("id"),
+                )
+            )
+        ).annotate(
+            pcnt=Subquery(
+                OrderPosition.objects.filter(
+                    subevent=self.object,
+                ).values("subevent").annotate(c=Count("*")).values("c")
+            ),
+            has_cancellation_request=Exists(CancellationRequest.objects.filter(order=OuterRef("pk"))),
+        ).select_related("invoice_address").prefetch_related("sales_channel")
+        ctx = {
+            "quotas": self.object.quotas.prefetch_related(
+                Prefetch(
+                    "items",
+                    queryset=Item.objects.annotate(
+                        has_variations=Exists(ItemVariation.objects.filter(item=OuterRef("pk")))
+                    ),
+                    to_attr="cached_items"
+                ),
+                "variations",
+                "variations__item",
+            ).order_by("name", "pk"),
+            "checkinlists": self.object.checkinlist_set.prefetch_related("limit_products"),
+            "orders": oqs[:11],
+            "order_count": oqs.count(),
+        }
+
+        qa = QuotaAvailability()
+        qa.queue(*ctx["quotas"])
+        qa.compute()
+        for quota in ctx["quotas"]:
+            quota.cached_avail = qa.results[quota]
+
+        return super().get_context_data(
+            **kwargs,
+            **ctx,
+        )
+
+
+class SubEventUpdate(EventPermissionRequiredMixin, SubEventEditorMixin, UpdateView):
+    model = SubEvent
+    template_name = 'pretixcontrol/subevents/edit.html'
     permission = 'event.subevents:write'
     context_object_name = 'subevent'
     form_class = SubEventForm
@@ -573,20 +638,28 @@ class SubEventUpdate(EventPermissionRequiredMixin, SubEventEditorMixin, UpdateVi
         return HttpResponseRedirect(self.get_success_url())
 
     def get_success_url(self) -> str:
-        return reverse('control:event.subevents', kwargs={
+        if "next" in self.request.GET and url_has_allowed_host_and_scheme(self.request.GET.get("next"), allowed_hosts=None):
+            return self.request.GET.get("next")
+        return reverse('control:event.subevent', kwargs={
             'organizer': self.request.event.organizer.slug,
             'event': self.request.event.slug,
-        }) + ('?' + self.request.GET.get('returnto') if 'returnto' in self.request.GET else '')
+            'subevent': self.object.pk,
+        })
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
         kwargs['event'] = self.request.event
         return kwargs
 
+    def get_context_data(self, **kwargs):
+        return super().get_context_data(
+            next_url=self.get_success_url()
+        )
+
 
 class SubEventCreate(SubEventEditorMixin, EventPermissionRequiredMixin, CreateView):
     model = SubEvent
-    template_name = 'pretixcontrol/subevents/detail.html'
+    template_name = 'pretixcontrol/subevents/edit.html'
     permission = 'event.subevents:write'
     context_object_name = 'subevent'
     form_class = SubEventForm

src/pretix/control/views/typeahead.py

@@ -145,11 +145,21 @@ def event_list(request):
     if 'can_copy' in request.GET:
         qs = EventWizardCopyForm.copy_from_queryset(request.user, request.session)
     else:
-        qs = request.user.get_events_with_any_permission(request)
+        permission = request.GET.get('permission')
+        if permission:
+            qs = request.user.get_events_with_permission(permission, request)
+        else:
+            qs = request.user.get_events_with_any_permission(request)
+
+    name_slug_q = Q(name__icontains=i18ncomp(query)) | Q(slug__icontains=query)
+    organizer = request.GET.get('organizer')
+    if organizer:
+        qs = qs.filter(organizer__slug=organizer)
+    else:
+        name_slug_q |= Q(organizer__name__icontains=i18ncomp(query)) | Q(organizer__slug__icontains=query)
 
     qs = qs.filter(
-        Q(name__icontains=i18ncomp(query)) | Q(slug__icontains=query) |
-        Q(organizer__name__icontains=i18ncomp(query)) | Q(organizer__slug__icontains=query)
+        name_slug_q
     ).annotate(
         min_from=Min('subevents__date_from'),
         max_from=Max('subevents__date_from'),
@@ -162,10 +172,19 @@ def event_list(request):
     total = qs.count()
     pagesize = 20
     offset = (page - 1) * pagesize
+    results = []
+    if page == 1 and 'include_none' in request.GET and not query:
+        results.append({
+            'id': "_none",
+            'text': _("No event"),
+            'name': _("No event"),
+            'type': "event",
+        })
+    results += [
+        serialize_event(e) for e in qs.select_related('organizer')[offset:offset + pagesize]
+    ]
     doc = {
-        'results': [
-            serialize_event(e) for e in qs.select_related('organizer')[offset:offset + pagesize]
-        ],
+        'results': results,
         'pagination': {
             "more": total >= (offset + pagesize)
         }

src/pretix/helpers/monkeypatching.py

@@ -148,13 +148,14 @@ def monkeypatch_urllib3_ssrf_protection():
 
             if not getattr(settings, "ALLOW_HTTP_TO_PRIVATE_NETWORKS", False):
                 ip_addr = ipaddress.ip_address(sa[0])
+                check_ip4 = ip_addr.ipv4_mapped if getattr(ip_addr, "ipv4_mapped", None) else ip_addr
                 if ip_addr.is_multicast:
                     raise HTTPError(f"Request to multicast address {sa[0]} blocked")
                 if ip_addr.is_loopback or ip_addr.is_link_local:
                     raise HTTPError(f"Request to local address {sa[0]} blocked")
                 if ip_addr.is_private:
                     raise HTTPError(f"Request to private address {sa[0]} blocked")
-                if ip_addr in _cgnat_net:
+                if check_ip4 in _cgnat_net:
                     raise HTTPError(f"Request to RFC 6598 address {sa[0]} blocked")
 
             sock = None

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

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-05-27 15:47+0000\n"
-"PO-Revision-Date: 2026-05-01 21:00+0000\n"
-"Last-Translator: Paul Berschick <paul@plainschwarz.com>\n"
+"PO-Revision-Date: 2026-05-29 17:00+0000\n"
+"Last-Translator: CVZ-es <damien.bremont@casadevelazquez.org>\n"
 "Language-Team: Spanish <https://translate.pretix.eu/projects/pretix/pretix/"
 "es/>\n"
 "Language: es\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.17\n"
+"X-Generator: Weblate 2026.5\n"
 
 #: htmlcov/d_daa1541d0cbf5e2b_dashboards_py.html:670
 #: pretix/control/templates/pretixcontrol/events/index.html:166
@@ -620,16 +620,17 @@ msgstr ""
 "como variaciones o paquetes."
 
 #: pretix/api/webhooks.py:413
-#, fuzzy
-#| msgid "Quota handling"
 msgid "Quota changed"
-msgstr "Gestión de cuotas"
+msgstr "Se ha modificado la cuota"
 
 #: pretix/api/webhooks.py:414
 msgid ""
 "This includes related events like creation, deletion, opening or closing of "
 "quotas. No webhook is sent for changes to the resulting availability."
 msgstr ""
+"Esto incluye acciones relacionadas, como la creación, la eliminación, la "
+"apertura o el cierre de cuotas. No se envía ningún webhook cuando se "
+"producen cambios en la disponibilidad resultante."
 
 #: pretix/api/webhooks.py:419
 msgid "Shop taken live"
@@ -3418,11 +3419,13 @@ msgid ""
 "The field \"%(label)s\" may not contain special characters such as "
 "\"%(chars)s\"."
 msgstr ""
+"El campo «%(label)s» no puede contener caracteres especiales como «%(chars)s"
+"»."
 
 #: pretix/base/forms/questions.py:305
 #, python-format
 msgid "The field \"%(label)s\" may not contain an URL (%(url)s)."
-msgstr ""
+msgstr "El campo «%(label)s» no puede contener una URL (%(url)s)."
 
 #: pretix/base/forms/questions.py:338
 msgctxt "phonenumber"
@@ -8361,19 +8364,14 @@ msgid "Program times"
 msgstr "Horarios del programa"
 
 #: pretix/base/pdf.py:503
-#, fuzzy
-#| msgid ""
-#| "2017-05-31 10:00 – 12:00\n"
-#| "2017-05-31 14:00 – 16:00\n"
-#| "2017-05-31 14:00 – 2017-06-01 14:00"
 msgid ""
 "2017-05-31 10:00 – 12:00, Room 1\n"
 "2017-05-31 14:00 – 16:00, Room 2\n"
 "2017-05-31 14:00 – 2017-06-01 14:00, Building A"
 msgstr ""
-"2017-05-31 10:00 – 12:00\n"
-"2017-05-31 14:00 – 16:00\n"
-"2017-05-31 14:00 – 2017-06-01 14:00"
+"31 de mayo de 2017, de 10:00 a 12:00, Sala 1\n"
+"31 de mayo de 2017, de 14:00 a 16:00, Sala 2\n"
+"31 de mayo de 2017, de 14:00 a 1 de junio de 2017, 14:00, Edificio A"
 
 #: pretix/base/pdf.py:507
 msgid "Reusable Medium ID"
@@ -8903,13 +8901,7 @@ msgid "This voucher code is not known in our database."
 msgstr "Este vale de compra no se conoce en nuestra base de datos."
 
 #: pretix/base/services/cart.py:165
-#, fuzzy, python-format
-#| msgid ""
-#| "The voucher code \"%(voucher)s\" can only be used if you select at least "
-#| "%(number)s matching products."
-#| msgid_plural ""
-#| "The voucher code \"%(voucher)s\" can only be used if you select at least "
-#| "%(number)s matching products."
+#, python-format
 msgid ""
 "The voucher code \"%(voucher)s\" can only be used if you select at least "
 "%(number)s matching product."
@@ -8917,22 +8909,14 @@ msgid_plural ""
 "The voucher code \"%(voucher)s\" can only be used if you select at least "
 "%(number)s matching products."
 msgstr[0] ""
-"El vale de compra \"%(voucher)s\" solo se puede utilizar si selecciona al "
-"menos %(number)s productos coincidentes."
+"El código de descuento «%(voucher)s» solo se puede utilizar si seleccionas "
+"al menos%(number)s productos que cumplan los requisitos."
 msgstr[1] ""
-"Los vales de compra \"%(voucher)s\" solo se pueden utilizar si selecciona al "
-"menos %(number)s productos coincidentes."
+"El código de descuento «%(voucher)s» solo se puede utilizar si seleccionas "
+"al menos %(number)s productos que cumplan los requisitos."
 
 #: pretix/base/services/cart.py:170
-#, fuzzy, python-format
-#| msgid ""
-#| "The voucher code \"%(voucher)s\" can only be used if you select at least "
-#| "%(number)s matching products. We have therefore removed some positions "
-#| "from your cart that can no longer be purchased like this."
-#| msgid_plural ""
-#| "The voucher code \"%(voucher)s\" can only be used if you select at least "
-#| "%(number)s matching products. We have therefore removed some positions "
-#| "from your cart that can no longer be purchased like this."
+#, python-format
 msgid ""
 "The voucher code \"%(voucher)s\" can only be used if you select at least "
 "%(number)s matching product. We have therefore removed some positions from "
@@ -8942,13 +8926,15 @@ msgid_plural ""
 "%(number)s matching products. We have therefore removed some positions from "
 "your cart that can no longer be purchased like this."
 msgstr[0] ""
-"El vale de compra \"%(voucher)s\" solo se puede utilizar si selecciona al "
-"menos %(number)s productos coincidentes. Por lo tanto, hemos eliminado "
-"algunas posiciones de su carrito que ya no se pueden comprar así."
+"El código promocional «%(voucher)s» solo se puede utilizar si seleccionas al "
+"menos %(number)s producto que cumpla los requisitos. Por lo tanto, hemos "
+"eliminado de tu carrito algunos artículos que ya no se pueden comprar de "
+"esta forma."
 msgstr[1] ""
-"Los vale de compra \"%(voucher)s\" solo se pueden utilizar si selecciona al "
-"menos %(number)s productos coincidentes. Por lo tanto, hemos eliminado "
-"algunas posiciones de su carrito que ya no se pueden comprar así."
+"El código promocional «%(voucher)s» solo se puede utilizar si seleccionas al "
+"menos %(number)s productos que cumplan los requisitos. Por lo tanto, hemos "
+"eliminado de tu carrito algunos artículos que ya no se pueden comprar de "
+"esta forma."
 
 #: pretix/base/services/cart.py:176
 msgid ""
@@ -14254,6 +14240,8 @@ msgid ""
 "You entered an URL, which is not allowed. Please remove %(match)s from your "
 "input."
 msgstr ""
+"Ha introducido una URL que no está permitida. Elimina %(match)s de su "
+"entrada."
 
 #: pretix/base/views/errors.py:48
 msgid ""
@@ -16194,14 +16182,8 @@ msgid "inactive"
 msgstr "inactivo"
 
 #: pretix/control/forms/item.py:1414
-#, fuzzy
-#| msgid ""
-#| "Sample Conference Center\n"
-#| "Heidelberg, Germany"
 msgid "Sample Conference Center, Heidelberg, Germany"
-msgstr ""
-"Ejemplo de Centro de Conferencia \n"
-"Heidelberg, Alemania"
+msgstr "Ejemplo de Centro de Conferencia : Heidelberg, Alemania"
 
 #: pretix/control/forms/mailsetup.py:42
 msgid "Hostname"
@@ -23659,11 +23641,8 @@ msgid "Quota history"
 msgstr "Historial de cuotas"
 
 #: pretix/control/templates/pretixcontrol/items/quota_bulk_edit.html:6
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "Change multiple dates"
 msgid "Change multiple quotas"
-msgstr "Cambiar varias fechas"
+msgstr "Modificar varias cuotas"
 
 #: pretix/control/templates/pretixcontrol/items/quota_bulk_edit.html:8
 #: pretix/control/templates/pretixcontrol/organizers/device_bulk_edit.html:8
@@ -23713,18 +23692,15 @@ msgstr ""
 
 #: pretix/control/templates/pretixcontrol/items/quota_delete_bulk.html:4
 #: pretix/control/templates/pretixcontrol/items/quota_delete_bulk.html:6
-#, fuzzy
-#| msgid "Delete quota"
 msgid "Delete quotas"
-msgstr "Borrar cuota"
+msgstr "Eliminar cuotas"
 
 #: pretix/control/templates/pretixcontrol/items/quota_delete_bulk.html:10
-#, fuzzy, python-format
-#| msgid "Are you sure you want to delete the following dates?"
+#, python-format
 msgid "Are you sure you want to delete the following quota?"
 msgid_plural "Are you sure you want to delete the following %(num)s quotas?"
-msgstr[0] "¿Está seguro de que desea borrar las fechas siguientes?"
-msgstr[1] "¿Está seguro de que desea borrar las fechas siguientes?"
+msgstr[0] "¿Está seguro de que desea eliminar la siguiente cuota?"
+msgstr[1] "¿Está seguro de que desea eliminar las siguientes %(num)s cuotas?"
 
 #: pretix/control/templates/pretixcontrol/items/quotas.html:9
 msgid ""
@@ -24329,12 +24305,15 @@ msgid ""
 "generated once the customer pays the invoice or selects a payment method "
 "that requires an invoice."
 msgstr ""
+"Este pedido se modificó después de que se generara la última factura. Aún no "
+"se ha generado una nueva factura, ya que las facturas están configuradas "
+"para generarse al realizar el pago o si así lo exige la forma de pago. Se "
+"generará una nueva factura una vez que el cliente abone la factura o "
+"seleccione una forma de pago que requiera una factura."
 
 #: pretix/control/templates/pretixcontrol/order/index.html:152
-#, fuzzy
-#| msgid "Request invoice"
 msgid "Reissue invoice"
-msgstr "Solicitar factura"
+msgstr "Reemitir factura"
 
 #: pretix/control/templates/pretixcontrol/order/index.html:161
 #: pretix/control/templates/pretixcontrol/order/index.html:413
@@ -24765,23 +24744,16 @@ msgid "How should the refund be sent?"
 msgstr "¿Cómo se debe de realizar este reembolso?"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html:25
-#, fuzzy
-#| msgid ""
-#| "Any payments that you selected for automatical refunds will be "
-#| "immediately communicate the refund request to the respective payment "
-#| "provider. Manual refunds will be created as pending refunds, you can then "
-#| "later mark them as done once you actually transferred the money back to "
-#| "the customer."
 msgid ""
 "Any payments you selected for automatic refunds will have the refund request "
 "sent immediately to the respective payment provider. Manual refunds will be "
 "created as pending refunds, which you can later mark as done once you have "
 "actually transferred the money back to the customer."
 msgstr ""
-"Cualquier pago que haya seleccionado de manera automática para reembolso "
-"será comunicado inmediatamente a la entidad de pago correspondiente. Los "
-"devoluciones manuales se crearán como reembolsos pendientes, podrá marcarlos "
-"como hechos una vez que se haya transferido el dinero al cliente."
+"Los pagos que hayas seleccionado para reembolsos automáticos se enviarán "
+"inmediatamente al proveedor de pagos correspondiente. Los reembolsos "
+"manuales se crearán como reembolsos pendientes, que podrás marcar como "
+"completados más adelante, una vez que hayas devuelto el dinero al cliente."
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html:32
 msgid "Refund to original payment method"
@@ -29337,11 +29309,8 @@ msgid "The new question has been created."
 msgstr "La nueva pregunta ha sido creada."
 
 #: pretix/control/views/item.py:918
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "The selected dates have been deleted or disabled."
 msgid "The selected quotas have been deleted or disabled."
-msgstr "Las fechas seleccionadas se han borrado o desactivado."
+msgstr "Las cuotas seleccionadas se han eliminado o desactivado."
 
 #: pretix/control/views/item.py:1074
 msgid "The new quota has been created."
@@ -30073,11 +30042,9 @@ msgstr ""
 "Este plugin no está permitido actualmente para su cuenta de organizador."
 
 #: pretix/control/views/organizer.py:832
-#, fuzzy, python-brace-format
-#| msgid "This plugin can be enabled or disabled for events individually."
+#, python-brace-format
 msgid "This plugin cannot be activated for event {}."
-msgstr ""
-"Este plugin se puede activar o desactivar para eventos de forma individual."
+msgstr "Este complemento no se puede activar para el evento {}."
 
 #: pretix/control/views/organizer.py:901
 msgid "The team has been created. You can now add members to the team."
@@ -31122,10 +31089,9 @@ msgid "{width} x {height} mm label"
 msgstr "etiqueta {width} x {height} mm"
 
 #: pretix/plugins/badges/templates.py:265
-#, fuzzy, python-brace-format
-#| msgid "{width} x {height} mm label"
+#, python-brace-format
 msgid "{width} x {height} inch label"
-msgstr "etiqueta {width} x {height} mm"
+msgstr "Etiqueta de {width} x {height} pulgadas"
 
 #: pretix/plugins/badges/templates/pretixplugins/badges/control_order_info.html:16
 #: pretix/plugins/badges/templates/pretixplugins/badges/index.html:27

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

@@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-05-27 15:47+0000\n"
-"PO-Revision-Date: 2026-05-08 04:00+0000\n"
-"Last-Translator: corentin-spec <corentin@spectentaculaire.fr>\n"
-"Language-Team: French <https://translate.pretix.eu/projects/pretix/pretix/fr/"
-">\n"
+"PO-Revision-Date: 2026-05-29 17:00+0000\n"
+"Last-Translator: CVZ-es <damien.bremont@casadevelazquez.org>\n"
+"Language-Team: French <https://translate.pretix.eu/projects/pretix/pretix/"
+"fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.17.1\n"
+"X-Generator: Weblate 2026.5\n"
 
 #: htmlcov/d_daa1541d0cbf5e2b_dashboards_py.html:670
 #: pretix/control/templates/pretixcontrol/events/index.html:166
@@ -618,16 +618,17 @@ msgstr ""
 "aux objets imbriqués tels que les variantes ou les lots."
 
 #: pretix/api/webhooks.py:413
-#, fuzzy
-#| msgid "Quota handling"
 msgid "Quota changed"
-msgstr "Traitement des quotas"
+msgstr "Quota modifié"
 
 #: pretix/api/webhooks.py:414
 msgid ""
 "This includes related events like creation, deletion, opening or closing of "
 "quotas. No webhook is sent for changes to the resulting availability."
 msgstr ""
+"Cela inclut les événements associés, tels que la création, la suppression, "
+"l'ouverture ou la suppression de quotas. Aucun webhook n'est envoyé en cas "
+"de modification de la disponibilité qui en résulte."
 
 #: pretix/api/webhooks.py:419
 msgid "Shop taken live"
@@ -3422,11 +3423,13 @@ msgid ""
 "The field \"%(label)s\" may not contain special characters such as "
 "\"%(chars)s\"."
 msgstr ""
+"Le champ « %(label)s » ne doit pas contenir de caractères spéciaux tels que "
+"«%(chars)s »."
 
 #: pretix/base/forms/questions.py:305
 #, python-format
 msgid "The field \"%(label)s\" may not contain an URL (%(url)s)."
-msgstr ""
+msgstr "Le champ « %(label)s » ne doit pas contenir d'URL (%(url)s)."
 
 #: pretix/base/forms/questions.py:338
 msgctxt "phonenumber"
@@ -8409,19 +8412,14 @@ msgid "Program times"
 msgstr "Horaires du programme"
 
 #: pretix/base/pdf.py:503
-#, fuzzy
-#| msgid ""
-#| "2017-05-31 10:00 – 12:00\n"
-#| "2017-05-31 14:00 – 16:00\n"
-#| "2017-05-31 14:00 – 2017-06-01 14:00"
 msgid ""
 "2017-05-31 10:00 – 12:00, Room 1\n"
 "2017-05-31 14:00 – 16:00, Room 2\n"
 "2017-05-31 14:00 – 2017-06-01 14:00, Building A"
 msgstr ""
-"2017-05-31 10:00 – 12:00\n"
-"2017-05-31 14:00 – 16:00\n"
-"2017-05-31 14:00 – 2017-06-01 14:00"
+"31 mai 2017, de 10 h à 12 h, salle 1\n"
+"31 mai 2017, de 14 h à 16 h, salle 2\n"
+"Du 31 mai 2017 à 1 h du matin au 1er juin 2017 à 14 h, bâtiment A"
 
 #: pretix/base/pdf.py:507
 msgid "Reusable Medium ID"
@@ -8957,13 +8955,7 @@ msgid "This voucher code is not known in our database."
 msgstr "Ce code promotionnel n'est pas connu dans notre base de données."
 
 #: pretix/base/services/cart.py:165
-#, fuzzy, python-format
-#| msgid ""
-#| "The voucher code \"%(voucher)s\" can only be used if you select at least "
-#| "%(number)s matching products."
-#| msgid_plural ""
-#| "The voucher code \"%(voucher)s\" can only be used if you select at least "
-#| "%(number)s matching products."
+#, python-format
 msgid ""
 "The voucher code \"%(voucher)s\" can only be used if you select at least "
 "%(number)s matching product."
@@ -8971,22 +8963,14 @@ msgid_plural ""
 "The voucher code \"%(voucher)s\" can only be used if you select at least "
 "%(number)s matching products."
 msgstr[0] ""
-"Le code promo \"%(voucher)s\" ne peut être utilisé que si vous sélectionnez "
+"Le code promo « %(voucher)s » ne peut être utilisé que si vous sélectionnez "
 "au moins %(number)s produit correspondant."
 msgstr[1] ""
-"Le code promo \"%(voucher)s\" ne peut être utilisé que si vous sélectionnez "
+"Le code promo « %(voucher)s » ne peut être utilisé que si vous sélectionnez "
 "au moins %(number)s produits correspondants."
 
 #: pretix/base/services/cart.py:170
-#, fuzzy, python-format
-#| msgid ""
-#| "The voucher code \"%(voucher)s\" can only be used if you select at least "
-#| "%(number)s matching products. We have therefore removed some positions "
-#| "from your cart that can no longer be purchased like this."
-#| msgid_plural ""
-#| "The voucher code \"%(voucher)s\" can only be used if you select at least "
-#| "%(number)s matching products. We have therefore removed some positions "
-#| "from your cart that can no longer be purchased like this."
+#, python-format
 msgid ""
 "The voucher code \"%(voucher)s\" can only be used if you select at least "
 "%(number)s matching product. We have therefore removed some positions from "
@@ -14379,6 +14363,8 @@ msgid ""
 "You entered an URL, which is not allowed. Please remove %(match)s from your "
 "input."
 msgstr ""
+"Vous avez saisi une URL, ce qui n'est pas autorisé. Veuillez supprimer %"
+"(match)s de votre saisie."
 
 #: pretix/base/views/errors.py:48
 msgid ""
@@ -16328,14 +16314,8 @@ msgid "inactive"
 msgstr "inactif"
 
 #: pretix/control/forms/item.py:1414
-#, fuzzy
-#| msgid ""
-#| "Sample Conference Center\n"
-#| "Heidelberg, Germany"
 msgid "Sample Conference Center, Heidelberg, Germany"
-msgstr ""
-"Exemple de centre de conférence\n"
-"Centre des Congrès, France"
+msgstr "Centre de conférences d'exemple, Heidelberg, Allemagne"
 
 #: pretix/control/forms/mailsetup.py:42
 msgid "Hostname"
@@ -23831,11 +23811,8 @@ msgid "Quota history"
 msgstr "Historique des quotas"
 
 #: pretix/control/templates/pretixcontrol/items/quota_bulk_edit.html:6
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "Change multiple dates"
 msgid "Change multiple quotas"
-msgstr "Modifier plusieurs dates"
+msgstr "Modifier plusieurs quotas"
 
 #: pretix/control/templates/pretixcontrol/items/quota_bulk_edit.html:8
 #: pretix/control/templates/pretixcontrol/organizers/device_bulk_edit.html:8
@@ -23883,18 +23860,15 @@ msgstr "Les produits suivants pourraient ne plus être disponibles à la vente
 
 #: pretix/control/templates/pretixcontrol/items/quota_delete_bulk.html:4
 #: pretix/control/templates/pretixcontrol/items/quota_delete_bulk.html:6
-#, fuzzy
-#| msgid "Delete quota"
 msgid "Delete quotas"
-msgstr "Supprimer le quota"
+msgstr "Supprimer les quotas"
 
 #: pretix/control/templates/pretixcontrol/items/quota_delete_bulk.html:10
-#, fuzzy, python-format
-#| msgid "Are you sure you want to delete the following dates?"
+#, python-format
 msgid "Are you sure you want to delete the following quota?"
 msgid_plural "Are you sure you want to delete the following %(num)s quotas?"
-msgstr[0] "Voulez-vous vraiment supprimer les dates suivantes ?"
-msgstr[1] "Voulez-vous vraiment supprimer les dates suivantes ?"
+msgstr[0] "Êtes-vous sûr de vouloir supprimer le quota suivant ?"
+msgstr[1] "Êtes-vous sûr de vouloir supprimer les %(num)s quotas suivants ?"
 
 #: pretix/control/templates/pretixcontrol/items/quotas.html:9
 msgid ""
@@ -24503,12 +24477,15 @@ msgid ""
 "generated once the customer pays the invoice or selects a payment method "
 "that requires an invoice."
 msgstr ""
+"Cette commande a été modifiée après l'émission de la dernière facture. "
+"Aucune nouvelle facture n'a encore été générée, car les factures sont "
+"configurées pour être émises lors du paiement ou si le mode de paiement "
+"l'exige. Une nouvelle facture sera générée dès que le client aura réglé la "
+"facture ou choisi un mode de paiement nécessitant une facture."
 
 #: pretix/control/templates/pretixcontrol/order/index.html:152
-#, fuzzy
-#| msgid "Request invoice"
 msgid "Reissue invoice"
-msgstr "Demande de facture"
+msgstr "Réémettre une facture"
 
 #: pretix/control/templates/pretixcontrol/order/index.html:161
 #: pretix/control/templates/pretixcontrol/order/index.html:413
@@ -24942,25 +24919,17 @@ msgid "How should the refund be sent?"
 msgstr "Comment le remboursement doit-il être envoyé ?"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html:25
-#, fuzzy
-#| msgid ""
-#| "Any payments that you selected for automatical refunds will be "
-#| "immediately communicate the refund request to the respective payment "
-#| "provider. Manual refunds will be created as pending refunds, you can then "
-#| "later mark them as done once you actually transferred the money back to "
-#| "the customer."
 msgid ""
 "Any payments you selected for automatic refunds will have the refund request "
 "sent immediately to the respective payment provider. Manual refunds will be "
 "created as pending refunds, which you can later mark as done once you have "
 "actually transferred the money back to the customer."
 msgstr ""
-"Tous les paiements que vous avez sélectionnés pour des remboursements "
-"automatiques seront immédiatement communiqués à la demande de remboursement "
-"au fournisseur de paiement respectif. Les remboursements manuels seront "
-"créés en tant que remboursements en attente, vous pourrez ensuite les "
-"marquer comme terminés une fois que vous aurez effectivement transféré "
-"l’argent au client."
+"Pour tous les paiements que vous avez sélectionnés pour un remboursement "
+"automatique, la demande de remboursement sera immédiatement transmise au "
+"prestataire de paiement concerné. Les remboursements manuels seront "
+"enregistrés comme remboursements en attente ; vous pourrez les marquer comme "
+"effectués une fois que vous aurez effectivement reversé l'argent au client."
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html:32
 msgid "Refund to original payment method"
@@ -29558,11 +29527,8 @@ msgid "The new question has been created."
 msgstr "La nouvelle question a été créée."
 
 #: pretix/control/views/item.py:918
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "The selected dates have been deleted or disabled."
 msgid "The selected quotas have been deleted or disabled."
-msgstr "Les dates sélectionnées ont été supprimées ou désactivées."
+msgstr "Les quotas sélectionnés ont été supprimés ou désactivés."
 
 #: pretix/control/views/item.py:1074
 msgid "The new quota has been created."
@@ -30302,12 +30268,9 @@ msgstr ""
 "Ce plugin n'est actuellement pas autorisé pour ce compte d'organisateur."
 
 #: pretix/control/views/organizer.py:832
-#, fuzzy, python-brace-format
-#| msgid "This plugin can be enabled or disabled for events individually."
+#, python-brace-format
 msgid "This plugin cannot be activated for event {}."
-msgstr ""
-"Ce plugin peut être activé ou désactivé individuellement pour chaque "
-"événement."
+msgstr "Ce plugin ne peut pas être activé pour l'événement {}."
 
 #: pretix/control/views/organizer.py:901
 msgid "The team has been created. You can now add members to the team."
@@ -31362,10 +31325,9 @@ msgid "{width} x {height} mm label"
 msgstr "{width} x {height} mm étiquette"
 
 #: pretix/plugins/badges/templates.py:265
-#, fuzzy, python-brace-format
-#| msgid "{width} x {height} mm label"
+#, python-brace-format
 msgid "{width} x {height} inch label"
-msgstr "{width} x {height} mm étiquette"
+msgstr "{width} x {height} pouce étiquette"
 
 #: pretix/plugins/badges/templates/pretixplugins/badges/control_order_info.html:16
 #: pretix/plugins/badges/templates/pretixplugins/badges/index.html:27

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: 2026-05-27 15:47+0000\n"
-"PO-Revision-Date: 2026-05-12 06:34+0000\n"
-"Last-Translator: Yasunobu YesNo Kawaguchi <kawaguti@gmail.com>\n"
+"PO-Revision-Date: 2026-06-01 09:00+0000\n"
+"Last-Translator: Hijiri Umemoto <hijiri@umemoto.org>\n"
 "Language-Team: Japanese <https://translate.pretix.eu/projects/pretix/pretix/"
 "ja/>\n"
 "Language: ja\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.17.1\n"
+"X-Generator: Weblate 2026.5\n"
 
 #: htmlcov/d_daa1541d0cbf5e2b_dashboards_py.html:670
 #: pretix/control/templates/pretixcontrol/events/index.html:166
@@ -608,20 +608,20 @@ msgstr ""
 "更を含みます。"
 
 #: pretix/api/webhooks.py:413
-#, fuzzy
-#| msgid "Quota handling"
 msgid "Quota changed"
-msgstr "クォータの処理"
+msgstr "クォータが変更されました"
 
 #: pretix/api/webhooks.py:414
 msgid ""
 "This includes related events like creation, deletion, opening or closing of "
 "quotas. No webhook is sent for changes to the resulting availability."
 msgstr ""
+"これには、クォータの作成、削除、開始または終了といった関連イベントが含まれま"
+"す。結果として得られる可用性の変更については、Webhookが送信されません。"
 
 #: pretix/api/webhooks.py:419
 msgid "Shop taken live"
-msgstr "ショップが公開中になりました"
+msgstr "ショップがオンラインになりました"
 
 #: pretix/api/webhooks.py:423
 msgid "Shop taken offline"
@@ -3394,11 +3394,13 @@ msgid ""
 "The field \"%(label)s\" may not contain special characters such as "
 "\"%(chars)s\"."
 msgstr ""
+"フィールド「%(label)s」には、\"%(chars)s\" のような特殊文字を含めることはでき"
+"ません。"
 
 #: pretix/base/forms/questions.py:305
 #, python-format
 msgid "The field \"%(label)s\" may not contain an URL (%(url)s)."
-msgstr ""
+msgstr "フィールド「%(label)s」には URL (%(url)s) を含めることができません。"
 
 #: pretix/base/forms/questions.py:338
 msgctxt "phonenumber"
@@ -8189,19 +8191,14 @@ msgid "Program times"
 msgstr "プログラム時間"
 
 #: pretix/base/pdf.py:503
-#, fuzzy
-#| msgid ""
-#| "2017-05-31 10:00 – 12:00\n"
-#| "2017-05-31 14:00 – 16:00\n"
-#| "2017-05-31 14:00 – 2017-06-01 14:00"
 msgid ""
 "2017-05-31 10:00 – 12:00, Room 1\n"
 "2017-05-31 14:00 – 16:00, Room 2\n"
 "2017-05-31 14:00 – 2017-06-01 14:00, Building A"
 msgstr ""
-"2017-05-31 10:00 – 12:00\n"
-"2017-05-31 14:00 – 16:00\n"
-"2017-05-31 14:00 – 2017-06-01 14:00"
+"2017-05-31 10:00 – 12:00、部屋1\n"
+"2017-05-31 14:00 – 16:00、部屋2\n"
+"2017-05-31 14:00 – 2017-06-01 14:00、ビルA"
 
 #: pretix/base/pdf.py:507
 msgid "Reusable Medium ID"
@@ -8710,13 +8707,7 @@ msgid "This voucher code is not known in our database."
 msgstr "このバウチャーコードは、当社のデータベースには登録されていません。"
 
 #: pretix/base/services/cart.py:165
-#, fuzzy, python-format
-#| msgid ""
-#| "The voucher code \"%(voucher)s\" can only be used if you select at least "
-#| "%(number)s matching products."
-#| msgid_plural ""
-#| "The voucher code \"%(voucher)s\" can only be used if you select at least "
-#| "%(number)s matching products."
+#, python-format
 msgid ""
 "The voucher code \"%(voucher)s\" can only be used if you select at least "
 "%(number)s matching product."
@@ -8728,15 +8719,7 @@ msgstr[0] ""
 "した場合にのみ使用できます。"
 
 #: pretix/base/services/cart.py:170
-#, fuzzy, python-format
-#| msgid ""
-#| "The voucher code \"%(voucher)s\" can only be used if you select at least "
-#| "%(number)s matching products. We have therefore removed some positions "
-#| "from your cart that can no longer be purchased like this."
-#| msgid_plural ""
-#| "The voucher code \"%(voucher)s\" can only be used if you select at least "
-#| "%(number)s matching products. We have therefore removed some positions "
-#| "from your cart that can no longer be purchased like this."
+#, python-format
 msgid ""
 "The voucher code \"%(voucher)s\" can only be used if you select at least "
 "%(number)s matching product. We have therefore removed some positions from "
@@ -13837,6 +13820,8 @@ msgid ""
 "You entered an URL, which is not allowed. Please remove %(match)s from your "
 "input."
 msgstr ""
+"URL を入力しましたが、許可されていません。入力から %(match)s を削除してくださ"
+"い。"
 
 #: pretix/base/views/errors.py:48
 msgid ""
@@ -15733,14 +15718,8 @@ msgid "inactive"
 msgstr "無効"
 
 #: pretix/control/forms/item.py:1414
-#, fuzzy
-#| msgid ""
-#| "Sample Conference Center\n"
-#| "Heidelberg, Germany"
 msgid "Sample Conference Center, Heidelberg, Germany"
-msgstr ""
-"サンプル・カンファレンスセンター\n"
-"ドイツ、ハイデルベルク"
+msgstr "サンプル・カンファレンスセンター, ドイツ, ハイデルベルク"
 
 #: pretix/control/forms/mailsetup.py:42
 msgid "Hostname"
@@ -22981,11 +22960,8 @@ msgid "Quota history"
 msgstr "クォータ履歴"
 
 #: pretix/control/templates/pretixcontrol/items/quota_bulk_edit.html:6
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "Change multiple dates"
 msgid "Change multiple quotas"
-msgstr "複数の日付を変更"
+msgstr "複数のクォータを変更"
 
 #: pretix/control/templates/pretixcontrol/items/quota_bulk_edit.html:8
 #: pretix/control/templates/pretixcontrol/organizers/device_bulk_edit.html:8
@@ -23031,17 +23007,14 @@ msgstr "以下の製品は販売できなくなる可能性があります："
 
 #: pretix/control/templates/pretixcontrol/items/quota_delete_bulk.html:4
 #: pretix/control/templates/pretixcontrol/items/quota_delete_bulk.html:6
-#, fuzzy
-#| msgid "Delete quota"
 msgid "Delete quotas"
 msgstr "クォータを削除"
 
 #: pretix/control/templates/pretixcontrol/items/quota_delete_bulk.html:10
-#, fuzzy, python-format
-#| msgid "Are you sure you want to delete the following dates?"
+#, python-format
 msgid "Are you sure you want to delete the following quota?"
 msgid_plural "Are you sure you want to delete the following %(num)s quotas?"
-msgstr[0] "以下の日付を削除してもよろしいですか？"
+msgstr[0] "以下の%(num)sのクォータを削除してもよろしいですか？"
 
 #: pretix/control/templates/pretixcontrol/items/quotas.html:9
 msgid ""
@@ -23634,12 +23607,14 @@ msgid ""
 "generated once the customer pays the invoice or selects a payment method "
 "that requires an invoice."
 msgstr ""
+"この注文は、最後の請求書が生成された後に変更されました。新しい請求書はまだ作"
+"成されていません。請求書は支払い時に生成されるか、支払方法によって必要とされ"
+"る場合に設定されているためです。お客様が請求書を支払うか、請求書が必要な支払"
+"方法を選択すると、新しい請求書が生成されます。"
 
 #: pretix/control/templates/pretixcontrol/order/index.html:152
-#, fuzzy
-#| msgid "Request invoice"
 msgid "Reissue invoice"
-msgstr "請求書を要求"
+msgstr "請求書を再発行する"
 
 #: pretix/control/templates/pretixcontrol/order/index.html:161
 #: pretix/control/templates/pretixcontrol/order/index.html:413
@@ -24064,22 +24039,15 @@ msgid "How should the refund be sent?"
 msgstr "どのように払い戻しますか？"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html:25
-#, fuzzy
-#| msgid ""
-#| "Any payments that you selected for automatical refunds will be "
-#| "immediately communicate the refund request to the respective payment "
-#| "provider. Manual refunds will be created as pending refunds, you can then "
-#| "later mark them as done once you actually transferred the money back to "
-#| "the customer."
 msgid ""
 "Any payments you selected for automatic refunds will have the refund request "
 "sent immediately to the respective payment provider. Manual refunds will be "
 "created as pending refunds, which you can later mark as done once you have "
 "actually transferred the money back to the customer."
 msgstr ""
-"自動払い戻しに選択した支払いは、該当する決済プロバイダーに払い戻し要求が即座"
-"に通知されます。手動払い戻しは保留中の払い戻しとして作成され、実際に顧客に送"
-"金した後で完了済みとしてマークできます。"
+"自動返金をご選択いただいたすべての支払いについては、返金リクエストが直ちに該"
+"当する決済プロバイダーへ送信されます。手動返金は保留中の返金として作成され、"
+"実際に顧客に返金した後で完了としてマークできます。"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html:32
 msgid "Refund to original payment method"
@@ -28504,11 +28472,8 @@ msgid "The new question has been created."
 msgstr "新しい質問が作成されました。"
 
 #: pretix/control/views/item.py:918
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "The selected dates have been deleted or disabled."
 msgid "The selected quotas have been deleted or disabled."
-msgstr "選択した日付は削除されたか無効になっています。"
+msgstr "選択したクォータは削除されたか無効です。"
 
 #: pretix/control/views/item.py:1074
 msgid "The new quota has been created."
@@ -29215,10 +29180,9 @@ msgid "This plugin is currently not allowed for this organizer account."
 msgstr "このプラグインは現在、この主催者アカウントでは許可されていません。"
 
 #: pretix/control/views/organizer.py:832
-#, fuzzy, python-brace-format
-#| msgid "This plugin can be enabled or disabled for events individually."
+#, python-brace-format
 msgid "This plugin cannot be activated for event {}."
-msgstr "このプラグインは、イベントごとに個別に有効化または無効化できます。"
+msgstr "このプラグインは、イベント{}に対してアクティベートできません。"
 
 #: pretix/control/views/organizer.py:901
 msgid "The team has been created. You can now add members to the team."
@@ -30236,10 +30200,9 @@ msgid "{width} x {height} mm label"
 msgstr "{width} x {height} mm ラベル"
 
 #: pretix/plugins/badges/templates.py:265
-#, fuzzy, python-brace-format
-#| msgid "{width} x {height} mm label"
+#, python-brace-format
 msgid "{width} x {height} inch label"
-msgstr "{width} x {height} mm ラベル"
+msgstr "{width} x {height} インチラベル"
 
 #: pretix/plugins/badges/templates/pretixplugins/badges/control_order_info.html:16
 #: pretix/plugins/badges/templates/pretixplugins/badges/index.html:27

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

@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-05-27 15:47+0000\n"
-"PO-Revision-Date: 2026-02-01 21:00+0000\n"
-"Last-Translator: z3rrry <z3rrry@gmail.com>\n"
-"Language-Team: Korean <https://translate.pretix.eu/projects/pretix/pretix/ko/"
-">\n"
+"PO-Revision-Date: 2026-06-01 09:00+0000\n"
+"Last-Translator: Hijiri Umemoto <hijiri@umemoto.org>\n"
+"Language-Team: Korean <https://translate.pretix.eu/projects/pretix/pretix/"
+"ko/>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.15.2\n"
+"X-Generator: Weblate 2026.5\n"
 
 #: htmlcov/d_daa1541d0cbf5e2b_dashboards_py.html:670
 #: pretix/control/templates/pretixcontrol/events/index.html:166
@@ -48,7 +48,7 @@ msgstr "사전판매 시작하지 않음"
 #: pretix/control/templates/pretixcontrol/subevents/index.html:176
 #: pretix/control/views/dashboards.py:549
 msgid "On sale"
-msgstr ""
+msgstr "세일 중"
 
 #: pretix/_base_settings.py:89
 msgid "English"
@@ -427,10 +427,8 @@ msgstr ""
 
 #: pretix/api/serializers/organizer.py:495
 #: pretix/control/views/organizer.py:1035
-#, fuzzy
-#| msgid "pretix account invitation"
 msgid "Account invitation"
-msgstr "프레틱스 계정 초대"
+msgstr "계정 초대"
 
 #: pretix/api/serializers/organizer.py:516
 #: pretix/control/views/organizer.py:1134
@@ -18087,10 +18085,8 @@ msgid "A payment has been performed."
 msgstr "수동 거래가 수행되었습니다."
 
 #: pretix/control/logdisplay.py:807
-#, fuzzy
-#| msgid "A manual transaction has been performed."
 msgid "A refund has been performed. "
-msgstr "수동 거래가 수행되었습니다."
+msgstr "환불이 처리되었습니다. "
 
 #: pretix/control/logdisplay.py:808
 #, python-brace-format

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

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-05-27 15:47+0000\n"
-"PO-Revision-Date: 2026-05-21 15:08+0000\n"
+"PO-Revision-Date: 2026-06-01 09:00+0000\n"
 "Last-Translator: Hijiri Umemoto <hijiri@umemoto.org>\n"
 "Language-Team: Chinese (Traditional Han script) <https://translate.pretix.eu/"
 "projects/pretix/pretix/zh_Hant/>\n"
@@ -595,16 +595,16 @@ msgid ""
 msgstr "這包括新增或刪除的產品，以及對變體或捆綁等巢狀物件的更改。"
 
 #: pretix/api/webhooks.py:413
-#, fuzzy
-#| msgid "Quota handling"
 msgid "Quota changed"
-msgstr "額度處理"
+msgstr "配額改變了"
 
 #: pretix/api/webhooks.py:414
 msgid ""
 "This includes related events like creation, deletion, opening or closing of "
 "quotas. No webhook is sent for changes to the resulting availability."
 msgstr ""
+"這包括建立、刪除、開啟或關閉配額等相關事件。 沒有傳送webhook來更改結果的可用"
+"性。"
 
 #: pretix/api/webhooks.py:419
 msgid "Shop taken live"
@@ -650,7 +650,7 @@ msgstr "優惠券已更改"
 msgid ""
 "Only includes explicit changes to the voucher, not e.g. an increase of the "
 "number of redemptions."
-msgstr ""
+msgstr "僅包括對代金券的明確更改，例如不包括兌換次數的增加。"
 
 #: pretix/api/webhooks.py:460
 msgid "Voucher deleted"
@@ -669,22 +669,16 @@ msgid "Customer account anonymized"
 msgstr "客戶帳戶已匿名化"
 
 #: pretix/api/webhooks.py:476
-#, fuzzy
-#| msgid "Gift card code"
 msgid "Gift card added"
-msgstr "禮品卡代碼"
+msgstr "添加了禮品卡"
 
 #: pretix/api/webhooks.py:480
-#, fuzzy
-#| msgid "Gift card code"
 msgid "Gift card modified"
-msgstr "禮品卡代碼"
+msgstr "禮品卡修改了"
 
 #: pretix/api/webhooks.py:484
-#, fuzzy
-#| msgid "Gift card transactions"
 msgid "Gift card used in transaction"
-msgstr "禮品卡交易"
+msgstr "交易中使用的禮品卡"
 
 #: pretix/base/addressvalidation.py:100 pretix/base/addressvalidation.py:103
 #: pretix/base/addressvalidation.py:108 pretix/base/forms/questions.py:1074

src/pretix/plugins/wallet/__init__.py

@@ -1,21 +0,0 @@
-#
-# This file is part of pretix (Community Edition).
-#
-# Copyright (C) 2014-2020  Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
-# Public License as published by the Free Software Foundation in version 3 of the License.
-#
-# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
-# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
-# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
-# this file, see <https://pretix.eu/about/en/license>.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
-# details.
-#
-# 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/>.
-#

src/pretix/plugins/wallet/api.py

@@ -1,87 +0,0 @@
-from rest_framework import viewsets
-from django.db import transaction
-from .styles import PassLayout, AVAILABLE_STYLES_DICT, AVAILABLE_PLATFORMS
-from .models import WalletLayout, WalletPlatformLayout
-from pretix.api.serializers.i18n import I18nAwareModelSerializer
-from django.core.exceptions import ValidationError
-from django.utils.translation import gettext_lazy as _
-from .views import get_layout_variables
-from rest_framework import serializers
-
-
-class WalletPlatformLayoutSerializer(I18nAwareModelSerializer):
-    platform = serializers.ChoiceField(choices=[p.identifier for p in AVAILABLE_PLATFORMS])
-    style = serializers.CharField(allow_null=True, required=False)
-
-    class Meta:
-        model = WalletPlatformLayout
-        fields = ("platform", "style", "layout")
-
-    def validate_layout(self, value):
-        if not isinstance(value, dict):
-            raise ValidationError(_("Layout must be a dict"))
-        return value
-
-    def validate(self, data):
-        platform = data.get('platform')
-        style = data.get('style')
-        layout = data.get('layout')
-        if platform and style and layout:
-            platform_styles = AVAILABLE_STYLES_DICT[platform]
-
-            if data["style"] not in platform_styles:
-                raise ValidationError(_("Invalid style"))
-            style = platform_styles[data["style"]]
-
-            layout = PassLayout(style=style, layout=data["layout"])
-            context = {"placeholders": get_layout_variables(self.context['event'])}
-            layout.validate(context=context)
-        return data
-
-
-class WalletLayoutSerializer(I18nAwareModelSerializer):
-    platform_layouts = WalletPlatformLayoutSerializer(many=True)
-
-    class Meta:
-        model = WalletLayout
-        fields = ("id", "name", "platform_layouts")
-        read_only_fields = ("id",)
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    def save(self, *args, **kwargs):
-        super().save(*args, **kwargs, event=self.context["event"])
-
-    def update(self, instance, validated_data):
-        platform_layouts = validated_data.pop('platform_layouts')
-        for layout in platform_layouts:
-            if layout['style']:
-                instance.platform_layouts.update_or_create(platform=layout['platform'], defaults=layout)
-        instance.platform_layouts.exclude(platform__in={layout['platform'] for layout in platform_layouts if layout['style'] is not None}).delete()
-        return super().update(instance, validated_data)
-
-
-class WalletLayoutViewSet(viewsets.ModelViewSet):
-    model = WalletLayout
-    queryset = WalletLayout.objects.none()
-    serializer_class = WalletLayoutSerializer
-    permission = "event.settings.general:write"
-
-    def get_queryset(self):
-        return self.request.event.wallet_layouts.all()
-
-    def get_serializer_context(self):
-        ctx = super().get_serializer_context()
-        ctx["event"] = self.request.event
-        return ctx
-
-    @transaction.atomic()
-    def perform_update(self, serializer):
-        super().perform_update(serializer)
-        serializer.instance.log_action(
-            action="pretix.plugins.wallet.layout.changed",
-            user=self.request.user,
-            auth=self.request.auth,
-            data=self.request.data,
-        )

src/pretix/plugins/wallet/apps.py

@@ -1,41 +0,0 @@
-#
-# This file is part of pretix (Community Edition).
-#
-# Copyright (C) 2014-2020  Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
-# Public License as published by the Free Software Foundation in version 3 of the License.
-#
-# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
-# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
-# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
-# this file, see <https://pretix.eu/about/en/license>.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
-# details.
-#
-# 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/>.
-#
-from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
-
-from pretix import __version__ as version
-
-
-class WalletApp(AppConfig):
-    name = 'pretix.plugins.wallet'
-    verbose_name = _("wallet")
-
-    class PretixPluginMeta:
-        name = _("wallet")
-        author = _("the pretix team")
-        version = version
-        category = 'FORMAT'
-        description = _("Issue wallet passes for tickets (e.g. apple wallet, google wallet)")
-
-    def ready(self):
-        from . import signals  # NOQA
-

src/pretix/plugins/wallet/migrations/0001_initial.py

@@ -1,98 +0,0 @@
-# Generated by Django 5.2.13 on 2026-05-19 15:39
-
-import django.db.models.deletion
-import pretix.base.models.base
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ("pretixbase", "0300_alter_customer_locale_alter_user_locale"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="WalletLayout",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True, primary_key=True, serialize=False
-                    ),
-                ),
-                ("name", models.CharField(max_length=190)),
-                (
-                    "event",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="wallet_layouts",
-                        to="pretixbase.event",
-                    ),
-                ),
-            ],
-            options={
-                "abstract": False,
-            },
-            bases=(models.Model, pretix.base.models.base.LoggingMixin),
-        ),
-        migrations.CreateModel(
-            name="WalletLayoutItem",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True, primary_key=True, serialize=False
-                    ),
-                ),
-                (
-                    "item",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="walletlayout_assignments",
-                        to="pretixbase.item",
-                    ),
-                ),
-                (
-                    "layout",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="item_assignments",
-                        to="wallet.walletlayout",
-                    ),
-                ),
-            ],
-            options={
-                "unique_together": {("item", "layout")},
-            },
-        ),
-        migrations.CreateModel(
-            name="WalletPlatformLayout",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True, primary_key=True, serialize=False
-                    ),
-                ),
-                ("platform", models.CharField(max_length=10)),
-                ("style", models.CharField(max_length=255)),
-                ("layout", models.JSONField(default=dict)),
-                (
-                    "parent",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="platform_layouts",
-                        to="wallet.walletlayout",
-                    ),
-                ),
-            ],
-            options={
-                "unique_together": {("parent", "platform")},
-            },
-            bases=(models.Model, pretix.base.models.base.LoggingMixin),
-        ),
-    ]

src/pretix/plugins/wallet/models.py

@@ -1,67 +0,0 @@
-#
-# This file is part of pretix (Community Edition).
-#
-# Copyright (C) 2014-2020  Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
-# Public License as published by the Free Software Foundation in version 3 of the License.
-#
-# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
-# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
-# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
-# this file, see <https://pretix.eu/about/en/license>.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
-# details.
-#
-# 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/>.
-#
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-
-from pretix.base.models import LoggedModel
-from django_scopes import ScopedManager
-from django.core.exceptions import ValidationError
-
-
-class WalletLayout(LoggedModel):
-    event = models.ForeignKey(
-        'pretixbase.Event',
-        on_delete=models.CASCADE,
-        related_name='wallet_layouts'
-    )
-    name = models.CharField(
-        max_length=190,
-        verbose_name=_('Name')
-    )
-
-    objects = ScopedManager(organizer='event__organizer')
-
-
-class WalletPlatformLayout(LoggedModel):
-    parent = models.ForeignKey(WalletLayout, on_delete=models.CASCADE, related_name="platform_layouts")
-
-    platform = models.CharField(max_length=10)
-    style = models.CharField(max_length=255)
-    layout = models.JSONField(default=dict)
-
-    objects = ScopedManager(organizer='parent__event__organizer')
-
-    class Meta:
-        unique_together = (('parent', 'platform'),)
-
-
-class WalletLayoutItem(models.Model):
-    item = models.ForeignKey('pretixbase.Item', null=True, blank=True, related_name='walletlayout_assignments',
-                             on_delete=models.CASCADE)
-    layout = models.ForeignKey(WalletLayout, on_delete=models.CASCADE, related_name='item_assignments')
-
-    class Meta:
-        unique_together = (('item', 'layout'),)
-
-    def clean(self):
-        if self.item.event != self.layout.event:
-            raise ValidationError("cannot bind layout to item of different event")

src/pretix/plugins/wallet/signals.py

@@ -1,35 +0,0 @@
-#
-# This file is part of pretix (Community Edition).
-#
-# Copyright (C) 2014-2020  Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
-# Public License as published by the Free Software Foundation in version 3 of the License.
-#
-# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
-# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
-# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
-# this file, see <https://pretix.eu/about/en/license>.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
-# details.
-#
-# 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/>.
-#
-
-from pretix.base.signals import register_ticket_outputs
-from .ticketoutput import OUTPUTS
-
-def connect_signals():
-    for output in OUTPUTS:
-        # DIY functools.partial to make get_defining_app happy
-        def get_register_func(o):
-            def register(sender, **kwargs):
-                return o
-            return register      
-        register_ticket_outputs.connect(get_register_func(output), dispatch_uid=f"output_{output.identifier}")
-
-connect_signals()

src/pretix/plugins/wallet/static/pretixplugins/wallet/components/app.vue

@@ -1,121 +0,0 @@
-<script setup lang="ts">
-import { computed, ref, watchEffect } from "vue";
-import StyleSettings from "./style-settings.vue";
-import Select from "./input/select.vue";
-import Input from "./input/input.vue";
-
-const gettext = (window as any).gettext;
-
-const isLoading = ref<boolean>(true);
-const wallet_layout = ref<Layout | null>(null);
-
-const PLATFORMS: Platforms = JSON.parse(
-    document.querySelector("#platforms")?.textContent ?? "{}",
-);
-const VARIABLES: VariableConfig = JSON.parse(
-    document.querySelector("#variables")?.textContent ?? "{}",
-);
-const LOCALES: Record<string, string> = JSON.parse(
-    document.querySelector("#locales")?.textContent ?? "{}",
-);
-const CSRF_TOKEN =
-    document.querySelector<HTMLInputElement>("input[name=csrfmiddlewaretoken]")
-        ?.value ?? "";
-
-const props = defineProps<{
-    layoutId: string;
-}>();
-
-watchEffect(() => {
-    // TODO: error handling / proper api client
-    isLoading.value = true;
-    fetch(
-        `/api/v1/organizers/demo/events/wallet/walletlayouts/${props.layoutId}/`,
-    )
-        .then((x) => x.json())
-        .then((x) => {
-            wallet_layout.value = x;
-            isLoading.value = false;
-        });
-});
-
-function saveLayout(e: SubmitEvent) {
-    e.preventDefault();
-    isLoading.value = true;
-    // TODO: error handling / proper api client
-    fetch(
-        `/api/v1/organizers/demo/events/wallet/walletlayouts/${props.layoutId}/`,
-        {
-            method: "PUT",
-            headers: {
-                "content-type": "application/json",
-                "X-CSRFToken": CSRF_TOKEN,
-            },
-            body: JSON.stringify(wallet_layout.value),
-        },
-    )
-        .then((x) => x.json())
-        .catch((x) => alert(x))
-        .then((x) => {
-            wallet_layout.value = x;
-            isLoading.value = false;
-        });
-}
-
-const currentPlatform = ref(PLATFORMS[0].identifier);
-const currentLayout = computed(() => ({}));
-const platformStyles = computed(() => {
-    for (const platform of PLATFORMS) {
-        if (platform.identifier === currentPlatform.value) {
-            return platform.styles
-        }
-    }
-});
-const platformLayout = computed(() => {
-    for (const layout of wallet_layout.value.platform_layouts) {
-        if (layout.platform === currentPlatform.value) {
-            return layout
-        }
-    }
-    const newLayout = {platform: currentPlatform, style: null, layout: {}};
-    wallet_layout.value.platform_layouts.push(newLayout);
-    return newLayout
-});
-const platformChoices = computed(() => {
-    return [[null, "Do not generate pass"], ...Object.values(platformStyles.value).map(x => [x.identifier, x.name])]
-});
-
-</script>
-
-<template lang="pug">
-    // TODO: add :key for all `v-for`s
-    // TODO: i18n textfields
-    // TODO: proper spinner
-    template(v-if="isLoading") {{ gettext("Loading...") }}
-    form(v-else @submit="saveLayout")
-        .form-group
-            Input(label="Name" v-model="wallet_layout.name")
-        nav
-            ul.nav.nav-tabs
-                li(v-for="platform in PLATFORMS" :class="{'active': currentPlatform === platform.identifier}")
-                    a(role="tab" @click="currentPlatform = platform.identifier") {{ platform.name }}
-        .tabbed-form.tab-content
-            .tab-pane.active.row
-                .col-md-8
-                    Select.form-group(label="Style" v-model="platformLayout.style" :choices="platformChoices")
-
-                    StyleSettings(v-if="platformLayout.style" v-model="platformLayout.layout" :style="platformStyles[platformLayout.style]" :variables="VARIABLES" :locales="LOCALES")
-                .col-md-4
-                    .panel.panel-default
-                        .panel-heading Preview
-                        .panel-body
-                            // TODO: Preview
-                            pre
-                                code {{ platformLayout }}
-                            pre(v-if="wallet_layout.style")
-                                code {{ platformStyles[wallet_layout.style] }}
-                            pre
-                                code {{ wallet_layout }}
-        .form-group.submit-group
-            button.btn.btn-primary.btn-save(type="submit") Submit
-</template>

src/pretix/plugins/wallet/static/pretixplugins/wallet/components/input/i18ninput.vue

@@ -1,25 +0,0 @@
-<script setup lang="ts">
-import { watchEffect } from 'vue'
-
-defineOptions({
-  inheritAttrs: false
-})
-
-const props = defineProps<{
-    errors?: string[],
-    locales: Record<string, string>
-}>();
-
-const modelValue = defineModel<Record<string, string> | string>();
-watchEffect(() => {
-    if (typeof modelValue.value === "string") {
-        const oldVal = modelValue.value;
-        modelValue.value = Object.fromEntries(Object.keys(props.locales).map((x): [string, string] => [x, oldVal]))
-    }
-})
-</script>
-
-<template lang="pug">
-    input.form-control(v-for="(human_readable, locale) in locales" v-model="modelValue[locale]" v-bind="$attrs" :lang="locale" :title="human_readable" :placeholder="human_readable")
-    .help-block(v-if="props.errors" v-for="error in props.errors") {{ error }}
-</template>

src/pretix/plugins/wallet/static/pretixplugins/wallet/components/input/input.vue

@@ -1,20 +0,0 @@
-<script setup lang="ts">
-import { useId } from 'vue'
-
-defineOptions({
-  inheritAttrs: false
-})
-
-const props = defineProps<{
-	label?: string,
-    errors?: string[],
-}>()
-const modelValue = defineModel<string|null>();
-const id = useId()
-</script>
-
-<template lang="pug">
-    label.control-label(:for="id", v-if="props.label") {{ props.label }}
-    input.form-control(:id="id" v-model="modelValue" v-bind="$attrs")
-    .help-block(v-if="props.errors" v-for="error in props.errors") {{ error }}
-</template>

src/pretix/plugins/wallet/static/pretixplugins/wallet/components/input/select.vue

@@ -1,32 +0,0 @@
-<script setup lang="ts">
-import { useId, watchEffect } from 'vue'
-
-defineOptions({
-  inheritAttrs: false
-})
-
-const props = defineProps<{
-	label?: string
-	choices: Array<[string, string]>
-    errors?: string[],
-    class: string
-}>()
-const modelValue = defineModel<string|null>();
-const id = useId()
-
-watchEffect(() => {
-    if (props.choices.length === 1) {
-        modelValue.value = props.choices[0][0]
-    } else if (props.choices.length < 1) {
-        modelValue.value = null
-    }
-})
-</script>
-
-<template lang="pug">
-    template(v-if="choices.length >= 1" :class="props.class")
-        label.control-label(v-if="props.label" :for="id") {{ props.label }}
-        select.form-control(:id="id" v-model="modelValue" v-bind="$attrs" required)
-            option(v-for="choice in props.choices" :key="choice[0]" :value="choice[0]") {{ choice[1] }}
-        .help-block(v-if="props.errors" v-for="error in props.errors") {{ error }}
-</template>

src/pretix/plugins/wallet/static/pretixplugins/wallet/components/placeholder-field-settings.vue

@@ -1,80 +0,0 @@
-<script setup lang="ts">
-import { computed, reactive, watchEffect } from "vue";
-import Select from "./input/select.vue";
-import Input from "./input/input.vue";
-import I18nInput from "./input/i18ninput.vue";
-import TextContent from "./text-content.vue";
-
-const gettext = (window as any).gettext;
-
-const props = defineProps<{
-	fieldgroup: PlaceholderFieldGroupDefinition;
-	overflows: FieldGroupDefinition[];
-	variables: Variables;
-    locales: Record<string, string>;
-}>();
-const fieldConfig = defineModel<PlaceholderFieldGroupConfig>({ required: true });
-
-const overflowOptions = computed((): Array<[string | null, string]> => {
-	if (props.overflows.length) {
-		return [
-			...props.overflows.map((x): [string, string] => [x.identifier, x.name]),
-			[null, "Do not overflow"],
-		];
-	} else {
-		return [];
-	}
-});
-
-function addVariable() {
-	fieldConfig.value.entries.push({ type: "placeholder", label: "" });
-}
-
-watchEffect(() => {
-    if (!fieldConfig.value) {
-        fieldConfig.value = {overflow: null, entries: JSON.parse(JSON.stringify(props.fieldgroup.default_entries))};
-    }
-    if (fieldConfig.value && !fieldConfig.value.entries) {
-        fieldConfig.value.entries = JSON.parse(JSON.stringify(props.fieldgroup.default_entries))
-    }
-});
-</script>
-
-<template lang="pug">
-    .panel.panel-default
-        .panel-heading
-            h3.panel-title {{ fieldgroup.name }}
-        .panel-body(v-if="fieldConfig")
-            .form-group()
-                span.text-muted(v-if="fieldgroup.description") {{ fieldgroup.description }}
-                h4 {{ gettext("Content") }}
-                table.table.table-hover
-                    thead
-                        tr
-                            th.col-md-5(v-if="fieldgroup.labels") {{ gettext('Label') }}
-                            th(:class="'col-md-' + (fieldgroup.labels ? '6' : '11')") {{ gettext('Content') }}
-                            th.col-xs-1
-                    tbody
-                        tr(v-for="n,i in fieldConfig.entries.length" :key="i")
-                            td(v-if="fieldgroup.labels")
-                                .i18n-form-group
-                                    I18nInput(v-model="fieldConfig.entries[n-1].label" :locales="locales")
-                            td
-                                TextContent(v-if='fieldgroup.content_type == "text"'
-                                            v-model="fieldConfig.entries[n-1]"
-                                            :variables="props.variables"
-                                            :locales="locales")
-                                Select(v-else-if='fieldgroup.content_type == "image"'
-                                        v-model="fieldConfig.entries[n-1].content"
-                                        :choices="Object.entries(props.variables).map(([k,v]) => [k, v.label])"
-                                    )
-                            td.text-right
-                                button.btn.btn-danger.form-control-static(type="button" @click="fieldConfig.entries.splice(n-1, 1)")
-                                    i.fa.fa-trash
-                                    span.sr-only {{ gettext('Delete')}}
-
-                button.btn.btn-default(type="button" @click="addVariable")
-                    i.fa.fa-plus
-                    |  {{ gettext("Add field") }}
-            Select(:label="gettext('Overflow to …')" :choices="overflowOptions" v-model="fieldConfig.overflow")
-</template>

src/pretix/plugins/wallet/static/pretixplugins/wallet/components/predefined-field-settings.vue

@@ -1,18 +0,0 @@
-<script setup lang="ts">
-const gettext = (window as any).gettext;
-
-const props = defineProps<{
-	fieldgroup: FieldGroupDefinition;
-}>();
-const fieldConfig = defineModel<PredefinedFieldGroupConfig>({ required: true });
-
-</script>
-
-<template lang="pug">
-    .panel.panel-default
-        .panel-heading
-            h3.panel-title {{ fieldgroup.name }}
-        .panel-body
-            .form-group
-                span.text-muted These fields appear somewhere and are visible too.
-</template>

src/pretix/plugins/wallet/static/pretixplugins/wallet/components/style-settings.vue

@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import { computed, watchEffect } from "vue";
-import PlaceholderFieldSettings from "./placeholder-field-settings.vue";
-import PredefinedFieldSettings from "./predefined-field-settings.vue";
-
-const gettext = (window as any).gettext;
-
-const props = defineProps<{
-    variables: VariableConfig
-    style?: Style;
-    locales: Record<string, string>;
-}>();
-
-const layout = defineModel<LayoutData>();
-
-watchEffect(() => {
-    if (layout.value === undefined) {
-        return
-    }
-    if (layout.value.fieldgroups === undefined) {
-        layout.value.fieldgroups = {};
-    }
-});
-</script>
-
-<template lang="pug">
-    h2.h3 {{ gettext("Field Groups") }}
-    template(v-if="props.style && layout.fieldgroups"
-             v-for="(fieldgroup, fieldgroupId) in props.style.fieldgroups")
-        PlaceholderFieldSettings(
-            v-if="fieldgroup.type == 'placeholder'"
-            v-model="layout.fieldgroups[fieldgroup.identifier]"
-            :fieldgroup="fieldgroup"
-            :overflows="props.style.fieldgroups.slice(fieldgroupId + 1).filter(x => x.type == 'placeholder' && x.content_type === fieldgroup.content_type)"
-            :variables="variables[fieldgroup.content_type]"
-            :locales="locales"
-        )
-        PredefinedFieldSettings(v-else-if="fieldgroup.type == 'predefined'"
-                    v-model="layout.fieldgroups[fieldgroup.identifier]"
-                    :fieldgroup="fieldgroup")
-</template>

src/pretix/plugins/wallet/static/pretixplugins/wallet/components/text-content.vue

@@ -1,65 +0,0 @@
-<script setup lang="ts">
-import { computed, reactive } from 'vue'
-import Select from './input/select.vue'
-import I18nInput from './input/i18ninput.vue'
-
-const gettext = (window as any).gettext
-
-const props = defineProps<{
-	variables: Variables
-    locales: Record<string, string>;
-}>()
-const entry = defineModel<FieldEntry>({ required: true })
-
-const selectChoices = computed(() =>{
-    const choices = Object.entries(props.variables).map(([k,v]): [string, string] => [k, v.label])
-    choices.push(["other", gettext("Other…")])
-    return choices
-});
-
-const selection = computed({
-    get() {
-        if (entry.value.type === 'placeholder') {
-            return entry.value.content
-        } else if (entry.value.type === 'custom') {
-            return "other"
-        } else {
-            throw new Error(`Unknown entry type "${entry.value.type}"`);
-        }
-    },
-    set(newValue) { 
-        if (newValue == "other") {
-            entry.value.type = "custom"
-            entry.value.content = {};
-        } else {
-            entry.value.type = "placeholder"
-            entry.value.content = newValue
-        }
-    }
-})
-
-const textContent = computed({
-    get() {
-        if (entry.value.type === 'placeholder') {
-            return ""
-        } else if (entry.value.type === 'custom') {
-            return entry.value.content
-        } else {
-            throw new Error(`Unknown entry type "${entry.value.type}"`);
-        }
-    },
-    set(newValue) { 
-        entry.value.content = newValue
-    }
-})
-
-</script>
-
-<template lang="pug">
-    .i18n-form-group
-        Select(
-            v-model="selection"
-            :choices="selectChoices"
-        )
-        I18nInput(v-model="textContent" v-if="selection === 'other'" :locales="locales")
-</template>

src/pretix/plugins/wallet/static/pretixplugins/wallet/index.d.ts

@@ -1,81 +0,0 @@
-type BaseFieldGroupDefinition = {
-	type: string;
-	identifier: string;
-	name: string;
-	required: boolean;
-}
-
-type FieldGroupDefinition = PlaceholderFieldGroupDefinition | PredefinedFieldGroupDefinition;
-
-type PlaceholderFieldGroupDefinition = BaseFieldGroupDefinition & {
-	type: 'placeholder';
-	content_type: FieldContentType;
-	default_entries: FieldEntry[];
-	labels: boolean;
-	min_entries: number|null;
-	max_entries: number|null;
-}
-
-type PredefinedFieldGroupDefinition = BaseFieldGroupDefinition & {
-	type: 'predefined';
-}
-
-type I18nString = string | Record<string, string>
-
-type FieldContentType = 'text' | 'image';
-
-type PlaceholderFieldEntry = {
-    type: 'placeholder';
-    label?: I18nString;
-    content?: string;
-}
-
-type ContentFieldEntry = {
-    type: FieldContentType;
-    label?: I18nString;
-    content?: I18nString;
-}
-
-type FieldEntry = PlaceholderFieldEntry | ContentFieldEntry;
-
-type Style = {
-	identifier: string;
-	name: string;
-	fieldgroups: FieldGroupDefinition[];
-};
-
-type Variable = {
-    label: string
-};
-
-type Platform = {
-	identifier: string;
-	name: string;
-	styles: Styles;
-};
-
-type Styles = Record<string, Style>;
-type Variables = Record<string, Variable>;
-type VariableConfig = Record<string, Variables>;
-type Platforms = Record<string, Platform>;
-
-
-type PlaceholderFieldGroupConfig = {
-	entries: Array<FieldEntry>;
-	overflow: string | null;
-};
-
-type PredefinedFieldGroupConfig = {};
-
-type FieldGroupConfig = PlaceholderFieldGroupConfig | PredefinedFieldGroupConfig;
-
-type LayoutData = {
-	fieldgroups: Record<string, FieldGroupConfig>;
-};
-
-type Layout = {
-	name?: string;
-	style?: string;
-	layout?: LayoutData;
-};
-

src/pretix/plugins/wallet/static/pretixplugins/wallet/main.ts

@@ -1,13 +0,0 @@
-import { createApp } from 'vue'
-import App from './components/app.vue'
-
-const mountEl = document.querySelector<HTMLElement>('#editor')!
-const app = createApp(App, mountEl.dataset)
-app.mount(mountEl)
-
-app.config.errorHandler = (error, _vm, info) => {
-	// vue fatals on errors by default, which is a weird choice
-	// https://github.com/vuejs/core/issues/3525
-	// https://github.com/vuejs/router/discussions/2435
-	console.error('[VUE]', info, error)
-}

src/pretix/plugins/wallet/styles/__init__.py

@@ -1,18 +0,0 @@
-from .apple import ApplePlatform, AppleWalletEventTicket
-from .google import GooglePlatform, GoogleWalletEventTicket
-from .base import PassLayout
-
-AVAILABLE_PLATFORMS = [ApplePlatform, GooglePlatform]
-
-AVAILABLE_STYLES = {
-    "apple": [AppleWalletEventTicket()],
-    "google": [
-        GoogleWalletEventTicket()
-    ],
-}
-
-AVAILABLE_STYLES_DICT = {
-    plat: {s.identifier: s for s in styls} for plat, styls in AVAILABLE_STYLES.items()
-}
-
-__all__ = ["AVAILABLE_PLATFORMS", "AVAILABLE_STYLES", "PassLayout"]

src/pretix/plugins/wallet/styles/apple.py

@@ -1,245 +0,0 @@
-from .base import (
-    FieldEntryType,
-    ImageFieldGroup,
-    PlaceholderFieldGroup,
-    PredefinedFieldGroup,
-    TextFieldGroup,
-    WalletPlatform,
-    PassStyle,
-    PlaceholderFieldEntry,
-)
-from django.utils.translation import gettext as _
-from i18nfield.strings import LazyI18nString
-import io
-import hashlib
-import zipfile
-import cryptography
-import cryptography.hazmat.primitives.serialization.pkcs7
-import json
-from django.contrib.staticfiles import finders
-
-
-class ApplePlatform(WalletPlatform):
-    identifier = "apple"
-    name = _("Apple")
-
-
-class StringResource:
-    # mapping string in default event locale -> LazyI18nString
-    entries: dict[str, LazyI18nString]
-    locales: set[str]
-
-    def __init__(self, locales):
-        self.entries = {}
-        self.locales = set(locales)
-
-    def add_entry(self, key: str, value: LazyI18nString):
-        if key in self.entries:
-            raise ValueError(f"{key} already exists in this StringResource")
-        self.entries[key] = value
-
-    def escape(self, string):
-        return string.translate(
-            str.maketrans({'"': '\\"', "\r": "\\r", "\n": "\\n", "\\": "\\\\"})
-        )
-
-    def generate_resource(self, language):
-        output = ""
-        for key, entry in self.entries.items():
-            output += (
-                f'"{self.escape(key)}" = "{self.escape(entry.localize(language))}";\n'
-            )
-        return output.strip()
-
-    def generate(self):
-        return {language: self.generate_resource(language) for language in self.locales}
-
-
-class SignedZipFile:
-    """Generates a zip-file with manifest and signature as apple expects a pkpass file to be"""
-
-    def __init__(self, ca_certificate, certificate, key, password):
-        self.ca_certificate = cryptography.x509.load_pem_x509_certificate(
-            ca_certificate
-        )
-        self.certificate = cryptography.x509.load_pem_x509_certificate(certificate)
-        self.key = cryptography.hazmat.primitives.serialization.load_pem_private_key(
-            key, password
-        )
-        self.password = password
-
-        self.file = io.BytesIO()
-        self.zip_file = zipfile.ZipFile(self.file, "w")
-        self.manifest = {}
-
-    def sign(self, data: bytes):
-        return (
-            cryptography.hazmat.primitives.serialization.pkcs7.PKCS7SignatureBuilder()
-            .set_data(data)
-            .add_signer(
-                self.certificate,
-                self.key,
-                cryptography.hazmat.primitives.hashes.SHA256(),
-            )
-            .add_certificate(self.ca_certificate)
-            .sign(
-                cryptography.hazmat.primitives.serialization.Encoding.DER,
-                [
-                    cryptography.hazmat.primitives.serialization.pkcs7.PKCS7Options.Binary,
-                    cryptography.hazmat.primitives.serialization.pkcs7.PKCS7Options.DetachedSignature,
-                ],
-            )
-        )
-
-    def finish(self):
-        manifest = json.dumps(self.manifest).encode()
-        signature = self.sign(manifest)
-        self.add_file("manifest.json", manifest)
-        self.add_file("signature", signature)
-        self.zip_file.close()
-        return self.file.getvalue()
-
-    def add_file(self, filename: str, content: str | bytes):
-        if isinstance(content, str):
-            content = content.encode()
-
-        with self.zip_file.open(filename, "w") as f:
-            f.write(content)
-        self.manifest[filename] = hashlib.sha1(content).hexdigest()
-
-
-class AppleWalletStyle(PassStyle):
-    platform = ApplePlatform
-
-    def pass_content(self, fields, strings):
-        raise NotImplementedError()
-
-    def generate_pass_json(self, fields, context, strings):
-        def add_from_context(key):
-            value = context.get(key)
-            if not value:
-                raise ValueError(f"{key} must be set to a truthy value")
-            return value
-
-        pass_json = {
-            "formatVersion": 1,
-            "description": add_from_context("description"),
-            "organizationName": add_from_context("organizationName"),
-            "passTypeIdentifier": add_from_context("passTypeIdentifier"),
-            "teamIdentifier": add_from_context("teamIdentifier"),
-            "serialNumber": add_from_context("serialNumber"),
-            **self.pass_content(fields, strings),
-        }
-        return pass_json
-
-    def generate(self, layout, context):
-        for key in ["ca_certificate", "certificate", "key", "password", "locales"]:
-            if key not in context:
-                raise ValueError(f"{key} missing from context")
-
-        fields = self.get_pass_fields(layout, context)
-
-        pkpass = SignedZipFile(
-            context["ca_certificate"],
-            context["certificate"],
-            context["key"],
-            context["password"],
-        )
-        strings = StringResource(locales=context['locales'])
-
-        pass_json = self.generate_pass_json(fields, context, strings)
-        print(pass_json)
-        if fields['logo']:
-            logo = fields['logo'][0]['value']
-        else:
-            logo = open(finders.find("pretix_passbook/logo.png"), "rb")
-
-        if fields['icon']:
-            icon = fields['icon'][0]['value']
-        else:
-            icon = open(finders.find("pretix_passbook/icon.png"), "rb")
-
-        pkpass.add_file("icon.png", icon.read())
-        pkpass.add_file("logo.png", logo.read())
-
-        for lang, content in strings.generate().items():
-            pkpass.add_file(f"{lang}.lproj/pass.strings", content)
-        pkpass.add_file("pass.json", json.dumps(pass_json))
-        return pkpass.finish()
-
-
-class AppleWalletEventTicket(AppleWalletStyle):
-    identifier = "event_1"
-    name = _("Event Ticket Layout 1")
-    fieldgroups = [
-        ImageFieldGroup(
-            identifier="icon",
-            name=_("Icon"),
-            min_entries=0,
-            max_entries=1,
-            labels=False,
-            default_entries=[
-                PlaceholderFieldEntry(
-                    content="poweredby",
-                )
-            ],
-        ),
-        ImageFieldGroup(
-            identifier="logo",
-            name=_("Logo"),
-            min_entries=0,
-            max_entries=1,
-            labels=False,
-            default_entries=[
-                PlaceholderFieldEntry(
-                    content="poweredby",
-                )
-            ],
-        ),
-        TextFieldGroup(
-            identifier="primary",
-            name=_("Primary"),
-            min_entries=1,
-            max_entries=1,
-            default_entries=[
-                PlaceholderFieldEntry(
-                    label=LazyI18nString({"de": "Tickettyp", "en": "Ticket type"}),
-                    content="item",
-                )
-            ],  # TODO: support Lazyi18nproxy here
-            description=_("These fields appear prominently featured on the pass."),
-        ),
-        TextFieldGroup(
-            identifier="secondary", name=_("Secondary"), max_entries=4
-        ),  # TODO: validation of max field count if combined "Coupons, store cards, and generic passes with a square barcode can have a total of up to four secondary and auxiliary fields, combined."
-        TextFieldGroup(
-            identifier="headers", name=_("Header"), max_entries=3
-        ),  # TODO: header image
-        TextFieldGroup(identifier="auxillary", name=_("Auxillary"), max_entries=4),
-        TextFieldGroup(identifier="back", name=_("Back")),
-    ]
-    # preview_image = "apple/event_ticket.svg"
-
-    def convert_fields(self, strings, fields, prefix):
-        converted = []
-        for i,f in enumerate(fields):
-            converted_field = {**f, "key": f"{prefix}-{i}"}
-            if "label" in converted_field and isinstance(converted_field['label'], LazyI18nString):
-                strings.add_entry(f"{prefix}-{i}-label", converted_field['label'])
-                converted_field['label'] = f"{prefix}-{i}-label"
-
-            if isinstance(converted_field['value'], LazyI18nString):
-                strings.add_entry(f"{prefix}-{i}-value", converted_field['value'])
-                converted_field['value'] = f"{prefix}-{i}-value"
-            converted.append(converted_field)
-        return converted
-
-    def pass_content(self, fields, strings):
-        return {
-            "eventTicket": {
-                "primaryFields": self.convert_fields(strings, fields['primary'], 'primary'),
-                "secondaryFields": self.convert_fields(strings, fields['secondary'], 'secondary'),
-                "auxillaryFields": self.convert_fields(strings, fields['auxillary'], 'auxillary'),
-                "backFields": self.convert_fields(strings, fields['back'], 'back'),
-            }
-        }

src/pretix/plugins/wallet/styles/base.py

@@ -1,346 +0,0 @@
-import enum
-from i18nfield.strings import LazyI18nString
-import jsonschema
-from django.core.exceptions import ValidationError
-
-class WalletPlatform:
-    identifier: str
-    name: str
-
-
-class FieldGroupType(enum.Enum):
-    PLACEHOLDER = "placeholder"
-    PREDEFINED = "predefined"
-
-
-class FieldGroup:
-    type: FieldGroupType
-    identifier: str
-    name: str
-    description: str
-    required: bool = False
-
-    def __init__(self, identifier: str, name: str, description=None, required=False):
-        self.identifier = identifier
-        self.name = name
-        self.required = required
-        self.description = description or ""
-
-    def layout_schema(
-        self,
-        remaining_fields: list["FieldGroup"],
-        context: dict,
-    ) -> dict:
-        raise NotImplemented()
-
-    def asdict(self):
-        return {
-            "type": self.type.value,
-            "identifier": self.identifier,
-            "name": self.name,
-            "description": self.description,
-            "required": self.required,
-        }
-
-
-class FieldContentType(enum.Enum):
-    IMAGE = "image"
-    TEXT = "text"
-
-
-class FieldEntryType(enum.Enum):
-    CUSTOM = "custom"
-    PLACEHOLDER = "placeholder"
-
-
-class FieldEntry[T]:
-    type: FieldEntryType
-    label: LazyI18nString | None
-    content: T
-
-    def __init__(
-        self, type: FieldEntryType, content: T, label: LazyI18nString | None = None
-    ):
-        self.type = type
-        self.label = label
-        self.content = content
-
-    def asdict(self) -> dict:
-        return {"type": self.type.value, "content": self.content, "label": self.label.data if self.label else None}
-
-class PlaceholderFieldEntry(FieldEntry[str]):
-    type = FieldEntryType.PLACEHOLDER
-    label: LazyI18nString | None
-    content: str
-
-    def __init__(
-        self, content: str, label: LazyI18nString | None = None
-    ):
-        self.label = label
-        self.content = content
-
-
-class CustomFieldEntry(FieldEntry[LazyI18nString]):
-    type: FieldEntryType
-    label: LazyI18nString | None
-    content: LazyI18nString
-
-    def asdict(self) -> dict:
-        return {"type": self.type.value, "content": self.content.data, "label": self.label.data if self.label else None}
-
-
-
-class PredefinedFieldGroup(FieldGroup):
-    type = FieldGroupType.PREDEFINED
-
-    def layout_schema(
-        self,
-        remaining_fields: list["FieldGroup"],
-        context: dict,
-    ):
-        return {
-            "type": "object"
-        }
-
-class PlaceholderFieldGroup(FieldGroup):
-    type = FieldGroupType.PLACEHOLDER
-    content_type: FieldContentType
-    default_entries: list[FieldEntry]
-    labels: bool
-    min_entries: int | None
-    max_entries: int | None
-
-    def __init__(
-        self,
-        identifier: str,
-        name: str,
-        content_type: FieldContentType,
-        description: str=None,
-        required=False,
-        default_entries=None,
-        min_entries=None,
-        max_entries=None,
-        labels=True,
-    ):
-        super().__init__(identifier, name, description, required)
-        self.content_type = content_type
-        self.default_entries = default_entries or []
-        self.min_entries = min_entries
-        self.max_entries = max_entries
-        self.labels = labels
-
-        if self.required and (self.min_entries is None or self.min_entries < 1):
-            self.min_entries = 1
-
-    def asdict(self):
-        return {
-            **super().asdict(),
-            "content_type": self.content_type.value,
-            "default_entries": [x.asdict() for x in self.default_entries],
-            "labels": self.labels,
-            "min_entries": self.min_entries,
-            "max_entries": self.max_entries,
-        }
-
-    def layout_schema(
-        self,
-        remaining_fields: list["FieldGroup"],
-        context: dict,
-    ):
-        placeholders = list(context.get("placeholders", {}).get(self.content_type.value, {}).keys())
-        return {
-            "type": "object",
-            "properties": {
-                "entries": self.entries_schema(placeholders=placeholders),
-                "overflow": {
-                    "anyOf": [
-                        {"type": "null"},
-                        {
-                            "type": "string",
-                            "enum": [
-                                f.identifier
-                                for f in remaining_fields
-                                if isinstance(f, PlaceholderFieldGroup)
-                                and f.content_type == self.content_type
-                            ],
-                        },
-                    ]
-                },
-            },
-            "required": ["entries"],
-        }
-
-    def entries_schema(self, placeholders: list[str]):
-        baseprops = {}
-        if self.labels:
-            baseprops["label"] = {"$ref": "#/$defs/I18nString"}
-
-        schema = {
-            "type": "array",
-            "items": {
-                "type": "object",
-                "anyOf": [
-                    {
-                        "properties": {
-                            **baseprops,
-                            "type": {"const": "placeholder"},
-                            "content": {"enum": placeholders},
-                        }
-                    },
-                    {
-                        "properties": {
-                            **baseprops,
-                            "type": {"const": "custom"},
-                            "content": {"$ref": "#/$defs/I18nString"},
-                        }
-                    },
-                ],
-                "required": ["type", "content"],
-            },
-        }
-        if self.labels:
-            schema["items"]["required"].append("label")
-        if self.min_entries is not None:
-            schema["minItems"] = self.min_entries
-        # max_entries is not enforced here, as the layout can have more fields than that (null-fields are removed, rest is overspilled)
-        return schema
-
-
-
-class TextFieldGroup(PlaceholderFieldGroup):
-    content_type = FieldContentType.TEXT
-
-    def __init__(self, **kwargs):
-        super().__init__(content_type=self.content_type, **kwargs)
-
-
-class ImageFieldGroup(PlaceholderFieldGroup):
-    content_type = FieldContentType.IMAGE
-
-    def __init__(self, **kwargs):
-        super().__init__(content_type=self.content_type, **kwargs)
-
-
-class PassStyle:
-    platform: type[WalletPlatform]
-    identifier: str  # unique within platform
-    name: str
-    # order here limits in what order users can configure field "overspilling" (if too many fields are defined, where should the rest go) -> can only go down in the list
-    # we evaluate the fields in this order, so they overspill in this order as well (fields from primary are appended to the overspilling field before fields from secondary are etc)
-
-    fieldgroups: list[FieldGroup]
-
-    def asdict(self):
-        return {
-            "platform": self.platform.identifier,
-            "identifier": self.identifier,
-            "name": self.name,
-            "fieldgroups": [x.asdict() for x in self.fieldgroups],
-        }
-
-    def layout_schema(self, context):
-        schema = {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            # TODO: $id
-            "title": self.name,
-            "type": "object",
-            "properties": {
-                "fieldgroups": {
-                    "description": "Layout Field Groups",
-                    "type": "object",
-                    "properties": {
-                        group.identifier: group.layout_schema(
-                            context=context, remaining_fields=self.fieldgroups[i:]
-                        )
-                        for (i, group) in enumerate(self.fieldgroups)
-                    },
-                    "required": [
-                        group.identifier for group in self.fieldgroups if group.required
-                    ],
-                }
-            },
-            "$defs": {
-                "I18nString": {
-                    "oneOf": [
-                        {"type": "string"},
-                        {"type": "object", "additionalProperties": {"type": "string"}},
-                    ]
-                }
-            },
-        }
-        if any(group.required for group in self.fieldgroups):
-            schema["required"] = ["fieldgroups"]
-
-        return schema
-
-    def generate(self, layout, context):
-        raise NotImplementedError()
-
-    def render_placeholder(self, context, content_type, content):
-        placeholder = (
-            context.get("placeholders")
-            .get(content_type, {})
-            .get(content)
-        )
-        if placeholder:
-            placeholder_value = placeholder["evaluate"](
-                *context.get("evaluation_context", [])
-            )
-            if placeholder_value:
-                return placeholder["label"], placeholder_value
-
-        return None, None
-
-    def get_pass_fields(self, layout, context):
-        fields = {}
-        for group in self.fieldgroups:
-            if isinstance(group, PredefinedFieldGroup):
-                pass
-            elif isinstance(group, PlaceholderFieldGroup):
-                group_fields = fields.get(group.identifier, [])
-                if group.identifier in layout["fieldgroups"]:
-                    for field in layout["fieldgroups"][group.identifier]["entries"]:
-                        field_entry = {}
-                        if group.labels:
-                            field_entry["label"] = LazyI18nString(field["label"])
-                        if field["type"] == FieldEntryType.PLACEHOLDER.value:
-                            label, field_entry["value"] = self.render_placeholder(context, group.content_type.value, field['content'])
-                            if group.labels and not str(field_entry['label']) and label:
-                                field_entry['label'] = LazyI18nString(label)
-
-                        elif field["type"] == FieldEntryType.CUSTOM.value:
-                            field_entry["value"] = LazyI18nString(field["content"])
-                        if "value" in field_entry and field_entry["value"]:
-                            group_fields.append(field_entry)
-                if group.min_entries and len(group_fields) < group.min_entries:
-                    raise ValueError(
-                        f"Group {group.identifier} needs at least {group.min_entries} entries, but only {len(group_fields)} were provided"
-                    )
-                fields[group.identifier] = group_fields[: group.max_entries]
-                if (overflow_group := layout["fieldgroups"][group.identifier]['overflow']):
-                    fields.setdefault(overflow_group, [])
-                    fields[overflow_group] += group_fields[group.max_entries:]
-            else:
-                raise ValueError("Unknown field group")
-        return fields
-
-
-class PassLayout:
-    style: PassStyle
-    layout: dict
-
-    def __init__(self, style, layout):
-        self.style = style
-        self.layout = layout
-
-    def validate(self, context):
-        schema = self.style.layout_schema(context)
-        try:
-            jsonschema.validate(self.layout, schema)
-        except jsonschema.ValidationError as e:
-            raise ValidationError("Invalid layout: {}".format(str(e)))
-
-    def generate(self, context):
-        # TODO: how to handle nonexisting placeholders here?
-        self.validate(context)
-        return self.style.generate(self.layout, context)

src/pretix/plugins/wallet/styles/google.py

@@ -1,20 +0,0 @@
-from .base import PassStyle, PredefinedFieldGroup, TextFieldGroup, WalletPlatform
-from django.utils.translation import gettext_lazy as _
-
-class GooglePlatform(WalletPlatform):
-    identifier = "google"
-    name = _("Google")
-
-
-class GoogleWalletStyle(PassStyle):
-    platform = GooglePlatform
-
-
-class GoogleWalletEventTicket(PassStyle):
-    identifier = "event"
-    name = "Event Ticket"
-    platform = GooglePlatform
-    fieldgroups = [
-        PredefinedFieldGroup(identifier="seating", name=_("Seating")),
-        TextFieldGroup(identifier="qrcode", name=_("QR-Code"), labels=False),
-    ]

src/pretix/plugins/wallet/templates/pretixplugins/wallet/create.html

@@ -1,35 +0,0 @@
-{% extends "pretixcontrol/event/base.html" %}
-{% load i18n %}
-{% load money %}
-{% load bootstrap3 %}
-{% load vite %}
-{% load static %}
-{% load compress %}
-
-
-{% block title %}{% trans "Wallet layouts" %}{% endblock %}
-
-{% block content %}
-    <h1>{% trans "New layout" %}</h1>
-    <form action="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {% bootstrap_form form layout="control" %}
-        <div class="form-group">
-            <label class="col-md-3 control-label">
-                {% trans "Ticket design" %}
-            </label>
-            <div class="col-md-9 form-control-static">
-                <p>
-                    {% blocktrans trimmed %}
-                        You can modify the design after you saved this page.
-                    {% endblocktrans %}
-                </p>
-            </div>
-        </div>
-        <div class="form-group submit-group">
-            <button type="submit" class="btn btn-primary btn-save">
-                {% trans "Save" %}
-            </button>
-        </div>
-    </form>
-{% endblock %}

src/pretix/plugins/wallet/templates/pretixplugins/wallet/edit.html

@@ -1,21 +0,0 @@
-{% extends "pretixcontrol/event/base.html" %}
-{% load i18n %}
-{% load money %}
-{% load bootstrap3 %}
-{% load vite %}
-{% load static %}
-{% load compress %}
-
-
-{% block title %}{% trans "Wallet layouts" %}{% endblock %}
-
-{% block content %}
-    <h1>{% trans "Edit layout" %}</h1>
-    {{ platforms|json_script:"platforms" }}
-    {{ variables|json_script:"variables" }}
-    {{ locales|json_script:"locales" }}
-    <div id="editor" data-layout-id="{{ object.pk }}"></div>
-    {% vite_hmr %}
-    {% vite_asset "src/pretix/plugins/wallet/static/pretixplugins/wallet/main.ts" %}
-    {% csrf_token %}
-{% endblock %}

src/pretix/plugins/wallet/templates/pretixplugins/wallet/layout_list.html

@@ -1,74 +0,0 @@
-{% extends "pretixcontrol/event/base.html" %}
-{% load i18n %}
-{% load money %}
-{% load wallet %}
-{% block title %}{% trans "Wallet layouts" %}{% endblock %}
-{% block content %}
-    <h1>{% trans "Wallet layouts" %}</h1>
-    {% if layouts|length == 0 %}
-        <div class="empty-collection">
-            <p>
-                {% blocktrans trimmed %}
-                    You haven't created any layouts yet.
-                {% endblocktrans %}
-            </p>
-
-            {% if "event.settings.general:write" in request.eventpermset %}
-                <a href="{% url "plugins:wallet:add" organizer=request.event.organizer.slug event=request.event.slug %}"
-                        class="btn btn-primary btn-lg"><i class="fa fa-plus"></i> {% trans "Create a new layout" %}
-                </a>
-            {% endif %}
-        </div>
-    {% else %}
-        <div class="table-responsive">
-            <table class="table table-hover table-quotas">
-                <thead>
-                <tr>
-                    <th>{% trans "Name" %}</th>
-                    <th>{% trans "Default" %}</th>
-                    <th class="action-col-2"></th>
-                </tr>
-                </thead>
-                <tbody>
-                {% for l in layouts %}
-                    <tr>
-                        <td>
-                            {% if "can_change_event_settings" in request.eventpermset %}
-                                <strong><a href="{% url "plugins:wallet:edit" organizer=request.event.organizer.slug event=request.event.slug layout=l.id %}">
-                                    {{ l.name }}
-                                </a></strong>
-                            {% else %}
-                                <strong>{{ l.name }}</strong>
-                            {% endif %}
-                        </td>
-                        <td>
-                            {% if l.default %}
-                                <span class="text-success">
-                                    <span class="fa fa-check"></span>
-                                    {% trans "Default" %}
-                                </span>
-                            {% elif "can_change_event_settings" in request.eventpermset %}
-                                <form class="form-inline" method="post"
-                                        action="{% url "plugins:wallet:default" organizer=request.event.organizer.slug event=request.event.slug layout=l.id %}">
-                                    {% csrf_token %}
-                                    <button class="btn btn-default btn-sm">
-                                        {% trans "Make default" %}
-                                    </button>
-                                </form>
-                            {% endif %}
-                        </td>
-                        <td class="text-right flip">
-                            {% if "can_change_event_settings" in request.eventpermset %}
-                                <a href="{% url "plugins:wallet:edit" organizer=request.event.organizer.slug event=request.event.slug layout=l.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
-                                <a href="{% url "plugins:wallet:add" organizer=request.event.organizer.slug event=request.event.slug %}?copy_from={{ l.id }}"
-                                        class="btn btn-default btn-sm" title="{% trans "Clone" %}" data-toggle="tooltip"><i class="fa fa-copy"></i></a>
-                                <a href="{% url "plugins:wallet:delete" organizer=request.event.organizer.slug event=request.event.slug layout=l.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
-                            {% endif %}
-                        </td>
-                    </tr>
-                {% endfor %}
-                </tbody>
-            </table>
-        </div>
-    {% endif %}
-{% endblock %}

src/pretix/plugins/wallet/templates/pretixplugins/wallet/settings_content.html

@@ -1,8 +0,0 @@
-{% load i18n %}
-<p>
-    <a class="btn btn-primary btn-lg" target="_blank"
-            href="{% url "plugins:wallet:index" organizer=request.organizer.slug event=request.event.slug %}">
-        <span class="fa fa-paint-brush"></span>
-        {% trans "Edit layouts" %}
-    </a>
-</p>

src/pretix/plugins/wallet/templatetags/wallet.py

@@ -1,10 +0,0 @@
-from django import template
-
-from ..models import WalletLayout
-
-register = template.Library()
-
-
-@register.filter
-def platform_layouts(platform, event):
-    return WalletLayout.objects.filter(event=event, platform=platform.identifier)

src/pretix/plugins/wallet/ticketoutput.py

@@ -1,136 +0,0 @@
-#
-# This file is part of pretix (Community Edition).
-#
-# Copyright (C) 2014-2020  Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
-# Public License as published by the Free Software Foundation in version 3 of the License.
-#
-# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
-# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
-# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
-# this file, see <https://pretix.eu/about/en/license>.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
-# details.
-#
-# 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 django.utils.translation import gettext_lazy as _
-from pretix.base.ticketoutput import BaseTicketOutput
-from pretix.base.models import Event
-from pretix.base.settings import SettingsSandbox
-from django.template.loader import render_to_string
-
-from .styles import AVAILABLE_STYLES_DICT
-from .styles.apple import ApplePlatform
-from .styles.google import GooglePlatform
-
-from .models import WalletLayout
-from .views import get_layout_variables
-
-
-logger = logging.getLogger("pretix.plugins.wallet")
-
-
-class WalletSettingsHolder(BaseTicketOutput):
-    identifier = "wallet"
-    verbose_name = _("Wallet Output")
-
-    is_meta = True
-    is_enabled = False
-    preview_allowed = (
-        False  # TODO: implement own preview view or hide button for meta-outputs
-    )
-
-    def settings_content_render(self, request) -> str:
-        return render_to_string(
-            "pretixplugins/wallet/settings_content.html", {"request": request}
-        )
-
-
-class WalletOutput(BaseTicketOutput):
-    settings_form_fields = []
-
-    def __init__(self, event: Event):
-        super().__init__(event)
-        self.settings = SettingsSandbox(
-            "ticketoutput", WalletSettingsHolder.identifier, event
-        )
-
-
-class GoogleWalletTicketOutput(WalletOutput):
-    identifier = "wallet_google"
-    verbose_name = _("Google")
-    download_button_text = "Add to Google Wallet"
-    platform = GooglePlatform
-
-
-class AppleWalletTicketOutput(WalletOutput):
-    identifier = "wallet_apple"
-    verbose_name = _("Apple")
-    download_button_text = "Add to Apple Wallet"
-    platform = ApplePlatform
-
-    def generate(self, op):
-        order = op.order
-        event = order.event
-        filename = "{}-{}.pkpass".format(order.event.slug, order.code)
-
-        # layout = self.override_layout_signal.send_chained(
-        #     order.event, 'layout', orderposition=op, layout=self.layout_map.get(
-        #         (op.item_id, self.override_channel or order.sales_channel.identifier),
-        #         self.layout_map.get(
-        #             (op.item_id, 'web'),
-        #             self.default_layout
-        #         )
-        #     )
-        # )
-        layout = WalletLayout.objects.get(pk=1)
-        platform_layout = layout.platform_layouts.get(platform=self.platform.identifier)
-
-        ticket = str(op.item.name)
-        if op.variation:
-            ticket += " - " + str(op.variation)
-        
-        serialNumber = "%s-%s-%s-%d" % (
-            order.event.organizer.slug,
-            order.event.slug,
-            order.code,
-            op.pk,
-        )
-
-        context = {
-            "placeholders": get_layout_variables(op.order.event),
-            "evaluation_context": [op, order, order.event],
-            "ca_certificate": open(
-                "/Users/engelhardt/code/tmp/wallet/apple/ca_cert.pem", "rb"
-            ).read(),
-            "certificate": open(
-                "/Users/engelhardt/code/tmp/wallet/apple/cert.pem", "rb"
-            ).read(),
-            "key": open(
-                "/Users/engelhardt/code/tmp/wallet/apple/secret_key.pem", "rb"
-            ).read(),
-            "password": None,
-            "description": _("Ticket for {event} ({product})").format( # TODO: i18n
-                event=event.name, product=ticket
-            ),
-            "organizationName": event.organizer.name,
-            "passTypeIdentifier": "pass.test.test",
-            "teamIdentifier": "TEST123456",
-            "serialNumber": serialNumber,
-            "locales": event.settings.locales
-        }
-
-        data = AVAILABLE_STYLES_DICT[self.platform.identifier][platform_layout.style].generate(
-            platform_layout.layout, context
-        )
-        return filename, "application/vnd.apple.pkpass", data
-
-
-OUTPUTS = [WalletSettingsHolder, GoogleWalletTicketOutput, AppleWalletTicketOutput]

src/pretix/plugins/wallet/urls.py

@@ -1,45 +0,0 @@
-#
-# This file is part of pretix (Community Edition).
-#
-# Copyright (C) 2014-2020  Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
-# Public License as published by the Free Software Foundation in version 3 of the License.
-#
-# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
-# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
-# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
-# this file, see <https://pretix.eu/about/en/license>.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
-# details.
-#
-# 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/>.
-#
-from django.urls import re_path
-from pretix.api.urls import event_router
-
-from .views import (
-    LayoutEditorView,
-    LayoutCreateView,
-    LayoutListView
-)
-from .api import WalletLayoutViewSet
-
-urlpatterns = [
-    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/wallet/$',
-        LayoutListView.as_view(), name='index'),
-    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/wallet/add/$',
-        LayoutCreateView.as_view(), name='add'),
-    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/wallet/edit/(?P<layout>[^/]+)/$',
-        LayoutEditorView.as_view(), name='edit'),
-    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/wallet/default/(?P<layout>[^/]+)/$', # TODO
-        LayoutEditorView.as_view(), name='default'),
-    re_path(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/wallet/delete/(?P<layout>[^/]+)/$', # TODO
-        LayoutEditorView.as_view(), name='delete'),
-]
-
-event_router.register('walletlayouts', WalletLayoutViewSet)

src/pretix/plugins/wallet/views.py

@@ -1,106 +0,0 @@
-import json
-from typing import Any
-
-from django import forms
-from django.http import Http404
-from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
-from django.views.generic import CreateView, DetailView, ListView
-from pretix.base.pdf import get_images, get_variables
-from pretix.control.permissions import EventPermissionRequiredMixin
-from django.conf import settings
-from .models import WalletLayout
-from .styles import AVAILABLE_STYLES, AVAILABLE_PLATFORMS
-
-from django.contrib.staticfiles import finders
-
-def get_layout_variables(event):
-    return {
-        "text": get_variables(event),
-        "image": get_images(event)
-        | {"poweredby": {"label": _("pretix-Logo"), "evaluate": lambda *_: open(finders.find("pretix_passbook/logo.png"), "rb")},
-           "poweredby_icon": {"label": _("pretix-Icon"), "evaluate": lambda *_: open(finders.find("pretix_passbook/icon.png"), "rb")}},  # TODO: image upload
-    }
-
-
-def get_editor_variables(event):
-    return {
-        t: {
-            vid: {"label": v.get("label"), "editor_sample": v.get("editor_sample")}
-            for vid, v in vs.items()
-        }
-        for t, vs in get_layout_variables(event).items()
-    }
-
-
-class LayoutListView(EventPermissionRequiredMixin, ListView):
-    model = WalletLayout
-    permission = "can_change_event_settings"
-    template_name = "pretixplugins/wallet/layout_list.html"
-    context_object_name = "layouts"
-
-    def get_queryset(self):
-        return self.request.event.wallet_layouts.all()
-
-
-class LayoutEditorView(DetailView):
-    template_name = "pretixplugins/wallet/edit.html"
-    model = WalletLayout
-    permission = "event.settings.general:write"
-    pk_url_kwarg = "layout"
-
-    def get_context_data(self, **kwargs) -> dict[str, Any]:
-        context = super().get_context_data(**kwargs)
-        context['platforms'] = [{
-                "identifier": platform.identifier,
-                "name": platform.name,
-                "styles": {
-                    style.identifier: style.asdict() for style in AVAILABLE_STYLES.get(platform.identifier)
-                }
-            } for platform in AVAILABLE_PLATFORMS
-        ]
-        # context["styles"] = {
-        #     style.identifier: style.asdict() for style in self.get_platform_styles()
-        # }
-        context["variables"] = get_editor_variables(self.request.event)
-        context["locales"] = {
-            l: dict(settings.LANGUAGES).get(l, l)
-            for l in self.request.event.settings.get("locales")
-        }
-
-        return context
-
-
-class WalletLayoutCreateForm(forms.ModelForm):
-    class Meta:
-        model = WalletLayout
-        fields = ("name",)
-
-    def __init__(self, *args, event, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.event = event
-
-    def save(self, *args, **kwargs) -> Any:
-        self.instance.event = self.event
-        return super().save(*args, **kwargs)
-
-
-class LayoutCreateView(CreateView):
-    template_name = "pretixplugins/wallet/create.html"
-    form_class = WalletLayoutCreateForm
-    permission = "event.settings.general:write"
-
-    def get_form_kwargs(self) -> dict[str, Any]:
-        kwargs = super().get_form_kwargs()
-        kwargs["event"] = self.request.event
-        return kwargs
-
-    def get_success_url(self) -> str:
-        return reverse(
-            "plugins:wallet:edit",
-            kwargs={
-                "organizer": self.request.event.organizer.slug,
-                "event": self.request.event.slug,
-                "layout": self.object.pk,
-            },
-        )

src/pretix/settings.py

@@ -705,7 +705,7 @@ if config.has_option('sentry', 'dsn') and not any(c in sys.argv for c in ('shell
     from sentry_sdk.integrations.logging import (
         LoggingIntegration, ignore_logger,
     )
-    from sentry_sdk.scrubber import EventScrubber, DEFAULT_DENYLIST
+    from sentry_sdk.scrubber import DEFAULT_DENYLIST, EventScrubber
 
     from .sentry import PretixSentryIntegration, setup_custom_filters
 
@@ -901,8 +901,8 @@ if DEBUG:
     # Reload if settings file changes
     config_files_to_watch = [Path(x).absolute() for x in config_files]
 
-    from django.utils.autoreload import autoreload_started, BaseReloader
     from django.dispatch import receiver
+    from django.utils.autoreload import BaseReloader, autoreload_started
 
     @receiver(autoreload_started, dispatch_uid="pretix_watch_config_file")
     def watch_config_file(sender: BaseReloader, *args, **kwargs):

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

@@ -639,11 +639,13 @@ var form_handlers = function (el) {
                         ).append(" ").append($("<div>").text(res.organizer).html())
                     );
                 }
-                $ret.append(
-                    $("<span>").addClass("event-daterange").append(
-                        $("<span>").addClass("fa fa-calendar fa-fw")
-                    ).append(" ").append(res.date_range)
-                );
+                if (res.date_range) {
+                    $ret.append(
+                        $("<span>").addClass("event-daterange").append(
+                            $("<span>").addClass("fa fa-calendar fa-fw")
+                        ).append(" ").append(res.date_range)
+                    );
+                }
                 return $ret;
             },
         }).on("select2:select", function () {

src/tests/api/test_checkinrpc.py

@@ -286,12 +286,12 @@ def test_by_secret_special_chars(token_client, organizer, clist, event, order):
 @pytest.mark.django_db
 def test_by_medium(token_client, organizer, clist, event, order):
     with scopes_disabled():
-        ReusableMedium.objects.create(
+        rm = ReusableMedium.objects.create(
             type="barcode",
             identifier="abcdef",
             organizer=organizer,
-            linked_orderposition=order.positions.first(),
         )
+        rm.linked_orderpositions.add(order.positions.first())
     resp = _redeem(token_client, organizer, clist, "abcdef", {"source_type": "barcode"})
     assert resp.status_code == 201
     assert resp.data['status'] == 'ok'
@@ -301,6 +301,71 @@ def test_by_medium(token_client, organizer, clist, event, order):
     assert ci.raw_source_type == "barcode"
 
 
+@pytest.mark.django_db
+def test_by_medium_multiple_orderpositions(token_client, organizer, clist_all, event, order):
+    with scopes_disabled():
+        rm = ReusableMedium.objects.create(
+            type="barcode",
+            identifier="abcdef",
+            organizer=organizer,
+        )
+        op_item_first = order.positions.first()
+        rm.linked_orderpositions.add(op_item_first)
+        op_item_other = order.positions.all()[1]
+        rm.linked_orderpositions.add(op_item_other)
+
+    # multiple tickets are valid => no check-in
+    resp = _redeem(token_client, organizer, clist_all, "abcdef", {"source_type": "barcode"})
+    assert resp.status_code == 400
+    assert resp.data['status'] == 'error'
+    assert resp.data['reason'] == 'ambiguous'
+
+    with scopes_disabled():
+        op_item_other.valid_from = datetime.datetime(2020, 1, 1, 12, 0, 0, tzinfo=event.timezone)
+        op_item_other.valid_until = datetime.datetime(2020, 1, 1, 15, 0, 0, tzinfo=event.timezone)
+        op_item_other.save()
+
+    with freeze_time("2020-01-01 13:45:00"):
+        # multiple tickets are valid => no check-in
+        resp = _redeem(token_client, organizer, clist_all, "abcdef", {"source_type": "barcode"})
+        assert resp.status_code == 400
+        assert resp.data['status'] == 'error'
+        assert resp.data['reason'] == 'ambiguous'
+
+    with freeze_time("2020-01-01 10:45:00"):
+        resp = _redeem(token_client, organizer, clist_all, "abcdef", {"source_type": "barcode"})
+        assert resp.status_code == 201
+        assert resp.data['status'] == 'ok'
+
+    with freeze_time("2020-01-01 15:45:00"):
+        resp = _redeem(token_client, organizer, clist_all, "abcdef", {"source_type": "barcode"})
+        assert resp.status_code == 400
+        assert resp.data['status'] == 'error'
+        assert resp.data['reason'] == 'already_redeemed'
+
+    with scopes_disabled():
+        op_item_first.valid_from = datetime.datetime(2020, 1, 1, 10, 0, 0, tzinfo=event.timezone)
+        op_item_first.valid_until = datetime.datetime(2020, 1, 1, 12, 0, 0, tzinfo=event.timezone)
+        op_item_first.save()
+
+    with freeze_time("2020-01-01 15:45:00"):
+        resp = _redeem(token_client, organizer, clist_all, "abcdef", {"source_type": "barcode"})
+        assert resp.status_code == 400
+        assert resp.data['status'] == 'error'
+        assert resp.data['reason'] == 'invalid_time'
+
+    with scopes_disabled():
+        op_item_first.canceled = True
+        op_item_first.save()
+        op_item_other.canceled = True
+        op_item_other.save()
+
+    resp = _redeem(token_client, organizer, clist_all, "abcdef", {"source_type": "barcode"})
+    assert resp.status_code == 400
+    assert resp.data['status'] == 'error'
+    assert resp.data['reason'] == 'canceled'
+
+
 @pytest.mark.django_db
 def test_by_medium_not_connected(token_client, organizer, clist, event, order):
     with scopes_disabled():
@@ -318,12 +383,12 @@ def test_by_medium_not_connected(token_client, organizer, clist, event, order):
 @pytest.mark.django_db
 def test_by_medium_wrong_event(token_client, organizer, clist, event, order2):
     with scopes_disabled():
-        ReusableMedium.objects.create(
+        rm = ReusableMedium.objects.create(
             type="barcode",
             identifier="abcdef",
             organizer=organizer,
-            linked_orderposition=order2.positions.first(),
         )
+        rm.linked_orderpositions.add(order2.positions.first())
     resp = _redeem(token_client, organizer, clist, "abcdef", {"source_type": "barcode"})
     assert resp.status_code == 404
     assert resp.data['status'] == 'error'
@@ -337,12 +402,12 @@ def test_by_medium_wrong_event(token_client, organizer, clist, event, order2):
 @pytest.mark.django_db
 def test_by_medium_wrong_type(token_client, organizer, clist, event, order):
     with scopes_disabled():
-        ReusableMedium.objects.create(
+        rm = ReusableMedium.objects.create(
             type="nfc_uid",
             identifier="abcdef",
             organizer=organizer,
-            linked_orderposition=order.positions.first(),
         )
+        rm.linked_orderpositions.add(order.positions.first())
     resp = _redeem(token_client, organizer, clist, "abcdef", {"source_type": "barcode"})
     assert resp.status_code == 404
     assert resp.data['status'] == 'error'
@@ -355,13 +420,13 @@ def test_by_medium_wrong_type(token_client, organizer, clist, event, order):
 @pytest.mark.django_db
 def test_by_medium_inactive(token_client, organizer, clist, event, order):
     with scopes_disabled():
-        ReusableMedium.objects.create(
+        rm = ReusableMedium.objects.create(
             type="barcode",
             identifier="abcdef",
             organizer=organizer,
             active=False,
-            linked_orderposition=order.positions.first(),
         )
+        rm.linked_orderpositions.add(order.positions.first())
     resp = _redeem(token_client, organizer, clist, "abcdef", {"source_type": "barcode"})
     assert resp.status_code == 404
     assert resp.data['status'] == 'error'

src/tests/api/test_order_create.py

@@ -3121,9 +3121,78 @@ def test_order_create_use_medium(token_client, organizer, event, item, quota, qu
     with scopes_disabled():
         o = Order.objects.get(code=resp.data['code'])
         medium.refresh_from_db()
-        assert o.positions.first() == medium.linked_orderposition
+        assert o.positions.first() == medium.linked_orderpositions.first()
         assert resp.data['positions'][0]['pdf_data']['medium_identifier'] == medium.identifier
 
+    resp = token_client.post(
+        '/api/v1/organizers/{}/events/{}/orders/?pdf_data=true'.format(
+            organizer.slug, event.slug
+        ), format='json', data=res
+    )
+    assert resp.status_code == 201
+    with scopes_disabled():
+        o = Order.objects.get(code=resp.data['code'])
+        medium.refresh_from_db()
+        assert medium.linked_orderpositions.count() == 1
+        assert o.positions.first() == medium.linked_orderpositions.first()
+        assert resp.data['positions'][0]['pdf_data']['medium_identifier'] == medium.identifier
+
+
+@pytest.mark.django_db
+def test_order_create_add_to_medium(token_client, organizer, event, item, quota, question, medium):
+    item.media_type = medium.type
+    item.media_policy = Item.MEDIA_POLICY_REUSE_OR_NEW
+    item.save()
+    res = copy.deepcopy(ORDER_CREATE_PAYLOAD)
+    res['positions'][0]['item'] = item.pk
+    res['positions'][0]['use_reusable_medium'] = medium.pk
+    res['positions'][0]['add_to_reusable_medium'] = medium.pk
+    res['positions'][0]['answers'][0]['question'] = question.pk
+
+    # do not use use_reusable_medium and add_to_reusable_medium
+    resp = token_client.post(
+        '/api/v1/organizers/{}/events/{}/orders/?pdf_data=true'.format(
+            organizer.slug, event.slug
+        ), format='json', data=res
+    )
+    assert resp.status_code == 400
+
+    del res['positions'][0]['use_reusable_medium']
+
+    resp = token_client.post(
+        '/api/v1/organizers/{}/events/{}/orders/?pdf_data=true'.format(
+            organizer.slug, event.slug
+        ), format='json', data=res
+    )
+    assert resp.status_code == 201
+    with scopes_disabled():
+        medium.refresh_from_db()
+        assert medium.linked_orderpositions.count() == 1
+
+    resp = token_client.post(
+        '/api/v1/organizers/{}/events/{}/orders/?pdf_data=true'.format(
+            organizer.slug, event.slug
+        ), format='json', data=res
+    )
+    assert resp.status_code == 201
+    with scopes_disabled():
+        medium.refresh_from_db()
+        assert medium.linked_orderpositions.count() == 2
+
+    res['positions'][0]['use_reusable_medium'] = medium.pk
+    del res['positions'][0]['add_to_reusable_medium']
+    resp = token_client.post(
+        '/api/v1/organizers/{}/events/{}/orders/?pdf_data=true'.format(
+            organizer.slug, event.slug
+        ), format='json', data=res
+    )
+    assert resp.status_code == 201
+    with scopes_disabled():
+        o = Order.objects.get(code=resp.data['code'])
+        medium.refresh_from_db()
+        assert medium.linked_orderpositions.count() == 1
+        assert o.positions.first() == medium.linked_orderpositions.first()
+
 
 @pytest.mark.django_db
 def test_order_create_use_medium_other_organizer(token_client, organizer, event, item, quota, question, medium2):
@@ -3168,7 +3237,7 @@ def test_order_create_create_medium(token_client, organizer, event, item, quota,
         i = resp.data['positions'][0]['pdf_data']['medium_identifier']
         assert i
         m = organizer.reusable_media.get(identifier=i)
-        assert m.linked_orderposition == o.positions.first()
+        assert m.linked_orderpositions.first() == o.positions.first()
         assert m.type == "barcode"
 
 

src/tests/api/test_reusable_media.py

@@ -89,10 +89,13 @@ TEST_MEDIUM_RES = {
     "organizer": "dummy",
     "identifier": "ABCDEFGH",
     "type": "barcode",
+    "claim_token": None,
+    "label": None,
     "active": True,
     "expires": None,
     "customer": None,
     "linked_orderposition": None,
+    "linked_orderpositions": [],
     "linked_giftcard": None,
     "notes": None,
     "info": {},
@@ -170,7 +173,7 @@ def test_medium_detail(token_client, organizer, event, medium, giftcard, custome
         ticket = event.items.create(name='Early-bird ticket', category=None, default_price=23, admission=True,
                                     personalized=True)
         op = o.positions.create(item=ticket, price=Decimal("14"))
-        medium.linked_orderposition = op
+        medium.linked_orderpositions.add(op)
         medium.linked_giftcard = giftcard
         medium.customer = customer
         medium.save()
@@ -273,7 +276,7 @@ def test_medium_detail_event_permission_missing(token_client, organizer, event,
         ticket = event.items.create(name='Early-bird ticket', category=None, default_price=23, admission=True,
                                     personalized=True)
         op = o.positions.create(item=ticket, price=Decimal("14"))
-        medium.linked_orderposition = op
+        medium.linked_orderpositions.add(op)
         medium.linked_giftcard = giftcard
         medium.customer = customer
         medium.save()
@@ -352,6 +355,110 @@ def test_medium_create(token_client, organizer, giftcard):
         assert m.updated > now() - timedelta(minutes=10)
 
 
+@pytest.mark.django_db
+def test_medium_create_linked_orderposition(token_client, organizer, event, org2_event, medium):
+    with scopes_disabled():
+        o = Order.objects.create(
+            code='FOO', event=event, email='dummy@dummy.test',
+            status=Order.STATUS_PENDING, datetime=now(), expires=now() + timedelta(days=10),
+            sales_channel=event.organizer.sales_channels.get(identifier="web"),
+            total=14, locale='en'
+        )
+        ticket = event.items.create(name='Early-bird ticket', category=None, default_price=23, admission=True,
+                                         personalized=True)
+        op = o.positions.create(item=ticket, price=Decimal("14"))
+        op2 = o.positions.create(item=ticket, price=Decimal("14"))
+
+        org2_o = Order.objects.create(
+            code='FOO', event=org2_event, email='dummy@dummy.test',
+            status=Order.STATUS_PENDING, datetime=now(), expires=now() + timedelta(days=10),
+            sales_channel=org2_event.organizer.sales_channels.get(identifier="web"),
+            total=14, locale='en'
+        )
+        org2_ticket = org2_event.items.create(name='Early-bird ticket', category=None, default_price=23, admission=True,
+                                                   personalized=True)
+        org2_op = org2_o.positions.create(item=org2_ticket, price=Decimal("14"))
+
+    payload = dict(TEST_MEDIUM_CREATE_PAYLOAD)
+
+    # wrong orderposition for organizer
+    payload['linked_orderposition'] = org2_op.pk
+    resp = token_client.post(
+        '/api/v1/organizers/{}/reusablemedia/'.format(organizer.slug),
+        payload,
+        format='json'
+    )
+    assert resp.status_code == 400
+
+    # unkown orderposition
+    payload['linked_orderposition'] = "unknown"
+    resp = token_client.post(
+        '/api/v1/organizers/{}/reusablemedia/'.format(organizer.slug),
+        payload,
+        format='json'
+    )
+    assert resp.status_code == 400
+
+    # create with linked_orderposition
+    payload['linked_orderposition'] = op.pk
+    resp = token_client.post(
+        '/api/v1/organizers/{}/reusablemedia/'.format(organizer.slug),
+        payload,
+        format='json'
+    )
+    assert resp.status_code == 201
+    with scopes_disabled():
+        m = ReusableMedium.objects.get(pk=resp.data['id'])
+        assert list(m.linked_orderpositions.values_list('pk', flat=True)) == [op.pk]
+
+    # double-check API-response for fallback-values
+    resp = token_client.get(
+        '/api/v1/organizers/{}/reusablemedia/{}/'.format(organizer.slug, resp.data['id'])
+    )
+    assert resp.status_code == 200
+    assert resp.data['linked_orderposition'] == op.pk
+    assert resp.data['linked_orderpositions'] == [op.pk]
+
+    # create with linked_orderposition and linked_orderpositions (not allowed)
+    payload['identifier'] = "FOOBAZ"
+    payload['linked_orderpositions'] = [op.pk, org2_op.pk]
+    resp = token_client.post(
+        '/api/v1/organizers/{}/reusablemedia/'.format(organizer.slug),
+        payload,
+        format='json'
+    )
+    assert resp.status_code == 400
+
+    # multiple linked_orderpositions, but from different organizers
+    del payload['linked_orderposition']
+    resp = token_client.post(
+        '/api/v1/organizers/{}/reusablemedia/'.format(organizer.slug),
+        payload,
+        format='json'
+    )
+    assert resp.status_code == 400
+
+    # multiple linked_orderpositions from same organizer
+    payload['linked_orderpositions'] = [op.pk, op2.pk]
+    resp = token_client.post(
+        '/api/v1/organizers/{}/reusablemedia/'.format(organizer.slug),
+        payload,
+        format='json'
+    )
+    assert resp.status_code == 201
+    with scopes_disabled():
+        m = ReusableMedium.objects.get(pk=resp.data['id'])
+        assert list(m.linked_orderpositions.values_list('pk', flat=True)) == [op.pk, op2.pk]
+
+    # double-check API-response for fallback-values
+    resp = token_client.get(
+        '/api/v1/organizers/{}/reusablemedia/{}/'.format(organizer.slug, resp.data['id'])
+    )
+    assert resp.status_code == 200
+    assert resp.data['linked_orderposition'] is None
+    assert resp.data['linked_orderpositions'] == [op.pk, op2.pk]
+
+
 @pytest.mark.django_db
 def test_medium_foreignkeyval(token_client, organizer, giftcard2):
     payload = dict(TEST_MEDIUM_CREATE_PAYLOAD)
@@ -398,6 +505,68 @@ def test_medium_patch(token_client, organizer, event, medium, giftcard, customer
     assert medium.info == {'test': 2}
     assert medium.identifier == "ABCDEFGH"
 
+    # test patch with linked_orderpositions
+    with scopes_disabled():
+        o = Order.objects.create(
+            code='FOO', event=event, email='dummy@dummy.test',
+            status=Order.STATUS_PENDING, datetime=now(), expires=now() + timedelta(days=10),
+            sales_channel=event.organizer.sales_channels.get(identifier="web"),
+            total=14, locale='en'
+        )
+        ticket = event.items.create(name='Early-bird ticket', category=None, default_price=23, admission=True,
+                                         personalized=True)
+        op = o.positions.create(item=ticket, price=Decimal("14"))
+        op2 = o.positions.create(item=ticket, price=Decimal("14"))
+
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/reusablemedia/{}/'.format(organizer.slug, medium.pk),
+        {
+            'linked_orderposition': op.pk,
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+    medium.refresh_from_db()
+    with scopes_disabled():
+        assert list(medium.linked_orderpositions.values_list('pk', flat=True)) == [op.pk]
+        assert medium.all_logentries().count() == 2
+
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/reusablemedia/{}/'.format(organizer.slug, medium.pk),
+        {
+            'linked_orderpositions': [op.pk, op2.pk],
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+    medium.refresh_from_db()
+    with scopes_disabled():
+        assert list(medium.linked_orderpositions.values_list('pk', flat=True)) == [op.pk, op2.pk]
+        assert medium.all_logentries().count() == 3
+
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/reusablemedia/{}/'.format(organizer.slug, medium.pk),
+        {
+            'linked_orderpositions': [op2.pk],
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+    medium.refresh_from_db()
+    with scopes_disabled():
+        assert list(medium.linked_orderpositions.values_list('pk', flat=True)) == [op2.pk]
+        assert medium.all_logentries().count() == 4
+
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/reusablemedia/{}/'.format(organizer.slug, medium.pk),
+        {
+            'linked_orderposition': op.pk,
+            'linked_orderpositions': [op.pk, op2.pk],
+        },
+        format='json'
+    )
+    assert resp.status_code == 400
+
 
 @pytest.mark.django_db
 def test_medium_no_deletion(token_client, organizer, event, medium):
@@ -538,7 +707,7 @@ def test_medium_lookup_cross_organizer(token_client, organizer, organizer2, org2
         ticket = org2_event.items.create(name='Early-bird ticket', category=None, default_price=23, admission=True,
                                          personalized=True)
         op = o.positions.create(item=ticket, price=Decimal("14"))
-        medium2.linked_orderposition = op
+        medium2.linked_orderpositions.add(op)
         medium2.linked_giftcard = giftcard2
         medium2.save()
 

src/tests/base/test_mail.py

@@ -602,10 +602,13 @@ PRIVATE_IPS_RES = [
     [(socket.AF_INET, socket.SOCK_STREAM, 6, '', ('127.1.1.1', 443))],
     [(socket.AF_INET, socket.SOCK_STREAM, 6, '', ('192.168.5.3', 443))],
     [(socket.AF_INET, socket.SOCK_STREAM, 6, '', ('224.0.0.1', 443))],
+    [(socket.AF_INET, socket.SOCK_STREAM, 6, '', ('100.64.0.1', 443))],
+    [(socket.AF_INET, socket.SOCK_STREAM, 6, '', ('100.100.100.100', 443))],
     [(socket.AF_INET6, socket.SOCK_STREAM, 6, '', ('::1', 443, 0, 0))],
     [(socket.AF_INET6, socket.SOCK_STREAM, 6, '', ('fe80::1', 443, 0, 0))],
     [(socket.AF_INET6, socket.SOCK_STREAM, 6, '', ('ff00::1', 443, 0, 0))],
     [(socket.AF_INET6, socket.SOCK_STREAM, 6, '', ('fc00::1', 443, 0, 0))],
+    [(socket.AF_INET6, socket.SOCK_STREAM, 6, '', ('::ffff:100.64.0.1', 443, 0, 0))],
 ]
 
 

src/tests/control/test_permissions.py

@@ -137,6 +137,7 @@ event_urls = [
     "subevents/select2",
     "subevents/add",
     "subevents/2/delete",
+    "subevents/2/edit",
     "subevents/2/",
     "quotas/",
     "quotas/2/delete",
@@ -360,8 +361,9 @@ event_permission_urls = [
     ("event.items:write", "discounts/reorder", 400, HTTP_POST),
     ("event.items:write", "discounts/add", 200, HTTP_GET),
     (None, "subevents/", 200, HTTP_GET),
-    ("event.subevents:write", "subevents/2/", 404, HTTP_GET),
-    ("event.subevents:write", "subevents/2/", 404, HTTP_POST),
+    (None, "subevents/2/", 404, HTTP_GET),
+    ("event.subevents:write", "subevents/2/edit", 404, HTTP_GET),
+    ("event.subevents:write", "subevents/2/edit", 404, HTTP_POST),
     ("event.subevents:write", "subevents/2/delete", 404, HTTP_GET),
     ("event.subevents:write", "subevents/add", 200, HTTP_GET),
     ("event.subevents:write", "subevents/bulk_add", 200, HTTP_GET),

src/tests/control/test_subevents.py

@@ -110,9 +110,9 @@ class SubEventsTest(SoupTest):
             assert se.checkinlist_set.count() == 1
 
     def test_modify(self):
-        doc = self.get_doc('/control/event/ccc/30c3/subevents/%d/' % self.subevent1.pk)
+        doc = self.get_doc('/control/event/ccc/30c3/subevents/%d/edit' % self.subevent1.pk)
         assert doc.select("input[name=quotas-TOTAL_FORMS]")
-        doc = self.post_doc('/control/event/ccc/30c3/subevents/%d/' % self.subevent1.pk, {
+        doc = self.post_doc('/control/event/ccc/30c3/subevents/%d/edit' % self.subevent1.pk, {
             'name_0': 'SE2',
             'active': 'on',
             'date_from_0': '2017-07-01',

src/tests/e2e/conftest.py

@@ -731,11 +731,13 @@ def event_series(organizer):
     """Create an event series with multiple subevents, items, and quotas."""
     from pretix.base.models import ItemCategory
 
+    base_date = _future_dt(days=30, hour=19)
+
     event = Event.objects.create(
         organizer=organizer,
         name='Concert Series',
         slug='concert-series',
-        date_from=_future_dt(days=30, hour=19),
+        date_from=base_date,
         has_subevents=True,
         currency='EUR',
         live=True,
@@ -760,9 +762,8 @@ def event_series(organizer):
     )
 
     subevents = []
-    base_date = _future_dt(days=30, hour=19)
 
-    for i in range(15):
+    for i in range(20):
         se = SubEvent.objects.create(
             event=event,
             name=f'Concert Night {i + 1}',

src/tests/helpers/test_urllib.py

@@ -43,6 +43,8 @@ def test_private_ip_blocked():
         requests.get("https://10.0.0.1", timeout=0.1)
     with pytest.raises(HTTPError, match="Request to RFC 6598 address.*"):
         requests.get("https://100.100.100.100", timeout=0.1)
+    with pytest.raises(HTTPError, match="Request to RFC 6598 address.*"):
+        requests.get("https://[::ffff:100.64.0.1]", timeout=0.1)
 
 
 @pytest.mark.django_db
@@ -58,6 +60,7 @@ def test_private_ip_blocked():
     [(AF_INET6, SOCK_STREAM, 6, '', ('fe80::1', 443, 0, 0))],
     [(AF_INET6, SOCK_STREAM, 6, '', ('ff00::1', 443, 0, 0))],
     [(AF_INET6, SOCK_STREAM, 6, '', ('fc00::1', 443, 0, 0))],
+    [(AF_INET6, SOCK_STREAM, 6, "", ("::ffff:100.64.0.1", 443, 0, 0))],
 ])
 def test_dns_resolving_to_local_blocked(res):
     with mock.patch('socket.getaddrinfo') as mock_addr:

src/tests/plugins/wallet/test_apple.py

@@ -1,186 +0,0 @@
-from pretix.plugins.wallet.styles.apple import SignedZipFile, StringResource, AppleWalletEventTicket
-from django.utils.translation import gettext as _
-import pytest
-from i18nfield.strings import LazyI18nString
-from cryptography.hazmat.primitives.asymmetric import rsa
-from cryptography.hazmat.primitives import serialization, hashes
-from cryptography import x509
-import datetime
-import io
-import zipfile
-import json
-import jsonschema
-
-
-@pytest.fixture
-def pkpass_context():
-    key_pw = b"TESTPW"
-    now = datetime.datetime.now()
-    ca_key = rsa.generate_private_key(public_exponent=65537, key_size=4096)
-    ca_cert = (
-        x509.CertificateBuilder()
-        .subject_name(
-            x509.Name([x509.NameAttribute(x509.oid.NameOID.COMMON_NAME, "TTDR")])
-        )
-        .issuer_name(
-            x509.Name([x509.NameAttribute(x509.oid.NameOID.COMMON_NAME, "ROOT Inc.")])
-        )
-        .public_key(ca_key.public_key())
-        .serial_number(1)
-        .not_valid_before(now)
-        .not_valid_after(now + datetime.timedelta(days=365))
-        .sign(ca_key, hashes.SHA256())
-    )
-
-    key = rsa.generate_private_key(public_exponent=65537, key_size=4096)
-    cert = (
-        x509.CertificateBuilder()
-        .subject_name(
-            x509.Name(
-                [x509.NameAttribute(x509.oid.NameOID.COMMON_NAME, "UID=pass.test.test")]
-            )
-        )
-        .issuer_name(
-            x509.Name([x509.NameAttribute(x509.oid.NameOID.COMMON_NAME, "TTDR")])
-        )
-        .public_key(key.public_key())
-        .serial_number(2)
-        .not_valid_before(now)
-        .not_valid_after(now + datetime.timedelta(days=365))
-        .sign(ca_key, hashes.SHA256())
-    )
-
-    ca_cert_pem = cert.public_bytes(encoding=serialization.Encoding.PEM)
-    cert_pem = cert.public_bytes(encoding=serialization.Encoding.PEM)
-    key_pem = key.private_bytes(
-        encoding=serialization.Encoding.PEM,
-        format=serialization.PrivateFormat.TraditionalOpenSSL,
-        encryption_algorithm=serialization.BestAvailableEncryption(key_pw),
-    )
-    return {
-        "ca_certificate": ca_cert_pem,
-        "certificate": cert_pem,
-        "key": key_pem,
-        "password": key_pw,
-    }
-
-
-def test_signed_zip(pkpass_context):
-    pkpass = SignedZipFile(**pkpass_context)
-    generated_pass = pkpass.finish()
-
-    with zipfile.ZipFile(io.BytesIO(generated_pass), "r") as zip_file:
-        assert set(zip_file.namelist()) == {"manifest.json", "signature"}
-        with zip_file.open("manifest.json") as f:
-            manifest = json.load(f)
-        assert manifest == {}
-
-        with zip_file.open("signature") as f:
-            signature = f.read()
-
-        assert signature
-
-    pkpass = SignedZipFile(**pkpass_context)
-    pkpass.add_file("test", b"test content")
-    generated_pass = pkpass.finish()
-
-    with zipfile.ZipFile(io.BytesIO(generated_pass), "r") as zip_file:
-        assert set(zip_file.namelist()) == {"test", "manifest.json", "signature"}
-        with zip_file.open("manifest.json") as f:
-            manifest = json.load(f)
-        assert manifest == {"test": "1eebdf4fdc9fc7bf283031b93f9aef3338de9052"}
-
-        with zip_file.open("signature") as f:
-            signature = f.read()
-
-        assert signature
-
-    pkpass = SignedZipFile(**pkpass_context)
-    pkpass.add_file("test/test", "test content")
-    generated_pass = pkpass.finish()
-
-    with zipfile.ZipFile(io.BytesIO(generated_pass), "r") as zip_file:
-        assert set(zip_file.namelist()) == {"test/test", "manifest.json", "signature"}
-        with zip_file.open("manifest.json") as f:
-            manifest = json.load(f)
-        assert manifest == {"test/test": "1eebdf4fdc9fc7bf283031b93f9aef3338de9052"}
-
-        with zip_file.open("signature") as f:
-            signature = f.read()
-
-        assert signature
-
-
-def test_stringresource_minimal():
-    resource = StringResource(locales=["de", "en"])
-    resource.add_entry("TEST", LazyI18nString({"de": "test-de", "en": "test-en"}))
-    stringfiles = resource.generate()
-
-    assert stringfiles.keys() == {"de", "en"}
-    assert stringfiles["de"] == '"TEST" = "test-de";'
-    assert stringfiles["en"] == '"TEST" = "test-en";'
-
-
-@pytest.mark.parametrize(
-    "input,output",
-    [
-        ['te"st', 'te\\"st'],
-        ["te\rst", "te\\rst"],
-        ["te\nst", "te\\nst"],
-        ["te\r\nst", "te\\r\\nst"],
-        ["te\r\nst", "te\\r\\nst"],
-        ["te\\st", "te\\\\st"],
-    ],
-)
-def test_stringresource_escaping(input, output):
-    resource = StringResource(locales=["en"])
-    resource.add_entry("TEST", LazyI18nString({"en": input}))
-    stringfiles = resource.generate()
-
-    assert stringfiles.keys() == {"en"}
-    assert stringfiles["en"] == f'"TEST" = "{output}";'
-
-    resource = StringResource(locales=["en"])
-    resource.add_entry(input, LazyI18nString({"en": "test"}))
-    stringfiles = resource.generate()
-
-    assert stringfiles.keys() == {"en"}
-    assert stringfiles["en"] == f'"{output}" = "test";'
-
-
-
-def test_stringresource_additional_locale():
-    resource = StringResource(locales=["de", "en", "fr"])
-    resource.add_entry("TEST", LazyI18nString({"de": "test-de", "en": "test-en"}))
-    stringfiles = resource.generate()
-
-    assert stringfiles.keys() == {"de", "en", "fr"}
-    assert stringfiles["de"] == '"TEST" = "test-de";'
-    assert stringfiles["en"] == '"TEST" = "test-en";'
-    assert stringfiles["fr"] == '"TEST" = "test-en";'
-
-def test_generate_pass_json():
-    context = {
-        "placeholders": {
-            "text": {"test_placeholder": {"evaluate": lambda: "test placeholder"}}
-        },
-        "description": "Ticket for Test",
-        "organizationName": "TestOrg",
-        "serialNumber": "1",
-        "passTypeIdentifier": "pass.test.test",
-        "teamIdentifier": "ABCDEF123456"
-    }
-    layout = {"fieldgroups": {"primary": {"entries": [{"type": "placeholder", "label": "test", "content": "test_placeholder"}, {"type": "text", "label": {"de":"test-de", "en": "test-en"}, "content": "test content"}]}}}
-    style = AppleWalletEventTicket()
-    schema = style.layout_schema(context)
-    jsonschema.validate(schema, layout)
-
-    result = style.generate_pass_json(layout, context)
-
-    required_fields = ["description", "formatVersion", "organizationName", "passTypeIdentifier", "serialNumber", "teamIdentifier"]
-    for field in required_fields:
-        assert field in result
-
-    assert result['formatVersion'] == 1
-
-    breakpoint()

src/tests/plugins/wallet/test_wallet.py

@@ -1,336 +0,0 @@
-from pretix.plugins.wallet.styles.base import (
-    PassStyle,
-    PredefinedFieldGroup,
-    WalletPlatform,
-    PlaceholderFieldGroup,
-    FieldContentType,
-    PassLayout,
-    FieldGroupType,
-    FieldEntryType,
-)
-from django.utils.translation import gettext as _
-import jsonschema
-import pytest
-from i18nfield.strings import LazyI18nString
-from cryptography.hazmat.primitives.asymmetric import rsa
-from cryptography.hazmat.primitives import serialization, hashes
-from cryptography import x509
-import datetime
-import io
-import zipfile
-import json
-
-
-class WalletTestPlatform(WalletPlatform):
-    identifier = "test_platform"
-    name = _("Test Wallet Platform")
-
-
-class MinimalTestStyle(PassStyle):
-    platform = WalletTestPlatform
-    identifier = "test_style"
-    name = _("Test Wallet Style")
-    fieldgroups = []
-
-
-class TicketTestStyle(PassStyle):
-    platform = WalletTestPlatform
-    identifier = "test_ticket"
-    name = _("Test Wallet Style Ticket")
-    fieldgroups = [
-        PlaceholderFieldGroup(
-            identifier="text1",
-            name=_("Text 1"),
-            content_type=FieldContentType.TEXT,
-            required=True,
-        ),
-        PlaceholderFieldGroup(
-            identifier="text2",
-            name=_("Text 2"),
-            content_type=FieldContentType.TEXT,
-            required=False,
-            labels=False,
-        ),
-        PlaceholderFieldGroup(
-            identifier="image1",
-            name=_("Image 1"),
-            content_type=FieldContentType.IMAGE,
-            required=False,
-            labels=False,
-        ),
-    ]
-
-    def generate(self, layout, context):
-        output = f"Generated Pass: {self.name}\n\n"
-        for group in self.fieldgroups:
-            if group.identifier in layout["fieldgroups"]:
-                output += f"Group: {group.name}\n"
-                if isinstance(group, PredefinedFieldGroup):
-                    output += "PREDEFINED\n"
-                elif isinstance(group, PlaceholderFieldGroup):
-                    for field in layout["fieldgroups"][group.identifier]["entries"]:
-                        if group.labels:
-                            label = LazyI18nString(field["label"])
-                            output += f"{label}: "
-                        if field["type"] == FieldEntryType.PLACEHOLDER.value:
-                            placeholder = (
-                                context.get("placeholders")
-                                .get(group.content_type.value, {})
-                                .get(field["content"])
-                            )
-                            if placeholder:
-                                output += placeholder["evaluate"](
-                                    *context.get("evaluation_context", [])
-                                )
-                            else:
-                                output += f"UNKNOWN: {field['content']}"
-                        elif field["type"] == FieldEntryType.TEXT.value:
-                            output += str(LazyI18nString(field["content"]))
-                        elif field["type"] == FieldEntryType.IMAGE.value:
-                            output += f"<IMG>{field['content']}</IMG>"
-                        output += "\n"
-                else:
-                    raise ValueError("Unknown field group")
-                output += "\n"
-        return output
-
-
-@pytest.fixture
-def layout_context():
-    return {
-        "placeholders": {
-            "text": {"test_placeholder": {"evaluate": lambda: "test placeholder"}}
-        }
-    }
-
-
-def test_schema_generation_minimal():
-    style = MinimalTestStyle()
-    context = {}
-    schema = style.layout_schema(context)
-    assert isinstance(schema, dict)
-    assert "properties" in schema
-    assert "fieldgroups" in schema["properties"]
-
-    jsonschema.validate({}, schema)
-    jsonschema.validate({"fieldgroups": {}}, schema)
-
-
-def test_schema_ticket_generation(layout_context):
-    style = TicketTestStyle()
-    schema = style.layout_schema(layout_context)
-    assert isinstance(schema, dict)
-    assert "properties" in schema
-    assert "fieldgroups" in schema["properties"]
-
-
-@pytest.mark.parametrize(
-    "layout",
-    [
-        {
-            "fieldgroups": {
-                "text1": {
-                    "entries": [
-                        {
-                            "type": "placeholder",
-                            "label": "test",
-                            "content": "test_placeholder",
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "fieldgroups": {
-                "text1": {
-                    "entries": [
-                        {
-                            "type": "placeholder",
-                            "label": {"de": "test-de", "en": "test-en"},
-                            "content": "test_placeholder",
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "fieldgroups": {
-                "text1": {
-                    "entries": [
-                        {"type": "text", "label": "test", "content": "test content"}
-                    ]
-                }
-            }
-        },
-        {
-            "fieldgroups": {
-                "text1": {
-                    "entries": [
-                        {
-                            "type": "placeholder",
-                            "label": {"de": "test-de", "en": "test-en"},
-                            "content": "test_placeholder",
-                        },
-                        {"type": "text", "label": "test", "content": "test content"},
-                    ]
-                }
-            }
-        },
-        {
-            "fieldgroups": {
-                "text1": {
-                    "entries": [
-                        {
-                            "type": "placeholder",
-                            "label": {"de": "test-de", "en": "test-en"},
-                            "content": "test_placeholder",
-                        },
-                        {"type": "text", "label": "test", "content": "test content"},
-                    ],
-                    "overflow": "text2",
-                }
-            }
-        },
-    ],
-)
-def test_schema_ticket_valid(layout_context, layout):
-    style = TicketTestStyle()
-    schema = style.layout_schema(layout_context)
-
-    jsonschema.validate(layout, schema)
-
-
-@pytest.mark.parametrize(
-    "layout",
-    [
-        {},
-        {"fieldgroups": {}},
-        {"fieldgroups": {"text1": {}}},
-        {"fieldgroups": {"text1": {"entries": []}}},
-        {"fieldgroups": {"text1": {"overflow": "test"}}},
-        {
-            "fieldgroups": {
-                "text1": {
-                    "entries": [{"type": "placeholder", "content": "test_placeholder"}]
-                }
-            }
-        },
-        {
-            "fieldgroups": {
-                "text1": {
-                    "entries": [
-                        {
-                            "type": "placeholder",
-                            "label": [],
-                            "content": "test_placeholder",
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "fieldgroups": {
-                "text1": {"entries": [{"type": "text", "content": "test content"}]}
-            }
-        },
-        {
-            "fieldgroups": {
-                "text1": {
-                    "entries": [
-                        {
-                            "type": "placeholder",
-                            "label": "test",
-                            "content": "test_placeholder",
-                        }
-                    ],
-                    "overflow": "invalid_group",
-                }
-            }
-        },
-        {
-            "fieldgroups": {
-                "text1": {
-                    "entries": [
-                        {
-                            "type": "placeholder",
-                            "label": "test",
-                            "content": "test_placeholder",
-                        }
-                    ],
-                    "overflow": "image1",
-                }
-            }
-        },
-        {
-            "fieldgroups": {
-                "text1": {
-                    "entries": [
-                        {
-                            "type": "placeholder",
-                            "label": "test",
-                            "content": "test_placeholder",
-                        }
-                    ],
-                },
-                "text2": {
-                    "entries": [
-                        {
-                            "type": "placeholder",
-                            "label": "test",
-                            "content": "test_placeholder",
-                        }
-                    ],
-                    "overflow": "text1",
-                },
-            }
-        },
-    ],
-)
-def test_schema_ticket_invalid(layout_context, layout):
-    style = TicketTestStyle()
-    schema = style.layout_schema(layout_context)
-
-    with pytest.raises(jsonschema.ValidationError):
-        jsonschema.validate(layout, schema)
-
-
-def test_style_representation():
-    style = TicketTestStyle()
-    style_dict = style.asdict()
-    assert style_dict["platform"] == "test_platform"
-    assert style_dict["identifier"] == "test_ticket"
-    assert style_dict["name"] == _("Test Wallet Style Ticket")
-
-    assert style_dict["fieldgroups"][0]["identifier"] == "text1"
-    assert style_dict["fieldgroups"][0]["name"] == "Text 1"
-    assert style_dict["fieldgroups"][0]["content_type"] == "text"
-    assert style_dict["fieldgroups"][0]["labels"] == True
-    assert style_dict["fieldgroups"][0]["required"] == True
-
-
-def test_layout_generate(layout_context):
-    style = TicketTestStyle()
-    layout = {
-        "fieldgroups": {
-            "text1": {
-                "entries": [
-                    {
-                        "type": "placeholder",
-                        "label": {"de": "test-de", "en": "test-en"},
-                        "content": "test_placeholder",
-                    },
-                    {"type": "text", "label": "test", "content": "test content"},
-                ],
-                "overflow": "text2",
-            }
-        }
-    }
-
-    pass_layout = PassLayout(style, layout)
-    generated_pass = pass_layout.generate(layout_context)
-
-    assert (
-        generated_pass
-        == "Generated Pass: Test Wallet Style Ticket\n\nGroup: Text 1\ntest-en: test placeholder\ntest: test content\n\n"
-    )
-