formatting

The current code links to a 404 page if the event has a custom domain
but the organizer uses the default system domain.

MANIFEST.in

@@ -16,8 +16,6 @@ recursive-include src/pretix/plugins/banktransfer/templates *
 recursive-include src/pretix/plugins/banktransfer/static *
 recursive-include src/pretix/plugins/manualpayment/templates *
 recursive-include src/pretix/plugins/manualpayment/static *
-recursive-include src/pretix/plugins/paypal/templates *
-recursive-include src/pretix/plugins/paypal/static *
 recursive-include src/pretix/plugins/paypal2/templates *
 recursive-include src/pretix/plugins/paypal2/static *
 recursive-include src/pretix/plugins/src/pretixdroid/templates *
@@ -44,6 +42,7 @@ recursive-include src *.py
 recursive-include src *.svg
 recursive-include src *.txt
 recursive-include src Makefile
+recursive-include src *.pdf
 
 recursive-exclude doc *
 recursive-exclude deployment *

doc/api/fundamentals.rst

@@ -173,7 +173,7 @@ Datetime              String in ISO 8601 format    ``"2017-12-27T10:00:00Z"``
                       with timezone (normally UTC) ``"2017-12-27T10:00:00.596934Z"``,
                                                    ``"2017-12-27T10:00:00+02:00"``
 Date                  String in ISO 8601 format    ``2017-12-27``
-Multi-lingual string  Object of strings            ``{"en": "red", "de": "rot", "de_Informal": "rot"}``
+Multi-lingual string  Object of strings            ``{"en": "red", "de": "rot", "de-informal": "rot"}``
 Money                 String with decimal number   ``"23.42"``
 Currency              String with ISO 4217 code    ``"EUR"``, ``"USD"``
 Relative datetime     *either* String in ISO 8601  ``"2017-12-27T10:00:00.596934Z"``,

doc/api/guides/custom_checkout.rst

@@ -56,7 +56,7 @@ calculated automatically.
           },
           "answers": [
             {
-              "question": 1,
+              "datafield": "A1B2C3D4",
               "answer": "23",
               "options": []
             }

doc/api/resources/carts.rst

@@ -3,6 +3,14 @@
 Cart positions
 ==============
 
+.. note::
+
+   This API is affected by an upcoming larger change to our API. The API documentation already reflects the future
+   version. Features or fields not yet available are marked with **NEW**.
+   The new version is expected to be released for hosted pretix early December and for self-hosted pretix with
+   version 2027.1.
+   You can find more information `on our blog <https://pretix.eu/about/en/blog/20261110-questionnaires/>`_.
+
 The API provides limited access to the cart position data model. This API currently only allows creating and deleting
 cart positions to reserve quota.
 
@@ -31,12 +39,13 @@ voucher                               integer                    Internal ID of
 addon_to                              integer                    Internal ID of the position this position is an add-on for (or ``null``)
 is_bundled                            boolean                    If ``addon_to`` is set, this shows whether this is a bundled product or an addon product
 subevent                              integer                    ID of the date inside an event series this position belongs to (or ``null``)
-answers                               list of objects            Answers to user-defined questions
-├ question                            integer                    Internal ID of the answered question
+answers                               list of objects            Values of data fields (answers to user-defined questions)
+├ datafield                           string                     **NEW** The data field's ``identifier`` (internal reference)
 ├ answer                              string                     Text representation of the answer
-├ question_identifier                 string                     The question's ``identifier`` field
 ├ options                             list of integers           Internal IDs of selected option(s)s (only for choice types)
-└ option_identifiers                  list of strings            The ``identifier`` fields of the selected option(s)s
+├ option_identifiers                  list of strings            The ``identifier`` fields of the selected option(s)s
+├ question                            integer                    **Deprecated.** Internal ID of the data field
+└ question_identifier                 string                     **Read-only, deprecated.** The data field's ``identifier`` (internal reference)
 seat                                  objects                    The assigned seat (or ``null``)
 ├ id                                  integer                    Internal ID of the seat instance
 ├ name                                string                     Human-readable seat name
@@ -199,7 +208,8 @@ Cart position endpoints
    * ``bundled`` (optional, expect a list of nested objects of cart positions)
    * ``answers``
 
-      * ``question``
+      * ``datafield`` **NEW**
+      * ``question`` **DEPRECATED**
       * ``answer``
       * ``options``
 
@@ -223,7 +233,7 @@ Cart position endpoints
         "attendee_email": null,
         "answers": [
           {
-            "question": 1,
+            "datafield": "A1B2C3D4",
             "answer": "23",
             "options": []
           }
@@ -285,7 +295,7 @@ Cart position endpoints
           "attendee_email": null,
           "answers": [
             {
-              "question": 1,
+              "datafield": "A1B2C3D4",
               "answer": "23",
               "options": []
             }
@@ -303,7 +313,7 @@ Cart position endpoints
           "attendee_email": null,
           "answers": [
             {
-              "question": 1,
+              "datafield": "A1B2C3D4",
               "answer": "23",
               "options": []
             }

doc/api/resources/checkin.rst

@@ -5,6 +5,14 @@
 Check-in
 ========
 
+.. note::
+
+   This API is affected by an upcoming larger change to our API. The API documentation already reflects the future
+   version. Features or fields not yet available are marked with **NEW**.
+   The new version is expected to be released for hosted pretix early December and for self-hosted pretix with
+   version 2027.1.
+   You can find more information `on our blog <https://pretix.eu/about/en/blog/20261110-questionnaires/>`_.
+
 This page describes special APIs built for ticket scanning apps. For managing check-in configuration or other operations,
 please also see :ref:`rest-checkinlists`. The check-in list API also contains endpoints to obtain statistics or log
 failed scans.
@@ -24,39 +32,43 @@ Checking a ticket in
    passed needs to be from a distinct event.
 
    :query string expand: Expand a field inside the ``position`` object into a full object. Currently ``subevent``, ``item``, ``variation``, and ``answers.question`` are supported. Can be passed multiple times.
-   :<json string secret: Scanned QR code corresponding to the ``secret`` attribute of a ticket.
-   :<json string source_type: Type of source the ``secret`` was obtained form. Defaults to ``"barcode"``.
-   :<json array lists: List of check-in list IDs to search on. No two check-in lists may be from the same event.
-   :<json string type: Send ``"exit"`` for an exit and ``"entry"`` (default) for an entry.
-   :<json datetime datetime: Specifies the datetime of the check-in. If not supplied, the current time will be used.
-   :<json boolean force: Specifies that the check-in should succeed regardless of revoked barcode, previous check-ins or required
+   :>json string secret: Scanned QR code corresponding to the ``secret`` attribute of a ticket.
+   :>json string source_type: Type of source the ``secret`` was obtained form. Defaults to ``"barcode"``.
+   :>json array lists: List of check-in list IDs to search on. No two check-in lists may be from the same event.
+   :>json string type: Send ``"exit"`` for an exit and ``"entry"`` (default) for an entry.
+   :>json datetime datetime: Specifies the datetime of the check-in. If not supplied, the current time will be used.
+   :>json boolean force: Specifies that the check-in should succeed regardless of revoked barcode, previous check-ins or required
                          questions that have not been filled. This is usually used to upload offline scans that already happened,
                          because there's no point in validating them since they happened whether they are valid or not. Defaults to ``false``.
-   :<json boolean questions_supported: When this parameter is set to ``true``, handling of questions is supported. If
+   :>json boolean questions_supported: When this parameter is set to ``true``, handling of questions is supported. If
                                        you do not implement question handling in your user interface, you **must**
                                        set this to ``false``. In that case, questions will just be ignored. Defaults
                                        to ``true``.
-   :<json boolean ignore_unpaid: Specifies that the check-in should succeed even if the order is in pending state.
+   :>json boolean ignore_unpaid: Specifies that the check-in should succeed even if the order is in pending state.
                                  Defaults to ``false`` and only works when ``include_pending`` is set on the check-in
                                  list.
-   :<json object answers: If questions are supported/required, you may/must supply a mapping of question IDs to their
-                          respective answers. The answers should always be strings. In case of (multiple-)choice-type
+   :>json object answers: If questions are supported/required, you may/must supply a mapping of ``identifier`` (`internal
+                          reference`) of data fields to their respective answers (**NEW**).
+                          For backwards compatibility, a mapping of data field ``id`` to answer is supported, as well.
+                          The answers should always be strings. In case of (multiple-)choice-type
                           answers, the string should contain the (comma-separated) IDs of the selected options.
-   :<json string nonce: You can set this parameter to a unique random value to identify this check-in. If you're sending
+   :>json string nonce: You can set this parameter to a unique random value to identify this check-in. If you're sending
                         this request twice with the same nonce, the second request will also succeed but will always
                         create only one check-in object even when the previous request was successful as well. This
                         allows for a certain level of idempotency and enables you to re-try after a connection failure.
-   :<json string exchange_medium_type: To perform an exchange to a reusable medium, pass the type of the new reusable medium
-   :<json string exchange_medium_identifier: To perform an exchange to a reusable media, pass the identifier of the new medium
-   :<json boolean use_order_locale: Specifies that pretix should use the customer's language (``locale`` field from the
+   :>json string exchange_medium_type: To perform an exchange to a reusable medium, pass the type of the new reusable medium
+   :>json string exchange_medium_identifier: To perform an exchange to a reusable media, pass the identifier of the new medium
+   :>json boolean use_order_locale: Specifies that pretix should use the customer's language (``locale`` field from the
                                     order) when building texts (currently only the ``reason_explanation`` response field).
                                     Defaults to ``false`` in which case the server will determine the language (currently
                                     the event default language, might change in the future with support for the
                                     ``Accept-Language`` header).
-   :>json string status: ``"ok"``, ``"incomplete"``, ``"exchange"``, or ``"error"``
-   :>json string reason: Reason code, only set on status ``"error"``, see below for possible values.
-   :>json string reason_explanation: Human-readable explanation, only set on status ``"error"`` and reason ``"rules"``, can be null.
-   :>json object position: Copy of the matching order position (if any was found). The contents are the same as the
+   :>json boolean simulate: Do not actually perform the check-in, only simulate the response. The ``position`` response
+                            object will not reflect the simulated changes.
+   :<json string status: ``"ok"``, ``"incomplete"``, ``"exchange"``, or ``"error"``
+   :<json string reason: Reason code, only set on status ``"error"``, see below for possible values.
+   :<json string reason_explanation: Human-readable explanation, only set on status ``"error"`` and reason ``"rules"``, can be null.
+   :<json object position: Copy of the matching order position (if any was found). The contents are the same as the
                            :ref:`order-position-resource`, with the following differences: (1) The ``checkins`` value
                            will only include check-ins for the selected list. (2) An additional boolean property
                            ``require_attention`` will inform you whether either the order or the item have the
@@ -64,15 +76,13 @@ Checking a ticket in
                            back to values from a parent product or from invoice addresses. (4) Additional properties
                            ``order__status``, ``order__valid_if_pending``, ``order__require_approval``, and
                            ``order__locale`` are included with details form the order for convenience.
-   :>json boolean require_attention: Whether or not the ``require_attention`` flag is set on the item or order.
-   :>json list checkin_texts: List of additional texts to show to the user.
-   :>json object list: Excerpt of information about the matching :ref:`check-in list <rest-checkinlists>` (if any was found),
+   :<json boolean require_attention: Whether or not the ``require_attention`` flag is set on the item or order.
+   :<json list checkin_texts: List of additional texts to show to the user.
+   :<json object list: Excerpt of information about the matching :ref:`check-in list <rest-checkinlists>` (if any was found),
                        including the attributes ``id``, ``name``, ``event``, ``subevent``, and ``include_pending``.
-   :>json object questions: List of questions to be answered for check-in, only set on status ``"incomplete"``.
-   :>json object media_policy: Reusable media policy (see documentation on items), only set on status ``"exchange"``.
-   :>json object media_type: Reusable media type (see documentation on items), only set on status ``"exchange"``.
-   :>json boolean simulate: Do not actually perform the check-in, only simulate the response. The ``position`` response
-                            object will not reflect the simulated changes.
+   :<json object questions: List of questions to be answered for check-in, only set on status ``"incomplete"``.
+   :<json object media_policy: Reusable media policy (see documentation on items), only set on status ``"exchange"``.
+   :<json object media_type: Reusable media type (see documentation on items), only set on status ``"exchange"``.
 
    **Example request**:
 
@@ -92,7 +102,7 @@ Checking a ticket in
         "datetime": null,
         "questions_supported": true,
         "answers": {
-          "4": "XS"
+          "A1B2C3D4": "XS"
         }
       }
 
@@ -318,6 +328,7 @@ Performing a ticket search
             ],
             "answers": [
               {
+                "datafield": "A1B2C3D4",
                 "question": 12,
                 "answer": "Foo",
                 "options": []

doc/api/resources/checkinlists.rst

@@ -5,6 +5,14 @@
 Check-in lists
 ==============
 
+.. note::
+
+   This API is affected by an upcoming larger change to our API. The API documentation already reflects the future
+   version. Features or fields not yet available are marked with **NEW**.
+   The new version is expected to be released for hosted pretix early December and for self-hosted pretix with
+   version 2027.1.
+   You can find more information `on our blog <https://pretix.eu/about/en/blog/20261110-questionnaires/>`_.
+
 Resource description
 --------------------
 
@@ -569,6 +577,7 @@ Order position endpoints
         ],
         "answers": [
           {
+            "datafield": "A1B2C3D4",
             "question": 12,
             "answer": "Foo",
             "options": []
@@ -609,27 +618,29 @@ Order position endpoints
    :query boolean untrusted_input: If set to true, the lookup parameter is **always** interpreted as a ``secret``, never
                                    as an ``id``. This should be always set if you are passing through untrusted, scanned
                                    data to avoid guessing of ticket IDs.
-   :<json boolean questions_supported: When this parameter is set to ``true``, handling of questions is supported. If
+   :>json boolean questions_supported: When this parameter is set to ``true``, handling of questions is supported. If
                                        you do not implement question handling in your user interface, you **must**
                                        set this to ``false``. In that case, questions will just be ignored. Defaults
                                        to ``true``.
-   :<json boolean canceled_supported: When this parameter is set to ``true``, the response code ``canceled`` may be
+   :>json boolean canceled_supported: When this parameter is set to ``true``, the response code ``canceled`` may be
                                       returned. Otherwise, canceled orders will return ``unpaid``. (**Deprecated**, in
                                       the future, this will be ignored and ``canceled`` may always be returned.)
-   :<json datetime datetime: Specifies the datetime of the check-in. If not supplied, the current time will be used.
-   :<json boolean force: Specifies that the check-in should succeed regardless of revoked barcode, previous check-ins or required
+   :>json datetime datetime: Specifies the datetime of the check-in. If not supplied, the current time will be used.
+   :>json boolean force: Specifies that the check-in should succeed regardless of revoked barcode, previous check-ins or required
                          questions that have not been filled. This is usually used to upload offline scans that already happened,
                          because there's no point in validating them since they happened whether they are valid or not. Defaults to ``false``.
-   :<json string type: Send ``"exit"`` for an exit and ``"entry"`` (default) for an entry.
-   :<json boolean ignore_unpaid: Specifies that the check-in should succeed even if the order is in pending state.
+   :>json string type: Send ``"exit"`` for an exit and ``"entry"`` (default) for an entry.
+   :>json boolean ignore_unpaid: Specifies that the check-in should succeed even if the order is in pending state.
                                  Defaults to ``false`` and only works when ``include_pending`` is set on the check-in
                                  list.
-   :<json string nonce: You can set this parameter to a unique random value to identify this check-in. If you're sending
+   :>json string nonce: You can set this parameter to a unique random value to identify this check-in. If you're sending
                         this request twice with the same nonce, the second request will also succeed but will always
                         create only one check-in object even when the previous request was successful as well. This
                         allows for a certain level of idempotency and enables you to re-try after a connection failure.
-   :<json object answers: If questions are supported/required, you may/must supply a mapping of question IDs to their
-                          respective answers. The answers should always be strings. In case of (multiple-)choice-type
+   :>json object answers: If questions are supported/required, you may/must supply a mapping of ``identifier`` (`internal
+                          reference`) of data fields to their respective answers (**NEW**).
+                          For backwards compatibility, a mapping of data field ``id`` to answer is supported, as well.
+                          The answers should always be strings. In case of (multiple-)choice-type
                           answers, the string should contain the (comma-separated) IDs of the selected options.
 
    **Example request**:
@@ -648,7 +659,7 @@ Order position endpoints
         "questions_supported": true,
         "canceled_supported": true,
         "answers": {
-          "4": "XS"
+          "A1B2C3D4": "XS"
         }
       }
 

doc/api/resources/datafield_options.rst

@@ -0,0 +1,250 @@
+
+.. _rest-datafieldoptions:
+
+Data field options
+================
+
+.. note::
+
+   This API is part of an upcoming larger change to our API. The API documentation already reflects the future
+   version. Until the change, this resource is still available at ``/questions/(id)/options/``.
+   The new version is expected to be released for hosted pretix early December and for self-hosted pretix with
+   version 2027.1.
+   You can find more information `on our blog <https://pretix.eu/about/en/blog/20261110-questionnaires/>`_.
+
+Resource description
+--------------------
+
+:ref:`Data fields <rest-datafields>` of type "choice" or "multiple choice" can have different options attached.
+
+As with data fields, data field options exist on two resource paths, depending on whether
+the data field is attached to orders or order positions. Therefore, each endpoint below has two
+different URLs.
+
+The options resource contains the following public fields:
+
+.. rst-class:: rest-resource-table
+
+===================================== ========================== =======================================================
+Field                                 Type                       Description
+===================================== ========================== =======================================================
+id                                    integer                    Internal ID of the option
+position                              integer                    An integer, used for sorting
+identifier                            string                     An arbitrary string that can be used for matching with
+                                                                 other sources.
+answer                                multi-lingual string       The displayed value of this option
+===================================== ========================== =======================================================
+
+Endpoints
+---------
+
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/datafields/position/(datafield)/options/
+              /api/v1/organizers/(organizer)/events/(event)/datafields/order/(datafield)/options/
+
+   Returns a list of all options for a given data field.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/events/sampleconf/datafields/position/11/options/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "count": 2,
+        "next": null,
+        "previous": null,
+        "results": [
+          {
+            "id": 1,
+            "identifier": "LVETRWVU",
+            "position": 1,
+            "answer": {"en": "S"}
+          },
+          {
+            "id": 2,
+            "identifier": "DFEMJWMJ",
+            "position": 2,
+            "answer": {"en": "M"}
+          },
+          {
+            "id": 3,
+            "identifier": "W9AH7RDE",
+            "position": 3,
+            "answer": {"en": "L"}
+          }
+        ]
+      }
+
+   :query integer page: The page number in case of a multi-page result set, default is 1
+   :query boolean active: If set to ``true`` or ``false``, only data fields with this value for the field ``active`` will be
+                          returned.
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param event: The ``slug`` field of the event to fetch
+   :param datafield: The ``id`` field of the data field to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event/data field does not exist **or** you have no permission to view this resource.
+
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/datafields/position/(datafield)/options/(id)/
+              /api/v1/organizers/(organizer)/events/(event)/datafields/order/(datafield)/options/(id)/
+
+   Returns information on one option, identified by its ID.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/events/sampleconf/datafields/position/1/options/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "identifier": "LVETRWVU",
+        "position": 1,
+        "answer": {"en": "S"}
+      }
+
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param event: The ``slug`` field of the event to fetch
+   :param datafield: The ``id`` field of the data field to fetch
+   :param id: The ``id`` field of the option to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
+
+.. http:post:: /api/v1/organizers/(organizer)/events/(event)/datafields/position/(datafield)/options/
+               /api/v1/organizers/(organizer)/events/(event)/datafields/order/(datafield)/options/
+
+   Create a new option
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      POST /api/v1/organizers/bigevents/events/sampleconf/datafields/position/1/options/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+
+      {
+        "identifier": "LVETRWVU",
+        "position": 1,
+        "answer": {"en": "S"}
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 201 Created
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "identifier": "LVETRWVU",
+        "position": 1,
+        "answer": {"en": "S"}
+      }
+
+   :param organizer: The ``slug`` field of the organizer of the event/data field to create a option for
+   :param event: The ``slug`` field of the event to create a option for
+   :param datafield: The ``id`` field of the data field to create a option for
+   :statuscode 201: no error
+   :statuscode 400: The option could not be created due to invalid submitted data.
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
+
+.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/datafields/position/(datafield)/options/(id)/
+                /api/v1/organizers/(organizer)/events/(event)/datafields/order/(datafield)/options/(id)/
+
+   Update an option. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
+   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
+   want to change.
+
+   You can change all fields of the resource except the ``id`` field.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      PATCH /api/v1/organizers/bigevents/events/sampleconf/datafields/position/1/options/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+      Content-Length: 94
+
+      {
+        "position": 3
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "identifier": "LVETRWVU",
+        "position": 1,
+        "answer": {"en": "S"}
+      }
+
+   :param organizer: The ``slug`` field of the organizer to modify
+   :param event: The ``slug`` field of the event to modify
+   :param id: The ``id`` field of the data field to modify
+   :param id: The ``id`` field of the option to modify
+   :statuscode 200: no error
+   :statuscode 400: The option could not be modified due to invalid submitted data
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
+
+.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/datafields/position/(datafield)/options/(id)/
+                 /api/v1/organizers/(organizer)/events/(event)/datafields/order/(datafield)/options/(id)/
+
+   Delete an option.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      DELETE /api/v1/organizers/bigevents/events/sampleconf/datafields/position/1/options/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 204 No Content
+      Vary: Accept
+
+   :param organizer: The ``slug`` field of the organizer to modify
+   :param event: The ``slug`` field of the event to modify
+   :param datafield: The ``id`` field of the data field to modify
+   :param id: The ``id`` field of the option to delete
+   :statuscode 204: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.

doc/api/resources/datafields.rst

@@ -0,0 +1,428 @@
+
+.. _rest-datafields:
+
+Data fields
+=========
+
+.. note::
+
+   This API is part of an upcoming larger change to our API. The API documentation already reflects the future
+   version. Until the change, please keep using the endpoints at ``/questions/``.
+   The new version is expected to be released for hosted pretix early December and for self-hosted pretix with
+   version 2027.1.
+   You can find more information `on our blog <https://pretix.eu/about/en/blog/20261110-questionnaires/>`_.
+
+Resource description
+--------------------
+
+Data fields define additional fields related to an order or an order position.
+By referencing data fields in a questionnaire, you can have customers or staff fill them out -- during or
+after checkout (web or POS), during check-in in the ticket scanner app, or in the backend.
+
+There are two different resource paths for data fields, depending on whether the data field is attached
+to orders or order positions. Therefore, each endpoint below has two different URLs.
+
+The data field resource contains the following public fields:
+
+.. rst-class:: rest-resource-table
+
+===================================== ========================== =======================================================
+Field                                 Type                       Description
+===================================== ========================== =======================================================
+id                                    integer                    Internal ID of the data field
+internal_name                         string                     **Required.** An internal field label
+identifier                            string                     An arbitrary string that can be used for matching with
+                                                                 other sources.
+                                                                 Must be unique per event, across all types of data fields.
+type                                  string                     **Required.** The expected type of data. Valid options:
+
+                                                                 * ``N`` – number
+                                                                 * ``S`` – one-line string
+                                                                 * ``T`` – multi-line string
+                                                                 * ``B`` – boolean
+                                                                 * ``C`` – choice from a list
+                                                                 * ``M`` – multiple choice from a list
+                                                                 * ``F`` – file upload
+                                                                 * ``D`` – date
+                                                                 * ``H`` – time
+                                                                 * ``W`` – date and time
+                                                                 * ``CC`` – country code (ISO 3666-1 alpha-2)
+                                                                 * ``TEL`` – telephone number
+show_during_checkin                   boolean                    If ``true``, the value of the data field will be shown
+                                                                 during check-in (if the check-in client supports it).
+                                                                 *Only supported on per-position data fields.*
+print_on_invoice                      boolean                    If ``true``, the data field will be shown on
+                                                                 invoices.
+                                                                 *Only supported on per-position data fields.*
+print_on_invoice_label                multi-lingual string       **Required if ``print_on_invoice`` is ``true``.** Label
+                                                                 to print on the invoice before the value of this field.
+                                                                 Otherwise `null`.
+options                               list of objects            In case of data field type ``C`` or ``M``, this lists the
+                                                                 available objects. Only writable during creation,
+                                                                 use :ref:`separate endpoint <rest-datafieldoptions>` to modify this later.
+├ id                                  integer                    Internal ID of the option
+├ position                            integer                    An integer, used for sorting
+├ identifier                          string                     An arbitrary string that can be used for matching with
+                                                                 other sources.
+└ answer                              multi-lingual string       The displayed value of this option
+valid_number_min                      string                     Minimum value for number fields (optional)
+valid_number_max                      string                     Maximum value for number fields (optional)
+valid_date_min                        date                       Minimum value for date fields (optional)
+valid_date_max                        date                       Maximum value for date fields (optional)
+valid_datetime_min                    datetime                   Minimum value for date and time fields (optional)
+valid_datetime_max                    datetime                   Maximum value for date and time fields (optional)
+valid_file_portrait                   boolean                    Turn on file validation for portrait photos
+valid_string_length_min               integer                    Minimum length for string fields (optional)
+valid_string_length_max               integer                    Maximum length for string fields (optional)
+referenced_by_questionnaires          list of integers           **Read-only.** List of questionnaire IDs that reference
+                                                                 this data field
+===================================== ========================== =======================================================
+
+Endpoints
+---------
+
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/datafields/position/
+              /api/v1/organizers/(organizer)/events/(event)/datafields/order/
+
+   Returns a list of all data fields within a given event.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/events/sampleconf/datafields/position/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "count": 1,
+        "next": null,
+        "previous": null,
+        "results": [
+          {
+            "id": 1,
+            "internal_name": "T-Shirt size",
+            "type": "C",
+            "identifier": "WY3TP9SL",
+            "show_during_checkin": false,
+            "print_on_invoice": false,
+            "print_on_invoice_label": null,
+            "valid_number_min": null,
+            "valid_number_max": null,
+            "valid_date_min": null,
+            "valid_date_max": null,
+            "valid_datetime_min": null,
+            "valid_datetime_max": null,
+            "valid_string_length_min": null,
+            "valid_string_length_max": null,
+            "valid_file_portrait": false,
+            "options": [
+              {
+                "id": 1,
+                "identifier": "LVETRWVU",
+                "position": 0,
+                "answer": {"en": "S"}
+              },
+              {
+                "id": 2,
+                "identifier": "DFEMJWMJ",
+                "position": 1,
+                "answer": {"en": "M"}
+              },
+              {
+                "id": 3,
+                "identifier": "W9AH7RDE",
+                "position": 2,
+                "answer": {"en": "L"}
+              }
+            ],
+            "referenced_by_questionnaires": [1]
+          }
+        ]
+      }
+
+   :query integer page: The page number in case of a multi-page result set, default is 1
+   :query string ordering: Manually set the ordering of results. Valid fields to be used are ``id`` and ``position``.
+                           Default: ``position``
+   :query string identifier: Only return questions with the given identifier string
+   :query boolean ask_during_checkin: Only return questions that are or are not to be asked during check-in
+   :query boolean required: Only return questions that are or are not required to fill in
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param event: The ``slug`` field of the event to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
+
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/datafields/position/(id)/
+              /api/v1/organizers/(organizer)/events/(event)/datafields/order/(id)/
+
+   Returns information on one data field, identified by its ID.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/events/sampleconf/datafields/position/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "internal_name": "T-Shirt size",
+        "type": "C",
+        "identifier": "WY3TP9SL",
+        "show_during_checkin": false,
+        "print_on_invoice": false,
+        "print_on_invoice_label": null,
+        "valid_number_min": null,
+        "valid_number_max": null,
+        "valid_date_min": null,
+        "valid_date_max": null,
+        "valid_datetime_min": null,
+        "valid_datetime_max": null,
+        "valid_string_length_min": null,
+        "valid_string_length_max": null,
+        "valid_file_portrait": false,
+        "options": [
+          {
+            "id": 1,
+            "identifier": "LVETRWVU",
+            "position": 0,
+            "answer": {"en": "S"}
+          },
+          {
+            "id": 2,
+            "identifier": "DFEMJWMJ",
+            "position": 1,
+            "answer": {"en": "M"}
+          },
+          {
+            "id": 3,
+            "identifier": "W9AH7RDE",
+            "position": 2,
+            "answer": {"en": "L"}
+          }
+        ],
+        "referenced_by_questionnaires": [1]
+      }
+
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param event: The ``slug`` field of the event to fetch
+   :param id: The ``id`` field of the question to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
+
+.. http:post:: /api/v1/organizers/(organizer)/events/(event)/datafields/position/
+               /api/v1/organizers/(organizer)/events/(event)/datafields/order/
+
+   Create a new question
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      POST /api/v1/organizers/bigevents/events/sampleconf/datafields/position/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+
+      {
+        "internal_name": "T-Shirt size",
+        "type": "C",
+        "show_during_checkin": false,
+        "print_on_invoice": false,
+        "print_on_invoice_label": null,
+        "options": [
+          {
+            "answer": {"en": "S"}
+          },
+          {
+            "answer": {"en": "M"}
+          },
+          {
+            "answer": {"en": "L"}
+          }
+        ]
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 201 Created
+      Vary: Accept
+      Content-Type: application/json
+
+
+      {
+        "id": 1,
+        "internal_name": "T-Shirt size",
+        "type": "C",
+        "identifier": "WY3TP9SL",
+        "show_during_checkin": false,
+        "print_on_invoice": false,
+        "print_on_invoice_label": null,
+        "valid_number_min": null,
+        "valid_number_max": null,
+        "valid_date_min": null,
+        "valid_date_max": null,
+        "valid_datetime_min": null,
+        "valid_datetime_max": null,
+        "valid_string_length_min": null,
+        "valid_string_length_max": null,
+        "valid_file_portrait": false,
+        "options": [
+          {
+            "id": 1,
+            "identifier": "LVETRWVU",
+            "position": 0,
+            "answer": {"en": "S"}
+          },
+          {
+            "id": 2,
+            "identifier": "DFEMJWMJ",
+            "position": 1,
+            "answer": {"en": "M"}
+          },
+          {
+            "id": 3,
+            "identifier": "W9AH7RDE",
+            "position": 2,
+            "answer": {"en": "L"}
+          }
+        ],
+        "referenced_by_questionnaires": [1]
+      }
+
+   :param organizer: The ``slug`` field of the organizer of the event to create an item for
+   :param event: The ``slug`` field of the event to create an item for
+   :statuscode 201: no error
+   :statuscode 400: The item could not be created due to invalid submitted data.
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
+
+.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/datafields/position/(id)/
+                /api/v1/organizers/(organizer)/events/(event)/datafields/order/(id)/
+
+   Update a data field. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
+   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
+   want to change.
+
+   You can change all fields of the resource except the ``options`` field. If
+   you need to update/delete options please use the nested dedicated endpoints.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      PATCH /api/v1/organizers/bigevents/events/sampleconf/datafields/position/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+      Content-Length: 94
+
+      {
+        "internal_name": "Clothing size"
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "internal_name": "Clothing size",
+        "type": "C",
+        "identifier": "WY3TP9SL",
+        "show_during_checkin": false,
+        "print_on_invoice": false,
+        "print_on_invoice_label": null,
+        "valid_number_min": null,
+        "valid_number_max": null,
+        "valid_date_min": null,
+        "valid_date_max": null,
+        "valid_datetime_min": null,
+        "valid_datetime_max": null,
+        "valid_string_length_min": null,
+        "valid_string_length_max": null,
+        "valid_file_portrait": false,
+        "options": [
+          {
+            "id": 1,
+            "identifier": "LVETRWVU",
+            "position": 0,
+            "answer": {"en": "S"}
+          },
+          {
+            "id": 2,
+            "identifier": "DFEMJWMJ",
+            "position": 1,
+            "answer": {"en": "M"}
+          },
+          {
+            "id": 3,
+            "identifier": "W9AH7RDE",
+            "position": 2,
+            "answer": {"en": "L"}
+          }
+        ],
+        "referenced_by_questionnaires": [1]
+      }
+
+   :param organizer: The ``slug`` field of the organizer to modify
+   :param event: The ``slug`` field of the event to modify
+   :param id: The ``id`` field of the question to modify
+   :statuscode 200: no error
+   :statuscode 400: The question could not be modified due to invalid submitted data
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
+
+.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/datafields/position/(id)/
+                 /api/v1/organizers/(organizer)/events/(event)/datafields/order/(id)/
+
+   Delete a data field.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      DELETE /api/v1/organizers/bigevents/events/sampleconf/datafields/position/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 204 No Content
+      Vary: Accept
+
+   :param organizer: The ``slug`` field of the organizer to modify
+   :param event: The ``slug`` field of the event to modify
+   :param id: The ``id`` field of the question to delete
+   :statuscode 204: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.
+
+

doc/api/resources/event_meta_properties.rst

@@ -0,0 +1,241 @@
+Event Meta Properties
+=====================
+
+Resource description
+--------------------
+
+An event meta property is used to to define meta information fields for its events.
+This information can be re-used, for example, in ticket layouts.
+
+The event meta property resource contains the following public fields:
+
+.. rst-class:: rest-resource-table
+
+===================================== ========================== =======================================================
+Field                                 Type                       Description
+===================================== ========================== =======================================================
+id                                    integer                    Unique ID for this property
+name                                  string                     Name of the property
+default                               string                     Value of the default option
+required                              boolean                    If ``true``, an event can only be taken live if the
+                                                                 property is set. In event series, it's always optional
+                                                                 to set a value for individual dates
+protected                             boolean                    If ``true``, the value for an event can only be changed
+                                                                 by organizer-level administrators
+filter_public                         boolean                    If ``true``, this property will be shown to filter
+                                                                 events in the public event list and calendar
+public_label                          string                     Public name of the property
+filter_allowed                        boolean                    If ``true``, this property will be shown to filter
+                                                                 events or reports in the backend, and it can also be
+                                                                 used for hidden filter parameters in the frontend
+choices                               list of objects            List of JSON objects representing all permitted values
+                                                                 for this property, or ``null`` for no limitation.
+                                                                 Each choice object has a required internal name named
+                                                                 ``key`` and optional public name named ``label``
+                                                                 consisting of a dictionary of i18n string translations
+===================================== ========================== =======================================================
+
+Endpoints
+---------
+
+.. http:get:: /api/v1/organizers/(organizer)/event_meta_properties/
+
+   Returns a list of all meta properties for the organizer.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/meta_properties/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "count": 1,
+        "next": null,
+        "previous": null,
+        "results": [
+          {
+            "id": 1,
+            "name": "Color",
+            "default": "blue",
+            "required": false,
+            "protected": false,
+            "filter_public": false,
+            "public_label": {},
+            "filter_allowed": true,
+            "choices": [
+                {
+                    "key": "blue",
+                    "label": {
+                        "en": "Blue"
+                    },
+                }
+            ]
+          }
+        ]
+      }
+
+   :param organizer: The ``slug`` field of the organizer
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer does not exist **or** you have no permission to view this resource.
+
+.. http:get:: /api/v1/organizers/(organizer)/event_meta_properties/(id)/
+
+   Returns information on one property, identified by its id.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/event_meta_properties/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      {
+        "id": 1,
+        "name": "Color",
+        "default": "blue",
+        "required": false,
+        "protected": false,
+        "filter_public": false,
+        "public_label": {},
+        "filter_allowed": true,
+        "choices": null
+      }
+
+   :param organizer: The ``slug`` field of the organizer
+   :param id: The ``id`` field of the meta property to retrieve
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer does not exist **or** you have no permission to view this resource.
+
+.. http:post:: /api/v1/organizers/(organizer)/event_meta_properties/
+
+   Creates a new meta property
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      POST /api/v1/organizers/bigevents/event_meta_properties/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+
+      {
+        "name": "ref-code",
+        "default": "abcde",
+        "required": true,
+        "choices": null
+      }
+
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+    {
+        "id": 2,
+        "name": "reference",
+        "default": "abcde",
+        "required": true,
+        "protected": false,
+        "filter_public": false,
+        "public_label": null,
+        "filter_allowed": true,
+        "choices": null
+    }
+
+   :param organizer: The ``slug`` field of the organizer
+   :statuscode 201: no error
+   :statuscode 400: The meta property could not be created due to invalid submitted data.
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.
+
+.. http:patch:: /api/v1/organizers/(organizer)/event_meta_properties/(id)/
+
+   Update a meta property. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide
+   all fields of the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the
+   fields that you want to change.
+
+   You can change all fields of the resource except the ``id`` field.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      PATCH /api/v1/organizers/bigevents/event_meta_properties/2/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+      Content-Length: 94
+
+      {
+        "required": false
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 3,
+        "name": "reference",
+        "default": "abcde",
+        "required": false,
+        "protected": false,
+        "filter_public": false,
+        "public_label": null,
+        "filter_allowed": true,
+        "choices": null
+      }
+
+   :param organizer: The ``slug`` field of the organizer
+   :param id: The ``id`` field of the meta property to modify
+   :statuscode 200: no error
+   :statuscode 400: The property could not be modified due to invalid submitted data
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer does not exist **or** you have no permission to change this resource.
+
+.. http:delete:: /api/v1/organizers/(organizer)/event_meta_properties/(id)/
+
+   Delete a meta property.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      DELETE /api/v1/organizers/bigevents/event_meta_properties/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 204 No Content
+      Vary: Accept
+
+   :param organizer: The ``slug`` field of the organizer
+   :param id: The ``id`` field of the meta property to delete
+   :statuscode 204: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer does not exist **or** you have no permission to delete this resource.

doc/api/resources/events.rst

@@ -110,7 +110,7 @@ Endpoints
             "plugins": [
               "pretix.plugins.banktransfer",
               "pretix.plugins.stripe",
-              "pretix.plugins.paypal",
+              "pretix.plugins.paypal2",
               "pretix.plugins.ticketoutputpdf"
             ],
             "all_sales_channels": false,
@@ -199,7 +199,7 @@ Endpoints
         "plugins": [
           "pretix.plugins.banktransfer",
           "pretix.plugins.stripe",
-          "pretix.plugins.paypal",
+          "pretix.plugins.paypal2",
           "pretix.plugins.ticketoutputpdf"
         ],
         "valid_keys": {
@@ -262,7 +262,7 @@ Endpoints
         "item_meta_properties": {},
         "plugins": [
           "pretix.plugins.stripe",
-          "pretix.plugins.paypal"
+          "pretix.plugins.paypal2"
         ],
         "all_sales_channels": true,
         "limit_sales_channels": []
@@ -299,7 +299,7 @@ Endpoints
         "item_meta_properties": {},
         "plugins": [
           "pretix.plugins.stripe",
-          "pretix.plugins.paypal"
+          "pretix.plugins.paypal2"
         ],
         "all_sales_channels": true,
         "limit_sales_channels": [],
@@ -364,7 +364,7 @@ Endpoints
         "item_meta_properties": {},
         "plugins": [
           "pretix.plugins.stripe",
-          "pretix.plugins.paypal"
+          "pretix.plugins.paypal2"
         ],
         "all_sales_channels": true,
         "limit_sales_channels": []
@@ -401,7 +401,7 @@ Endpoints
         "item_meta_properties": {},
         "plugins": [
           "pretix.plugins.stripe",
-          "pretix.plugins.paypal"
+          "pretix.plugins.paypal2"
         ],
         "all_sales_channels": true,
         "limit_sales_channels": [],
@@ -438,7 +438,7 @@ Endpoints
         "plugins": [
           "pretix.plugins.banktransfer",
           "pretix.plugins.stripe",
-          "pretix.plugins.paypal",
+          "pretix.plugins.paypal2",
           "pretix.plugins.pretixdroid"
         ]
       }
@@ -475,7 +475,7 @@ Endpoints
         "plugins": [
           "pretix.plugins.banktransfer",
           "pretix.plugins.stripe",
-          "pretix.plugins.paypal",
+          "pretix.plugins.paypal2",
           "pretix.plugins.pretixdroid"
         ],
         "all_sales_channels": true,

doc/api/resources/index.rst

@@ -12,6 +12,7 @@ at :ref:`plugin-docs`.
    organizers
    events
    subevents
+   event_meta_properties
    taxrules
    categories
    items
@@ -20,6 +21,9 @@ at :ref:`plugin-docs`.
    item_add-ons
    item_meta_properties
    item_program_times
+   datafields
+   datafield_options
+   questionnaires
    questions
    question_options
    quotas

doc/api/resources/items.rst

@@ -37,12 +37,9 @@ tax_rule                                integer                    The internal
 admission                               boolean                    ``true`` for items that grant admission to the event
                                                                    (such as primary tickets) and ``false`` for others
                                                                    (such as add-ons or merchandise).
-personalized                            boolean                    ``true`` for items that require personalization according
+personalized                            boolean                    **DEPRECATED.** ``true`` for items that require personalization according
                                                                    to event settings. Only affects system-level fields, not
-                                                                   custom questions. Currently only allowed for products with
-                                                                   ``admission`` set to ``true``. For backwards compatibility,
-                                                                   when creating new items and this field is not given, it defaults
-                                                                   to the same value as ``admission``.
+                                                                   custom questions. Defaults to ``false``.
 position                                integer                    An integer, used for sorting
 picture                                 file                       A product picture to be displayed in the shop
                                                                    (can be ``null``).
@@ -233,6 +230,17 @@ meta_data                               object                     Values set fo
 
    The ``program_times`` attribute has been added.
 
+.. versionchanged:: 2027.1
+
+   The ``personalized`` attribute has been deprecated.
+
+   For compatibility with existing applications:
+
+   * When retrieving products, `personalized` is `True` if any attached questionnaire asks for `attendee_name` and/or `attendee_email`.
+   * When creating a new product, setting the `personalized` field to `True` will attach the "Attendee data" questionnaire to the new product. If no such questionnaire exists, it will be created.
+     Before, the `personalized` field defaulted to the same value as `admission`. Now, it defaults to `false`.
+   * When updating a product, the `personalized` field cannot be changed, returning an HTTP 400 error if attempted.
+
 Notes
 -----
 

doc/api/resources/orders.rst

@@ -9,6 +9,14 @@
 Orders
 ======
 
+.. note::
+
+   This API is affected by an upcoming larger change to our API. The API documentation already reflects the future
+   version. Features or fields not yet available are marked with **NEW**.
+   The new version is expected to be released for hosted pretix early December and for self-hosted pretix with
+   version 2027.1.
+   You can find more information `on our blog <https://pretix.eu/about/en/blog/20261110-questionnaires/>`_.
+
 Order resource
 --------------
 
@@ -119,6 +127,11 @@ cancellation_date                     datetime                   Time of order c
 plugin_data                           object                     Additional data added by plugins.
 use_gift_cards                        list of strings            List of unique gift card secrets that are used to pay
                                                                  for this order.
+answers                               list of objects            **NEW** Values of data fields (answers to user-defined questions)
+├ datafield                           string                     The data field's ``identifier`` (internal reference)
+├ answer                              string                     Text representation of the answer
+├ options                             list of integers           Internal IDs of selected option(s)s (only for choice types)
+└ option_identifiers                  list of strings            The ``identifier`` fields of the selected option(s)s
 ===================================== ========================== =======================================================
 
 
@@ -162,6 +175,10 @@ use_gift_cards                        list of strings            List of unique
 
    The ``use_gift_cards`` attribute has been added.
 
+.. versionchanged:: 2027.1
+
+   The ``answers`` attribute has been added.
+
 .. _order-position-resource:
 
 Order position resource
@@ -231,12 +248,13 @@ print_logs                            list of objects            List of print j
 downloads                             list of objects            List of ticket download options
 ├ output                              string                     Ticket output provider (e.g. ``pdf``, ``passbook``)
 └ url                                 string                     Download URL
-answers                               list of objects            Answers to user-defined questions
-├ question                            integer                    Internal ID of the answered question
-├ answer                              string                     Text representation of the answer (URL if answer is a file)
-├ question_identifier                 string                     The question's ``identifier`` field
+answers                               list of objects            Values of data fields (answers to user-defined questions)
+├ datafield                           string                     **NEW** The data field's ``identifier`` (internal reference)
+├ answer                              string                     Text representation of the answer
 ├ options                             list of integers           Internal IDs of selected option(s)s (only for choice types)
-└ option_identifiers                  list of strings            The ``identifier`` fields of the selected option(s)s
+├ option_identifiers                  list of strings            The ``identifier`` fields of the selected option(s)s
+├ question                            integer                    **Deprecated.** Internal ID of the data field
+└ question_identifier                 string                     **Read-only, deprecated.** The data field's ``identifier`` (internal reference)
 seat                                  objects                    The assigned seat. Can be ``null``.
 ├ id                                  integer                    Internal ID of the seat instance
 ├ name                                string                     Human-readable seat name
@@ -452,10 +470,11 @@ List of all orders
                 ],
                 "answers": [
                   {
+                    "datafield": "WY3TP9SL",
                     "question": 12,
                     "question_identifier": "WY3TP9SL",
                     "answer": "Foo",
-                    "option_idenfiters": [],
+                    "option_identifiers": [],
                     "options": []
                   }
                 ],
@@ -488,7 +507,15 @@ List of all orders
             ],
             "refunds": [],
             "cancellation_date": null,
-            "plugin_data": {}
+            "plugin_data": {},
+            "answers": [
+              {
+                "datafield": "XYZ12345",
+                "answer": "42",
+                "option_identifiers": [],
+                "options": []
+              }
+            ]
           }
         ]
       }
@@ -699,6 +726,7 @@ Fetching individual orders
             ],
             "answers": [
               {
+                "datafield": "WY3TP9SL",
                 "question": 12,
                 "question_identifier": "WY3TP9SL",
                 "answer": "Foo",
@@ -735,7 +763,15 @@ Fetching individual orders
         ],
         "refunds": [],
         "cancellation_date": null,
-        "plugin_data": {}
+        "plugin_data": {},
+        "answers": [
+          {
+            "datafield": "XYZ12345",
+            "answer": "42",
+            "option_identifiers": [],
+            "options": []
+          }
+        ]
       }
 
    :param organizer: The ``slug`` field of the organizer to fetch
@@ -1079,7 +1115,8 @@ Creating orders
       * ``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``
 
-        * ``question``
+        * ``datafield`` (**NEW**)
+        * ``question`` (**DEPRECATED**)
         * ``answer``
         * ``options``
 
@@ -1114,6 +1151,12 @@ Creating orders
      order isn't completely paid after its creation with ``use_gift_cards``, then a subsequent request to the payment
      endpoint is needed.
 
+   * **NEW** ``answers`` (optional). Values for order-level data fields.
+
+     * ``datafield``
+     * ``answer``
+     * ``options``
+
    If you want to use add-on products, you need to set the ``positionid`` fields of all positions manually
    to incrementing integers starting with ``1``. Then, you can reference one of these
    IDs in the ``addon_to`` field of another position. Note that all add_ons for a specific position need to come
@@ -1161,6 +1204,12 @@ Creating orders
           "internal_reference": "",
           "vat_id": ""
         },
+        "answers": [
+          {
+            "datafield": "XYZ12345",
+            "answer": "42"
+          }
+        ],
         "positions": [
           {
             "positionid": 1,
@@ -1174,7 +1223,7 @@ Creating orders
             "addon_to": null,
             "answers": [
               {
-                "question": 1,
+                "datafield": "WY3TP9SL",
                 "answer": "23",
                 "options": []
               }
@@ -1684,6 +1733,7 @@ List of all order positions
             ],
             "answers": [
               {
+                "datafield": "WY3TP9SL",
                 "question": 12,
                 "question_identifier": "WY3TP9SL",
                 "answer": "Foo",
@@ -1863,6 +1913,7 @@ Fetching individual positions
         ],
         "answers": [
           {
+            "datafield": "WY3TP9SL",
             "question": 12,
             "question_identifier": "WY3TP9SL",
             "answer": "Foo",
@@ -1971,7 +2022,7 @@ Manipulating individual positions
 
    * ``answers``: If specified, you will need to provide **all** answers for this order position.
      Validation is handled the same way as when creating orders through the API. You are therefore
-     expected to provide ``question``, ``answer``, and possibly ``options``. ``question_identifier``
+     expected to provide ``datafield``, ``answer``, and possibly ``options``. ``question`` is deprecated. ``question_identifier``
      and ``option_identifiers`` will be ignored. As a special case, you can submit the magic value
      ``"file:keep"`` as the answer to a file question to keep the current value without re-uploading it.
 
@@ -2067,7 +2118,7 @@ Manipulating individual positions
    * ``state``
 
    * ``answers``: Validation is handled the same way as when creating orders through the API. You are therefore
-     expected to provide ``question``, ``answer``, and possibly ``options``. ``question_identifier``
+     expected to provide ``datafield``, ``answer``, and possibly ``options``. ``question`` is deprecated. ``question_identifier``
      and ``option_identifiers`` will be ignored. As a special case, you can submit the magic value
      ``"file:keep"`` as the answer to a file question to keep the current value without re-uploading it.
 

doc/api/resources/question_options.rst

@@ -1,229 +1,7 @@
 Question options
 ================
 
-Resource description
---------------------
+.. warning:: This resource is **deprecated**.
 
-Questions of type "choice" or "multiple choice" can have different options attached.
-The options resource contains the following public fields:
+             New applications must use the :ref:`rest-datafieldoptions` resource.
 
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the option
-position                              integer                    An integer, used for sorting
-identifier                            string                     An arbitrary string that can be used for matching with
-                                                                 other sources.
-answer                                multi-lingual string       The displayed value of this option
-===================================== ========================== =======================================================
-
-Endpoints
----------
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/questions/(question)/options/
-
-   Returns a list of all options for a given question.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/questions/11/options/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "count": 2,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id": 1,
-            "identifier": "LVETRWVU",
-            "position": 1,
-            "answer": {"en": "S"}
-          },
-          {
-            "id": 2,
-            "identifier": "DFEMJWMJ",
-            "position": 2,
-            "answer": {"en": "M"}
-          },
-          {
-            "id": 3,
-            "identifier": "W9AH7RDE",
-            "position": 3,
-            "answer": {"en": "L"}
-          }
-        ]
-      }
-
-   :query integer page: The page number in case of a multi-page result set, default is 1
-   :query boolean active: If set to ``true`` or ``false``, only questions with this value for the field ``active`` will be
-                          returned.
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param question: The ``id`` field of the question to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/question does not exist **or** you have no permission to view this resource.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/questions/(question)/options/(id)/
-
-   Returns information on one option, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/questions/1/options/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "identifier": "LVETRWVU",
-        "position": 1,
-        "answer": {"en": "S"}
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param question: The ``id`` field of the question to fetch
-   :param id: The ``id`` field of the option to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/questions/(question)/options/
-
-   Creates a new option
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/questions/1/options/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "identifier": "LVETRWVU",
-        "position": 1,
-        "answer": {"en": "S"}
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "identifier": "LVETRWVU",
-        "position": 1,
-        "answer": {"en": "S"}
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event/question to create a option for
-   :param event: The ``slug`` field of the event to create a option for
-   :param question: The ``id`` field of the question to create a option for
-   :statuscode 201: no error
-   :statuscode 400: The option could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/questions/(question)/options/(id)/
-
-   Update an option. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
-   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
-   want to change.
-
-   You can change all fields of the resource except the ``id`` field.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/questions/1/options/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "position": 3
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "identifier": "LVETRWVU",
-        "position": 1,
-        "answer": {"en": "S"}
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the question to modify
-   :param id: The ``id`` field of the option to modify
-   :statuscode 200: no error
-   :statuscode 400: The option could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/questions/(id)/options/(id)/
-
-   Delete an option.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/questions/1/options/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the question to modify
-   :param id: The ``id`` field of the option to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.

doc/api/resources/questionnaires.rst

@@ -0,0 +1,379 @@
+
+.. _rest-questionnaires:
+
+Questionnaires
+=========
+
+.. note::
+
+   This API is part of an upcoming larger change to our API. The API documentation already reflects the future
+   version. Until the change, please keep using the endpoints at ``/questions/``.
+   The new version is expected to be released for hosted pretix early December and for self-hosted pretix with
+   version 2027.1.
+   You can find more information `on our blog <https://pretix.eu/about/en/blog/20261110-questionnaires/>`_.
+
+Questionnaires are attached to one or more products, and a product can have multiple questionnaires.
+They consist of questionnaire rows, each of which can be one of the following:
+
+Reference to system field
+    To reference a system field, use one of the identifier strings from the table below in the row's `datafield` attribute.
+    Currently, system fields are only defined on order positions, not on orders.
+
+    =============== =========================== ============================
+    Container       Identifier                  Label
+    =============== =========================== ============================
+    Order position  `"@attendee_name_parts"`     Attendee name
+    Order position  `"@attendee_email"`          Attendee email
+    Order position  `"@company"`                 Company
+    Order position  `"@street"`                  Street
+    Order position  `"@zipcode"`                 ZIP code
+    Order position  `"@city"`                    City
+    Order position  `"@state"`                   State
+    Order position  `"@country"`                 Country
+    =============== =========================== ============================
+
+
+Reference to user-defined data field
+    To reference a :ref:`user-defined data field <rest-datafields>`, use its internal reference (`identifier`)
+    in the row's `datafield` attribute.
+
+
+Static explanation text / subheading
+    To add a static text block, set the row's `datafield` attribute to `null`. In this case, the text
+    from the `label` attribute is displayed as a subheading, and the `help_text` attribute as a normal paragraph.
+
+
+Resource description
+--------------------
+
+
+.. rst-class:: rest-resource-table
+
+===================================== ========================== =======================================================
+Field                                 Type                       Description
+===================================== ========================== =======================================================
+id                                    integer                    Internal ID of the questionnaire
+type                                  string                     The type of questionnaire. Valid options:
+
+                                                                 * ``order_purchase`` — Order-wide, before purchase
+                                                                 * ``position_purchase`` — Per product, before purchase
+                                                                 * ``position_attendee`` — Per product, via attendee link
+                                                                 * ``position_checkin`` — Per product, at check-in
+                                                                 * ``position_hidden`` — Per product, hidden
+internal_name                         string                     Internal label for the questionnaire.
+items                                 list of integers           List of item IDs this questionnaire is assigned to.
+                                                                 *Only supported on per-product questionnaires.*
+position                              integer                    An integer, used for sorting
+all_sales_channels                    boolean                    If ``true`` (default), the questions from this questionnaire
+                                                                 are asked on all sales channels.
+limit_sales_channels                  list of strings            List of sales channel identifiers the questions are asked on
+                                                                 if ``all_sales_channels`` is ``false``.
+rows                                  list of objects            List of all questionnaire rows.
+├ datafield                           string                     Reference to a data field (see above)
+├ required                            boolean                    If ``true``, the question needs to be filled out.
+├ label                               multi-lingual string       The field label shown to the customer. In case of a static
+                                                                 text block, the subheading.
+├ help_text                           multi-lingual string       The help text shown to the customer.
+├ dependency_datafield                string                     ``datafield`` reference of a different row in the same
+                                                                 questionnaire.
+                                                                 The current question will only be shown if the question
+                                                                 given in this attribute is set to one of the values given
+                                                                 in ``dependency_values``.
+├ dependency_values                   list of strings            If ``dependency_datafield`` is set to reference a boolean
+                                                                 data field, this should be ``["True"]`` or ``["False"]``.
+                                                                 Otherwise, it should be a list of ``identifier`` values
+                                                                 of question options.
+├ rendered_help_text                  string                     **Read-only.** Markdown contents from help_text rendered
+                                                                 to HTML
+===================================== ========================== =======================================================
+
+
+Endpoints
+---------
+
+
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/questionnaires/
+
+   Returns a list of all questionnaires within a given event.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/events/sampleconf/questionnaires/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "count": 2,
+        "next": null,
+        "previous": null,
+        "results": [
+          {
+            "id": 1,
+            "type": "position_purchase",
+            "internal_name": "Attendee data",
+            "items": [1, 2],
+            "position": 0,
+            "all_sales_channels": true,
+            "limit_sales_channels": [],
+            "rows": [
+              {
+                "datafield": "@attendee_name_parts",
+                "required": false,
+                "label": {"en": "Attendee name"},
+                "help_text": {},
+                "dependency_datafield": null,
+                "dependency_values": [],
+                "rendered_help_text": ""
+              },
+              {
+                "datafield": "@attendee_email",
+                "required": false,
+                "label": {"en": "Attendee email"},
+                "help_text": {"en": "*We'll send you our program guide a few days before the event.*"},
+                "dependency_datafield": null,
+                "dependency_values": [],
+                "rendered_help_text": "<em>We'll send you our program guide a few days before the event.</em>"
+              }
+            ]
+          },
+          {
+            "id": 2,
+            "type": "order_purchase",
+            "internal_name": "Per-order questions",
+            "items": [],
+            "position": 0,
+            "all_sales_channels": true,
+            "limit_sales_channels": [],
+            "rows": [
+              {
+                "datafield": "87Y8DCS9",
+                "required": false,
+                "label": {"en": "How did you find us?"},
+                "help_text": {},
+                "dependency_datafield": null,
+                "dependency_values": [],
+                "rendered_help_text": ""
+              }
+            ]
+          }
+        ]
+      }
+
+   :query integer page: The page number in case of a multi-page result set, default is 1
+   :query string ordering: Manually set the ordering of results. Valid fields to be used are ``id`` and ``position``.
+                           Default: ``position``
+   :query string type: Only return questionnaires with the given type
+   :query string items: Only return questionnaires associated with the given item (internal item ID)
+   :query boolean sales_channel: Only return questionnaires visible on the given sales channel (sales channel identifier string)
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param event: The ``slug`` field of the event to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
+
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/questionnaires/(id)/
+
+   Returns information on one questionnaire, identified by its ID.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/events/sampleconf/questionnaires/2/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 2,
+        "type": "order_purchase",
+        "internal_name": "Per-order questions",
+        "items": [],
+        "position": 0,
+        "all_sales_channels": true,
+        "limit_sales_channels": [],
+        "rows": [
+          {
+            "datafield": "87Y8DCS9",
+            "required": false,
+            "label": {"en": "How did you find us?"},
+            "help_text": {},
+            "dependency_datafield": null,
+            "dependency_values": [],
+            "rendered_help_text": ""
+          }
+        ]
+      }
+
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param event: The ``slug`` field of the event to fetch
+   :param id: The ``id`` field of the questionnaire to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
+
+.. http:post:: /api/v1/organizers/(organizer)/events/(event)/questionnaires/
+
+   Create a new questionnaire
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      POST /api/v1/organizers/bigevents/events/sampleconf/questionnaires/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+
+      {
+        "type": "order_purchase",
+        "internal_name": "Per-order questions",
+        "position": 0,
+        "all_sales_channels": true,
+        "rows": [
+          {
+            "datafield": "87Y8DCS9",
+            "required": false,
+            "label": {"en": "How did you find us?"}
+          }
+        ]
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 201 Created
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 2,
+        "type": "order_purchase",
+        "internal_name": "Per-order questions",
+        "items": [],
+        "position": 0,
+        "all_sales_channels": true,
+        "limit_sales_channels": [],
+        "rows": [
+          {
+            "datafield": "87Y8DCS9",
+            "required": false,
+            "label": {"en": "How did you find us?"},
+            "help_text": {},
+            "dependency_datafield": null,
+            "dependency_values": [],
+            "rendered_help_text": ""
+          }
+        ]
+      }
+
+
+   :param organizer: The ``slug`` field of the organizer of the event to create a questionnaire for
+   :param event: The ``slug`` field of the event to create a questionnaire for
+   :statuscode 201: no error
+   :statuscode 400: The questionnaire could not be created due to invalid submitted data.
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
+
+.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/questionnaires/(id)/
+
+   Update a questionnaire. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
+   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
+   want to change.
+
+   You can only change all ``rows`` en bloc, or keep all of them unchanged in case of a ``PATCH``. If you
+   change ``rows``, you need to specify all fields of the resource.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      PATCH /api/v1/organizers/bigevents/events/sampleconf/questionnaires/2/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+
+      {
+        "internal_name": "Questions asked per order"
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 2,
+        "type": "order_purchase",
+        "internal_name": "Questions asked per order",
+        "items": [],
+        "position": 0,
+        "all_sales_channels": true,
+        "limit_sales_channels": [],
+        "rows": [
+          {
+            "datafield": "87Y8DCS9",
+            "required": false,
+            "label": {"en": "How did you find us?"},
+            "help_text": {},
+            "dependency_datafield": null,
+            "dependency_values": [],
+            "rendered_help_text": ""
+          }
+        ]
+      }
+
+   :param organizer: The ``slug`` field of the organizer of the questionnaire to modify
+   :param event: The ``slug`` field of the event of the questionnaire to modify
+   :param id: The ``id`` field of the questionnaire to modify
+   :statuscode 200: no error
+   :statuscode 400: The questionnaire could not be modified due to invalid submitted data
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
+
+.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/questionnaires/(id)/
+
+   Delete a questionnaire.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      DELETE /api/v1/organizers/bigevents/events/sampleconf/questionnaires/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 204 No Content
+      Vary: Accept
+
+   :param organizer: The ``slug`` field of the organizer of the questionnaire to modify
+   :param event: The ``slug`` field of the event of the questionnaire to modify
+   :param id: The ``id`` field of the questionnaire to delete
+   :statuscode 204: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.

doc/api/resources/questions.rst

@@ -8,10 +8,23 @@
 Questions
 =========
 
+.. warning:: This resource is **deprecated**. It is only provided for compatibility with existing applications
+             and should not be used in new development.
+
+             New applications must use the :ref:`rest-datafields` and :ref:`rest-questionnaires` resources.
+             The new version is expected to be released for hosted pretix early December and for self-hosted pretix with
+             version 2027.1.
+             You can find more information `on our blog <https://pretix.eu/about/en/blog/20261110-questionnaires/>`_.
+
+             This resource will continue to work in read-only mode on events where the
+             :ref:`questionnaire configuration <rest-questionnaires>` is compatible with the old data model.
+             If incompatible configuration is detected, all endpoints return HTTP 410.
+
+
 Resource description
 --------------------
 
-Questions define additional fields that need to be filled out by customers during checkout.
+Questions define additional fields related to an order position that need to be filled out by customers during checkout.
 The question resource contains the following public fields:
 
 .. rst-class:: rest-resource-table
@@ -84,6 +97,10 @@ dependency_value                      string                     An old version
 
    The ``show_during_checkin`` attribute has been added.
 
+.. versionchanged:: 2026.[TODO]
+
+   The questions resource was deprecated and replaced by the :ref:`rest-datafields` and :ref:`rest-questionnaires` resources.
+
 Endpoints
 ---------
 
@@ -249,6 +266,13 @@ Endpoints
 
 .. http:post:: /api/v1/organizers/(organizer)/events/(event)/questions/
 
+   .. warning:: This endpoint is **deprecated** and will be removed as part of an upcoming API change.
+                The new version is expected to be released for hosted pretix early December and for self-hosted
+                pretix with version 2027.1.
+                You can find more information `on our blog <https://pretix.eu/about/en/blog/20261110-questionnaires/>`_.
+                After the change, instead create a :ref:`data field <rest-datafields>` first, then add
+                it to a :ref:`questionnaire <rest-questionnaires>`.
+
    Creates a new question
 
    **Example request**:
@@ -351,6 +375,13 @@ Endpoints
 
 .. http:patch:: /api/v1/organizers/(organizer)/events/(event)/questions/(id)/
 
+   .. warning:: This endpoint is **deprecated** and will be removed as part of an upcoming API change.
+                The new version is expected to be released for hosted pretix early December and for self-hosted
+                pretix with version 2027.1.
+                You can find more information `on our blog <https://pretix.eu/about/en/blog/20261110-questionnaires/>`_.
+                After the change, instead update the relevant :ref:`data field <rest-datafields>`, or
+                the reference to it inside a :ref:`questionnaire <rest-questionnaires>`.
+
    Update a question. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
    the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
    want to change.
@@ -437,6 +468,14 @@ Endpoints
 
 .. http:delete:: /api/v1/organizers/(organizer)/events/(event)/questions/(id)/
 
+
+   .. warning:: This endpoint is **deprecated** and will be removed as part of an upcoming API change.
+                The new version is expected to be released for hosted pretix early December and for self-hosted
+                pretix with version 2027.1.
+                You can find more information `on our blog <https://pretix.eu/about/en/blog/20261110-questionnaires/>`_.
+                After the change, insteadremove the questionnaire child from its :ref:`questionnaire <rest-questionnaires>`,
+                or delete the relevant :ref:`data field <rest-datafields>`.
+
    Delete a question.
 
    **Example request**:

doc/api/resources/vouchers.rst

@@ -116,6 +116,7 @@ Endpoints
 
    :query integer page: The page number in case of a multi-page result set, default is 1
    :query string code: Only show the voucher with the given voucher code.
+   :query string search: Only show the voucher with the given query found in the code, tag, or comment.
    :query integer max_usages: Only show vouchers with the given maximal number of usages.
    :query integer redeemed: Only show vouchers with the given number of redemptions. Note that this doesn't tell you if
                             the voucher can still be redeemed, as this also depends on ``max_usages``. See the

doc/development/api/general.rst

@@ -11,7 +11,8 @@ Core
 ----
 
 .. automodule:: pretix.base.signals
-   :members: periodic_task, event_live_issues, event_copy_data, email_filter, register_notification_types, notification,
+   :members: periodic_task, event_live_issues, event_copy_data, email_filter,
+      register_notification_types, event_notification_sent, organizer_notification_sent,
       item_copy_data, register_sales_channel_types, register_global_settings, quota_availability, global_email_filter,
       register_ticket_secret_generators, gift_card_transaction_display,
       register_text_placeholders, register_mail_placeholders, device_info_updated,

doc/requirements.rtd.txt

@@ -1,6 +1,6 @@
-sphinx==9.1.*
+sphinx==9.0.*
 sphinx-rtd-theme~=3.1.0
-sphinxcontrib-httpdomain~=2.0.0
+sphinxcontrib-httpdomain~=2.1.0
 sphinxcontrib-images~=1.0.1
 sphinxcontrib-jquery~=4.1
 sphinxcontrib-spelling~=8.0.2

doc/requirements.txt

@@ -1,7 +1,7 @@
 -e ../
-sphinx==9.1.*
+sphinx==9.0.*
 sphinx-rtd-theme~=3.1.0
-sphinxcontrib-httpdomain~=2.0.0
+sphinxcontrib-httpdomain~=2.1.0
 sphinxcontrib-images~=1.0.1
 sphinxcontrib-jquery~=4.1
 sphinxcontrib-spelling~=8.0.2

eslint.config.mjs

@@ -49,7 +49,6 @@ const ignores = globalIgnores([
 	'src/pretix/static/pretixcontrol/js/ui/editor.js',
 	'src/pretix/static/pretixcontrol/js/ui/geo.js',
 	'src/pretix/static/pretixcontrol/js/ui/main.js',
-	'src/pretix/static/pretixcontrol/js/ui/plugins.js',
 	'src/pretix/static/pretixcontrol/js/ui/subevent.js',
 	'src/pretix/static/pretixcontrol/js/ui/variations.js',
 	'src/pretix/static/pretixcontrol/js/ui/webauthn.js',

package.json

@@ -27,8 +27,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "vue": "^3.5.30",
-    "vue-slicksort": "^2.0.5"
+    "vue": "^3.5.30"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",

pyproject.toml

@@ -27,26 +27,26 @@ classifiers = [
 ]
 
 dependencies = [
-  "arabic-reshaper==3.0.1",  # Support for Arabic in reportlab
+  "arabic-reshaper==3.1.0",  # Support for Arabic in reportlab
   "babel",
   "BeautifulSoup4==4.15.*",
   "bleach==6.4.*",
   "celery==5.6.*",
   "chardet==5.2.*",
-  "cryptography>=50.0.0",
-  "css-inline==0.21.*",
+  "cryptography>=50.0.2",
+  "css-inline==0.23.*",
   "defusedcsv>=3.0.0",
-  "dnspython==2.*",
+  "dnspython==2.9.*",
   "Django[argon2]==5.2.*,>=5.2.17",
-  "django-bootstrap3==26.2",
+  "django-bootstrap3==26.3",
   "django-compressor==4.6.0",
-  "django-countries==9.0.*",
-  "django-filter==26.1",
+  "django-countries==9.1.*",
+  "django-filter==26.2",
   "django-formset-js-improved==0.5.0.5",
   "django-formtools==2.7",
   "django-hierarkey==2.0.*,>=2.0.2",
   "django-hijack==3.7.*",
-  "django-i18nfield==1.11.*",
+  "django-i18nfield==1.12.*",
   "django-libsass==0.9",
   "django-localflavor==5.1",
   "django-markup",
@@ -57,48 +57,45 @@ dependencies = [
   "django-redis==7.0.*",
   "django-scopes==2.1.*",
   "django-statici18n==2.8.*",
-  "djangorestframework==3.17.*",
-  "dnspython==2.8.*",
+  "djangorestframework>=3.18.3",
   "drf_ujson2==1.7.*",
   "geoip2==5.*",
-  "importlib_metadata==9.*",  # Polyfill, we can probably drop this once we require Python 3.10+
   "isoweek",
   "jsonschema",
   "kombu==5.6.*",
   "libsass==0.23.*",
   "lxml",
-  "markdown==3.10.3",  # 3.3.5 requires importlib-metadata>=4.4, but django-bootstrap3 requires importlib-metadata<3.
-  # We can upgrade markdown again once django-bootstrap3 upgrades or once we drop Python 3.6 and 3.7
+  "markdown==3.11.2",
   "mt-940==4.30.*",
   "oauthlib==3.3.*",
   "openpyxl==3.1.*",
   "packaging",
   "paypalrestsdk==1.13.*",
   "paypal-checkout-serversdk==1.0.*",
-  "PyJWT==2.13.*",
+  "PyJWT==2.15.*",
   "phonenumberslite==9.0.*",
-  "Pillow==12.3.*",
+  "Pillow==13.0.*",
   "pretix-plugin-build",
   "protobuf==7.36.*",
   "psycopg2-binary",
   "pycountry",
-  "pycparser==3.0",
-  "pycryptodome==3.23.*",
-  "pypdf==6.11.*",
+  "pycparser==3.12",
+  "pycryptodome==3.24.*",
+  "pypdf==6.20.*",
   "python-bidi==0.6.*",  # Support for Arabic in reportlab
-  "python-dateutil==2.9.*",
+  "python-dateutil==4.0.*",
   "pytz",
   "pytz-deprecation-shim==0.1.*",
   "pyuca",
   "qrcode==8.2",
   "redis==7.4.*",
-  "reportlab==5.0.*",
+  "reportlab==5.1.*",
   "requests==2.34.*",
-  "sentry-sdk==2.68.*",
+  "sentry-sdk==2.71.*",
   "sepaxml==2.7.*",
   "stripe==7.9.*",
   "text-unidecode==1.*",
-  "tlds>=2026072401",
+  "tlds>=2026102900",
   "tqdm==4.*",
   "ua-parser==1.0.*",
   "vobject==0.9.*",
@@ -112,23 +109,24 @@ dev = [
   "aiohttp==3.14.*",
   "coverage",
   "coveralls",
-  "fakeredis==2.37.*",
-  "flake8==7.3.*",
+  "fakeredis==2.40.*",
+  "flake8==7.5.*",
   "freezegun",
-  "isort==8.0.*",
+  "isort==9.0.*",
   "pep8-naming==0.15.*",
   "potypo",
-  "pytest-asyncio>=1.4.0",
+  "pytest-asyncio>=1.4.1.post1",
   "pytest-cache",
   "pytest-cov",
   "pytest-django==4.*",
-  "pytest-mock==3.15.*",
+  "pytest-mock==3.17.*",
   "pytest-sugar",
   "pytest-xdist==3.8.*",
   "pytest-playwright",
   "pytest==9.1.*",
   "playwright",
   "responses",
+  "pypdfium2"
 ]
 
 [project.entry-points."distutils.commands"]

setup.cfg

@@ -26,7 +26,6 @@ ignore =
     src/tests/plugins/*
     src/tests/plugins/badges/*
     src/tests/plugins/banktransfer/*
-    src/tests/plugins/paypal/*
     src/tests/plugins/paypal2/*
     src/tests/plugins/pretixdroid/*
     src/tests/plugins/stripe/*

src/Makefile

@@ -30,3 +30,5 @@ npminstall:
 npmbuild:
 	npm run build
 
+licenseheaders:
+	licenseheaders -t ../.licenseheader -E .py -x "*/migrations/*.py"

src/pretix/__init__.py

@@ -19,4 +19,4 @@
 # 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/>.
 #
-__version__ = "2026.8.0.dev0"
+__version__ = "2026.10.0.dev0"

src/pretix/api/auth/device.py

@@ -76,7 +76,7 @@ class DeviceTokenAuthentication(TokenAuthentication):
             except DeviceLastSeen.DoesNotExist:
                 # First request from device, create model, ignore result. Use get_or_create to be safe
                 # against concurrent create requests
-                DeviceLastSeen.objects.get_or_create(device=device, last_seen=now())
+                DeviceLastSeen.objects.get_or_create(device=device, defaults={"last_seen": now()})
             else:
                 if now() - last_seen_obj.last_seen < timedelta(seconds=10):
                     # We don't need to know the last seen info of a device to more precision than this,

src/pretix/api/auth/utils.py

@@ -19,13 +19,12 @@
 # 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.dispatch import receiver
-
-from pretix.base.signals import register_payment_providers
+def get_session_key_for_api_auth(user, auth, prefix='api-upload'):
+    if user.is_authenticated:
+        return f'{prefix}-User-{user.pk}'
+    else:
+        return f'{prefix}-{str(type(auth))}-{auth.pk}'
 
 
-@receiver(register_payment_providers, dispatch_uid="payment_paypal")
-def register_payment_provider(sender, **kwargs):
-    from .payment import Paypal
-    return Paypal
+def get_session_key_for_api_request(request, prefix='api-upload'):
+    return get_session_key_for_api_auth(request.user, request.auth, prefix)

src/pretix/api/models.py

@@ -101,6 +101,10 @@ class OAuthAccessToken(AbstractAccessToken):
         self.expires = now() - timedelta(hours=1)
         self.save(update_fields=['expires'])
 
+    def is_valid(self, scopes=None):
+        # Can maybe be removed after upgrading django-oauth-toolkit to 3.4.1
+        return super().is_valid(scopes) and self.application.is_usable(None)
+
 
 class OAuthRefreshToken(AbstractRefreshToken):
     application = models.ForeignKey(

src/pretix/api/serializers/event.py

@@ -35,10 +35,13 @@
 import logging
 
 from django.conf import settings
-from django.core.exceptions import PermissionDenied
+from django.core.exceptions import (
+    PermissionDenied, ValidationError as DjangoValidationError,
+)
 from django.db import transaction
 from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
+from django.utils.html import strip_tags
 from django.utils.translation import gettext as _
 from django_countries.serializers import CountryFieldMixin
 from pytz import common_timezones
@@ -218,8 +221,6 @@ class EventSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
             if self.instance is None:
                 raise ValidationError(_('Events cannot be created as \'live\'. Quotas and payment must be added to the '
                                         'event before sales can go live.'))
-            else:
-                self.instance.clean_live()
         return value
 
     @cached_property
@@ -429,6 +430,14 @@ class EventSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
             event.set_active_plugins(plugins)
             event.save()
 
+        live = validated_data.get('live') or event.live
+        if live:
+            event.refresh_from_db()
+            try:
+                event.clean_live()
+            except DjangoValidationError as e:
+                raise ValidationError({'live': [strip_tags(m) for m in e.messages]})
+
         return event
 
 
@@ -979,7 +988,7 @@ class DeviceEventSettingsSerializer(EventSettingsSerializer):
         'reusable_media_type_nfc_mf0aes',
         'reusable_media_type_nfc_mf0aes_random_uid',
         'reusable_media_usage_enforced',
-        'system_question_order',  # TODO(questionnaires) - remove or replace
+        'system_question_order',
         'tax_rule_payment',
         'tax_rule_cancellation',
     ]

src/pretix/api/serializers/fields.py

@@ -37,6 +37,8 @@ from collections import OrderedDict
 from django.core.exceptions import ValidationError
 from rest_framework import serializers
 
+from pretix.api.auth.utils import get_session_key_for_api_request
+
 
 def remove_duplicates_from_list(data):
     return list(OrderedDict.fromkeys(data))
@@ -83,10 +85,16 @@ class UploadedFileField(serializers.Field):
         request = self.context.get('request', None)
         try:
             cf = CachedFile.objects.get(
-                session_key=f'api-upload-{str(type(request.user or request.auth))}-{(request.user or request.auth).pk}',
                 file__isnull=False,
                 pk=data[len("file:"):],
             )
+            if cf.session_key == "api-upload-<class 'django.contrib.auth.models.AnonymousUser'>-None":
+                # OK, backwards-compatibility of a security bug fixed 2026-09, delete this at some point, but should
+                # also be harmless because all files with this key are expired one day after deployment of this fix
+                # and no new files with this key are created
+                pass
+            elif cf.session_key != get_session_key_for_api_request(request):
+                self.fail('not_found')
         except (ValidationError, IndexError):  # invalid uuid
             self.fail('not_found')
         except CachedFile.DoesNotExist:

src/pretix/api/serializers/item.py

@@ -53,7 +53,6 @@ from pretix.base.models import (
     ItemVariation, ItemVariationMetaValue, Question, QuestionOption, Quota,
     SalesChannel,
 )
-from pretix.base.models.items import Questionnaire, QuestionnaireChild
 
 
 class InlineItemVariationSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
@@ -262,7 +261,9 @@ class ItemAddOnSerializer(serializers.ModelSerializer):
     def validate(self, data):
         data = super().validate(data)
 
-        ItemAddOn.clean_max_min_count(data.get('max_count'), data.get('min_count'))
+        full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
+        full_data.update(data)
+        ItemAddOn.clean_max_min_count(full_data.get('max_count'), full_data.get('min_count'))
 
         return data
 
@@ -377,7 +378,7 @@ class ItemSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
     def validate_bundles(self, value):
         if not self.instance:
             for b_data in value:
-                ItemBundle.clean_itemvar(self.context['event'], b_data['bundled_item'], b_data['bundled_variation'])
+                ItemBundle.clean_itemvar(self.context['event'], b_data.get('bundled_item'), b_data.get('bundled_variation'))
         return value
 
     def validate_addons(self, value):
@@ -543,7 +544,6 @@ class LegacyDependencyValueField(serializers.CharField):
 class QuestionSerializer(I18nAwareModelSerializer):
     options = InlineQuestionOptionSerializer(many=True, required=False)
     identifier = serializers.CharField(allow_null=True)
-    internal_name = serializers.CharField(allow_null=True, source='question', read_only=True)
     dependency_value = LegacyDependencyValueField(source='dependency_values', required=False, allow_null=True)
 
     class Meta:
@@ -552,7 +552,7 @@ class QuestionSerializer(I18nAwareModelSerializer):
                   'ask_during_checkin', 'show_during_checkin', 'identifier', 'dependency_question', 'dependency_values',
                   'hidden', 'dependency_value', 'print_on_invoice', 'help_text', 'valid_number_min',
                   'valid_number_max', 'valid_date_min', 'valid_date_max', 'valid_datetime_min', 'valid_datetime_max',
-                  'valid_string_length_max', 'valid_string_length_min', 'valid_file_portrait', 'internal_name',)
+                  'valid_string_length_max', 'valid_string_length_min', 'valid_file_portrait')
 
     def validate_identifier(self, value):
         Question._clean_identifier(self.context['event'], value, self.instance)
@@ -628,160 +628,6 @@ class QuestionSerializer(I18nAwareModelSerializer):
         return question
 
 
-class QuestionRefField(serializers.PrimaryKeyRelatedField):
-    def to_representation(self, qc):
-        if not qc:
-            return None
-        elif qc.system_datafield:
-            return qc.system_datafield
-        elif qc.user_datafield_id:
-            return qc.user_datafield_id
-        else:
-            return None
-
-    def to_internal_value(self, data):
-        if type(data) == int:
-            return {'user_datafield': super().to_internal_value(data), 'system_datafield': None}
-        elif type(data) == str or data is None:
-            return {'user_datafield': None, 'system_datafield': data}
-        else:
-            self.fail('incorrect_type', data_type=type(data).__name__)
-
-    def use_pk_only_optimization(self):
-        return self.source == '*'
-
-
-class InlineQuestionnaireChildSerializer(I18nAwareModelSerializer):
-    question = QuestionRefField(source='*', queryset=Question.objects.none())
-    dependency_question = QuestionRefField(allow_null=True, required=False, queryset=Question.objects.none())
-
-    class Meta:
-        model = QuestionnaireChild
-        fields = ('question', 'required', 'label', 'help_text', 'dependency_question', 'dependency_values')
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields["question"].queryset = self.context["event"].questions.all()
-        self.fields["dependency_question"].queryset = self.context["event"].questions.all()
-
-    def validate(self, data):
-        data = super().validate(data)
-        event = self.context['event']
-
-        full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
-        full_data.update(data)
-
-        if full_data.get('ask_during_checkin') and full_data.get('dependency_question'):
-            raise ValidationError('Dependencies are not supported during check-in.')
-
-        dep = full_data.get('dependency_question')
-        if dep:
-            if dep.ask_during_checkin:
-                raise ValidationError(_('Question cannot depend on a question asked during check-in.'))
-
-            seen_ids = {self.instance.pk} if self.instance else set()
-            while dep:
-                if dep.pk in seen_ids:
-                    raise ValidationError(_('Circular dependency between questions detected.'))
-                seen_ids.add(dep.pk)
-                dep = dep.dependency_question
-
-        return data
-
-    def validate_dependency_question(self, value):
-        if value:
-            if value.type not in (Question.TYPE_CHOICE, Question.TYPE_BOOLEAN, Question.TYPE_CHOICE_MULTIPLE):
-                raise ValidationError('Question dependencies can only be set to boolean or choice questions.')
-            if value == self.instance:
-                raise ValidationError('A question cannot depend on itself.')
-        return value
-
-
-class QuestionnaireSerializer(I18nAwareModelSerializer):
-    limit_sales_channels = serializers.SlugRelatedField(
-        slug_field="identifier",
-        queryset=SalesChannel.objects.none(),
-        required=False,
-        allow_empty=True,
-        many=True,
-    )
-
-    class Meta:
-        model = Questionnaire
-        fields = ('id', 'type', 'internal_name', 'items', 'position', 'all_sales_channels', 'limit_sales_channels', 'children')
-
-    def __init__(self, *args, **kwargs):
-        self.fields['children'] = InlineQuestionnaireChildSerializer(many=True, required=True, context=kwargs['context'], partial=False)
-        super().__init__(*args, **kwargs)
-
-    def validate(self, data):
-        data = super().validate(data)
-        event = self.context['event']
-
-        #full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
-        #full_data.update(data)
-
-        #if full_data.get('ask_during_checkin') and full_data.get('dependency_question'):
-        #    raise ValidationError('Dependencies are not supported during check-in.')
-
-        #if full_data.get('ask_during_checkin') and full_data.get('type') in Question.ASK_DURING_CHECKIN_UNSUPPORTED:
-        #    raise ValidationError(_('This type of question cannot be asked during check-in.'))
-
-        #if full_data.get('show_during_checkin') and full_data.get('type') in Question.SHOW_DURING_CHECKIN_UNSUPPORTED:
-        #    raise ValidationError(_('This type of question cannot be shown during check-in.'))
-
-        #Question.clean_items(event, full_data.get('items') or [])
-        return data
-
-    def validate_children(self, value):
-        prev_questions = {}
-        for child in value:
-            if child.get('dependency_question'):
-                if (child['dependency_question']['user_datafield'] or child['dependency_question']['system_datafield']) not in prev_questions:
-                    raise ValidationError('A question can only depend on a previous question from the same questionnaire.')
-
-            if child['user_datafield']:
-                prev_questions[child['user_datafield']] = child
-            if child['system_datafield']:
-                prev_questions[child['system_datafield']] = child
-        return value
-
-    @transaction.atomic
-    def create(self, validated_data):
-        children_data = validated_data.pop('children') if 'children' in validated_data else []
-        questionnaire = super().create(validated_data)
-        self.set_children(questionnaire, children_data)
-        return questionnaire
-
-    @transaction.atomic
-    def update(self, instance, validated_data):
-        children_data = validated_data.pop('children', None)
-        questionnaire = super().update(instance, validated_data)
-        if children_data is not None:
-            self.set_children(questionnaire, children_data)
-        return questionnaire
-
-    def set_children(self, questionnaire, new_data):
-        result = []
-        child_serializer = self.fields['children'].child
-        existing = questionnaire.children.all()
-        for i, d in enumerate(new_data):
-            d['questionnaire'] = questionnaire
-            d['position'] = i + 1
-            d.setdefault('required', False)
-            d.setdefault('help_text', None)
-            d.setdefault('dependency_question', None)
-            d.setdefault('dependency_values', None)
-        updatable = min(len(existing), len(new_data))
-        for i in range(0, updatable):
-            result.append(child_serializer.update(existing[i], new_data[i]))
-        for i in range(updatable, len(new_data)):
-            result.append(child_serializer.create(new_data[i]))
-        for i in range(updatable, len(existing)):
-            existing[i].delete()
-        return result
-
-
 class QuotaSerializer(I18nAwareModelSerializer):
     available = serializers.BooleanField(read_only=True)
     available_number = serializers.IntegerField(read_only=True)

src/pretix/api/serializers/order.py

@@ -41,6 +41,7 @@ from rest_framework.exceptions import ValidationError
 from rest_framework.relations import SlugRelatedField
 from rest_framework.reverse import reverse
 
+from pretix.api.auth.utils import get_session_key_for_api_request
 from pretix.api.serializers import CompatDecimalField, CompatibleJSONField
 from pretix.api.serializers.event import SubEventSerializer
 from pretix.api.serializers.forms import form_field_to_serializer_field
@@ -258,16 +259,21 @@ class AnswerSerializer(I18nAwareModelSerializer):
         if data['answer'] == 'file:keep':
             return data
         try:
-            ao = self.context["request"].user or self.context["request"].auth
             cf = CachedFile.objects.get(
-                session_key=f'api-upload-{str(type(ao))}-{ao.pk}',
                 file__isnull=False,
                 pk=data['answer'][len("file:"):],
             )
+            if cf.session_key == "api-upload-<class 'django.contrib.auth.models.AnonymousUser'>-None":
+                # OK, backwards-compatibility of a security bug fixed 2026-09, delete this at some point, but should
+                # also be harmless because all files with this key are expired one day after deployment of this fix
+                # and no new files with this key are created
+                pass
+            elif cf.session_key != get_session_key_for_api_request(self.context["request"]):
+                raise ValidationError('The submitted file ID "{fid}" was not found.'.format(fid=data['answer']))
         except (ValidationError, IndexError):  # invalid uuid
-            raise ValidationError('The submitted file ID "{fid}" was not found.'.format(fid=data))
+            raise ValidationError('The submitted file ID "{fid}" was not found.'.format(fid=data['answer']))
         except CachedFile.DoesNotExist:
-            raise ValidationError('The submitted file ID "{fid}" was not found.'.format(fid=data))
+            raise ValidationError('The submitted file ID "{fid}" was not found.'.format(fid=data['answer']))
 
         allowed_types = (
             'image/png', 'image/jpeg', 'image/gif', 'application/pdf'
@@ -1234,6 +1240,9 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
             return None
         if pp not in self.context['event'].get_payment_providers():
             raise ValidationError('The given payment provider is not known.')
+        if pp == "giftcard":
+            raise serializers.ValidationError("Cannot create giftcard payment. Use `use_gift_cards` instead")
+
         return pp
 
     def validate_payment_info(self, info):
@@ -1273,7 +1282,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
             raise ValidationError(
                 'Orders cannot have more than %(max)s positions.' % {'max': settings.PRETIX_MAX_ORDER_SIZE}
             )
-        errs = [{} for p in data]
+        errs = defaultdict(dict)
         if any([p.get('positionid') for p in data]):
             if not all([p.get('positionid') for p in data]):
                 for i, p in enumerate(data):
@@ -1302,16 +1311,16 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                 last_posid = p['positionid']
 
         elif any([p.get('addon_to') for p in data]):
-            errs = [
-                {'positionid': ["If you set addon_to on any position, you need to specify position IDs manually."]}
-                for p in data
-            ]
+            errs = {
+                i: {'positionid': ["If you set addon_to on any position, you need to specify position IDs manually."]}
+                for i, p in enumerate(data)
+            }
         else:
             for i, p in enumerate(data):
                 p['positionid'] = i + 1
 
-        if any(errs):
-            raise ValidationError(errs)
+        if errs:
+            raise ValidationError(dict(errs))
         return data
 
     def create(self, validated_data):
@@ -1428,7 +1437,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         # use further down
         del quota_diff_for_locking, voucher_diff_for_locking, seat_diff_for_locking
 
-        errs = [{} for p in positions_data]
+        errs = defaultdict(dict)
 
         for i, pos_data in enumerate(positions_data):
             if pos_data.get('voucher'):
@@ -1557,7 +1566,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                                     )
                                 ]
 
-        if any(errs):
+        if errs:
             raise ValidationError({'positions': errs})
 
         if validated_data.get('locale', None) is None:
@@ -1954,10 +1963,15 @@ class OrderPaymentCreateSerializer(I18nAwareModelSerializer):
         model = OrderPayment
         fields = ('state', 'amount', 'payment_date', 'provider', 'info')
 
+    def validate_provider(self, value):
+        if value == "giftcard":
+            raise serializers.ValidationError("Cannot create giftcard payment")
+        return value
+
     def create(self, validated_data):
-        order = OrderPayment(order=self.context['order'], **validated_data)
-        order.save()
-        return order
+        payment = OrderPayment(order=self.context['order'], **validated_data)
+        payment.save()
+        return payment
 
 
 class OrderRefundCreateSerializer(I18nAwareModelSerializer):
@@ -1969,6 +1983,12 @@ class OrderRefundCreateSerializer(I18nAwareModelSerializer):
         model = OrderRefund
         fields = ('state', 'source', 'amount', 'payment', 'execution_date', 'provider', 'info', 'comment')
 
+    def validate_provider(self, value):
+        if value == "giftcard":
+            raise serializers.ValidationError("Cannot create giftcard payment")
+
+        return value
+
     def create(self, validated_data):
         pid = validated_data.pop('payment', None)
         if pid:

src/pretix/api/serializers/organizer.py

@@ -28,6 +28,7 @@ from django.db import transaction
 from django.db.models import Q
 from django.utils.crypto import get_random_string
 from django.utils.translation import gettext, gettext_lazy as _
+from i18nfield.rest_framework import I18nField
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
@@ -40,7 +41,7 @@ from pretix.api.serializers.settings import SettingsSerializer
 from pretix.base.auth import get_auth_backends
 from pretix.base.i18n import get_language_without_region
 from pretix.base.models import (
-    Customer, Device, GiftCard, GiftCardAcceptance, GiftCardTransaction,
+    Customer, Device, EventMetaProperty, GiftCard, GiftCardTransaction,
     Membership, MembershipType, OrderPosition, Organizer, ReusableMedium,
     SalesChannel, SeatingPlan, Team, TeamAPIToken, TeamInvite, User,
 )
@@ -268,15 +269,7 @@ class GiftCardSerializer(I18nAwareModelSerializer):
         data = super().validate(data)
         if 'secret' in data:
             s = data['secret']
-            qs = GiftCard.objects.filter(
-                secret=s
-            ).filter(
-                Q(issuer=self.context["organizer"]) |
-                Q(issuer__in=GiftCardAcceptance.objects.filter(
-                    acceptor=self.context["organizer"],
-                    active=True,
-                ).values_list('issuer', flat=True))
-            )
+            qs = self.context["organizer"].accepted_gift_cards.filter(secret=s)
             if self.instance:
                 qs = qs.exclude(pk=self.instance.pk)
             if qs.exists():
@@ -640,3 +633,88 @@ class OrganizerSettingsSerializer(SettingsSerializer):
         )
         # TODO: make sure pub is always correct
         return 'pub/' + fname
+
+
+class MetaPropertyListField(serializers.ListField):
+    def __init__(self, *args, **kwargs):
+        kwargs["validators"] = kwargs.pop("validators", [])
+
+        def validate_keys_unique(choices):
+            if not choices:
+                return
+            keys = [c.get("key") for c in choices]
+            if len(set(keys)) < len(keys):
+                raise ValidationError("The key for each meta property value option must be unique.")
+
+        kwargs["validators"].append(
+            validate_keys_unique
+        )
+        super().__init__(*args, **kwargs)
+
+
+class MetaPropertyDictField(serializers.DictField):
+
+    def __init__(self, **kwargs):
+        self.label_child = kwargs.pop("label_child", I18nField())
+        super().__init__(**kwargs)
+
+    def to_representation(self, value):
+        # django added unneccessary keys DELETE, ORDER through formsets, filter them here for backwards compat
+        d = {
+            "key": value["key"]
+        }
+        if "label" in value:
+            d["label"] = self.label_child.to_representation(value["label"])
+
+        return super().to_representation(d)
+
+    def to_internal_value(self, data):
+        if not isinstance(data, dict):
+            raise ValidationError("Meta property value options must be a dict.")
+
+        if not isinstance(data.get("key"), str):
+            raise ValidationError("Meta property value options must have a key of type string.")
+
+        if any(k not in {"key", "label"} for k in data.keys()):
+            raise ValidationError("Meta property value options may only have a key and optionally a label.")
+
+        if "label" in data:
+            try:
+                data["label"] = self.label_child.to_internal_value(data["label"])
+            except ValidationError as e:
+                raise ValidationError({"label": e.detail})
+
+        return super().to_internal_value(data)
+
+
+class EventMetaPropertiesSerializer(I18nAwareModelSerializer):
+    choices = MetaPropertyListField(
+        child=MetaPropertyDictField(
+            label_child=I18nField()
+        ),
+        allow_null=True,
+    )
+
+    class Meta:
+        model = EventMetaProperty
+        fields = (
+            'id', 'name', 'default', 'required', 'protected', 'filter_public', 'public_label', 'filter_allowed',
+            'choices'
+        )
+
+    def validate(self, data):
+        data = super().validate(data)
+        full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
+        full_data.update(data)
+
+        choices = full_data.get("choices")
+        default = full_data.get("default")
+        if choices and default:
+            choice_keys = [c.get("key") for c in choices]
+            if default not in choice_keys:
+                raise ValidationError("You cannot set a default value that is not a valid value.")
+
+        if not choices and "choices" in data:
+            # normalize empty dict to None
+            data["choices"] = None
+        return data

src/pretix/api/serializers/voucher.py

@@ -19,6 +19,7 @@
 # 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 collections import defaultdict
 from decimal import Decimal
 
 from rest_framework import serializers
@@ -38,23 +39,20 @@ class VoucherListSerializer(serializers.ListSerializer):
 
         codes = set()
         seats = set()
-        errs = []
-        err = False
-        for voucher_data in validated_data:
+        errs = defaultdict(dict)
+        for i, voucher_data in enumerate(validated_data):
             if voucher_data.get('seat') and (voucher_data.get('seat'), voucher_data.get('subevent')) in seats:
-                err = True
-                errs.append({'code': ['Duplicate seat ID in request.']})
+                errs[i] = {'code': ['Duplicate seat ID in request.']}
                 continue
             else:
                 seats.add((voucher_data.get('seat'), voucher_data.get('subevent')))
 
             if voucher_data['code'] in codes:
-                err = True
-                errs.append({'code': ['Duplicate voucher code in request.']})
+                errs[i] = {'code': ['Duplicate voucher code in request.']}
             else:
                 codes.add(voucher_data['code'])
-                errs.append({})
-        if err:
+
+        if errs:
             raise ValidationError(errs)
         return super().create(validated_data)
 

src/pretix/api/urls.py

@@ -68,6 +68,7 @@ orga_router.register(r'scheduled_exports', exporters.ScheduledOrganizerExportVie
 orga_router.register(r'exporters', exporters.OrganizerExportersViewSet, basename='exporters')
 orga_router.register(r'transactions', order.OrganizerTransactionViewSet)
 orga_router.register(r'orderpositions', order.OrganizerOrderPositionViewSet, basename='orderpositions')
+orga_router.register(r'event_meta_properties', organizer.EventMetaPropertiesViewSet)
 
 team_router = routers.DefaultRouter()
 team_router.register(r'members', organizer.TeamMemberViewSet)
@@ -79,8 +80,7 @@ event_router.register(r'subevents', event.SubEventViewSet)
 event_router.register(r'clone', event.CloneEventViewSet)
 event_router.register(r'items', item.ItemViewSet)
 event_router.register(r'categories', item.ItemCategoryViewSet)
-event_router.register(r'datafields', item.QuestionViewSet)
-event_router.register(r'questionnaires', item.QuestionnaireViewSet)
+event_router.register(r'questions', item.QuestionViewSet)
 event_router.register(r'discounts', discount.DiscountViewSet)
 event_router.register(r'quotas', item.QuotaViewSet)
 event_router.register(r'vouchers', voucher.VoucherViewSet)

src/pretix/api/views/checkin.py

@@ -50,6 +50,7 @@ from rest_framework.generics import ListAPIView
 from rest_framework.permissions import SAFE_METHODS
 from rest_framework.response import Response
 
+from pretix.api.auth.utils import get_session_key_for_api_auth
 from pretix.api.serializers.checkin import (
     CheckinListSerializer, CheckinRPCAnnulInputSerializer,
     CheckinRPCRedeemInputSerializer, MiniCheckinListSerializer,
@@ -331,10 +332,16 @@ with scopes_disabled():
 def _handle_file_upload(data, user, auth):
     try:
         cf = CachedFile.objects.get(
-            session_key=f'api-upload-{str(type(user or auth))}-{(user or auth).pk}',
             file__isnull=False,
             pk=data[len("file:"):],
         )
+        if cf.session_key == "api-upload-<class 'django.contrib.auth.models.AnonymousUser'>-None":
+            # OK, backwards-compatibility of a security bug fixed 2026-09, delete this at some point, but should
+            # also be harmless because all files with this key are expired one day after deployment of this fix
+            # and no new files with this key are created
+            pass
+        elif cf.session_key != get_session_key_for_api_auth(user, auth):
+            raise ValidationError('The submitted file ID "{fid}" was not found.'.format(fid=data))
     except (ValidationError, BaseValidationError, IndexError):  # invalid uuid
         raise ValidationError('The submitted file ID "{fid}" was not found.'.format(fid=data))
     except CachedFile.DoesNotExist:

src/pretix/api/views/exporters.py

@@ -75,7 +75,7 @@ class ExportersMixin:
 
     @action(detail=True, methods=['GET'], url_name='download', url_path='download/(?P<asyncid>[^/]+)/(?P<cfid>[^/]+)')
     def download(self, *args, **kwargs):
-        cf = get_object_or_404(CachedFile, id=kwargs['cfid'])
+        cf = get_object_or_404(CachedFile, id=kwargs['cfid'], web_download=True)
         if not cf.allowed_for_session(self.request, "exporters-api"):
             return Response(
                 {'status': 'failed', 'message': 'Unknown file ID or export failed'},

src/pretix/api/views/item.py

@@ -48,15 +48,13 @@ from pretix.api.pagination import TotalOrderingFilter
 from pretix.api.serializers.item import (
     ItemAddOnSerializer, ItemBundleSerializer, ItemCategorySerializer,
     ItemProgramTimeSerializer, ItemSerializer, ItemVariationSerializer,
-    QuestionnaireSerializer, QuestionOptionSerializer, QuestionSerializer,
-    QuotaSerializer,
+    QuestionOptionSerializer, QuestionSerializer, QuotaSerializer,
 )
 from pretix.api.views import ConditionalListView
 from pretix.base.models import (
     CartPosition, Item, ItemAddOn, ItemBundle, ItemCategory, ItemProgramTime,
     ItemVariation, Question, QuestionOption, Quota,
 )
-from pretix.base.models.items import Questionnaire
 from pretix.base.services.quotas import QuotaAvailability
 from pretix.helpers.dicts import merge_dicts
 from pretix.helpers.i18n import i18ncomp
@@ -568,51 +566,6 @@ class QuestionOptionViewSet(viewsets.ModelViewSet):
         super().perform_destroy(instance)
 
 
-class QuestionnaireViewSet(ConditionalListView, viewsets.ModelViewSet):
-    serializer_class = QuestionnaireSerializer
-    queryset = Questionnaire.objects.none()
-    #filter_backends = (DjangoFilterBackend, TotalOrderingFilter)
-    #filterset_class = QuestionFilter
-    ordering_fields = ('id', 'position')
-    ordering = ('position', 'id')
-    permission = None
-    write_permission = 'event.items:write'
-
-    def get_queryset(self):
-        return self.request.event.questionnaires.prefetch_related('children').all()
-
-    def perform_create(self, serializer):
-        serializer.save(event=self.request.event)
-        serializer.instance.log_action(
-            'pretix.event.questionnaire.added',
-            user=self.request.user,
-            auth=self.request.auth,
-            data=self.request.data
-        )
-
-    def get_serializer_context(self):
-        ctx = super().get_serializer_context()
-        ctx['event'] = self.request.event
-        return ctx
-
-    def perform_update(self, serializer):
-        serializer.save(event=self.request.event)
-        serializer.instance.log_action(
-            'pretix.event.questionnaire.changed',
-            user=self.request.user,
-            auth=self.request.auth,
-            data=self.request.data
-        )
-
-    def perform_destroy(self, instance):
-        instance.log_action(
-            'pretix.event.questionnaire.deleted',
-            user=self.request.user,
-            auth=self.request.auth,
-        )
-        super().perform_destroy(instance)
-
-
 class NumberInFilter(django_filters.BaseInFilter, django_filters.NumberFilter):
     pass
 

src/pretix/api/views/media.py

@@ -39,7 +39,7 @@ from pretix.api.serializers.media import (
 )
 from pretix.base.media import MEDIA_TYPES
 from pretix.base.models import (
-    Checkin, GiftCard, GiftCardAcceptance, GiftCardTransaction, OrderPosition,
+    Checkin, GiftCardAcceptance, GiftCardTransaction, OrderPosition,
     ReusableMedium,
 )
 from pretix.base.models.orders import PrintLog
@@ -88,7 +88,7 @@ class ReusableMediaViewSet(viewsets.ModelViewSet):
             ),
             Prefetch(
                 'linked_giftcard',
-                queryset=GiftCard.objects.annotate(
+                queryset=self.request.organizer.accepted_gift_cards.annotate(
                     cached_value=Coalesce(Subquery(s), Decimal('0.00'))
                 )
             )

src/pretix/api/views/order.py

@@ -1683,7 +1683,7 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
     @action(detail=True, methods=['POST'])
     def confirm(self, request, **kwargs):
         payment = self.get_object()
-        force = request.data.get('force', False)
+        force = request.data.get('force', False) if request.data else False
         send_mail = request.data.get('send_email', True) if request.data else True
 
         if payment.state not in (OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED):

src/pretix/api/views/organizer.py

@@ -44,15 +44,16 @@ from pretix.api.models import OAuthAccessToken
 from pretix.api.pagination import TotalOrderingFilter
 from pretix.api.serializers.organizer import (
     CustomerCreateSerializer, CustomerSerializer, DeviceSerializer,
-    GiftCardSerializer, GiftCardTransactionSerializer, MembershipSerializer,
+    EventMetaPropertiesSerializer, GiftCardSerializer,
+    GiftCardTransactionSerializer, MembershipSerializer,
     MembershipTypeSerializer, OrganizerSerializer, OrganizerSettingsSerializer,
     SalesChannelSerializer, SeatingPlanSerializer, TeamAPITokenSerializer,
     TeamInviteSerializer, TeamMemberSerializer, TeamSerializer,
 )
 from pretix.base.models import (
-    Customer, Device, Event, GiftCard, GiftCardTransaction, LogEntry,
-    Membership, MembershipType, Organizer, SalesChannel, SeatingPlan, Team,
-    TeamAPIToken, TeamInvite, User,
+    Customer, Device, Event, EventMetaProperty, GiftCard, GiftCardTransaction,
+    LogEntry, Membership, MembershipType, Organizer, SalesChannel, SeatingPlan,
+    Team, TeamAPIToken, TeamInvite, User,
 )
 from pretix.base.plugins import (
     PLUGIN_LEVEL_EVENT, PLUGIN_LEVEL_EVENT_ORGANIZER_HYBRID,
@@ -846,3 +847,49 @@ class SalesChannelViewSet(viewsets.ModelViewSet):
             data={'id': instance.pk}
         )
         instance.delete()
+
+
+class EventMetaPropertiesViewSet(viewsets.ModelViewSet):
+    serializer_class = EventMetaPropertiesSerializer
+    queryset = EventMetaProperty.objects.none()
+    write_permission = 'organizer.settings.general:write'
+
+    def get_queryset(self):
+        return self.request.organizer.meta_properties.all()
+
+    def get_serializer_context(self):
+        ctx = super().get_serializer_context()
+        ctx['organizer'] = self.request.organizer
+        return ctx
+
+    @transaction.atomic()
+    def perform_destroy(self, instance):
+        instance.log_action(
+            'pretix.property.deleted',
+            user=self.request.user,
+            auth=self.request.auth,
+            data={'id': instance.pk}
+        )
+        instance.delete()
+
+    @transaction.atomic()
+    def perform_create(self, serializer):
+        inst = serializer.save(organizer_id=self.request.organizer.pk)
+        serializer.instance.log_action(
+            'pretix.property.created',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=self.request.data,
+        )
+        return inst
+
+    @transaction.atomic()
+    def perform_update(self, serializer):
+        inst = serializer.save(organizer_id=self.request.organizer.pk)
+        serializer.instance.log_action(
+            'pretix.property.changed',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=self.request.data,
+        )
+        return inst

src/pretix/api/views/shredders.py

@@ -33,6 +33,7 @@ from rest_framework.exceptions import ValidationError
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
 
+from pretix.api.auth.utils import get_session_key_for_api_request
 from pretix.api.serializers.shredders import (
     JobRunSerializer, ShredderSerializer,
 )
@@ -68,8 +69,14 @@ class ShreddersMixin:
         cf = get_object_or_404(
             CachedFile,
             id=kwargs['cfid'],
-            session_key=f'api-shredder-{str(type(self.request.user or self.request.auth))}-{(self.request.user or self.request.auth).pk}'
         )
+        if cf.session_key == "api-shredder-<class 'django.contrib.auth.models.AnonymousUser'>-None":
+            # OK, backwards-compatibility of a security bug fixed 2026-10, delete this at some point, but should
+            # also be harmless because all files with this key are expired one day after deployment of this fix
+            # and no new files with this key are created
+            pass
+        elif cf.session_key != get_session_key_for_api_request(self.request, prefix='api-shredder'):
+            raise Http404()
         if cf.file:
             resp = ChunkBasedFileResponse(cf.file.file, content_type=cf.type)
             resp['Content-Disposition'] = 'attachment; filename="{}"'.format(cf.filename).encode("ascii", "ignore")
@@ -118,10 +125,16 @@ class ShreddersMixin:
                 )
 
         try:
-            CachedFile.objects.get(
+            cf = CachedFile.objects.get(
                 id=kwargs['cfid'],
-                session_key=f'api-shredder-{str(type(self.request.user or self.request.auth))}-{(self.request.user or self.request.auth).pk}'
             )
+            if cf.session_key == "api-shredder-<class 'django.contrib.auth.models.AnonymousUser'>-None":
+                # OK, backwards-compatibility of a security bug fixed 2026-10, delete this at some point, but should
+                # also be harmless because all files with this key are expired one day after deployment of this fix
+                # and no new files with this key are created
+                pass
+            elif cf.session_key != get_session_key_for_api_request(self.request, prefix='api-shredder'):
+                raise CachedFile.DoesNotExist()
         except CachedFile.DoesNotExist:
             return Response(
                 {'status': 'gone', 'message': 'May have succeeded or timed out'},
@@ -140,8 +153,14 @@ class ShreddersMixin:
         cf = get_object_or_404(
             CachedFile,
             id=kwargs['cfid'],
-            session_key=f'api-shredder-{str(type(self.request.user or self.request.auth))}-{(self.request.user or self.request.auth).pk}'
         )
+        if cf.session_key == "api-shredder-<class 'django.contrib.auth.models.AnonymousUser'>-None":
+            # OK, backwards-compatibility of a security bug fixed 2026-10, delete this at some point, but should
+            # also be harmless because all files with this key are expired one day after deployment of this fix
+            # and no new files with this key are created
+            pass
+        elif cf.session_key != get_session_key_for_api_request(self.request, prefix='api-shredder'):
+            raise Http404()
         if cf.file:
             async_result = self.do_shred(cf)
             url_kwargs = {
@@ -184,7 +203,7 @@ class ShreddersMixin:
         cf = CachedFile(web_download=False)
         cf.date = now()
         cf.expires = now() + timedelta(hours=2)
-        cf.session_key = f'api-shredder-{str(type(self.request.user or self.request.auth))}-{(self.request.user or self.request.auth).pk}'
+        cf.session_key = get_session_key_for_api_request(self.request, prefix='api-shredder')
         cf.save()
         d = serializer.data
         for k, v in d.items():
@@ -224,7 +243,7 @@ class EventShreddersViewSet(ShreddersMixin, viewsets.ViewSet):
         return export.apply_async(args=(
             self.request.event.id,
             list(shredders),
-            f'api-shredder-{str(type(self.request.user or self.request.auth))}-{(self.request.user or self.request.auth).pk}',
+            get_session_key_for_api_request(self.request, prefix='api-shredder'),
             str(cf.pk)
         ))
 

src/pretix/api/views/upload.py

@@ -33,6 +33,7 @@ from rest_framework.views import APIView
 from pretix.api.auth.device import DeviceTokenAuthentication
 from pretix.api.auth.permission import AnyAuthenticatedClientPermission
 from pretix.api.auth.token import TeamTokenAuthentication
+from pretix.api.auth.utils import get_session_key_for_api_request
 from pretix.base.models import CachedFile
 from pretix.helpers.images import (
     IMAGE_TYPES, validate_uploaded_file_for_valid_image,
@@ -78,7 +79,7 @@ class UploadView(APIView):
             web_download=False,
             filename=file_obj.name,
             type=content_type,
-            session_key=f'api-upload-{str(type(request.user or request.auth))}-{(request.user or request.auth).pk}'
+            session_key=get_session_key_for_api_request(request)
         )
         cf.file.save(file_obj.name, file_obj)
         cf.save()

src/pretix/api/views/voucher.py

@@ -40,6 +40,7 @@ with scopes_disabled():
     class VoucherFilter(FilterSet):
         active = BooleanFilter(method='filter_active')
         code = CharFilter(lookup_expr='iexact')
+        search = CharFilter(method='search_qs')
 
         class Meta:
             model = Voucher
@@ -54,6 +55,9 @@ with scopes_disabled():
                 return queryset.filter(Q(redeemed__gte=F('max_usages')) |
                                        (Q(valid_until__isnull=False) & Q(valid_until__lte=now())))
 
+        def search_qs(self, qs, name, value):
+            return qs.filter(Q(code__icontains=value) | Q(tag__icontains=value) | Q(comment__icontains=value))
+
 
 class VoucherViewSet(viewsets.ModelViewSet):
     serializer_class = VoucherSerializer

src/pretix/base/customersso/oidc.py

@@ -239,8 +239,9 @@ def oidc_validate_authorization(provider, code, redirect_uri, pkce_code_verifier
             )
         )
 
-    if 'email_verified' in userinfo and not userinfo['email_verified']:
-        # todo: how universal is this, do we need to make this configurable?
+    if 'email_verified' in userinfo and userinfo['email_verified'] not in (True, 1, "1", "True", "true", "TRUE"):
+        # Documented criteria for using a provider with pretix:
+        # "The SSO provider only allows verified accounts to log in or the SSO provider sends the claim email_verified. "
         raise ValidationError(_('The email address on this account is not yet verified. Please first confirm the '
                                 'email address in your customer account.'))
 
@@ -263,6 +264,8 @@ def oidc_validate_authorization(provider, code, redirect_uri, pkce_code_verifier
             )
         )
 
+    profile['oidc_claims'] = userinfo
+
     return profile
 
 

src/pretix/base/datasync/datasync.py

@@ -27,8 +27,9 @@ from datetime import timedelta
 from functools import cached_property
 from typing import List, Optional, Protocol
 
-import sentry_sdk
+from django.conf import settings
 from django.db import DatabaseError, transaction
+from django.utils.functional import classproperty
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 
@@ -101,9 +102,8 @@ class OutboundSyncProvider:
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.close()
 
-    @classmethod
-    @property
-    def display_name(cls):
+    @classproperty
+    def display_name(cls):   # noqa: N805
         return str(cls.identifier)
 
     @classmethod
@@ -236,7 +236,9 @@ class OutboundSyncProvider:
                 # model changes saved by set_sync_error / clear_in_flight calls below
                 if sq.failed_attempts >= self.max_attempts:
                     logger.exception('Failed to sync order (max attempts exceeded)')
-                    sentry_sdk.capture_exception(e)
+                    if settings.SENTRY_ENABLED:
+                        import sentry_sdk
+                        sentry_sdk.capture_exception(e)
                     sq.set_sync_error("exceeded", e.messages, e.full_message)
                 else:
                     logger.info(
@@ -247,7 +249,9 @@ class OutboundSyncProvider:
                     sq.clear_in_flight()
             except Exception as e:
                 logger.exception('Failed to sync order (unhandled exception)')
-                sentry_sdk.capture_exception(e)
+                if settings.SENTRY_ENABLED:
+                    import sentry_sdk
+                    sentry_sdk.capture_exception(e)
                 sq.set_sync_error("internal", [], str(e))
 
     @cached_property

src/pretix/base/exporters/customers.py

@@ -160,7 +160,11 @@ class CustomerListExporter(OrganizerLevelExportMixin, MultiSheetListExporter):
             ]
             if name_scheme and len(name_scheme['fields']) > 1:
                 for k, label, w in name_scheme['fields']:
-                    row.append(obj.attendee_name_parts.get(k, ''))
+                    row.append(
+                        obj.attendee_name_parts.get(k, '')
+                        if obj.attendee_name_parts
+                        else ''
+                    )
             yield row
 
     def get_filename(self):

src/pretix/base/exporters/invoices.py

@@ -54,6 +54,7 @@ from ...control.forms.filter import get_all_payment_providers
 from ...helpers import GroupConcat
 from ...helpers.iter import chunked_iterable
 from ..exporter import BaseExporter, MultiSheetListExporter
+from ..invoicing.transmission import get_transmission_types
 from ..services.export import ExportError
 from ..services.invoices import invoice_pdf_task
 from ..signals import (
@@ -197,7 +198,7 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
     def iterate_sheet(self, form_data, sheet):
         _ = gettext
         if sheet == 'invoices':
-            yield [
+            headers = [
                 _('Invoice number'),
                 _('Date'),
                 _('Order code'),
@@ -230,8 +231,18 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
                 _('Total value (without taxes)'),
                 _('Payment matching IDs'),
                 _('Payment providers'),
+                _('Transmission type'),
+                _('Transmission status'),
+                _('Transmission date'),
             ]
 
+            transmission_types = get_transmission_types()
+            for tt in transmission_types:
+                for c in tt.describe_info_columns():
+                    headers.append(str(tt.verbose_name) + ': ' + str(c))
+
+            yield headers
+
             p_providers = OrderPayment.objects.filter(
                 order=OuterRef('order'),
                 state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED,
@@ -242,7 +253,7 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
                 'm'
             ).order_by()
 
-            base_qs = self.invoices_queryset(form_data)\
+            base_qs = self.invoices_queryset(form_data)
 
             qs = base_qs.select_related(
                 'order', 'refers'
@@ -280,7 +291,7 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
                                 if mid:
                                     pmis.append(mid)
                     pmi = '\n'.join(pmis)
-                    yield [
+                    line = [
                         i.full_invoice_no,
                         date_format(i.date, "SHORT_DATE_FORMAT"),
                         i.order.code,
@@ -315,8 +326,20 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
                         ', '.join([
                             str(self.providers.get(p, p)) for p in sorted(set((i.payment_providers or '').split(',')))
                             if p and p != 'free'
-                        ])
+                        ]),
+                        i.transmission_type_instance.verbose_name,
+                        i.get_transmission_status_display(),
+                        date_format(i.transmission_date, "SHORT_DATETIME_FORMAT") if i.transmission_date else "",
                     ]
+                    for tt in transmission_types:
+                        if tt.identifier == i.transmission_type:
+                            described = dict(tt.describe_info(i.invoice_to_transmission_info, i.invoice_to_country, i.invoice_to_is_business))
+                            for c in tt.describe_info_columns():
+                                line.append(described.get(c, ""))
+                        else:
+                            for c in tt.describe_info_columns():
+                                line.append("")
+                    yield line
         elif sheet == 'lines':
             yield [
                 _('Invoice number'),

src/pretix/base/exporters/orderlist.py

@@ -55,9 +55,10 @@ from openpyxl.comments import Comment
 from openpyxl.styles import Font, PatternFill
 
 from pretix.base.models import (
-    Checkin, GiftCard, GiftCardTransaction, Invoice, InvoiceAddress, Order,
+    Checkin, GiftCardTransaction, Invoice, InvoiceAddress, Order,
     OrderPosition, Question,
 )
+from pretix.base.models.giftcards import GiftCard
 from pretix.base.models.orders import (
     OrderFee, OrderPayment, OrderRefund, Transaction,
 )
@@ -1326,12 +1327,12 @@ class GiftcardRedemptionListExporter(ListExporter):
             order__event__in=self.events,
             provider='giftcard',
             state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED),
-        ).order_by('created')
+        ).order_by('created').select_related("order__event__organizer")
         refunds = OrderRefund.objects.filter(
             order__event__in=self.events,
             provider='giftcard',
             state=OrderRefund.REFUND_STATE_DONE
-        ).order_by('created')
+        ).order_by('created').select_related("order__event__organizer")
 
         objs = sorted(list(payments) + list(refunds), key=lambda o: (o.order.code, o.created))
 
@@ -1348,9 +1349,9 @@ class GiftcardRedemptionListExporter(ListExporter):
                 obj.order.code,
                 obj.full_id,
                 obj.created.astimezone(tz).date().strftime('%Y-%m-%d'),
-                gc.secret,
+                gc.secret if gc.accepted_by(obj.order.event.organizer) else '?',
                 obj.amount * (-1 if isinstance(obj, OrderRefund) else 1),
-                gc.issuer
+                gc.issuer.slug
             ]
             yield row
 

src/pretix/base/forms/questions.py

@@ -36,6 +36,7 @@ import copy
 import json
 import logging
 import re
+from collections import namedtuple
 from datetime import timedelta
 from decimal import Decimal
 from io import BytesIO
@@ -599,12 +600,16 @@ class PortraitImageField(SizeValidationMixin, ExtValidationMixin, forms.FileFiel
             image = ImageOps.exif_transpose(image)
 
             if f._cropdata:
-                image = image.crop((
-                    f._cropdata.get('x', 0),
-                    f._cropdata.get('y', 0),
-                    f._cropdata.get('x', 0) + f._cropdata.get('width', image.width),
-                    f._cropdata.get('y', 0) + f._cropdata.get('height', image.height),
-                ))
+                left = int(f._cropdata.get('x', 0))
+                top = int(f._cropdata.get('y', 0))
+                right = left + int(f._cropdata.get('width', image.width))
+                bottom = top + int(f._cropdata.get('height', image.height))
+                if left >= image.width or top >= image.height or right > image.width or bottom > image.height:
+                    raise ValidationError(
+                        self.error_messages['max_dimension'],
+                        code='max_dimension',
+                    )
+                image = image.crop((left, top, right, bottom))
                 with BytesIO() as output:
                     # This might use a lot of memory, but temporary files are not a good option since
                     # we don't control the cleanup
@@ -642,22 +647,49 @@ class PortraitImageField(SizeValidationMixin, ExtValidationMixin, forms.FileFiel
         super().__init__(*args, **kwargs)
 
 
+FakeQuestion = namedtuple(
+    'FakeQuestion', 'id question position required help_text container_type', defaults=('', Question.ContainerType.ORDERPOSITION)
+)
+
+
+def get_fake_attendee_questions(settings):
+    fq = []
+    sqo = settings.system_question_order
+
+    if settings.attendee_names_asked:
+        fq.append(FakeQuestion('attendee_name_parts', _('Attendee name'), sqo.get('attendee_name_parts', 0), settings.attendee_names_required))
+
+    if settings.attendee_emails_asked:
+        fq.append(FakeQuestion('attendee_email', _('Attendee email'), sqo.get('attendee_email', 0), settings.attendee_emails_required))
+
+    if settings.attendee_company_asked:
+        fq.append(FakeQuestion('company', _('Company'), sqo.get('company', 0), settings.attendee_company_required))
+
+    if settings.attendee_addresses_asked:
+        fq.append(FakeQuestion('street', _('Street'), sqo.get('street', 0), settings.attendee_addresses_required))
+        fq.append(FakeQuestion('zipcode', _('ZIP code'), sqo.get('zipcode', 0), settings.attendee_addresses_required))
+        fq.append(FakeQuestion('city', _('City'), sqo.get('city', 0), settings.attendee_addresses_required))
+        fq.append(FakeQuestion('state', _('State'), sqo.get('country', 0), settings.attendee_addresses_required))
+        fq.append(FakeQuestion('country', _('Country'), sqo.get('country', 0), settings.attendee_addresses_required))
+    return fq
+
+
 class BaseQuestionsForm(forms.Form):
     """
     This is the base form class responsible for asking order- or ticket-related questions.
     """
     address_validation = False
 
-    def build_user_question_field(self, request, event, answerlist, qc, datafield):
+    def build_user_question_field(self, request, event, answerlist, q):
         # Do we already have an answer? Provide it as the initial value
-        answers = [a for a in answerlist if a.question_id == datafield.id]
+        answers = [a for a in answerlist if a.question_id == q.id]
         if answers:
             initial = answers[0]
         else:
             initial = None
         tz = ZoneInfo(event.settings.timezone)
-        required = qc.required and not self.all_optional
-        if datafield.type == Question.TYPE_BOOLEAN:
+        required = q.required and not self.all_optional
+        if q.type == Question.TYPE_BOOLEAN:
             if required:
                 # For some reason, django-bootstrap3 does not set the required attribute
                 # itself.
@@ -671,105 +703,107 @@ class BaseQuestionsForm(forms.Form):
                 initialbool = False
 
             field = forms.BooleanField(
-                label=escape(qc.label), required=required,
-                help_text=rich_text(qc.help_text),
+                label=escape(q.question), required=required,
+                help_text=rich_text(q.help_text),
                 initial=initialbool, widget=widget,
             )
-        elif datafield.type == Question.TYPE_NUMBER:
+        elif q.type == Question.TYPE_NUMBER:
             field = forms.DecimalField(
-                label=escape(qc.label), required=required,
-                min_value=datafield.valid_number_min or Decimal('0.00'),
-                max_value=datafield.valid_number_max,
-                help_text=rich_text(qc.help_text),
+                label=escape(q.question), required=required,
+                min_value=q.valid_number_min or Decimal('0.00'),
+                max_value=q.valid_number_max,
+                help_text=rich_text(q.help_text),
                 initial=initial.answer if initial else None,
             )
-        elif datafield.type == Question.TYPE_STRING:
+        elif q.type == Question.TYPE_STRING:
             field = forms.CharField(
-                label=escape(qc.label), required=required,
-                min_length=datafield.valid_string_length_min,
-                max_length=datafield.valid_string_length_max,
-                help_text=rich_text(qc.help_text),
+                label=escape(q.question), required=required,
+                min_length=q.valid_string_length_min,
+                max_length=q.valid_string_length_max,
+                help_text=rich_text(q.help_text),
                 initial=initial.answer if initial else None,
             )
-        elif datafield.type == Question.TYPE_TEXT:
+        elif q.type == Question.TYPE_TEXT:
             field = forms.CharField(
-                label=escape(qc.label), required=required,
-                min_length=datafield.valid_string_length_min,
-                max_length=datafield.valid_string_length_max,
-                help_text=rich_text(qc.help_text),
+                label=escape(q.question), required=required,
+                min_length=q.valid_string_length_min,
+                max_length=q.valid_string_length_max,
+                help_text=rich_text(q.help_text),
                 widget=forms.Textarea,
                 initial=initial.answer if initial else None,
             )
-        elif datafield.type == Question.TYPE_COUNTRYCODE:
+        elif q.type == Question.TYPE_COUNTRYCODE:
             field = CountryField(
                 countries=CachedCountries,
                 blank=True, null=True, blank_label=' ',
             ).formfield(
-                label=escape(qc.label), required=required,
-                help_text=rich_text(qc.help_text),
+                label=escape(q.question), required=required,
+                help_text=rich_text(q.help_text),
                 widget=forms.Select,
                 empty_label=' ',
-                initial=initial.answer if initial else (guess_country_from_request(request, event) if required else None),
+                initial=initial.answer if initial else (
+                    guess_country_from_request(request, event) if required else None),
             )
-        elif datafield.type == Question.TYPE_CHOICE:
+        elif q.type == Question.TYPE_CHOICE:
             field = forms.ModelChoiceField(
-                queryset=datafield.options,
-                label=escape(qc.label), required=required,
-                help_text=rich_text(qc.help_text),
+                queryset=q.options,
+                label=escape(q.question), required=required,
+                help_text=rich_text(q.help_text),
                 widget=forms.Select,
                 to_field_name='identifier',
                 empty_label='',
                 initial=initial.options.first() if initial else None,
             )
-        elif datafield.type == Question.TYPE_CHOICE_MULTIPLE:
+        elif q.type == Question.TYPE_CHOICE_MULTIPLE:
             field = forms.ModelMultipleChoiceField(
-                queryset=datafield.options,
-                label=escape(qc.label), required=required,
-                help_text=rich_text(qc.help_text),
+                queryset=q.options,
+                label=escape(q.question), required=required,
+                help_text=rich_text(q.help_text),
                 to_field_name='identifier',
                 widget=QuestionCheckboxSelectMultiple,
                 initial=initial.options.all() if initial else None,
             )
-        elif datafield.type == Question.TYPE_FILE:
-            if datafield.valid_file_portrait:
+        elif q.type == Question.TYPE_FILE:
+            if q.valid_file_portrait:
                 field = PortraitImageField(
-                    label=escape(qc.label), required=required,
-                    help_text=rich_text(qc.help_text),
+                    label=escape(q.question), required=required,
+                    help_text=rich_text(q.help_text),
                     initial=initial.file if initial else None,
-                    widget=PortraitImageWidget(answer=initial, request=request, attrs={'data-portrait-photo': 'true'}),
+                    widget=PortraitImageWidget(answer=initial, request=request,
+                                               attrs={'data-portrait-photo': 'true'}),
                 )
             else:
                 field = ExtFileField(
-                    label=escape(qc.label), required=required,
-                    help_text=rich_text(qc.help_text),
+                    label=escape(q.question), required=required,
+                    help_text=rich_text(q.help_text),
                     initial=initial.file if initial else None,
                     widget=UploadedFileWidget(answer=initial, request=request),
                     ext_whitelist=settings.FILE_UPLOAD_EXTENSIONS_OTHER,
                     max_size=settings.FILE_UPLOAD_MAX_SIZE_OTHER,
                 )
-        elif datafield.type == Question.TYPE_DATE:
+        elif q.type == Question.TYPE_DATE:
             attrs = {}
-            if datafield.valid_date_min:
-                attrs['data-min'] = datafield.valid_date_min.isoformat()
-            if datafield.valid_date_max:
-                attrs['data-max'] = datafield.valid_date_max.isoformat()
-            help_text = qc.help_text
+            if q.valid_date_min:
+                attrs['data-min'] = q.valid_date_min.isoformat()
+            if q.valid_date_max:
+                attrs['data-max'] = q.valid_date_max.isoformat()
+            help_text = q.help_text
             if not help_text:
-                if datafield.valid_date_min and datafield.valid_date_max:
+                if q.valid_date_min and q.valid_date_max:
                     help_text = format_lazy(
                         _('Please enter a date between {min} and {max}.'),
-                        min=date_format(datafield.valid_date_min, "SHORT_DATE_FORMAT"),
-                        max=date_format(datafield.valid_date_max, "SHORT_DATE_FORMAT"),
+                        min=date_format(q.valid_date_min, "SHORT_DATE_FORMAT"),
+                        max=date_format(q.valid_date_max, "SHORT_DATE_FORMAT"),
                     )
-                elif datafield.valid_date_min:
+                elif q.valid_date_min:
                     help_text = format_lazy(
                         _('Please enter a date no earlier than {min}.'),
-                        min=date_format(datafield.valid_date_min, "SHORT_DATE_FORMAT"),
+                        min=date_format(q.valid_date_min, "SHORT_DATE_FORMAT"),
                     )
-                elif datafield.valid_date_max:
+                elif q.valid_date_max:
                     help_text = format_lazy(
                         _('Please enter a date no later than {max}.'),
-                        max=date_format(datafield.valid_date_max, "SHORT_DATE_FORMAT"),
+                        max=date_format(q.valid_date_max, "SHORT_DATE_FORMAT"),
                     )
             if initial and initial.answer:
                 try:
@@ -779,16 +813,16 @@ class BaseQuestionsForm(forms.Form):
             else:
                 _initial = None
             field = forms.DateField(
-                label=escape(qc.label), required=required,
+                label=escape(q.question), required=required,
                 help_text=rich_text(help_text),
                 initial=_initial,
                 widget=DatePickerWidget(attrs),
             )
-            if datafield.valid_date_min:
-                field.validators.append(MinDateValidator(datafield.valid_date_min))
-            if datafield.valid_date_max:
-                field.validators.append(MaxDateValidator(datafield.valid_date_max))
-        elif datafield.type == Question.TYPE_TIME:
+            if q.valid_date_min:
+                field.validators.append(MinDateValidator(q.valid_date_min))
+            if q.valid_date_max:
+                field.validators.append(MaxDateValidator(q.valid_date_max))
+        elif q.type == Question.TYPE_TIME:
             if initial and initial.answer:
                 try:
                     _initial = dateutil.parser.parse(initial.answer).time()
@@ -797,29 +831,29 @@ class BaseQuestionsForm(forms.Form):
             else:
                 _initial = None
             field = forms.TimeField(
-                label=escape(qc.label), required=required,
-                help_text=rich_text(qc.help_text),
+                label=escape(q.question), required=required,
+                help_text=rich_text(q.help_text),
                 initial=_initial,
                 widget=TimePickerWidget(without_seconds=True),
             )
-        elif datafield.type == Question.TYPE_DATETIME:
-            help_text = qc.help_text
+        elif q.type == Question.TYPE_DATETIME:
+            help_text = q.help_text
             if not help_text:
-                if datafield.valid_datetime_min and datafield.valid_datetime_max:
+                if q.valid_datetime_min and q.valid_datetime_max:
                     help_text = format_lazy(
                         _('Please enter a date and time between {min} and {max}.'),
-                        min=date_format(datafield.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
-                        max=date_format(datafield.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
+                        min=date_format(q.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
+                        max=date_format(q.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
                     )
-                elif datafield.valid_datetime_min:
+                elif q.valid_datetime_min:
                     help_text = format_lazy(
                         _('Please enter a date and time no earlier than {min}.'),
-                        min=date_format(datafield.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
+                        min=date_format(q.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
                     )
-                elif datafield.valid_datetime_max:
+                elif q.valid_datetime_max:
                     help_text = format_lazy(
                         _('Please enter a date and time no later than {max}.'),
-                        max=date_format(datafield.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
+                        max=date_format(q.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
                     )
 
             if initial and initial.answer:
@@ -831,20 +865,20 @@ class BaseQuestionsForm(forms.Form):
                 _initial = None
 
             field = SplitDateTimeField(
-                label=escape(qc.label), required=required,
+                label=escape(q.question), required=required,
                 help_text=rich_text(help_text),
                 initial=_initial,
                 widget=SplitDateTimePickerWidget(
                     time_format=get_format_without_seconds('TIME_INPUT_FORMATS'),
-                    min_date=datafield.valid_datetime_min,
-                    max_date=datafield.valid_datetime_max
+                    min_date=q.valid_datetime_min,
+                    max_date=q.valid_datetime_max
                 ),
             )
-            if datafield.valid_datetime_min:
-                field.validators.append(MinDateTimeValidator(datafield.valid_datetime_min))
-            if datafield.valid_datetime_max:
-                field.validators.append(MaxDateTimeValidator(datafield.valid_datetime_max))
-        elif datafield.type == Question.TYPE_PHONENUMBER:
+            if q.valid_datetime_min:
+                field.validators.append(MinDateTimeValidator(q.valid_datetime_min))
+            if q.valid_datetime_max:
+                field.validators.append(MaxDateTimeValidator(q.valid_datetime_max))
+        elif q.type == Question.TYPE_PHONENUMBER:
             if initial:
                 try:
                     initial = PhoneNumber().from_string(initial.answer)
@@ -857,27 +891,26 @@ class BaseQuestionsForm(forms.Form):
                     initial = "+{}.".format(phone_prefix)
 
             field = PhoneNumberField(
-                label=escape(qc.label), required=required,
-                help_text=rich_text(qc.help_text),
+                label=escape(q.question), required=required,
+                help_text=rich_text(q.help_text),
                 # We now exploit an implementation detail in PhoneNumberPrefixWidget to allow us to pass just
                 # a country code but no number as an initial value. It's a bit hacky, but should be stable for
                 # the future.
                 initial=initial,
                 widget=WrappedPhoneNumberPrefixWidget()
             )
-        field.datafield = datafield
+        field.question = q
         if answers:
             # Cache the answer object for later use
             field.answer = answers[0]
 
-        if qc.dependency_question_id:
-            field.widget.attrs['data-question-dependency'] = qc.dependency_question_id
-            field.widget.attrs['data-question-dependency-values'] = escapejson_attr(json.dumps(qc.dependency_values))
-            if datafield.type != 'M':
-                field.widget.attrs['required'] = qc.required and not self.all_optional
-            field._required = qc.required and not self.all_optional
+        if q.dependency_question_id:
+            field.widget.attrs['data-question-dependency'] = q.dependency_question_id
+            field.widget.attrs['data-question-dependency-values'] = escapejson_attr(json.dumps(q.dependency_values))
+            if q.type != 'M':
+                field.widget.attrs['required'] = q.required and not self.all_optional
+            field._required = q.required and not self.all_optional
             field.required = False
-
         return field
 
     def check_user_questions(self, d):
@@ -941,7 +974,6 @@ class OrderLevelQuestionsForm(BaseQuestionsForm):
 
         super().__init__(*args, **kwargs)
 
-        # TODO(questionnaires) - switch olq's to questionnaires !
         questions = Question.objects.filter(
             event=event, container_type=Question.ContainerType.ORDER,
             ask_during_checkin=False, hidden=False,
@@ -976,7 +1008,6 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
         orderpos = self.orderpos = kwargs.pop('orderpos', None)
         pos = cartpos or orderpos
         item = pos.item
-        questionnaires = pos.item.relevant_questionnaires
         event = kwargs.pop('event')
         self.all_optional = kwargs.pop('all_optional', False)
         self.attendee_addresses_required = event.settings.attendee_addresses_required and not self.all_optional
@@ -986,13 +1017,18 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
         if cartpos and item.validity_mode == Item.VALIDITY_MODE_DYNAMIC and item.validity_dynamic_start_choice:
             self.fields['requested_valid_from'] = self.build_requested_valid_from_field(event, pos, item)
 
-        for questionnaire in questionnaires:
-            for child in getattr(questionnaire, 'childlist', questionnaire.children.all()):
-                if child.user_datafield:
-                    df = child.user_datafield
-                    self.fields['question_%s' % df.id] = self.build_user_question_field(request, event, pos.answerlist, child, df)
-                elif child.system_datafield:
-                    self.fields[child.system_datafield] = self.build_system_question_field(request, event, pos, child)
+        questions = []
+        if item.ask_attendee_data:
+            questions += get_fake_attendee_questions(event.settings)
+        questions += pos.item.questions_to_ask
+
+        questions.sort(key=lambda q: q.position)
+
+        for q in questions:
+            if isinstance(q, FakeQuestion):
+                self.fields[q.id] = self.build_system_question_field(request, event, pos, q)
+            else:
+                self.fields['question_%s' % q.id] = self.build_user_question_field(request, event, pos.answerlist, q)
 
         responses = question_form_fields.send(sender=event, position=pos)
         data = pos.meta_info_data
@@ -1057,21 +1093,21 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
             )
 
     def build_system_question_field(self, request, event, pos, qc):
-        field_name = qc.system_datafield
+        field_name = qc.id
         if field_name == 'attendee_name_parts':
             return NamePartsFormField(
                 max_length=255,
                 required=qc.required and not self.all_optional,
                 scheme=event.settings.name_scheme,
                 titles=event.settings.name_scheme_titles,
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 initial=pos.attendee_name_parts,
             )
         if field_name == 'attendee_email':
             return forms.EmailField(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 initial=pos.attendee_email,
                 widget=forms.EmailInput(
@@ -1083,7 +1119,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
         if field_name == 'company':
             return forms.CharField(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 max_length=255,
                 initial=pos.company,
@@ -1092,7 +1128,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
         if field_name == 'street':
             return forms.CharField(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 widget=forms.Textarea(attrs={
                     'rows': 2,
@@ -1105,7 +1141,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
             return forms.CharField(
                 required=False,
                 max_length=30,
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 initial=pos.zipcode,
                 widget=forms.TextInput(attrs={
@@ -1115,7 +1151,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
         if field_name == 'city':
             return forms.CharField(
                 required=False,
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 max_length=255,
                 initial=pos.city,
@@ -1129,7 +1165,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
                 countries=CachedCountries
             ).formfield(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 initial=country,
                 widget=forms.Select(attrs={
@@ -1157,7 +1193,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
                 del self.data[fprefix + 'state']
 
             field = forms.ChoiceField(
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 required=False,
                 choices=c,
@@ -1170,8 +1206,9 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
             return field
 
     def clean(self):
-        from pretix.base.addressvalidation import \
-            validate_address  # local import to prevent impact on startup time
+        from pretix.base.addressvalidation import (  # local import to prevent impact on startup time
+            validate_address,
+        )
 
         d = super().clean()
 
@@ -1412,8 +1449,9 @@ class BaseInvoiceAddressForm(forms.ModelForm):
         self.fields['transmission_type'].widget.attrs['data-trigger-address-info'] = 'on'
 
     def clean(self):
-        from pretix.base.addressvalidation import \
-            validate_address  # local import to prevent impact on startup time
+        from pretix.base.addressvalidation import (  # local import to prevent impact on startup time
+            validate_address,
+        )
 
         data = self.cleaned_data
 
@@ -1467,7 +1505,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
                 "vat_id": _("This field is required.")
             })
 
-        if self.validate_vat_id and self.instance.vat_id_validated and 'vat_id' not in self.changed_data:
+        if self.validate_vat_id and self.instance.vat_id_validated and not any(v in self.changed_data for v in ('is_business', 'vat_id', 'country')):
             pass  # Skip re-validation if it is validated
         elif self.validate_vat_id and vat_id_applicable:
             try:

src/pretix/base/forms/user.py

@@ -82,8 +82,8 @@ class UserSettingsForm(forms.ModelForm):
 class User2FADeviceAddForm(forms.Form):
     name = forms.CharField(label=_('Device name'), max_length=64)
     devicetype = forms.ChoiceField(label=_('Device type'), widget=forms.RadioSelect, choices=(
-        ('totp', _('Smartphone with the Authenticator application')),
-        ('webauthn', _('WebAuthn-compatible hardware token (e.g. Yubikey)')),
+        ('otp_totp.totpdevice', _('Smartphone with the Authenticator application')),
+        ('pretixbase.webauthndevice', _('WebAuthn-compatible hardware token (e.g. Yubikey)')),
     ))
 
 

src/pretix/base/invoicing/email.py

@@ -71,8 +71,8 @@ class EmailTransmissionType(TransmissionType):
 
     def transmission_info_to_form_data(self, transmission_info: dict) -> dict:
         return {
-            "transmission_email_other": bool(transmission_info.get("transmission_email_address")),
-            "transmission_email_address": transmission_info.get("transmission_email_address"),
+            "transmission_email_other": bool((transmission_info or {}).get("transmission_email_address")),
+            "transmission_email_address": (transmission_info or {}).get("transmission_email_address"),
         }
 
     def form_data_to_transmission_info(self, form_data: dict) -> dict:

src/pretix/base/invoicing/peppol.py

@@ -131,6 +131,27 @@ class PeppolIdValidator:
     def __init__(self, validate_online=False):
         self.validate_online = validate_online
 
+    def _validate_peppol_id_online(self, value):
+        base_hostnames = ['participant.sml.prod.tech.peppol.org', 'participant.sml.test.tech.peppol.org']
+        smp_id = base64.b32encode(hashlib.sha256(value.lower().encode()).digest()).decode().rstrip("=")
+        for base_hostname in base_hostnames:
+            smp_domain = f'{smp_id}.iso6523-actorid-upis.{base_hostname}'
+            resolver = dns.resolver.Resolver()
+            try:
+                answers = resolver.resolve(smp_domain, 'NAPTR', lifetime=1.0)
+                if answers:
+                    return value
+            except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
+                # ID not registered, do not set found=True
+                pass
+            except Exception:  # noqa
+                # Error likely on our end or infrastructure is down, allow user to proceed
+                return value
+
+        raise ValidationError(
+            _("The Peppol participant ID is not registered on the Peppol network."),
+        )
+
     def __call__(self, value):
         if ":" not in value:
             raise ValidationError(_("A Peppol participant ID always starts with a prefix, followed by a colon (:)."))
@@ -146,25 +167,7 @@ class PeppolIdValidator:
                                   params={"number": prefix})
 
         if self.validate_online:
-            base_hostnames = ['edelivery.tech.ec.europa.eu', 'acc.edelivery.tech.ec.europa.eu']
-            smp_id = base64.b32encode(hashlib.sha256(value.lower().encode()).digest()).decode().rstrip("=")
-            for base_hostname in base_hostnames:
-                smp_domain = f'{smp_id}.iso6523-actorid-upis.{base_hostname}'
-                resolver = dns.resolver.Resolver()
-                try:
-                    answers = resolver.resolve(smp_domain, 'NAPTR', lifetime=1.0)
-                    if answers:
-                        return value
-                except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
-                    # ID not registered, do not set found=True
-                    pass
-                except Exception:  # noqa
-                    # Error likely on our end or infrastructure is down, allow user to proceed
-                    return value
-
-            raise ValidationError(
-                _("The Peppol participant ID is not registered on the Peppol network."),
-            )
+            value = self._validate_peppol_id_online(value)
 
         return value
 

src/pretix/base/invoicing/transmission.py

@@ -107,6 +107,9 @@ class TransmissionType:
     def transmission_info_to_form_data(self, transmission_info: dict) -> dict:
         return transmission_info
 
+    def describe_info_columns(self):
+        return [f.label for f in self.invoice_address_form_fields.values()]
+
     def describe_info(self, transmission_info: dict, country: Country, is_business: bool):
         form_data = self.transmission_info_to_form_data(transmission_info)
         data = []

src/pretix/base/migrations/0310_questionnaire_questionnairechild.py

@@ -1,196 +0,0 @@
-# Generated by Django 4.2.29 on 2026-03-19 14:24
-import json
-from collections import namedtuple
-from itertools import chain, groupby
-
-from django.db import migrations, models
-import django.db.models.deletion
-import i18nfield.fields
-from i18nfield.strings import LazyI18nString
-
-import pretix.base.models.base
-import pretix.base.models.fields
-
-
-FakeQuestion = namedtuple(
-    'FakeQuestion', 'id question position required'
-)
-
-
-def get_fake_questions(settings):
-    def b(s):
-        return s == 'True'
-    fq = []
-    sqo = json.loads(settings.get('system_question_order', '{}'))
-    _ = LazyI18nString.from_gettext
-
-    if b(settings.get('attendee_names_asked', 'True')):
-        fq.append(FakeQuestion('attendee_name_parts', _('Attendee name'), sqo.get('attendee_name_parts', 0), b(settings.get('attendee_names_required'))))
-
-    if b(settings.get('attendee_emails_asked')):
-        fq.append(FakeQuestion('attendee_email', _('Attendee email'), sqo.get('attendee_email', 0), b(settings.get('attendee_emails_required'))))
-
-    if b(settings.get('attendee_company_asked')):
-        fq.append(FakeQuestion('company', _('Company'), sqo.get('company', 0), b(settings.get('attendee_company_required'))))
-
-    if b(settings.get('attendee_addresses_asked')):
-        fq.append(FakeQuestion('street', _('Street'), sqo.get('street', 0), b(settings.get('attendee_addresses_required'))))
-        fq.append(FakeQuestion('zipcode', _('ZIP code'), sqo.get('zipcode', 0), b(settings.get('attendee_addresses_required'))))
-        fq.append(FakeQuestion('city', _('City'), sqo.get('city', 0), b(settings.get('attendee_addresses_required'))))
-        fq.append(FakeQuestion('country', _('Country'), sqo.get('country', 0), b(settings.get('attendee_addresses_required'))))
-    return fq
-
-
-def migrate_questions_forward(apps, schema_editor):
-    Event = apps.get_model("pretixbase", "Event")
-    Item = apps.get_model("pretixbase", "Item")
-    Question = apps.get_model("pretixbase", "Question")
-    Questionnaire = apps.get_model("pretixbase", "Questionnaire")
-    QuestionnaireChild = apps.get_model("pretixbase", "QuestionnaireChild")
-    EventSettingsStore = apps.get_model('pretixbase', 'Event_SettingsStore')
-
-    def create_grouped_item_questionnaires(event, children, label_prefix, questionnaire_type):
-        # group by item, creating a unique questionnaire per item
-        item_questionnaires = (([t[3] for t in children], item_id) for item_id, children in
-                               groupby(children, key=lambda t: t[0]))
-
-        # group again, merging all questionnaires with identical children
-        merged_questionnaires = groupby(sorted(item_questionnaires, key=lambda t: [q.id for q in t[0]]),
-                                        key=lambda t: t[0])
-        for children, iterator in merged_questionnaires:
-            items = [item for _c, item in iterator]
-
-            # create questionnaires and children
-            questionnaire = Questionnaire.objects.create(
-                event=event, type=questionnaire_type, position=0, all_sales_channels=True,
-                internal_name=label_prefix + ', '.join(str(iname or name) for (id, iname, name) in items)
-            )
-            questionnaire.items.set([id for (id, iname, name) in items])
-            deps = {}
-            for position, child in enumerate(children):
-                if isinstance(child, FakeQuestion):
-                    QuestionnaireChild.objects.create(
-                        questionnaire=questionnaire,
-                        position=position + 1,
-                        system_datafield=child.id,
-                        required=child.required,
-                        label=child.question,
-                    )
-                else:
-                    deps[child.id] = QuestionnaireChild.objects.create(
-                        questionnaire=questionnaire,
-                        position=position + 1,
-                        user_datafield=child,
-                        required=child.required,
-                        label=child.question,
-                        help_text=child.help_text,
-                        dependency_question=deps[child.dependency_question.id] if child.dependency_question else None,
-                        dependency_values=child.dependency_values,
-                    )
-
-    for event in Event.objects.iterator():
-        # get relevant settings
-        settings = {
-            setting.key: setting.value for setting in EventSettingsStore.objects.filter(object_id=event.id, key__in=(
-                'system_question_order', 'attendee_names_asked', 'attendee_names_required', 'attendee_emails_asked', 'attendee_emails_required',
-                'attendee_company_asked', 'attendee_company_required', 'attendee_addresses_asked', 'attendee_addresses_required',
-            ))
-        }
-
-        # get all ticket-level questions (user-defined and system provided), along with the products for which they're asked
-        questions = event.questions.filter(container_type='P')
-        children = sorted(chain((
-            (item, q.position, 0, q)
-            for q in get_fake_questions(settings)
-            for item in event.items.filter(personalized=True).values_list('id', 'internal_name', 'name')
-        ), (
-            (item, q.position, q.id, q)
-            for q in questions.filter(hidden=False)
-            for item in q.items.values_list('id', 'internal_name', 'name')
-        )), key=lambda t: (t[0], t[1]))
-
-        create_grouped_item_questionnaires(event, children, '', 'PS')
-
-        children = sorted(chain((
-            (item, q.position, q.id, q)
-            for q in questions.filter(hidden=True)
-            for item in q.items.values_list('id', 'internal_name', 'name')
-        )), key=lambda t: (t[0], t[1]))
-
-        create_grouped_item_questionnaires(event, children, 'Hidden questions for ', 'PH')
-
-        # get all order-level questions
-        questions = list(event.questions.filter(container_type='O', hidden=False).order_by('position'))
-        if questions:
-            # create questionnaires and children
-            questionnaire = Questionnaire.objects.create(
-                event=event, type='OS', position=0, all_sales_channels=True,
-                internal_name='Per-order questions',
-            )
-            deps = {}
-            for position, child in enumerate(questions):
-                deps[child.id] = QuestionnaireChild.objects.create(
-                    questionnaire=questionnaire,
-                    position=position + 1,
-                    user_datafield=child,
-                    required=child.required,
-                    label=child.question,
-                    help_text=child.help_text,
-                    dependency_question=deps[child.dependency_question.id] if child.dependency_question else None,
-                    dependency_values=child.dependency_values,
-                )
-
-
-def migrate_questions_backward(apps, schema_editor):
-    pass  # as long as we don't delete the old columns, this is a no op. after that, it gets complicated...
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0309_alter_questionanswer_unique_together_and_more'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Questionnaire',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
-                ('internal_name', models.CharField(max_length=255)),
-                ('type', models.CharField(max_length=5)),
-                ('position', models.PositiveIntegerField(default=0)),
-                ('all_sales_channels', models.BooleanField(default=True)),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='questionnaires', to='pretixbase.event')),
-                ('items', models.ManyToManyField(related_name='questionnaires', to='pretixbase.item')),
-                ('limit_sales_channels', models.ManyToManyField(to='pretixbase.saleschannel')),
-            ],
-            options={
-                'abstract': False,
-            },
-            bases=(models.Model, pretix.base.models.base.LoggingMixin),
-        ),
-        migrations.CreateModel(
-            name='QuestionnaireChild',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
-                ('position', models.PositiveIntegerField(default=0)),
-                ('system_datafield', models.CharField(max_length=25, null=True)),
-                ('required', models.BooleanField(default=False)),
-                ('label', i18nfield.fields.I18nTextField()),
-                ('help_text', i18nfield.fields.I18nTextField(null=True)),
-                ('dependency_values', pretix.base.models.fields.MultiStringField(default=[])),
-                ('dependency_question', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='dependent_questions', to='pretixbase.questionnairechild')),
-                ('questionnaire', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='children', to='pretixbase.questionnaire')),
-                ('user_datafield', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='references', to='pretixbase.question')),
-            ],
-            options={
-                'abstract': False,
-            },
-            bases=(models.Model, pretix.base.models.base.LoggingMixin),
-        ),
-        migrations.RunPython(
-            migrate_questions_forward,
-            migrate_questions_backward,
-        ),
-        # TODO(questionnaires) remove old columns from Question model
-    ]

src/pretix/base/migrations/0311_fix_unshredded_invoices.py

@@ -0,0 +1,49 @@
+# Generated by Django 5.2.17 on 2026-09-21 11:30
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+def fix_unshredded_invoices(apps, _):
+    Invoice = apps.get_model("pretixbase", "Invoice")
+    InvoiceLine = apps.get_model("pretixbase", "InvoiceLine")
+    ignore_fields = (
+        # bool/int fields are not listed and skipped automatically
+        'prefix', 'invoice_no', 'full_invoice_no', 'invoice_from', 'invoice_from_name', 'invoice_from_zipcode',
+        'invoice_from_city', 'invoice_from_state', 'invoice_from_country', 'invoice_from_tax_id',
+        'invoice_from_vat_id', 'locale', 'payment_provider_stamp', 'footer_text', 'foreign_currency_display',
+        'foreign_currency_source', 'transmission_type', 'transmission_provider', 'transmission_status',
+    )
+
+    for i in Invoice.objects.filter(shredded=True):
+        for f in Invoice._meta.fields:
+            if f.name in ignore_fields:
+                continue
+            val = getattr(i, f.name, None)
+            if val and isinstance(val, str):
+                setattr(i, f.name, "█")
+            elif val and isinstance(val, list):  # jsonfield
+                setattr(i, f.name, [])
+            elif val and isinstance(val, dict):  # jsonfield
+                setattr(i, f.name, {"_shredded": True})
+        i.save()
+
+    InvoiceLine.objects.filter(
+        attendee_name__isnull=False,
+        invoice__shredded=True
+    ).update(attendee_name="█")
+
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("pretixbase", "0310_question_valid_string_length_min"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            fix_unshredded_invoices,
+            migrations.RunPython.noop,
+        ),
+    ]

src/pretix/base/models/__init__.py

@@ -37,8 +37,8 @@ from .invoices import Invoice, InvoiceLine, invoice_filename
 from .items import (
     Item, ItemAddOn, ItemBundle, ItemCategory, ItemMetaProperty, ItemMetaValue,
     ItemProgramTime, ItemVariation, ItemVariationMetaValue, Question,
-    Questionnaire, QuestionnaireChild, QuestionOption, Quota, SubEventItem,
-    SubEventItemVariation, itempicture_upload_to,
+    QuestionOption, Quota, SubEventItem, SubEventItemVariation,
+    itempicture_upload_to,
 )
 from .log import LogEntry
 from .mail import OutgoingMail

src/pretix/base/models/base.py

@@ -151,12 +151,29 @@ class LoggingMixin:
         logentry = LogEntry(content_object=self, user=user, action_type=action, event=event,
                             organizer_id=organizer_id, **kwargs)
         if isinstance(data, dict):
-            sensitivekeys = ['password', 'secret', 'api_key']
+            # sensitivekeys are matched whether contained, not exactly
+            sensitivekeys = [
+                'auth',
+                'key',
+                'token',
+                'password',
+                'Password',
+                '_pass',
+                'salt',
+                'secret',
+            ]
 
-            for sensitivekey in sensitivekeys:
-                for k, v in data.items():
-                    if (sensitivekey in k) and v:
+            def clean_recursive(d):
+                data = d
+                data_iterator = d.items() if isinstance(d, dict) else enumerate(d)
+                for k, v in data_iterator:
+                    if v and any([sensitivekey in str(k) for sensitivekey in sensitivekeys]):
                         data[k] = "********"
+                    elif isinstance(v, (list, dict)):
+                        data[k] = clean_recursive(v)
+                return data
+
+            data = clean_recursive(data)
 
             logentry.data = json.dumps(data, cls=CustomJSONEncoder, sort_keys=True)
         elif data:

src/pretix/base/models/devices.py

@@ -166,6 +166,7 @@ class Device(LoggedModel):
     )
     security_profile = models.CharField(
         max_length=190,
+        verbose_name=_('Security profile'),
         default='full',
         null=True,
         blank=False

src/pretix/base/models/event.py

@@ -83,6 +83,8 @@ from .organizer import Organizer, Team
 if TYPE_CHECKING:
     from hierarkey.proxy import HierarkeyProxy
 
+    from .organizer import SalesChannel
+
 logger = logging.getLogger(__name__)
 
 
@@ -336,12 +338,18 @@ class EventMixin:
         return safe_string(json.dumps(eventdict))
 
     @classmethod
-    def annotated(cls, qs, channel, voucher=None):
+    def annotated(cls, qs, channel: "str | SalesChannel | list[SalesChannel]", voucher=None):
         # Channel can currently be a SalesChannel or a str, since we need that compatibility, but a SalesChannel
         # makes the query SIGNIFICANTLY faster
         from pretix.base.models import Item, ItemVariation, Quota, SalesChannel
 
-        assert isinstance(channel, (SalesChannel, str))
+        assert isinstance(channel, (SalesChannel, str, list))
+
+        if isinstance(channel, SalesChannel):
+            channel = [channel]
+
+        if isinstance(channel, list):
+            assert all(isinstance(c, SalesChannel) for c in channel)
 
         sq_active_item = Item.objects.using(settings.DATABASE_REPLICA).filter_available(channel=channel, voucher=voucher).filter(
             Q(variations__isnull=True)
@@ -364,8 +372,8 @@ class EventMixin:
             q_variation &= Q(Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=channel))
             q_variation &= Q(Q(item__all_sales_channels=True) | Q(item__limit_sales_channels__identifier=channel))
         else:
-            q_variation &= Q(Q(all_sales_channels=True) | Q(limit_sales_channels=channel))
-            q_variation &= Q(Q(item__all_sales_channels=True) | Q(item__limit_sales_channels=channel))
+            q_variation &= Q(Q(all_sales_channels=True) | Q(limit_sales_channels__in=channel))
+            q_variation &= Q(Q(item__all_sales_channels=True) | Q(item__limit_sales_channels__in=channel))
 
         if voucher:
             if voucher.variation_id:
@@ -1661,11 +1669,17 @@ class SubEvent(EventMixin, LoggedModel):
         return qs_annotated
 
     @classmethod
-    def annotated(cls, qs, channel, voucher=None):
+    def annotated(cls, qs, channel: "str | SalesChannel | list[SalesChannel]", voucher=None):
         from .items import SubEventItem, SubEventItemVariation
         from .organizer import SalesChannel
 
-        assert isinstance(channel, (str, SalesChannel))
+        assert isinstance(channel, (SalesChannel, str, list))
+
+        if isinstance(channel, SalesChannel):
+            channel = [channel]
+
+        if isinstance(channel, list):
+            assert all(isinstance(c, SalesChannel) for c in channel)
 
         qs = super().annotated(qs, channel, voucher=voucher)
         qs = qs.annotate(

src/pretix/base/models/items.py

@@ -313,7 +313,14 @@ def filter_available(qs, channel='web', voucher=None, allow_addons=False, allow_
     # makes the query SIGNIFICANTLY faster
     from .organizer import SalesChannel
 
-    assert isinstance(channel, (SalesChannel, str))
+    assert isinstance(channel, (SalesChannel, str, list))
+
+    if isinstance(channel, SalesChannel):
+        channel = [channel]
+
+    if isinstance(channel, list):
+        assert all(isinstance(c, SalesChannel) for c in channel)
+
     q = (
         # IMPORTANT: If this is updated, also update the ItemVariation query
         # in models/event.py: EventMixin.annotated()
@@ -325,7 +332,7 @@ def filter_available(qs, channel='web', voucher=None, allow_addons=False, allow_
     if isinstance(channel, str):
         q &= Q(Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=channel))
     else:
-        q &= Q(Q(all_sales_channels=True) | Q(limit_sales_channels=channel))
+        q &= Q(Q(all_sales_channels=True) | Q(limit_sales_channels__in=channel))
 
     if not allow_addons:
         q &= Q(Q(category__isnull=True) | Q(category__is_addon=False))
@@ -1050,10 +1057,8 @@ class Item(LoggedModel):
 
                 replace_year = valid_until.year
                 replace_month = valid_until.month + self.validity_dynamic_duration_months
-
-                while replace_month > 12:
-                    replace_month -= 12
-                    replace_year += 1
+                replace_year += (replace_month - 1) // 12
+                replace_month = ((replace_month - 1) % 12) + 1
                 max_day = calendar.monthrange(replace_year, replace_month)[1]
                 replace_date = date(
                     year=replace_year,
@@ -1569,12 +1574,10 @@ class ItemBundle(models.Model):
 
 class Question(LoggedModel):
     """
-    A question is a data field that can be used to extend an order or a ticket by custom
-    information, e.g. "Attendee age". To be actually useful, questions need to be added to
-    one or multiple Questionnaires. The answers may be found in QuestionAnswers, attached
-    to Orders, OrderPositions or CartPositions.
-
-    A question can allow one of several input types, currently:
+    A question is an input field that can be used to extend a ticket by custom information,
+    e.g. "Attendee age". The answers are found next to the position. The answers may be found
+    in QuestionAnswers, attached to OrderPositions/CartPositions. A question can allow one of
+    several input types, currently:
 
     * a number (``TYPE_NUMBER``)
     * a one-line string (``TYPE_STRING``)
@@ -1594,7 +1597,7 @@ class Question(LoggedModel):
     :param required: Whether answering this question is required for submitting an order including
                      items associated with this question.
     :type required: bool
-    :param items: TO BE REMOVED
+    :param items: A set of ``Items`` objects that this question should be applied to
     :param ask_during_checkin: Whether to ask this question during check-in instead of during check-out.
     :type ask_during_checkin: bool
     :param show_during_checkin: Whether to show the answer to this question during check-in.
@@ -1653,7 +1656,6 @@ class Question(LoggedModel):
         default=ContainerType.ORDERPOSITION,
     )
     question = I18nTextField(
-        # TODO(questionnaires) : to be renamed to 'internal_name'
         verbose_name=_("Question")
     )
     identifier = models.CharField(
@@ -1669,7 +1671,6 @@ class Question(LoggedModel):
         ],
     )
     help_text = I18nTextField(
-        # TODO(questionnaires) : to be removed
         verbose_name=_("Help text"),
         help_text=_("If the question needs to be explained or clarified, do it here!"),
         null=True, blank=True,
@@ -1679,22 +1680,22 @@ class Question(LoggedModel):
         choices=TYPE_CHOICES,
         verbose_name=_("Question type")
     )
-    required = models.BooleanField(  # TODO(questionnaires) : to be removed, -> QuestionnaireChild
+    required = models.BooleanField(
         default=False,
         verbose_name=_("Required question")
     )
-    items = models.ManyToManyField(  # TODO(questionnaires) : to be removed, -> Questionnaire
+    items = models.ManyToManyField(
         Item,
         related_name='questions',
         verbose_name=_("Products"),
         blank=True,
         help_text=_('This question will be asked to buyers of the selected products')
     )
-    position = models.PositiveIntegerField(  # TODO(questionnaires) : to be removed, -> Questionnaire + QuestionnaireChild
+    position = models.PositiveIntegerField(
         default=0,
         verbose_name=_("Position")
     )
-    ask_during_checkin = models.BooleanField(  # TODO(questionnaires) : to be removed
+    ask_during_checkin = models.BooleanField(
         verbose_name=_('Ask during check-in instead of in the ticket buying process'),
         help_text=_('Not supported by all check-in apps for all question types.'),
         default=False
@@ -1704,7 +1705,7 @@ class Question(LoggedModel):
         help_text=_('Not supported by all check-in apps for all question types.'),
         default=False
     )
-    hidden = models.BooleanField(  # to be removed
+    hidden = models.BooleanField(
         verbose_name=_('Hidden question'),
         help_text=_('This question will only show up in the backend.'),
         default=False
@@ -1713,10 +1714,10 @@ class Question(LoggedModel):
         verbose_name=_('Print answer on invoices'),
         default=False
     )
-    dependency_question = models.ForeignKey(  # TODO(questionnaires) : to be removed, -> QuestionnaireChild
+    dependency_question = models.ForeignKey(
         'Question', null=True, blank=True, on_delete=models.SET_NULL, related_name='dependent_questions'
     )
-    dependency_values = MultiStringField(default=[])  # TODO(questionnaires) : to be removed, -> QuestionnaireChild
+    dependency_values = MultiStringField(default=[])
     valid_number_min = models.DecimalField(decimal_places=6, max_digits=30, null=True, blank=True,
                                            verbose_name=_('Minimum value'),
                                            help_text=_('Currently not supported in our apps and during check-in'))
@@ -1755,9 +1756,9 @@ class Question(LoggedModel):
     objects = ScopedManager(organizer='event__organizer')
 
     class Meta:
-        verbose_name = _("Data field")
-        verbose_name_plural = _("Data fields")
-        ordering = ('question', 'id')
+        verbose_name = _("Question")
+        verbose_name_plural = _("Questions")
+        ordering = ('position', 'id')
         unique_together = (('event', 'identifier'),)
 
     def __str__(self):
@@ -1908,7 +1909,7 @@ class Question(LoggedModel):
         return answer
 
     @staticmethod
-    def clean_items(event, items):  # TODO(questionnaires) : remove method / move to qc
+    def clean_items(event, items):
         for item in items:
             if event != item.event:
                 raise ValidationError(_('One or more items do not belong to this event.'))
@@ -1989,105 +1990,6 @@ class QuestionOption(models.Model):
         ordering = ('position', 'id')
 
 
-class Questionnaire(LoggedModel):
-    TYPE_ORDER_SALE = "OS"
-    TYPE_ORDER_POSITION_SALE = "PS"
-    TYPE_ORDER_POSITION_ATTENDEE_ONLY = "PA"
-    TYPE_ORDER_POSITION_CHECKIN = "PC"
-    TYPE_ORDER_POSITION_HIDDEN = "PH"
-    TYPE_CHOICES = (
-        (TYPE_ORDER_SALE, _("Order-wide, before purchase")),
-        (TYPE_ORDER_POSITION_SALE, _("Per product, before purchase")),
-        (TYPE_ORDER_POSITION_ATTENDEE_ONLY, _("Per product, via attendee link")),
-        (TYPE_ORDER_POSITION_CHECKIN, _("Per product, at check-in")),
-        (TYPE_ORDER_POSITION_HIDDEN, _("Per product, hidden")),
-    )
-    event = models.ForeignKey(
-        Event,
-        related_name="questionnaires",
-        on_delete=models.CASCADE
-    )
-    internal_name = models.CharField(
-        verbose_name=_("Internal name"),
-        max_length=255,
-    )
-    type = models.CharField(
-        max_length=5,
-        choices=TYPE_CHOICES,
-        verbose_name=_("Questionnaire type")
-    )
-    items = models.ManyToManyField(
-        Item,
-        related_name='questionnaires',
-        verbose_name=_("Products"),
-        blank=True,
-        help_text=_('This questionnaire will be asked to buyers of the selected products')
-    )
-    position = models.PositiveIntegerField(
-        default=0,
-        verbose_name=_("Position")
-    )
-    all_sales_channels = models.BooleanField(
-        verbose_name=_("Sell on all sales channels the product is sold on"),
-        default=True,
-    )
-    limit_sales_channels = models.ManyToManyField(
-        "SalesChannel",
-        verbose_name=_("Restrict to specific sales channels"),
-        help_text=_('The sales channel selection for the product as a whole takes precedence, so if a sales channel is '
-                    'selected here but not on product level, the variation will not be available.'),
-        blank=True,
-    )
-
-
-class QuestionnaireChild(LoggedModel):
-    SYSTEM_QUESTION_CHOICES = (
-        ('attendee_name_parts', _('Attendee name')),
-        ('attendee_email', _('Attendee email')),
-        ('company', _('Company')),
-        ('street', _('Street')),
-        ('zipcode', _('ZIP code')),
-        ('city', _('City')),
-        ('country', _('Country')),
-    )
-    questionnaire = models.ForeignKey(
-        Questionnaire,
-        related_name="children",
-        on_delete=models.CASCADE
-    )
-    position = models.PositiveIntegerField(
-        default=0,
-        verbose_name=_("Position")
-    )
-    user_datafield = models.ForeignKey(
-        Question,
-        related_name="references",
-        on_delete=models.CASCADE,
-        null=True, blank=True,
-    )
-    system_datafield = models.CharField(
-        max_length=25,
-        choices=SYSTEM_QUESTION_CHOICES,
-        null=True, blank=True,
-    )
-    required = models.BooleanField(
-        default=False,
-        verbose_name=_("Required question")
-    )
-    label = I18nTextField(
-        verbose_name=_("Question")
-    )
-    help_text = I18nTextField(
-        verbose_name=_("Help text"),
-        help_text=_("If the question needs to be explained or clarified, do it here!"),
-        null=True, blank=True,
-    )
-    dependency_question = models.ForeignKey(
-        'QuestionnaireChild', null=True, blank=True, on_delete=models.SET_NULL, related_name='dependent_questions'
-    )
-    dependency_values = MultiStringField(default=[])
-
-
 class Quota(LoggedModel):
     """
     A quota is a "pool of tickets". It is there to limit the number of items

src/pretix/base/models/orders.py

@@ -1449,12 +1449,6 @@ class QuestionAnswer(models.Model):
         else:
             return self.answer
 
-    def to_dependency_values(self):
-        if self.question.type in (Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE):
-            return [o.identifier for o in self.options.all()]
-        elif self.question.type in (Question.TYPE_BOOLEAN, Question.TYPE_COUNTRYCODE):
-            return self.answer
-
     def save(self, *args, **kwargs):
         if self.orderposition and self.cartposition:
             raise ValueError('QuestionAnswer cannot be linked to an order and a cart position at the same time.')
@@ -1599,80 +1593,53 @@ class AbstractPosition(RoundingCorrectionMixin, models.Model):
 
     def cache_answers(self, all=True):
         """
-        Creates a new property on the object:
-        questions: a list of Question objects, extended by an 'answer' property
+        Creates two properties on the object.
+        (1) answ: a dictionary of question.id → answer string
+        (2) questions: a list of Question objects, extended by an 'answer' property
         """
+        self.answ = {}
+        for a in getattr(self, 'answerlist', self.answers.all()):  # use prefetch_related cache from get_cart
+            self.answ[a.question_id] = a
+
         # We need to clone our question objects, otherwise we will override the cached
         # answers of other items in the same cart if the question objects have been
         # selected via prefetch_related
         if not all:
-            if hasattr(self.item, 'relevant_questionnaires'):
-                children = list(copy.copy(qc) for qq in self.item.relevant_questionnaires for qc in qq.childlist)
+            if hasattr(self.item, 'questions_to_ask'):
+                questions = list(copy.copy(q) for q in self.item.questions_to_ask)
             else:
-                children = list(copy.copy(qc) for qq in self.item.questionnaires.filter(type='PS') for qc in qq.children.all())
+                questions = list(copy.copy(q) for q in self.item.questions.filter(ask_during_checkin=False,
+                                                                                  hidden=False))
         else:
-            children = list(copy.copy(qc) for qq in self.item.questionnaires.filter(type__startswith='P') for qc in qq.children.all())
+            questions = list(copy.copy(q) for q in self.item.questions.all())
 
-        qc_cache = {
-            q.pk: q for q in children
+        question_cache = {
+            q.pk: q for q in questions
         }
 
-        def qc_is_visible(parentid, qvals):
-            if parentid not in qc_cache:
+        def question_is_visible(parentid, qvals):
+            if parentid not in question_cache:
                 return False
-            parentqc = qc_cache[parentid]
-            if parentqc.dependency_question_id and not qc_is_visible(parentqc.dependency_question_id, parentqc.dependency_values):
+            parentq = question_cache[parentid]
+            if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
                 return False
-            answer_values = self.get_dependency_answer_values(parentqc)
-            return any(qval in answer_values for qval in qvals)
+            if parentid not in self.answ:
+                return False
+            return (
+                ('True' in qvals and self.answ[parentid].answer == 'True')
+                or ('False' in qvals and self.answ[parentid].answer == 'False')
+                or (any(qval in [o.identifier for o in self.answ[parentid].options.all()] for qval in qvals))
+            )
 
         self.questions = []
-        for qc in children:
-            if qc.user_datafield_id and qc.user_datafield_id in self.answer_cache:
-                qc.answer = self.answer_cache[qc.user_datafield_id]
-                #qc.answer.question = qc  # cache object
-            elif qc.system_datafield:
-                qc.answer = self.get_system_answer(qc.system_datafield)
-                #qc.answer.question = qc  # cache object
+        for q in questions:
+            if q.id in self.answ:
+                q.answer = self.answ[q.id]
+                q.answer.question = q  # cache object
             else:
-                qc.answer = ""
-            if not qc.dependency_question_id or qc_is_visible(qc.dependency_question_id, qc.dependency_values):
-                self.questions.append(qc)
-
-    @cached_property
-    def answer_cache(self):
-        return {
-            aw.question_id: aw for aw in getattr(self, 'answerlist', self.answers.all())
-        }
-
-    def get_dependency_answer_values(self, qc):
-        if qc.user_datafield_id:
-            if qc.user_datafield_id not in self.answer_cache:
-                return None
-            answer = self.answer_cache[qc.user_datafield_id]
-            return answer.to_dependency_values()
-        elif qc.system_datafield:
-            return [self.get_system_answer(qc.system_datafield)]
-        else:
-            raise ValueError('Questionnaire child without datafield has no answer')
-
-    def get_system_answer(self, system_datafield_name):
-        if system_datafield_name == 'attendee_name_parts':
-            return self.attendee_name_parts
-        elif system_datafield_name == 'attendee_email':
-            return self.attendee_email
-        elif system_datafield_name == 'street':
-            return self.street
-        elif system_datafield_name == 'zipcode':
-            return self.zipcode
-        elif system_datafield_name == 'city':
-            return self.city
-        elif system_datafield_name == 'state':
-            return self.state
-        elif system_datafield_name == 'country':
-            return self.country
-        else:
-            raise ValueError('Unknown system question name')
+                q.answer = ""
+            if not q.dependency_question_id or question_is_visible(q.dependency_question_id, q.dependency_values):
+                self.questions.append(q)
 
     @property
     def net_price(self):

src/pretix/base/models/organizer.py

@@ -42,7 +42,7 @@ from django.conf import settings
 from django.core.mail import get_connection
 from django.core.validators import MinLengthValidator, RegexValidator
 from django.db import models
-from django.db.models import Q
+from django.db.models import Exists, OuterRef, Q
 from django.urls import reverse
 from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
@@ -312,6 +312,25 @@ class Organizer(LoggedModel):
             )
             i += 1
 
+    def get_users_with_permission(self, permission):
+        """
+        Returns a queryset of users who have a specific permission to this organizer.
+
+        :return: Iterable of User
+        """
+        from .auth import User
+
+        if permission:
+            qs = Team.objects.with_organizer_permission(permission)
+        else:
+            qs = Team.objects.all()
+
+        team_with_perm = qs.filter(
+            members__pk=OuterRef('pk'),
+            organizer=self,
+        )
+        return User.objects.filter(Exists(team_with_perm))
+
 
 def generate_invite_token():
     return get_random_string(length=32, allowed_chars=string.ascii_lowercase + string.digits)

src/pretix/base/notifications.py

@@ -35,12 +35,13 @@
 import logging
 from collections import OrderedDict, namedtuple
 from itertools import groupby
+from typing import Optional, Union
 
 from django.dispatch import receiver
 from django.utils.formats import date_format
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 
-from pretix.base.models import Event, LogEntry
+from pretix.base.models import Event, LogEntry, Organizer
 from pretix.base.signals import register_notification_types
 from pretix.base.templatetags.money import money_filter
 from pretix.helpers.urls import mainreverse_absolute
@@ -57,7 +58,8 @@ class Notification:
     """
     Represents a notification that is sent/shown to a user. A notification consists of:
 
-    * one ``event`` reference
+    * one ``event`` reference (can be ``Ǹone``)
+    * one ``organizer`` reference
     * one ``title`` text that is shown e.g. in the email subject or in a headline
     * optionally one ``detail`` text that may or may not be shown depending on the notification method
     * optionally one ``url`` that should be absolute and point to the context of an notification (e.g. an order)
@@ -67,8 +69,12 @@ class Notification:
       each consisting of a button label and an absolute URL to point to.
     """
 
-    def __init__(self, event: Event, title: str, detail: str=None, url: str=None):
+    def __init__(self, event: Optional[Event], title: str, detail: Optional[str]=None, url: Optional[str]=None, organizer: Optional[Organizer]=None):
+        assert event or organizer, "You need to pass either event or organizer"
+        if event and organizer:
+            assert event.organizer_id == organizer.id, "Organizer and event mismatch"
         self.title = title
+        self.organizer = organizer or event.organizer
         self.event = event
         self.detail = detail
         self.url = url
@@ -91,8 +97,16 @@ class Notification:
 
 
 class NotificationType:
-    def __init__(self, event: Event = None):
-        self.event = event
+    def __init__(self, event_or_organizer: Union[Event, Organizer] = None):
+        if isinstance(event_or_organizer, Event):
+            self.event = event_or_organizer
+            self.organizer = event_or_organizer.organizer
+        elif isinstance(event_or_organizer, Organizer):
+            self.event = None
+            self.organizer = event_or_organizer
+        else:
+            self.event = None
+            self.organizer = None
 
     def __repr__(self):
         return '<NotificationType: {}>'.format(self.action_type)
@@ -121,31 +135,39 @@ class NotificationType:
         """
         raise NotImplementedError()  # NOQA
 
+    @property
+    def is_event_level(self) -> bool:
+        """
+        Return `True` if this notification type can be configured per event (the default).
+        """
+        return True
+
     def build_notification(self, logentry: LogEntry) -> Notification:
         """
         This is the main function that you should override. It is supposed to turn a log entry
         object into a notification object that can then be rendered e.g. into an email.
         """
         return Notification(
-            logentry.event,
-            logentry.display()
+            event=logentry.event,
+            title=logentry.display(),
+            organizer=logentry.organizer,
         )
 
 
-def get_all_notification_types(event=None):
+def get_all_notification_types(event_or_organizer=None):
     global _ALL_TYPES
 
-    if event is None and _ALL_TYPES:
+    if event_or_organizer is None and _ALL_TYPES:
         return _ALL_TYPES
 
     types = OrderedDict()
-    for recv, ret in register_notification_types.send(event):
+    for recv, ret in register_notification_types.send(event_or_organizer):
         if isinstance(ret, (list, tuple)):
             for r in ret:
                 types[r.action_type] = r
         else:
             types[ret.action_type] = ret
-    if event is None:
+    if event_or_organizer is None:
         _ALL_TYPES = types
     return types
 
@@ -181,6 +203,7 @@ class ParametrizedOrderNotificationType(NotificationType):
 
         n = Notification(
             event=logentry.event,
+            organizer=logentry.organizer,
             title=self._title.format(order=order, event=logentry.event),
             url=order_url
         )

src/pretix/base/payment.py

@@ -72,7 +72,7 @@ from pretix.helpers.countries import CachedCountries
 from pretix.helpers.format import format_map
 from pretix.helpers.money import DecimalTextInput
 from pretix.multidomain.urlreverse import eventreverse_absolute
-from pretix.presale.views import get_cart_positions
+from pretix.presale.views import get_cart
 from pretix.presale.views.cart import cart_session, get_or_create_cart_id
 
 logger = logging.getLogger(__name__)
@@ -1165,7 +1165,7 @@ class FreeOrderProvider(BasePaymentProvider):
     def is_allowed(self, request: HttpRequest, total: Decimal=None) -> bool:
         from .services.cart import get_fees
 
-        cart = get_cart_positions(request)
+        cart = get_cart(request)
 
         try:
             fees = get_fees(event=request.event, request=request,
@@ -1433,7 +1433,7 @@ class GiftCardPayment(BasePaymentProvider):
                 for p in cs.get('payments', [])
                 if p.get('info_data', {}).get('gift_card')
             ]
-            positions = get_cart_positions(request)
+            positions = get_cart(request)
             testmode = self.event.testmode
         else:
             used_cards = []
@@ -1527,42 +1527,37 @@ class GiftCardPayment(BasePaymentProvider):
         })
 
     def refund_control_render(self, request, refund) -> str:
-        from .models import GiftCard
-
         if 'gift_card' in refund.info_data:
-            gc = GiftCard.objects.get(pk=refund.info_data.get('gift_card'))
             template = get_template('pretixcontrol/giftcards/payment.html')
-
             ctx = {
                 'request': request,
                 'event': self.event,
-                'gc': gc,
             }
+            try:
+                gc = self.event.organizer.accepted_gift_cards.get(pk=refund.info_data.get('gift_card'))
+                ctx['gc'] = gc
+            except GiftCard.DoesNotExist:
+                pass
             return template.render(ctx)
 
     def payment_control_render(self, request, payment) -> str:
-        from .models import GiftCard
+        template = get_template('pretixcontrol/giftcards/payment.html')
+        ctx = {
+            'request': request,
+            'event': self.event,
+            **({'error': payment.info_data[
+                'error']} if 'error' in payment.info_data else {}),
+            **({'gift_card_secret': payment.info_data[
+                'gift_card_secret']} if 'gift_card_secret' in payment.info_data else {})
+        }
 
-        if any(key in payment.info_data for key in ('gift_card', 'error')):
-            template = get_template('pretixcontrol/giftcards/payment.html')
-            ctx = {
-                'request': request,
-                'event': self.event,
-                **({'error': payment.info_data[
-                    'error']} if 'error' in payment.info_data else {}),
-                **({'gift_card_secret': payment.info_data[
-                    'gift_card_secret']} if 'gift_card_secret' in payment.info_data else {})
-            }
+        try:
+            ctx['gc'] = self.event.organizer.accepted_gift_cards.get(pk=payment.info_data.get('gift_card'))
+        except GiftCard.DoesNotExist:
+            pass
 
-            try:
-                gc = GiftCard.objects.get(pk=payment.info_data.get('gift_card'))
-                ctx = {
-                    'gc': gc,
-                }
-            except GiftCard.DoesNotExist:
-                pass
-            finally:
-                return template.render(ctx)
+        if any(key in ctx for key in ('gc', 'gift_card_secret', 'error')):
+            return template.render(ctx)
 
     def payment_control_render_short(self, payment: OrderPayment) -> str:
         d = payment.info_data
@@ -1572,10 +1567,9 @@ class GiftCardPayment(BasePaymentProvider):
         d = refund.info_data
         return d.get('gift_card_secret', d.get('gift_card_code', self.public_name))
 
-    def api_payment_details(self, payment: OrderPayment):
-        from .models import GiftCard
+    def api_payment_details(self, payment: OrderPayment | OrderRefund):
         try:
-            gc = GiftCard.objects.get(pk=payment.info_data.get('gift_card'))
+            gc = self.event.organizer.accepted_gift_cards.get(pk=payment.info_data.get('gift_card'))
         except GiftCard.DoesNotExist:
             return {
                 **({'error': payment.info_data[
@@ -1698,7 +1692,19 @@ class GiftCardPayment(BasePaymentProvider):
     @transaction.atomic()
     def execute_refund(self, refund: OrderRefund):
         from .models import GiftCard
-        gc = GiftCard.objects.get(pk=refund.info_data.get('gift_card') or refund.payment.info_data.get('gift_card'))
+        try:
+            gc = self.event.organizer.accepted_gift_cards.get(
+                pk=refund.info_data.get('gift_card') or refund.payment.info_data.get('gift_card'),
+                currency=self.event.currency
+            )
+        except GiftCard.DoesNotExist:
+            raise PaymentException(_("Gift card not found."))
+
+        if gc.testmode != refund.order.testmode:
+            raise PaymentException(_("Only test gift card can be used in test mode and vice versa."))
+        if gc.expires and gc.expires < time_machine_now():
+            raise PaymentException(_("This gift card is no longer valid."))
+
         trans = gc.transactions.create(
             value=refund.amount,
             order=refund.order,

src/pretix/base/pdf.py

@@ -801,6 +801,18 @@ def generate_compressed_addon_list(op, order, event, only_checked_in=False):
     return addonlist
 
 
+def get_sizebox(page: pypdf.PageObject):
+    mediabox = page.mediabox
+    cropbox = page.cropbox
+
+    return pypdf.generic.RectangleObject((
+        max(mediabox[0], cropbox[0]),
+        max(mediabox[1], cropbox[1]),
+        min(mediabox[2], cropbox[2]),
+        min(mediabox[3], cropbox[3]),
+    ))
+
+
 class Renderer:
 
     def __init__(self, event, layout, background_file):
@@ -1079,7 +1091,7 @@ class Renderer:
         fontsize = float(o['fontsize'])
         height = float(o['height']) * mm
         width = float(o['width']) * mm
-        while True:
+        for _i in range(25):  # try adapting the font size at most 25 times
             p, ad, lineheight = self._text_paragraph(op, order, o, override_fontsize=fontsize)
             w, h = p.wrapOn(canvas, width, 1000 * mm)
             widths = p.getActualLineWidths0()
@@ -1153,11 +1165,10 @@ class Renderer:
                 elif o['type'] == "poweredby":
                     self._draw_poweredby(canvas, op, o)
                 if self.bg_pdf:
-                    page_size = (
-                        self.bg_pdf.pages[0].mediabox[2] - self.bg_pdf.pages[0].mediabox[0],
-                        self.bg_pdf.pages[0].mediabox[3] - self.bg_pdf.pages[0].mediabox[1]
-                    )
-                    if self.bg_pdf.pages[0].get('/Rotate') in (90, 270):
+                    first_page = self.bg_pdf.pages[0]
+                    sizebox = get_sizebox(first_page)
+                    page_size = (sizebox.width, sizebox.height)
+                    if first_page.rotation in (90, 270):
                         # swap dimensions due to pdf being rotated
                         page_size = page_size[::-1]
                     canvas.setPageSize(page_size)
@@ -1312,14 +1323,18 @@ def merge_background(fg_pdf: PdfWriter, bg_pdf: PdfWriter, out_file, compress):
 
 
 def _merge_with_correct_page_media_box(output: pypdf.PdfWriter, fg_page: pypdf.PageObject, bg_page: pypdf.PageObject):
-    if bg_page.rotation != 0:
-        bg_page.transfer_rotation_to_content()
-    media_box = bg_page.mediabox
+    """
+    Adds fg_page to output, merging bg_page behind it.
+
+    If bg_page has a non-zero mergebox/cropbox or is rotated via /Rotate, a transformation is applied to fix this."""
     trsf = pypdf.Transformation()
-    if media_box.bottom != 0:
-        trsf = trsf.translate(0, -media_box.bottom)
-    if media_box.left != 0:
-        trsf = trsf.translate(-media_box.left, 0)
+    if bg_page.rotation != 0:
+        trsf = trsf.rotate(-bg_page.rotation)
+
+    mb = get_sizebox(bg_page)
+    pt1 = trsf.apply_on(mb.lower_left)
+    pt2 = trsf.apply_on(mb.upper_right)
+    trsf = trsf.translate(-min(pt1[0], pt2[0]), -min(pt1[1], pt2[1]))
 
     fg_page = output.add_page(fg_page)
     fg_page.merge_transformed_page(bg_page, trsf, over=False, expand=False)

src/pretix/base/permissions.py

@@ -330,5 +330,6 @@ def register_default_organizer_permissions(sender, **kwargs):
                 PermissionOption(actions=tuple(), label=pgettext_lazy("permission_level", "No access")),
                 PermissionOption(actions=("read",), label=pgettext_lazy("permission_level", "View")),
             ],
+            help_text=_("View access includes the option to e.g. abort pending emails or retry failed emails."),
         ),
     ]

src/pretix/base/plugins.py

@@ -22,9 +22,9 @@
 import os
 import sys
 from enum import Enum
+from importlib import metadata
 from typing import List
 
-import importlib_metadata as metadata
 from django.apps import AppConfig, apps
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured

src/pretix/base/services/mail.py

@@ -54,7 +54,7 @@ from celery.exceptions import MaxRetriesExceededError
 from django.conf import settings
 from django.core.files.storage import default_storage
 from django.core.mail import EmailMultiAlternatives, SafeMIMEMultipart
-from django.core.mail.message import SafeMIMEText
+from django.core.mail.message import SafeMIMEText, utf8_charset_qp
 from django.db import connection, transaction
 from django.db.models import Q
 from django.dispatch import receiver
@@ -316,6 +316,7 @@ def mail(email: Union[str, Sequence[str]], subject: Union[str, FormattedString],
                 body_html = None
 
         m = OutgoingMail.objects.create(
+            guid=guid,
             organizer=organizer,
             event=event,
             order=order,
@@ -380,6 +381,8 @@ def mail(email: Union[str, Sequence[str]], subject: Union[str, FormattedString],
 
 
 class CustomEmail(EmailMultiAlternatives):
+    encoding = utf8_charset_qp
+
     def _create_mime_attachment(self, content, mimetype):
         """
         Convert the content, mimetype pair into a MIME attachment object.
@@ -449,9 +452,9 @@ def mail_send_task(self, **kwargs) -> bool:
 
     # Rewrite all <img> tags from real URLs or data URLs to inline attachments referred to by content ID
     if outgoing_mail.body_html is not None:
-        html_message = SafeMIMEMultipart(_subtype='related', encoding=settings.DEFAULT_CHARSET)
+        html_message = SafeMIMEMultipart(_subtype='related')
         html_with_cid, cid_images = replace_images_with_cid_paths(outgoing_mail.body_html)
-        html_message.attach(SafeMIMEText(html_with_cid, 'html', settings.DEFAULT_CHARSET))
+        html_message.attach(SafeMIMEText(html_with_cid, 'html', utf8_charset_qp))
         attach_cid_images(html_message, cid_images, verify_ssl=True)
         email.attach_alternative(html_message, "multipart/related")
 

src/pretix/base/services/notifications.py

@@ -34,7 +34,9 @@ from pretix.base.models import (
 from pretix.base.notifications import Notification, get_all_notification_types
 from pretix.base.services.mail import mail_send_task
 from pretix.base.services.tasks import ProfiledTask, TransactionAwareTask
-from pretix.base.signals import notification
+from pretix.base.signals import (
+    event_notification_sent, organizer_notification_sent,
+)
 from pretix.celery_app import app
 from pretix.helpers.celery import get_task_priority
 from pretix.helpers.urls import mainreverse_absolute
@@ -47,40 +49,47 @@ def notify(logentry_ids: list):
         logentry_ids = [logentry_ids]
 
     qs = LogEntry.all.select_related(
-        'event', 'event__organizer'
+        'event', 'event__organizer', 'organizer'
     ).order_by(
-        'action_type', 'event_id',
+        'action_type', 'event_id', 'organizer_id',
     ).filter(id__in=logentry_ids)
 
-    _event, _at, notify_specific, notify_global = None, None, None, None
+    _event, _organizer, _at, notify_specific, notify_global = None, None, None, None, None
     for logentry in qs:
-        if not logentry.event:
-            break  # Ignore, we only have event-related notifications right now
+        if not logentry.event and not logentry.organizer:
+            break  # Ignore, we only have event- or organizer-related notifications right now
 
         notification_type = logentry.notification_type
 
         if not notification_type:
             break  # No suitable plugin
 
-        if _event != logentry.event or _at != logentry.action_type or notify_global is None:
+        if _event != logentry.event or _organizer != logentry.organizer or _at != logentry.action_type or notify_global is None:
             _event = logentry.event
+            _organizer = logentry.organizer
             _at = logentry.action_type
+
+            event_or_organizer = logentry.event or logentry.organizer
             # All users that have the permission to get the notification
-            users = logentry.event.get_users_with_permission(
+            users = event_or_organizer.get_users_with_permission(
                 notification_type.required_permission
             ).filter(notifications_send=True, is_active=True)
+
             if logentry.user:
                 users = users.exclude(pk=logentry.user.pk)
 
             # Get all notification settings, both specific to this event as well as global
-            notify_specific = {
-                (ns.user, ns.method): ns.enabled
-                for ns in NotificationSetting.objects.filter(
-                    event=logentry.event,
-                    action_type=notification_type.action_type,
-                    user__pk__in=users.values_list('pk', flat=True)
-                )
-            }
+            if logentry.event:
+                notify_specific = {
+                    (ns.user, ns.method): ns.enabled
+                    for ns in NotificationSetting.objects.filter(
+                        event=logentry.event,
+                        action_type=notification_type.action_type,
+                        user__pk__in=users.values_list('pk', flat=True)
+                    )
+                }
+            else:
+                notify_specific = {}
             notify_global = {
                 (ns.user, ns.method): ns.enabled
                 for ns in NotificationSetting.objects.filter(
@@ -106,7 +115,10 @@ def notify(logentry_ids: list):
                     priority=get_task_priority("notifications", logentry.organizer_id),
                 )
 
-        notification.send(logentry.event, logentry_id=logentry.id, notification_type=notification_type.action_type)
+        if logentry.event:
+            event_notification_sent.send(logentry.event, logentry_id=logentry.id, notification_type=notification_type.action_type)
+        elif logentry.organizer:
+            organizer_notification_sent.send(logentry.organizer, logentry_id=logentry.id, notification_type=notification_type.action_type)
 
 
 @app.task(base=ProfiledTask, acks_late=True, max_retries=9, default_retry_delay=900)
@@ -158,13 +170,20 @@ def send_notification_mail(notification: Notification, user: User):
     body_plain = tpl_plain.render(ctx)
 
     guid = uuid.uuid4()
+    settings_holder = notification.event or notification.organizer
+    prefix = settings_holder.settings.mail_prefix
+    if not prefix:
+        if notification.event:
+            prefix = notification.event.slug.upper()
+        elif notification.organizer:
+            prefix = notification.organizer.name
     m = OutgoingMail.objects.create(
         guid=guid,
         user=user,
         to=[user.email],
         subject='[{}] {}: {}'.format(
             settings.PRETIX_INSTANCE_NAME,
-            notification.event.settings.mail_prefix or notification.event.slug.upper(),
+            prefix,
             notification.title
         ),
         body_plain=body_plain,

src/pretix/base/services/orders.py

@@ -359,7 +359,8 @@ def mark_order_refunded(order, user=None, auth=None, api_token=None):
 
 def mark_order_expired(order, user=None, auth=None):
     """
-    Mark this order as expired. This sets the payment status and returns the order object.
+    Mark this order as expired. This sets the order status, generates an invoice cancellation
+    and returns the order object.
     :param order: The order to change
     :param user: The user that performed the change
     """
@@ -969,7 +970,7 @@ def _apply_rounding_and_fees(positions: List[CartPosition], payment_requests: Li
     gift_cards = []  # for backwards compatibility
     for p in payment_requests:
         if p['provider'] == 'giftcard':
-            gift_cards.append(GiftCard.objects.get(pk=p['info_data']['gift_card']))
+            gift_cards.extend(event.organizer.accepted_gift_cards.filter(pk=p['info_data']['gift_card']))
 
     for recv, resp in order_fee_calculation.send(sender=event, invoice_address=address, total=total, payment_requests=payment_requests,
                                                  meta_info=meta_info, positions=positions, gift_cards=gift_cards):
@@ -2175,7 +2176,8 @@ class OrderChangeManager:
                 subevent=a.subevent,
                 voucher=None,
                 base_qs=Item.objects.filter(pk=a.item.pk),
-                allow_addons=True
+                allow_addons=True,
+                ignore_hide_sold_out_for_item_ids={a.item.pk}
             )
             if (not items) or items[0].current_unavailability_reason:
                 return False
@@ -2474,7 +2476,11 @@ class OrderChangeManager:
                 self.order.log_action('pretix.event.order.changed.feevalue', user=self.user, auth=self.auth, data={
                     'fee': fee.pk,
                     'old_price': fee.value,
-                    'new_price': op.value.gross
+                    'new_price': op.value.gross,
+                    'old_tax_rate': fee.tax_rate,
+                    'new_tax_rate': op.value.rate,
+                    'old_tax_value': fee.tax_value,
+                    'new_tax_value': op.value.tax,
                 })
                 fee.value = op.value.gross
                 fee._calculate_tax()
@@ -2484,9 +2490,13 @@ class OrderChangeManager:
                 self.order.log_action('pretix.event.order.changed.price', user=self.user, auth=self.auth, data={
                     'position': position.pk,
                     'positionid': position.positionid,
-                    'old_price': position.price,
                     'addon_to': position.addon_to_id,
-                    'new_price': op.price.gross
+                    'old_price': position.price,
+                    'new_price': op.price.gross,
+                    'old_tax_rate': position.tax_rate,
+                    'new_tax_rate': op.price.rate,
+                    'old_tax_value': position.tax_value,
+                    'new_tax_value': op.price.tax,
                 })
                 position.price = op.price.gross
                 position.price_includes_rounding_correction = Decimal("0.00")
@@ -2501,25 +2511,43 @@ class OrderChangeManager:
             elif isinstance(op, self.TaxRuleOperation):
                 if isinstance(op.position, OrderPosition):
                     position = position_cache.setdefault(op.position.pk, op.position)
-                    self.order.log_action('pretix.event.order.changed.tax_rule', user=self.user, auth=self.auth, data={
+                    log = {
                         'position': position.pk,
                         'positionid': position.positionid,
                         'addon_to': position.addon_to_id,
                         'old_taxrule': position.tax_rule.pk if position.tax_rule else None,
-                        'new_taxrule': op.tax_rule.pk
-                    })
+                        'new_taxrule': op.tax_rule.pk,
+                        'old_price': position.price,
+                        'old_tax_rate': position.tax_rate,
+                        'old_tax_value': position.tax_value,
+                    }
                     position._calculate_tax(op.tax_rule)
                     position.save()
+                    log.update({
+                        'new_price': position.price,
+                        'new_tax_rate': position.tax_rate,
+                        'new_tax_value': position.tax_value,
+                    })
+                    self.order.log_action('pretix.event.order.changed.tax_rule', user=self.user, auth=self.auth, data=log)
                 elif isinstance(op.position, OrderFee):
                     fee = fee_cache.setdefault(op.position.pk, op.position)
-                    self.order.log_action('pretix.event.order.changed.tax_rule', user=self.user, auth=self.auth, data={
+                    log = {
                         'fee': fee.pk,
                         'fee_type': fee.fee_type,
                         'old_taxrule': fee.tax_rule.pk if fee.tax_rule else None,
-                        'new_taxrule': op.tax_rule.pk
-                    })
+                        'new_taxrule': op.tax_rule.pk,
+                        'old_price': fee.value,
+                        'old_tax_rate': fee.tax_rate,
+                        'old_tax_value': fee.tax_value,
+                    }
                     fee._calculate_tax(op.tax_rule)
                     fee.save()
+                    log.update({
+                        'new_price': fee.value,
+                        'new_tax_rate': fee.tax_rate,
+                        'new_tax_value': fee.tax_value,
+                    })
+                    self.order.log_action('pretix.event.order.changed.tax_rule', user=self.user, auth=self.auth, data=log)
             elif isinstance(op, self.CancelFeeOperation):
                 fee = fee_cache.setdefault(op.fee.pk, op.fee)
                 self.order.log_action('pretix.event.order.changed.cancelfee', user=self.user, auth=self.auth, data={

src/pretix/base/services/placeholders.py

@@ -752,6 +752,11 @@ def base_placeholders(sender, **kwargs):
         lambda position_or_address: concatenation_for_salutation(get_best_name(position_or_address, parts=True)),
         lambda event: concatenation_for_salutation(name_scheme['sample']),
     ))
+    ph.append(SimpleFunctionalTextPlaceholder(
+        "attendee_name_for_salutation", ["position"],
+        lambda position: concatenation_for_salutation(position.attendee_name_parts),
+        lambda event: concatenation_for_salutation(name_scheme['sample']),
+    ))
 
     for f, l, w in name_scheme['fields']:
         if f == 'full_name':

src/pretix/base/services/seating.py

@@ -126,10 +126,10 @@ def generate_seats(event, subevent, plan, mapping, blocked_guids=None):
     for s in current_seats.values():
         if s.has_op:
             raise SeatProtected(_('You can not change the plan since seat "%s" is not present in the new plan and is '
-                                  'already sold.', s.name))
+                                  'already sold.'), s.name)
         if s.has_v:
             raise SeatProtected(_('You can not change the plan since seat "%s" is not present in the new plan and is '
-                                  'already used in a voucher.', s.name))
+                                  'already used in a voucher.'), s.name)
 
     Seat.objects.bulk_create(create_seats)
     CartPosition.objects.filter(addon_to__seat__in=[s.pk for s in current_seats.values()]).delete()

src/pretix/base/settings.py

@@ -379,7 +379,7 @@ DEFAULTS = {
 
         )
     },
-    'system_question_order': {  # TODO(questionnaires) - remove this
+    'system_question_order': {
         'default': {},
         'type': dict,
         'serializer_class': serializers.DictField,
@@ -3767,10 +3767,6 @@ Your {organizer} team"""))  # noqa: W291
         'default': "7B227073704964223A2239373943394538343346343131343044463144313834343232393232313734313034353044314339464446394437384337313531303944334643463542433731222C2276657273696F6E223A312C22637265617465644F6E223A313536363233343735303036312C227369676E6174757265223A22333038303036303932613836343838366637306430313037303261303830333038303032303130313331306633303064303630393630383634383031363530333034303230313035303033303830303630393261383634383836663730643031303730313030303061303830333038323033653333303832303338386130303330323031303230323038346333303431343935313964353433363330306130363038326138363438636533643034303330323330376133313265333032633036303335353034303330633235343137303730366336353230343137303730366336393633363137343639366636653230343936653734363536373732363137343639366636653230343334313230326432303437333333313236333032343036303335353034306230633164343137303730366336353230343336353732373436393636363936333631373436393666366532303431373537343638366637323639373437393331313333303131303630333535303430613063306134313730373036633635323034393665363332653331306233303039303630333535303430363133303235353533333031653137306433313339333033353331333833303331333333323335333735613137306433323334333033353331333633303331333333323335333735613330356633313235333032333036303335353034303330633163363536333633326437333664373032643632373236663662363537323264373336393637366535663535343333343264353035323466343433313134333031323036303335353034306230633062363934663533323035333739373337343635366437333331313333303131303630333535303430613063306134313730373036633635323034393665363332653331306233303039303630333535303430363133303235353533333035393330313330363037326138363438636533643032303130363038326138363438636533643033303130373033343230303034633231353737656465626436633762323231386636386464373039306131323138646337623062643666326332383364383436303935643934616634613534313162383334323065643831316633343037653833333331663163353463336637656233323230643662616435643465666634393238393839336537633066313361333832303231313330383230323064333030633036303335353164313330313031666630343032333030303330316630363033353531643233303431383330313638303134323366323439633434663933653465663237653663346636323836633366613262626664326534623330343530363038326230363031303530353037303130313034333933303337333033353036303832623036303130353035303733303031383632393638373437343730336132663266366636333733373032653631373037303663363532653633366636643266366636333733373033303334326436313730373036633635363136393633363133333330333233303832303131643036303335353164323030343832303131343330383230313130333038323031306330363039326138363438383666373633363430353031333038316665333038316333303630383262303630313035303530373032303233303831623630633831623335323635366336393631366536333635323036663665323037343638363937333230363336353732373436393636363936333631373436353230363237393230363136653739323037303631373237343739323036313733373337353664363537333230363136333633363537303734363136653633363532303666363632303734363836353230373436383635366532303631373037303663363936333631363236633635323037333734363136653634363137323634323037343635373236643733323036313665363432303633366636653634363937343639366636653733323036663636323037353733363532633230363336353732373436393636363936333631373436353230373036663663363936333739323036313665363432303633363537323734363936363639363336313734363936663665323037303732363136333734363936333635323037333734363137343635366436353665373437333265333033363036303832623036303130353035303730323031313632613638373437343730336132663266373737373737326536313730373036633635326536333666366432663633363537323734363936363639363336313734363536313735373436383666373236393734373932663330333430363033353531643166303432643330326233303239613032376130323538363233363837343734373033613266326636333732366332653631373037303663363532653633366636643266363137303730366336353631363936333631333332653633373236633330316430363033353531643065303431363034313439343537646236666435373438313836383938393736326637653537383530376537396235383234333030653036303335353164306630313031666630343034303330323037383033303066303630393261383634383836663736333634303631643034303230353030333030613036303832613836343863653364303430333032303334393030333034363032323130306265303935373166653731653165373335623535653561666163623463373266656234343566333031383532323263373235313030326236316562643666353530323231303064313862333530613564643664643665623137343630333562313165623263653837636661336536616636636264383338303839306463383263646461613633333038323032656533303832303237356130303330323031303230323038343936643266626633613938646139373330306130363038326138363438636533643034303330323330363733313162333031393036303335353034303330633132343137303730366336353230353236663666373432303433343132303264323034373333333132363330323430363033353530343062306331643431373037303663363532303433363537323734363936363639363336313734363936663665323034313735373436383666373236393734373933313133333031313036303335353034306130633061343137303730366336353230343936653633326533313Line truncated
         'type': str,
     },
-    'widget_vue2_origins': {
-        'default': '',
-        'type': str,
-    },
 }
 PERSON_NAME_TITLE_GROUPS = OrderedDict([
     ('english_common', (_('Most common English titles'), (

src/pretix/base/shredder.py

@@ -50,8 +50,8 @@ from pretix.api.serializers.order import (
 from pretix.api.serializers.waitinglist import WaitingListSerializer
 from pretix.base.i18n import LazyLocaleException
 from pretix.base.models import (
-    CachedCombinedTicket, CachedTicket, Event, InvoiceAddress, OrderPayment,
-    OrderPosition, OrderRefund, OutgoingMail, QuestionAnswer,
+    CachedCombinedTicket, CachedTicket, Event, Invoice, InvoiceAddress,
+    OrderPayment, OrderPosition, OrderRefund, OutgoingMail, QuestionAnswer,
 )
 from pretix.base.services.invoices import invoice_pdf_task
 from pretix.base.signals import register_data_shredders
@@ -598,18 +598,30 @@ class InvoiceShredder(BaseDataShredder):
     def shred_data(self, progress_callback=None):
         qs_i = self.event.invoices.filter(shredded=False)
         total = qs_i.count()
+        ignore_fields = (
+            'prefix', 'invoice_no', 'full_invoice_no', 'invoice_from', 'invoice_from_name', 'invoice_from_zipcode',
+            'invoice_from_city', 'invoice_from_state', 'invoice_from_country', 'invoice_from_tax_id',
+            'invoice_from_vat_id', 'locale', 'payment_provider_stamp', 'footer_text', 'foreign_currency_display',
+            'foreign_currency_source', 'transmission_type', 'transmission_provider', 'transmission_status',
+        )
 
         for i in _progress_helper(qs_i, progress_callback, 0, total):
             if i.file:
                 i.file.delete()
-                i.shredded = True
-                i.introductory_text = "█"
-                i.additional_text = "█"
-                i.invoice_to = "█"
-                i.payment_provider_text = "█"
-                i.transmission_info = {"_shredded": True}
-                i.save()
-                i.lines.update(description="█")
+            i.shredded = True
+
+            for f in Invoice._meta.fields:
+                if f.name in ignore_fields:
+                    continue
+                val = getattr(i, f.name, None)
+                if val and isinstance(val, str):
+                    setattr(i, f.name, "█")
+                elif val and isinstance(val, list):  # jsonfield
+                    setattr(i, f.name, [])
+                elif val and isinstance(val, dict):  # jsonfield
+                    setattr(i, f.name, {"_shredded": True})
+            i.save()
+            i.lines.update(description="█", attendee_name="█")
 
 
 class CachedTicketShredder(BaseDataShredder):

src/pretix/base/signals.py

@@ -605,15 +605,14 @@ subclass of pretix.base.ticketoutput.BaseTicketOutput
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_notification_types = EventPluginSignal()
+register_notification_types = GlobalSignal()
 """
 This signal is sent out to get all known notification types. Receivers should return an
 instance of a subclass of pretix.base.notifications.NotificationType or a list of such
 instances.
 
-As with all event-plugin signals, the ``sender`` keyword argument will contain the event,
-however for this signal, the ``sender`` **may also be None** to allow creating the general
-notification settings!
+When called for actually sending notifications, ``sender`` will be the event or organizer,
+depending on context.
 """
 
 register_event_permission_groups = GlobalSignal()
@@ -628,7 +627,7 @@ This signal is sent out to get all known permissions. Receivers should return an
 instance of pretix.base.permissions.PermissionGroup or a list of such instances.
 """
 
-notification = EventPluginSignal()
+event_notification_sent = EventPluginSignal()
 """
 Arguments: ``logentry_id``, ``notification_type``
 
@@ -637,6 +636,15 @@ This signal is sent out when a notification is sent.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
+organizer_notification_sent = OrganizerPluginSignal()
+"""
+Arguments: ``logentry_id``, ``notification_type``
+
+This signal is sent out when a notification is sent.
+
+As with all organizer-plugin signals, the ``sender`` keyword argument will contain the organizer.
+"""
+
 register_sales_channel_types = GlobalSignal()
 """
 This signal is sent out to get all known sales channels types. Receivers should return an
@@ -1191,11 +1199,14 @@ The ``sender`` keyword argument will contain the organizer.
 
 customer_signed_in = OrganizerPluginSignal(allow_legacy_plugins=True)
 """
-Arguments: ``customer``
+Arguments: ``customer``, ``profile``
 
 This signal is sent out every time a customer signs in. The ``customer`` object
 is given as the first argument.
 
+In case of SSO login, the full claims will be passed in the ``profile`` argument,
+e.g. as ``oidc_claims`` for OIDC. Otherwise, ``profile`` will be ``None``.
+
 The ``sender`` keyword argument will contain the organizer.
 """
 

src/pretix/base/templatetags/money.py

@@ -20,6 +20,7 @@
 # <https://www.gnu.org/licenses/>.
 #
 from decimal import ROUND_HALF_UP, Decimal
+from typing import Optional
 
 from babel import Locale, UnknownLocaleError
 from babel.numbers import format_currency
@@ -35,32 +36,32 @@ register = template.Library()
 
 
 @register.filter("money")
-def money_filter(value: Decimal, arg='', hide_currency=False):
-    if isinstance(value, (float, int)):
+def money_filter(value: Optional[Decimal | float | int | str], arg='', hide_currency=False):
+    if isinstance(value, (float, int, str)):
+        if value == '':
+            return value
         value = Decimal(value)
     if value is None:
         value = Decimal('0.00')
     if not isinstance(value, Decimal):
-        if value == '':
-            return value
         raise TypeError("Invalid data type passed to money filter: %r" % type(value))
     if not arg:
         raise ValueError("No currency passed.")
     arg = arg.upper()
 
-    places = settings.CURRENCY_PLACES.get(arg, 2)
-    rounded = value.quantize(Decimal('1') / 10 ** places, ROUND_HALF_UP)
-    if places < 2 and rounded != value:
-        # We display decimal places even if we shouldn't for this currency if rounding
-        # would make the numbers incorrect. If this branch executes, it's likely a bug in
-        # pretix, but we won't show wrong numbers!
-        if hide_currency:
-            return floatformat(value, "2g")
-        else:
-            return '{} {}'.format(arg, floatformat(value, "2g"))
+    if value.normalize().as_tuple().exponent < -9:
+        # Heuristic: It's unlikely we'll ever see values of less than 0.000000001 in any currency. Therefore, if we
+        # do see them, we very likely deal with a floating point error. This happens mostly in dev mode when computations
+        # are made in SQLite, which uses REAL precision, but it can also happen when we naively pass a float from Python
+        # land to this filter (even though it should not happen).
+        value = value.quantize(Decimal('1e-9'), ROUND_HALF_UP).normalize()
+
+    currency_places = settings.CURRENCY_PLACES.get(arg, 2)
+    required_places = -value.normalize().as_tuple().exponent
+    render_places = max(currency_places, required_places)
 
     if hide_currency:
-        return floatformat(value, f"{places}g")
+        return floatformat(value, f"{render_places}g")
 
     try:
         locale = Locale(get_babel_locale())
@@ -68,14 +69,29 @@ def money_filter(value: Decimal, arg='', hide_currency=False):
         locale = "en"
 
     try:
-        return format_currency(value, arg, locale=locale)
+        return format_currency(
+            value,
+            arg,
+            locale=locale,
+            # We only allow Babel to restrict the digits to the digits defined by the currency if this does not remove any
+            # precision in case we have sub-currency precision (which we shouldn't have in most places, but it's still
+            # better than showing wrong data). Note: Weird precision effects can occur after in-database arithmetic
+            # on SQLite, since SQLite does not have fixed-decimal computation.
+            currency_digits=currency_places >= required_places,
+            decimal_quantization=currency_places >= required_places,
+        )
     except:
-        return '{} {}'.format(arg, floatformat(value, f"{places}g"))
+        return '{} {}'.format(arg, floatformat(value, f"{render_places}g"))
+
+
+@register.filter("money_without_currency")
+def money_filter_without_currency(value: Optional[Decimal | float | int | str], arg=''):
+    return money_filter(value, arg, hide_currency=True)
 
 
 @register.filter("money_numberfield")
-def money_numberfield_filter(value: Decimal, arg=''):
-    if isinstance(value, (float, int)):
+def money_numberfield_filter(value: Optional[Decimal | float | int | str], arg=''):
+    if isinstance(value, (float, int, str)):
         value = Decimal(value)
     if not isinstance(value, Decimal):
         raise TypeError("Invalid data type passed to money filter: %r" % type(value))
@@ -87,15 +103,28 @@ def money_numberfield_filter(value: Decimal, arg=''):
 
 
 @register.filter(is_safe=True)
-def tax_rate_format(number):
+def tax_rate_format(number: Optional[Decimal | float | int | str]):
     """
     Display a Decimal to its significant decimal places, used for tax rates.
     """
-    assert isinstance(number, Decimal)
+    if isinstance(number, (float, int, str)):
+        if number == '':
+            return number
+        number = Decimal(number)
+    if number is None:
+        number = Decimal('0.00')
+    if not isinstance(number, Decimal):
+        raise TypeError("Invalid data type passed to tax rate format filter: %r" % type(number))
+    if number.normalize().as_tuple().exponent < -9:
+        # Heuristic: It's unlikely we'll ever see values of less than 0.000000001 in any currency. Therefore, if we
+        # do see them, we very likely deal with a floating point error. This happens mostly in dev mode when computations
+        # are made in SQLite, which uses REAL precision, but it can also happen when we naively pass a float from Python
+        # land to this filter (even though it should not happen).
+        number = number.quantize(Decimal('1e-9'), ROUND_HALF_UP).normalize()
     return mark_safe(
         formats.number_format(
-            number.normalize(),
-            -number.as_tuple().exponent,
+            number,
+            -number.normalize().as_tuple().exponent,
             use_l10n=True,
             force_grouping=False,
         )

src/pretix/base/templatetags/vite.py

@@ -23,10 +23,10 @@ import json
 import logging
 import pathlib
 import re
+from importlib import metadata
 from urllib.parse import urljoin
 from urllib.request import urlopen
 
-import importlib_metadata as metadata
 from django import template
 from django.conf import settings
 from django.utils.safestring import mark_safe

src/pretix/base/timemachine.py

@@ -21,8 +21,8 @@
 #
 import contextvars
 from contextlib import contextmanager
+from datetime import datetime
 
-from dateutil.parser import parse
 from django.utils.timezone import now
 
 from pretix.base.auth import has_event_access_permission
@@ -34,7 +34,7 @@ timemachine_now_var = contextvars.ContextVar('timemachine_now', default=None)
 def time_machine_now_assigned_from_request(request):
     if hasattr(request, 'event') and f'timemachine_now_dt:{request.event.pk}' in request.session and \
             request.event.testmode and has_event_access_permission(request):
-        request.now_dt = parse(request.session[f'timemachine_now_dt:{request.event.pk}'])
+        request.now_dt = datetime.fromisoformat(request.session[f'timemachine_now_dt:{request.event.pk}'])
         request.now_dt_is_fake = True
     else:
         request.now_dt = now()

src/pretix/base/views/errors.py

@@ -19,6 +19,7 @@
 # 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.conf import settings
 from django.http import (
     HttpResponseForbidden, HttpResponseNotFound, HttpResponseServerError,
 )
@@ -27,7 +28,6 @@ from django.template import TemplateDoesNotExist, loader
 from django.template.loader import get_template
 from django.utils.functional import Promise
 from django.utils.translation import gettext as _
-from sentry_sdk import last_event_id
 
 from pretix.base.i18n import language
 from pretix.base.middleware import get_language_from_request
@@ -106,9 +106,14 @@ def server_error(request):
             template = loader.get_template('500.html')
         except TemplateDoesNotExist:
             return HttpResponseServerError('<h1>Server Error (500)</h1>', content_type='text/html')
+        if settings.SENTRY_ENABLED:
+            from sentry_sdk import last_event_id
+            sentry_id = last_event_id()
+        else:
+            sentry_id = None
         r = HttpResponseServerError(template.render({
             'request': request,
-            'sentry_event_id': last_event_id(),
+            'sentry_event_id': sentry_id,
         }))
         r.xframe_options_exempt = True
         return r

src/pretix/base/views/mixins.py

@@ -27,7 +27,7 @@ from decimal import Decimal
 from django import forms
 from django.core.files.uploadedfile import UploadedFile
 from django.db import IntegrityError
-from django.db.models import Prefetch, Q, QuerySet
+from django.db.models import Prefetch, QuerySet
 from django.utils.functional import cached_property
 from django.utils.timezone import make_aware
 
@@ -37,7 +37,7 @@ from pretix.base.forms.questions import (
 )
 from pretix.base.models import (
     CartPosition, InvoiceAddress, OrderPosition, Question, QuestionAnswer,
-    QuestionnaireChild, QuestionOption,
+    QuestionOption,
 )
 from pretix.base.models.customers import AttendeeProfile
 from pretix.base.models.orders import CheckoutSession, Order
@@ -348,37 +348,27 @@ class OrderQuestionsViewMixin(BaseQuestionsViewMixin):
 
     @cached_property
     def positions(self):
-        qqs = self.request.event.questionnaires.all()
+        qqs = self.request.event.questions.all()
         if self.only_user_visible:
-            qqs = qqs.filter(type='PS')
-        else:
-            qqs = qqs.filter(type__startswith='P')
-        qqs = qqs.filter(
-            Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=self.order.sales_channel.identifier)
-        )
+            qqs = qqs.filter(ask_during_checkin=False, hidden=False, container_type=Question.ContainerType.ORDERPOSITION)
         return list(self.order.positions.select_related(
             'item', 'variation'
         ).prefetch_related(
             Prefetch('answers',
                      QuestionAnswer.objects.prefetch_related('options'),
                      to_attr='answerlist'),
-            Prefetch('item__questionnaires',
+            Prefetch('item__questions',
                      qqs.prefetch_related(
-                         Prefetch('children', QuestionnaireChild.objects.prefetch_related(
-                             Prefetch('user_datafield', Question.objects.prefetch_related(
-                                 Prefetch('options', QuestionOption.objects.prefetch_related(Prefetch(
-                                     # This prefetch statement is utter bullshit, but it actually prevents Django from doing
-                                     # a lot of queries since ModelChoiceIterator stops trying to be clever once we have
-                                     # a prefetch lookup on this query...
-                                     'question',
-                                     Question.objects.none(),
-                                     to_attr='dummy'
-                                 )))
-                             ))
-                         ),
-                         to_attr='childlist')
-                     ),
-                     to_attr='relevant_questionnaires')
+                         Prefetch('options', QuestionOption.objects.prefetch_related(Prefetch(
+                             # This prefetch statement is utter bullshit, but it actually prevents Django from doing
+                             # a lot of queries since ModelChoiceIterator stops trying to be clever once we have
+                             # a prefetch lookup on this query...
+                             'question',
+                             Question.objects.none(),
+                             to_attr='dummy'
+                         )))
+                     ).select_related('dependency_question'),
+                     to_attr='questions_to_ask')
         ))
 
     @cached_property

src/pretix/base/views/redirect.py

@@ -26,7 +26,6 @@ from django.core import signing
 from django.http import HttpResponseBadRequest, HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import reverse
-from django.utils.html import format_html
 
 logger = logging.getLogger(__name__)
 
@@ -61,7 +60,6 @@ def redir_view(request):
         u = urllib.parse.urlparse(url)
         return render(request, 'pretixbase/redirect.html', {
             'hostname': u.hostname,
-            'bold_hostname': format_html("<strong>{}</strong>", u.hostname),
             'url': url,
         })
 

src/pretix/celery_app.py

@@ -20,6 +20,7 @@
 # <https://www.gnu.org/licenses/>.
 #
 import logging
+import multiprocessing
 import os
 
 from celery import Celery, signals
@@ -54,6 +55,21 @@ def on_task_received(sender, request, **kwargs):
         logger.info(f"Task {request.id} has trace {trace}")
 
 
+@receiver(signals.after_setup_task_logger)
+def on_after_setup_task_logger(sender, logger, loglevel, logfile, format, colorize, **kwargs):
+    # This hack seems to be required to get celery to log internal events from eg billiard/pool.py such as
+    # "worker killed because it used too much memory"
+    # You can test that it is working by starting a celery worker with a low value like
+    # --max-memory-per-child 300000
+    # and then trigger a task. Result should look like this:
+    # [2026-09-23 10:42:26,234: WARNING/ForkPoolWorker-16]: [???:???] child process exiting after exceeding memory limit (394540KiB / 300000KiB)
+    # The ???:??? are likely because by copying the handlers, we are also copying the format, but I was unable to find
+    # a better compatible way.
+    multi_logger = multiprocessing.get_logger()
+    multi_logger.setLevel(logging.WARNING)
+    multi_logger.handlers = logger.handlers
+
+
 @receiver(signals.task_prerun)
 def on_task_prerun(sender, task_id, task, **kwargs):
     from pretix.helpers.logs import local

src/pretix/control/forms/__init__.py

@@ -172,7 +172,7 @@ class CachedFileInput(forms.ClearableFileInput):
         from ...base.models import CachedFile
         v = super().value_from_datadict(data, files, name)
         if v is None and data.get(name + '-cachedfile'):  # An explicit "[x] clear" would be False, not None
-            v = CachedFile.objects.filter(id=data[name + '-cachedfile']).first()
+            v = CachedFile.objects.filter(id=data[name + '-cachedfile'], web_download=True).first()
             if not v.allowed_for_session(self.request):
                 v = None
         return v

src/pretix/control/forms/event.py

@@ -400,10 +400,10 @@ class EventMetaValueForm(forms.ModelForm):
         if self.disabled:
             self.fields['value'].widget.attrs['readonly'] = 'readonly'
 
-    def clean_slug(self):
+    def clean_value(self):
         if self.disabled:
             return self.instance.value if self.instance else None
-        return self.cleaned_data['slug']
+        return self.cleaned_data['value']
 
     class Meta:
         model = EventMetaValue
@@ -838,9 +838,10 @@ class CancelSettingsForm(SettingsForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if self.obj.settings.giftcard_expiry_years is not None:
-            self.fields['cancel_allow_user_paid_refund_as_giftcard'].help_text = gettext(
-                'You have configured gift cards to be valid {} years plus the year the gift card is issued in.'
-            ).format(self.obj.settings.giftcard_expiry_years)
+            self.fields['cancel_allow_user_paid_refund_as_giftcard'].help_text = format_html(
+                gettext('You have configured gift cards to be valid {} years plus the year the gift card is issued in.'),
+                self.obj.settings.giftcard_expiry_years
+            )
 
 
 class PaymentSettingsForm(EventSettingsValidationMixin, SettingsForm):
@@ -1635,10 +1636,15 @@ class MailSettingsForm(FormPlaceholderMixin, SettingsForm):
             self._set_field_placeholders(k, v, rich=k.startswith('mail_text_') and k not in self.plain_rendering)
 
         for k, v in list(self.fields.items()):
-            if k.endswith('_attendee') and not event.settings.attendee_emails_asked:
-                # If we don't ask for attendee emails, we can't send them anything and we don't need to clutter
-                # the user interface with it
-                del self.fields[k]
+            if k.endswith('_attendee'):
+                if not event.settings.attendee_emails_asked:
+                    # If we don't ask for attendee emails, we can't send them anything and we don't need to clutter
+                    # the user interface with it
+                    del self.fields[k]
+                elif 'subject' in k and k.replace("subject", "send") in self.fields:
+                    v.widget.attrs["data-display-dependency"] = f'#id_{k.replace("subject", "send")}'
+                elif 'text' in k and k.replace("text", "send") in self.fields:
+                    v.widget.attrs["data-display-dependency"] = f'#id_{k.replace("text", "send")}'
 
 
 class TicketSettingsForm(SettingsForm):

src/pretix/control/forms/global_settings.py

@@ -105,13 +105,6 @@ class GlobalSettingsForm(SettingsForm):
                     domain=settings.SITE_URL
                 )
             )),
-            ('widget_vue2_origins', forms.CharField(
-                widget=forms.Textarea(attrs={'rows': '3'}),
-                required=False,
-                # Not translated on purpose, this is a temporary feature and contains too many special case words
-                label="Vue2 widget origins",
-                help_text="One origin per line (e.g. https://example.com). Requests from these origins will be served the old vue2-based widget.",
-            ))
         ])
         responses = register_global_settings.send(self)
         for r, response in sorted(responses, key=lambda r: str(r[0])):

src/pretix/control/forms/modelimport.py

@@ -22,7 +22,7 @@
 from django import forms
 from django.core.exceptions import ValidationError
 from django.utils.functional import lazy
-from django.utils.html import format_html
+from django.utils.html import conditional_escape, format_html
 from django.utils.translation import gettext_lazy as _
 
 from pretix.base.modelimport_orders import get_order_import_columns
@@ -66,7 +66,7 @@ class ProcessForm(forms.Form):
                 widget=forms.Select(
                     attrs={'data-static': 'true'}
                 ),
-                help_text=c.help_text,
+                help_text=conditional_escape(c.help_text or ""),
             )
 
     def get_columns(self):

src/pretix/control/forms/organizer.py

@@ -38,7 +38,6 @@ from urllib.parse import urlparse
 from django import forms
 from django.conf import settings
 from django.core.exceptions import ValidationError
-from django.db.models import Q
 from django.forms import formset_factory, inlineformset_factory
 from django.forms.utils import ErrorDict
 from django.urls import reverse
@@ -70,9 +69,9 @@ from pretix.base.forms.widgets import (
     SplitDateTimePickerWidget, format_placeholders_help_text,
 )
 from pretix.base.models import (
-    Customer, Device, Event, EventMetaProperty, Gate, GiftCard,
-    GiftCardAcceptance, Membership, MembershipType, OrderPosition, Organizer,
-    ReusableMedium, SalesChannel, Team,
+    Customer, Device, Event, EventMetaProperty, Gate, GiftCard, Membership,
+    MembershipType, OrderPosition, Organizer, ReusableMedium, SalesChannel,
+    Team,
 )
 from pretix.base.models.customers import CustomerSSOClient, CustomerSSOProvider
 from pretix.base.models.organizer import OrganizerFooterLink, TeamQuerySet
@@ -364,7 +363,7 @@ class TeamForm(forms.ModelForm):
                     for opt in pg.options
                 ],
                 label=pg.label,
-                help_text=pg.help_text,
+                help_text=conditional_escape(pg.help_text or ""),
                 initial=initial,
                 widget=forms.RadioSelect,
             )
@@ -389,7 +388,7 @@ class TeamForm(forms.ModelForm):
                     for opt in pg.options
                 ],
                 label=pg.label,
-                help_text=pg.help_text,
+                help_text=conditional_escape(pg.help_text or ""),
                 initial=initial,
                 widget=forms.RadioSelect,
             )
@@ -894,15 +893,7 @@ class GiftCardCreateForm(forms.ModelForm):
 
     def clean_secret(self):
         s = self.cleaned_data['secret']
-        if GiftCard.objects.filter(
-                secret__iexact=s
-        ).filter(
-            Q(issuer=self.organizer) |
-            Q(issuer__in=GiftCardAcceptance.objects.filter(
-                acceptor=self.organizer,
-                active=True,
-            ).values_list('issuer', flat=True))
-        ).exists():
+        if self.organizer.accepted_gift_cards.filter(secret__iexact=s).exists():
             raise ValidationError(
                 _('A gift card with the same secret already exists in your or an affiliated organizer account.')
             )
@@ -1198,7 +1189,7 @@ OrganizerFooterLinkFormset = inlineformset_factory(
 class SSOProviderForm(I18nModelForm):
 
     config_oidc_base_url = forms.URLField(
-        label=pgettext_lazy('sso_oidc', 'Base URL'),
+        label=pgettext_lazy('sso_oidc', 'Base URL / issuer'),
         required=False,
     )
     config_oidc_client_id = forms.CharField(
@@ -1295,6 +1286,14 @@ class SSOProviderForm(I18nModelForm):
 
 
 class SSOClientForm(I18nModelForm):
+    disp_base_url = forms.CharField(
+        label=_('Base URL / issuer'),
+        disabled=True,
+    )
+    disp_client_id = forms.CharField(
+        label=_('Client ID'),
+        disabled=True,
+    )
     regenerate_client_secret = forms.BooleanField(
         label=_('Invalidate old client secret and generate a new one'),
         required=False,
@@ -1302,7 +1301,8 @@ class SSOClientForm(I18nModelForm):
 
     class Meta:
         model = CustomerSSOClient
-        fields = ['is_active', 'name', 'client_id', 'client_type', 'authorization_grant_type', 'redirect_uris',
+        fields = ['is_active', 'name', 'disp_base_url', 'disp_client_id', 'regenerate_client_secret',
+                  'client_type', 'authorization_grant_type', 'redirect_uris',
                   'allowed_scopes', 'require_pkce']
         widgets = {
             'authorization_grant_type': forms.RadioSelect,
@@ -1317,13 +1317,15 @@ class SSOClientForm(I18nModelForm):
             help_text=self.fields['allowed_scopes'].help_text,
             required=self.fields['allowed_scopes'].required,
             initial=self.fields['allowed_scopes'].initial,
-            choices=CustomerSSOClient.SCOPE_CHOICES,
+            choices=[(val, format_html('<code>{}</code> &ndash; {}', val, label)) for val, label in CustomerSSOClient.SCOPE_CHOICES],
             widget=forms.CheckboxSelectMultiple
         )
+        organizer = kwargs['event']
+        self.initial['disp_base_url'] = eventreverse_absolute(organizer, 'presale:organizer.index', {}).strip('/')
         if self.instance and self.instance.pk:
-            self.fields['client_id'].disabled = True
+            self.initial['disp_client_id'] = self.instance.client_id
         else:
-            del self.fields['client_id']
+            self.initial['disp_client_id'] = _('(will be generated)')
             del self.fields['regenerate_client_secret']
 
 

src/pretix/control/forms/subevents.py

@@ -153,7 +153,7 @@ class SubEventBulkEditForm(I18nModelForm):
             self.fields[k].widget.is_required = False
             self.fields[k].required = False
 
-        for k in ('date_from', 'date_to', 'date_admission', 'presale_start', 'presale_end'):
+        for k in ('date_from', 'date_to'):
             self.fields[k + '_day'] = forms.DateField(
                 label=self._meta.model._meta.get_field(k).verbose_name,
                 help_text=self._meta.model._meta.get_field(k).help_text,
@@ -167,6 +167,14 @@ class SubEventBulkEditForm(I18nModelForm):
                 required=False,
             )
 
+        for k in ('date_admission', 'presale_start', 'presale_end'):
+            self.fields[k + '_rel'] = RelativeDateTimeField(
+                label=self._meta.model._meta.get_field(k).verbose_name,
+                help_text=self._meta.model._meta.get_field(k).help_text,
+                required=False,
+                limit_choices=('event__date_from',),
+            )
+
     class Meta:
         model = SubEvent
         localized_fields = '__all__'
@@ -247,6 +255,18 @@ class SubEventBulkEditForm(I18nModelForm):
                     )
                     setattr(obj, k.replace('_time', ''), newval)
                 fields.add(k.replace('_time', ''))
+            elif k.endswith('_rel'):
+                target_key = k[:-4]
+                for obj in objs:
+                    cval = self.cleaned_data[k]
+                    if cval is None:
+                        newval = None
+                        if not self._meta.model._meta.get_field(target_key).null:
+                            continue
+                    else:
+                        newval = cval.datetime(obj)
+                    setattr(obj, target_key, newval)
+                fields.add(target_key)
             else:
                 fields.add(k)
                 for obj in objs:
@@ -435,10 +455,10 @@ class SubEventMetaValueForm(forms.ModelForm):
         if self.disabled:
             self.fields['value'].widget.attrs['readonly'] = 'readonly'
 
-    def clean_slug(self):
+    def clean_value(self):
         if self.disabled:
             return self.instance.value if self.instance else None
-        return self.cleaned_data['slug']
+        return self.cleaned_data['value']
 
     class Meta:
         model = SubEventMetaValue

src/pretix/control/forms/vouchers.py

@@ -44,6 +44,7 @@ from django.db.models import Count, F, Max
 from django.db.models.functions import Upper
 from django.forms.utils import ErrorDict
 from django.urls import reverse
+from django.utils.html import escape
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes.forms import SafeModelChoiceField
@@ -176,7 +177,7 @@ class VoucherForm(I18nModelForm):
                 required=False,
                 widget=forms.TextInput(attrs={'data-seat-guid-field': '1'}),
                 initial=self.instance.seat.seat_guid if self.instance.seat else '',
-                help_text=str(self.instance.seat) if self.instance.seat else '',
+                help_text=escape(str(self.instance.seat) if self.instance.seat else ''),
             )
 
     def parse_itemvar(self, data):

src/pretix/control/logdisplay.py

@@ -717,6 +717,10 @@ class CoreUserImpersonatedLogEntryType(UserImpersonatedLogEntryType):
     'pretix.organizer.export.schedule.failed': _('A scheduled export has failed: {reason}.'),
     'pretix.organizer.outgoingmails.retried': _('Failed emails have been scheduled to be retried.'),
     'pretix.organizer.outgoingmails.aborted': _('Queued emails have been aborted.'),
+    'pretix.property.created': _('An organizer meta property has been created.'),
+    'pretix.property.deleted': _('An organizer meta property has been deleted.'),
+    'pretix.property.changed': _('An organizer meta property has been changed.'),
+    'pretix.property.reordered': _('An organizer meta property has been reordered.'),
     'pretix.giftcards.acceptance.added': _('Gift card acceptance for another organizer has been added.'),
     'pretix.giftcards.acceptance.removed': _('Gift card acceptance for another organizer has been removed.'),
     'pretix.giftcards.acceptance.acceptor.invited': _('A new gift card acceptor has been invited.'),
@@ -774,6 +778,7 @@ class CoreUserImpersonatedLogEntryType(UserImpersonatedLogEntryType):
     'pretix.user.settings.2fa.disabled': _('Two-factor authentication has been disabled.'),
     'pretix.user.settings.2fa.regenemergency': _('Your two-factor emergency codes have been regenerated.'),
     'pretix.user.settings.2fa.emergency': _('A two-factor emergency code has been generated.'),
+    'pretix.user.settings.2fa.resetdrift': _('Drift and throttle values for two-factor devices have been reset.'),
     'pretix.user.settings.2fa.device.added': _('A new two-factor authentication device "{name}" has been added to '
                                                'your account.'),
     'pretix.user.settings.2fa.device.deleted': _('The two-factor authentication device "{name}" has been removed '
@@ -861,9 +866,6 @@ class OrganizerPluginStateLogEntryType(LogEntryType):
     'pretix.event.question.option.added': _('An answer option has been added to the question.'),
     'pretix.event.question.option.deleted': _('An answer option has been removed from the question.'),
     'pretix.event.question.option.changed': _('An answer option has been changed.'),
-    'pretix.event.questionnaire.added': _('A questionnaire has been created.'),
-    'pretix.event.questionnaire.deleted': _('A questionnaire has been deleted.'),
-    'pretix.event.questionnaire.changed': _('A questionnaire has been changed.'),
     'pretix.event.permissions.added': _('A user has been added to the event team.'),
     'pretix.event.permissions.invited': _('A user has been invited to the event team.'),
     'pretix.event.permissions.changed': _('A user\'s permissions have been changed.'),

src/pretix/control/middleware.py

@@ -85,8 +85,8 @@ class PermissionMiddleware:
         "user.settings.2fa.enable",
         "user.settings.2fa.disable",
         "user.settings.2fa.regenemergency",
-        "user.settings.2fa.confirm.totp",
-        "user.settings.2fa.confirm.webauthn",
+        "user.settings.2fa.confirm.otp_totp.totpdevice",
+        "user.settings.2fa.confirm.pretixbase.webauthndevice",
         "user.settings.2fa.delete",
         "user.settings.2fa.leaveteams",
         "auth.logout",

src/pretix/control/navigation.py

@@ -182,12 +182,12 @@ def get_event_navigation(request: HttpRequest):
                 'active': 'event.items.categories' in url.url_name,
             },
             {
-                'label': _('Questionnaires'),
-                'url': reverse('control:event.items.questionnaires', kwargs={
+                'label': _('Questions'),
+                'url': reverse('control:event.items.questions', kwargs={
                     'event': request.event.slug,
                     'organizer': request.event.organizer.slug,
                 }),
-                'active': 'event.items.questionnaires' in url.url_name or 'event.items.questions' in url.url_name,
+                'active': 'event.items.questions' in url.url_name,
             },
             {
                 'label': _('Discounts'),

src/pretix/control/templates/pretixcontrol/auth/oauth_authorization.html

@@ -45,8 +45,8 @@
             </p>
 
             <div class="form-group buttons">
-                <input type="submit" class="btn btn-large btn-default" value="Cancel"/>
-                <input type="submit" class="btn btn-large btn-primary" name="allow" value="Authorize"/>
+                <input type="submit" class="btn btn-large btn-default" value="{% trans "Cancel" %}"/>
+                <input type="submit" class="btn btn-large btn-primary" name="allow" value="{% trans "Authorize" %}"/>
             </div>
         </form>
     {% else %}

src/pretix/control/templates/pretixcontrol/base.html

@@ -16,6 +16,7 @@
     		<link rel="stylesheet" type="text/x-scss" href="{% static "pretixcontrol/scss/main.scss" %}" />
             <link rel="stylesheet" type="text/x-scss" href="{% static "lightbox/css/lightbox.scss" %}" />
 		{% endcompress %}
+        {% vite_importmap %}
         {% if DEBUG %}
             <script type="text/javascript" src="{% url 'javascript-catalog' lang=request.LANGUAGE_CODE %}"></script>
         {% else %}
@@ -87,7 +88,6 @@
         <meta name="theme-color" content="#3b1c4a">
         <meta name="referrer" content="origin">
 
-        {% vite_importmap %}
         {% block custom_header %}{% endblock %}
 	</head>
 	<body data-datetimeformat="{{ js_datetime_format }}" data-timeformat="{{ js_time_format }}"

src/pretix/control/templates/pretixcontrol/events/create_basics.html

@@ -33,7 +33,7 @@
                 </div>
                 <div class="slug-length alert alert-warning helper-display-none-soft">
                     {% blocktrans trimmed %}
-                        We strongly recommend against using short forms of more then 16 characters.
+                        We strongly recommend against using short forms of more than 16 characters.
                     {% endblocktrans %}
                 </div>
             </div>

src/pretix/control/templates/pretixcontrol/giftcards/payment.html

@@ -1,22 +1,24 @@
 {% load i18n %}
 
 <dl class="dl-horizontal">
-    <dt>{% trans "Gift card code" %}</dt>
-    <dd>
-        {% if gc %}
-            <a href="{% url "control:organizer.giftcard" organizer=gc.issuer.slug giftcard=gc.pk %}">
-                {{ gc.secret }}
-            </a>
-            {% if gc.issuer.slug != request.organizer %}
-                <span class="text-muted">
-                    <br>
-                    <span class="fa fa-group"></span> {{ gc.issuer }}
-                </span>
+    {% if gc or gift_card_secret %}
+        <dt>{% trans "Gift card code" %}</dt>
+        <dd>
+            {% if gc %}
+                <a href="{% url "control:organizer.giftcard" organizer=gc.issuer.slug giftcard=gc.pk %}">
+                    {{ gc.secret }}
+                </a>
+                {% if gc.issuer.slug != request.organizer %}
+                    <span class="text-muted">
+                        <br>
+                        <span class="fa fa-group"></span> {{ gc.issuer }}
+                    </span>
+                {% endif %}
+            {% elif gift_card_secret %}
+                {{ gift_card_secret }}
             {% endif %}
-        {% elif gift_card_secret %}
-            {{ gift_card_secret }}
-        {% endif %}
-    </dd>
+        </dd>
+    {% endif %}
     {% if gc %}
         <dt>{% trans "Issuer" %}</dt>
         <dd>{{ gc.issuer }}</dd>
@@ -25,4 +27,4 @@
          <dt>{% trans "Error" %}</dt>
         <dd>{{ error }}</dd>
     {% endif %}
-</dl>
+</dl>

src/pretix/control/templates/pretixcontrol/items/question_edit.html

@@ -12,120 +12,151 @@
 {% endblock %}
 {% block inside %}
     {% if question %}
-        <h1>{% blocktrans with name=question.question %}Data field: {{ name }}{% endblocktrans %}</h1>
+        <h1>{% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}</h1>
     {% else %}
-        <h1>{% trans "Data field" %}</h1>
+        <h1>{% trans "Question" %}</h1>
     {% endif %}
     <form action="" method="post" class="form-horizontal">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
-        {% bootstrap_field form.question layout="control" %}
-        {% bootstrap_field form.type layout="control" %}
-        <div id="valid-number">
-            {% bootstrap_field form.valid_number_min layout="control" %}
-            {% bootstrap_field form.valid_number_max layout="control" %}
-        </div>
-        <div id="valid-date">
-            {% bootstrap_field form.valid_date_min layout="control" %}
-            {% bootstrap_field form.valid_date_max layout="control" %}
-        </div>
-        <div id="valid-datetime">
-            {% bootstrap_field form.valid_datetime_min layout="control" %}
-            {% bootstrap_field form.valid_datetime_max layout="control" %}
-        </div>
-        <div id="valid-string">
-            {% bootstrap_field form.valid_string_length_min layout="control" %}
-            {% bootstrap_field form.valid_string_length_max layout="control" %}
-        </div>
-        <div id="valid-file">
-            {% bootstrap_field form.valid_file_portrait layout="control" %}
-        </div>
-        <div id="answer-options">
-            <h3>{% trans "Answer options" %}</h3>
-            <noscript>
-                <p>{% trans "Only applicable if you choose 'Choose one/multiple from a list' above." %}</p>
-            </noscript>
-            <div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}" data-formset-delete-confirm-text="{% trans "If you delete an answer option, you will no longer be able to see statistical data on customers who previously selected this option, and when such customers edit their answers, they need to select a different option." %}">
-                {{ formset.management_form }}
-                {% bootstrap_formset_errors formset %}
-                <div data-formset-body>
-                    {% for form in formset %}
-                        <div data-formset-form>
-                            <div class="sr-only">
-                                {{ form.id }}
-                                {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
-                                {% bootstrap_field form.ORDER form_group_class="" layout="inline" %}
-                            </div>
-                            <div class="row question-option-row">
-                                <div class="col-xs-10">
-                            <span class="text-muted">
-                                {% blocktrans trimmed with id=form.instance.identifier %}
-                                    Answer option {{ id }}
-                                {% endblocktrans %}
-                            </span>
-                                    {% bootstrap_form_errors form %}
-                                    {% bootstrap_field form.answer layout='inline' form_group_class="" %}
-                                </div>
-                                <div class="col-xs-2 text-right flip">
-                                    <span>&nbsp;</span><br>
-                                    <button type="button" class="btn btn-default" data-formset-move-up-button>
-                                        <i class="fa fa-arrow-up"></i></button>
-                                    <button type="button" class="btn btn-default" data-formset-move-down-button>
-                                        <i class="fa fa-arrow-down"></i></button>
-                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                        <i class="fa fa-trash"></i></button>
-                                </div>
-                            </div>
-                        </div>
-                    {% endfor %}
+        <div class="tabbed-form">
+            <fieldset>
+                <legend>{% trans "General" %}</legend>
+                {% bootstrap_field form.question layout="control" %}
+                {% bootstrap_field form.type layout="control" %}
+                {% if form.items %}
+                    {% bootstrap_field form.items layout="control" %}
+                {% endif %}
+                {% bootstrap_field form.required layout="control" %}
+                <div class="alert alert-info alert-required-boolean">
+                    {% blocktrans trimmed %}
+                        If you mark a Yes/No question as required, it means that the user has to select Yes and No is not
+                        accepted. If you want to allow both options, do not make this field required.
+                    {% endblocktrans %}
                 </div>
-                <script type="form-template" data-formset-empty-form>
-                    {% escapescript %}
-                        <div data-formset-form>
-                            <div class="sr-only">
-                                {{ formset.empty_form.id }}
-                                {% bootstrap_field formset.empty_form.DELETE form_group_class="" layout="inline" %}
-                                {% bootstrap_field formset.empty_form.ORDER form_group_class="" layout="inline" %}
-                            </div>
-                            <div class="row question-option-row">
-                                <div class="col-xs-10">
-                            <span class="text-muted">
-                                {% trans "New answer option" %}
-                            </span>
-                                    {% bootstrap_field formset.empty_form.answer layout='inline' form_group_class="" %}
+                <div id="valid-number">
+                    {% bootstrap_field form.valid_number_min layout="control" %}
+                    {% bootstrap_field form.valid_number_max layout="control" %}
+                </div>
+                <div id="valid-date">
+                    {% bootstrap_field form.valid_date_min layout="control" %}
+                    {% bootstrap_field form.valid_date_max layout="control" %}
+                </div>
+                <div id="valid-datetime">
+                    {% bootstrap_field form.valid_datetime_min layout="control" %}
+                    {% bootstrap_field form.valid_datetime_max layout="control" %}
+                </div>
+                <div id="valid-string">
+                    {% bootstrap_field form.valid_string_length_min layout="control" %}
+                    {% bootstrap_field form.valid_string_length_max layout="control" %}
+                </div>
+                <div id="valid-file">
+                    {% bootstrap_field form.valid_file_portrait layout="control" %}
+                </div>
+                <div id="answer-options">
+                    <h3>{% trans "Answer options" %}</h3>
+                    <noscript>
+                        <p>{% trans "Only applicable if you choose 'Choose one/multiple from a list' above." %}</p>
+                    </noscript>
+                    <div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}" data-formset-delete-confirm-text="{% trans "If you delete an answer option, you will no longer be able to see statistical data on customers who previously selected this option, and when such customers edit their answers, they need to select a different option." %}">
+                        {{ formset.management_form }}
+                        {% bootstrap_formset_errors formset %}
+                        <div data-formset-body>
+                            {% for form in formset %}
+                                <div data-formset-form>
+                                    <div class="sr-only">
+                                        {{ form.id }}
+                                        {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
+                                        {% bootstrap_field form.ORDER form_group_class="" layout="inline" %}
+                                    </div>
+                                    <div class="row question-option-row">
+                                        <div class="col-xs-10">
+                                    <span class="text-muted">
+                                        {% blocktrans trimmed with id=form.instance.identifier %}
+                                            Answer option {{ id }}
+                                        {% endblocktrans %}
+                                    </span>
+                                            {% bootstrap_form_errors form %}
+                                            {% bootstrap_field form.answer layout='inline' form_group_class="" %}
+                                        </div>
+                                        <div class="col-xs-2 text-right flip">
+                                            <span>&nbsp;</span><br>
+                                            <button type="button" class="btn btn-default" data-formset-move-up-button>
+                                                <i class="fa fa-arrow-up"></i></button>
+                                            <button type="button" class="btn btn-default" data-formset-move-down-button>
+                                                <i class="fa fa-arrow-down"></i></button>
+                                            <button type="button" class="btn btn-danger" data-formset-delete-button>
+                                                <i class="fa fa-trash"></i></button>
+                                        </div>
+                                    </div>
                                 </div>
-                                <div class="col-xs-2 text-right flip">
-                                    <span>&nbsp;</span><br>
-                                    <button type="button" class="btn btn-default" data-formset-move-up-button>
-                                        <i class="fa fa-arrow-up"></i></button>
-                                    <button type="button" class="btn btn-default" data-formset-move-down-button>
-                                        <i class="fa fa-arrow-down"></i></button>
-                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                        <i class="fa fa-trash"></i></button>
-                                </div>
-                            </div>
+                            {% endfor %}
                         </div>
-                    {% endescapescript %}
-                </script>
-                <p>
-                    <button type="button" class="btn btn-default" data-formset-add>
-                        <i class="fa fa-plus"></i> {% trans "Add a new option" %}</button>
-                </p>
-            </div>
+                        <script type="form-template" data-formset-empty-form>
+                            {% escapescript %}
+                                <div data-formset-form>
+                                    <div class="sr-only">
+                                        {{ formset.empty_form.id }}
+                                        {% bootstrap_field formset.empty_form.DELETE form_group_class="" layout="inline" %}
+                                        {% bootstrap_field formset.empty_form.ORDER form_group_class="" layout="inline" %}
+                                    </div>
+                                    <div class="row question-option-row">
+                                        <div class="col-xs-10">
+                                    <span class="text-muted">
+                                        {% trans "New answer option" %}
+                                    </span>
+                                            {% bootstrap_field formset.empty_form.answer layout='inline' form_group_class="" %}
+                                        </div>
+                                        <div class="col-xs-2 text-right flip">
+                                            <span>&nbsp;</span><br>
+                                            <button type="button" class="btn btn-default" data-formset-move-up-button>
+                                                <i class="fa fa-arrow-up"></i></button>
+                                            <button type="button" class="btn btn-default" data-formset-move-down-button>
+                                                <i class="fa fa-arrow-down"></i></button>
+                                            <button type="button" class="btn btn-danger" data-formset-delete-button>
+                                                <i class="fa fa-trash"></i></button>
+                                        </div>
+                                    </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 option" %}</button>
+                        </p>
+                    </div>
+                </div>
+            </fieldset>
+            <fieldset>
+                <legend>{% trans "Advanced" %}</legend>
+                {% bootstrap_field form.help_text layout="control" %}
+                {% bootstrap_field form.identifier layout="control" %}
+                {% if form.ask_during_checkin %}
+                    {% bootstrap_field form.ask_during_checkin layout="control" %}
+                {% endif %}
+                {% if form.show_during_checkin %}
+                    {% bootstrap_field form.show_during_checkin layout="control" %}
+                {% endif %}
+                {% bootstrap_field form.hidden layout="control" %}
+                {% if form.print_on_invoice %}
+                    {% bootstrap_field form.print_on_invoice layout="control" %}
+                {% endif %}
+
+                <div class="form-group">
+                    <label class="col-md-3 control-label" for="id_dependency_question">
+                        {% trans "Question dependency" %}
+                        <br><span class="optional">{% trans "Optional" context "form" %}</span>
+                    </label>
+                    <div class="col-md-4">
+                        {% bootstrap_field form.dependency_question layout="inline" form_group_class="inner" %}
+                    </div>
+                    <div class="col-md-5">
+                        <script type="text/plain" id="dependency_value_val">{{ form.instance.dependency_values|escapejson_dumps }}</script>
+                        {% bootstrap_field form.dependency_values layout="inline" form_group_class="inner" %}
+                    </div>
+                </div>
+            </fieldset>
         </div>
-        {% bootstrap_field form.identifier layout="control" %}
-        {% if form.ask_during_checkin %}
-            {% bootstrap_field form.ask_during_checkin layout="control" %}
-        {% endif %}
-        {% if form.show_during_checkin %}
-            {% bootstrap_field form.show_during_checkin layout="control" %}
-        {% endif %}
-        {% bootstrap_field form.hidden layout="control" %}
-        {% if form.print_on_invoice %}
-            {% bootstrap_field form.print_on_invoice layout="control" %}
-        {% endif %}
-
-
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}