Fix issues

Fixup incorrect merge
Move default statistics to plugin
2026-10-03 19:34:41 +00:00 · 2026-10-03 10:50:03 +02:00 · 2026-10-03 10:37:35 +02:00 · 2026-10-03 10:33:13 +02:00 · 2026-10-03 10:32:05 +02:00 · 2026-10-03 10:31:46 +02:00
372 changed files with 39080 additions and 39030 deletions
@@ -0,0 +1,2 @@
+# Format pre-vue code with eslint where possible (2026-09-10)
+d85e52c83ed3639e040372fd0052e842e4899d90
@@ -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 *
@@ -53,6 +53,8 @@ Checking a ticket in
                                    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 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.
@@ -71,8 +73,6 @@ Checking a ticket in
   :>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.

   **Example request**:

@@ -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.
@@ -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,
@@ -566,7 +566,7 @@ organizer level.
      Content-Type: application/json

      {
-        "imprint_url": "https://pretix.eu",
+        "region": "DE",
        …
      }

@@ -579,12 +579,14 @@ organizer level.
      Content-Type: application/json

      {
-        "imprint_url":
+        "region":
          {
-            "value": "https://pretix.eu",
-            "label": "Imprint URL",
+            "value": "DE",
+            "label": "Region",
            "readonly": false,
-            "help_text": "This should point e.g. to a part of your website that has your contact details and legal information."
+            "help_text": "Will be used to determine date and time formatting as well as default country for customer
+                          addresses and phone numbers. For formatting, this takes less priority than the language and
+                          is therefore mostly relevant for languages used in different regions globally (like English)."
          }
        },
        …
@@ -620,7 +622,7 @@ organizer level.
      Content-Type: application/json

      {
-        "imprint_url": "https://example.org/imprint/"
+        "region": "DE"
      }

   **Example response**:
@@ -632,7 +634,7 @@ organizer level.
      Content-Type: application/json

      {
-        "imprint_url": "https://example.org/imprint/",
+        "region": "DE",
        …
      }

@@ -12,6 +12,7 @@ at :ref:`plugin-docs`.
   organizers
   events
   subevents
+   event_meta_properties
   taxrules
   categories
   items
@@ -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
@@ -15,7 +15,7 @@ Core
      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,
-      register_event_permission_groups, register_organizer_permission_groups, self_service_cancellation_checks
+      register_event_permission_groups, register_organizer_permission_groups

 Order events
 """"""""""""
@@ -83,7 +83,7 @@ Dashboards

 .. automodule:: pretix.control.signals
   :no-index:
-   :members: event_dashboard_widgets, user_dashboard_widgets, event_dashboard_top
+   :members: event_dashboard_statistics, user_dashboard_widgets, event_dashboard_top

 Ticket designs
 """"""""""""""
@@ -8,7 +8,63 @@ import vuePug from 'eslint-plugin-vue-pug'

 const ignores = globalIgnores([
 	'**/node_modules',
-	'**/dist'
+	'**/dist',
+	// Vendored code
+	'src/pretix/static/leaflet',
+	'src/pretix/static/clipboard',
+	'src/pretix/static/cropper',
+	'src/pretix/static/lightbox',
+	'src/pretix/static/are-you-sure',
+	'src/pretix/static/vuejs',
+	'src/pretix/static/fontawesome',
+	'src/pretix/static/typeahead',
+	'src/pretix/static/moment',
+	'src/pretix/static/pdfjs',
+	'src/pretix/static/sortable',
+	'src/pretix/static/iframeresizer',
+	'src/pretix/static/bootstrap',
+	'src/pretix/static/d3',
+	'src/pretix/static/jsi18n',
+	'src/pretix/static/fabric',
+	'src/pretix/static/datetimepicker',
+	'src/pretix/static/charts',
+	'src/pretix/static/fileupload',
+	'src/pretix/static/seating',
+	'src/pretix/static/rest_framework',
+	'src/pretix/static/select2',
+	'src/pretix/static/schema',
+	'src/pretix/static/slider',
+	'src/pretix/static/jquery',
+	'src/pretix/static/colorpicker',
+	'src/pretix/static/rrule',
+	'src/pretix/static/pretixcontrol/js/jquery.qrcode.min.js',
+	'src/pretix/static/pretixpresale/js/widget/docready.js',
+	// Pre-vue JS code
+	'src/pretix/static/pretixbase/js/addressform.js',
+	'src/pretix/static/pretixbase/js/asynctask.js',
+	'src/pretix/static/pretixbase/js/details.js',
+	'src/pretix/static/pretixbase/js/gettextstub.js',
+	'src/pretix/static/pretixbase/js/i18nstring.js',
+	'src/pretix/static/pretixcontrol/js/menu.js',
+	'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/subevent.js',
+	'src/pretix/static/pretixcontrol/js/ui/variations.js',
+	'src/pretix/static/pretixcontrol/js/ui/webauthn.js',
+	'src/pretix/static/pretixpresale/js/ui/cart.js',
+	'src/pretix/static/pretixpresale/js/ui/main.js',
+	'src/pretix/static/pretixpresale/js/ui/questions.js',
+	'src/pretix/static/pretixpresale/js/widget/floatformat.js',
+	'src/pretix/static/pretixpresale/js/widget/widget.js',
+	'src/pretix/plugins/banktransfer/static',
+	'src/pretix/plugins/paypal2/static',
+	'src/pretix/plugins/statistics/static',
+	'src/pretix/plugins/stripe/static',
+	// Plugin checkouts
+	'local',
+	// docs
+	'doc',
 ])

 export default defineConfig([
@@ -194,16 +194,16 @@
      }
    },
    "node_modules/@eslint/config-array/node_modules/brace-expansion": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
-      "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
+      "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "balanced-match": "^4.0.2"
      },
      "engines": {
-        "node": "18 || 20 || >=22"
+        "node": "20 || >=22"
      }
    },
    "node_modules/@eslint/config-array/node_modules/minimatch": {
@@ -294,29 +294,43 @@
      }
    },
    "node_modules/@humanfs/core": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
-      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz",
+      "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==",
      "dev": true,
      "license": "Apache-2.0",
+      "dependencies": {
+        "@humanfs/types": "^0.15.0"
+      },
      "engines": {
        "node": ">=18.18.0"
      }
    },
    "node_modules/@humanfs/node": {
-      "version": "0.16.7",
-      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
-      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
+      "version": "0.16.8",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz",
+      "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
-        "@humanfs/core": "^0.19.1",
+        "@humanfs/core": "^0.19.2",
+        "@humanfs/types": "^0.15.0",
        "@humanwhocodes/retry": "^0.4.0"
      },
      "engines": {
        "node": ">=18.18.0"
      }
    },
+    "node_modules/@humanfs/types": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz",
+      "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
    "node_modules/@humanwhocodes/module-importer": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -1325,16 +1339,16 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
-      "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
+      "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "balanced-match": "^4.0.2"
      },
      "engines": {
-        "node": "18 || 20 || >=22"
+        "node": "20 || >=22"
      }
    },
    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
@@ -1683,9 +1697,9 @@
      "license": "ISC"
    },
    "node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.7.tgz",
+      "integrity": "sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -2108,16 +2122,16 @@
      }
    },
    "node_modules/eslint/node_modules/brace-expansion": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
-      "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
+      "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "balanced-match": "^4.0.2"
      },
      "engines": {
-        "node": "18 || 20 || >=22"
+        "node": "20 || >=22"
      }
    },
    "node_modules/eslint/node_modules/eslint-visitor-keys": {
@@ -3380,9 +3394,9 @@
      }
    },
    "node_modules/postcss-selector-parser": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
-      "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==",
+      "version": "7.1.5",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.5.tgz",
+      "integrity": "sha512-KvvtD7SrlBP7dlgkBghEE3r84CABm5SmV2aNcG4oCA+qDnJ/tvKonFVvwWAyyWUEwxuNawdfEAZKP9zM3oZ2Uw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -4148,9 +4162,9 @@
      }
    },
    "node_modules/smol-toml": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.6.1.tgz",
-      "integrity": "sha512-dWUG8F5sIIARXih1DTaQAX4SsiTXhInKf1buxdY9DIg4ZYPZK5nGM1VRIYmEbDbsHt7USo99xSLFu5Q1IqTmsg==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.7.1.tgz",
+      "integrity": "sha512-PPlsspAZ4jbMBu5DMFhfUGDQLu/vrL4SyBROVS37x8ynnVmFIs1VPBz1Co8Xks3TvpIaZXmU85y4DrQ+UyVFoQ==",
      "dev": true,
      "license": "BSD-3-Clause",
      "engines": {
@@ -33,14 +33,14 @@ dependencies = [
  "bleach==6.4.*",
  "celery==5.6.*",
  "chardet==5.2.*",
-  "cryptography>=50.0.0",
+  "cryptography>=50.0.1",
  "css-inline==0.21.*",
  "defusedcsv>=3.0.0",
  "dnspython==2.*",
-  "Django[argon2]==5.2.*",
+  "Django[argon2]==5.2.*,>=5.2.17",
  "django-bootstrap3==26.2",
  "django-compressor==4.6.0",
-  "django-countries==9.0.*",
+  "django-countries==9.1.*",
  "django-filter==26.1",
  "django-formset-js-improved==0.5.0.5",
  "django-formtools==2.7",
@@ -56,7 +56,7 @@ dependencies = [
  "django-querytagger==0.0.3",
  "django-redis==7.0.*",
  "django-scopes==2.1.*",
-  "django-statici18n==2.7.*",
+  "django-statici18n==2.8.*",
  "djangorestframework==3.17.*",
  "dnspython==2.8.*",
  "drf_ujson2==1.7.*",
@@ -67,7 +67,7 @@ dependencies = [
  "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.
+  "markdown==3.11",  # 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
  "mt-940==4.30.*",
  "oauthlib==3.3.*",
@@ -75,7 +75,7 @@ dependencies = [
  "packaging",
  "paypalrestsdk==1.13.*",
  "paypal-checkout-serversdk==1.0.*",
-  "PyJWT==2.13.*",
+  "PyJWT==2.15.*",
  "phonenumberslite==9.0.*",
  "Pillow==12.3.*",
  "pretix-plugin-build",
@@ -84,7 +84,7 @@ dependencies = [
  "pycountry",
  "pycparser==3.0",
  "pycryptodome==3.23.*",
-  "pypdf==6.5.*",
+  "pypdf==6.19.*",
  "python-bidi==0.6.*",  # Support for Arabic in reportlab
  "python-dateutil==2.9.*",
  "pytz",
@@ -94,7 +94,7 @@ dependencies = [
  "redis==7.4.*",
  "reportlab==5.0.*",
  "requests==2.34.*",
-  "sentry-sdk==2.68.*",
+  "sentry-sdk==2.70.*",
  "sepaxml==2.7.*",
  "stripe==7.9.*",
  "text-unidecode==1.*",
@@ -112,10 +112,10 @@ dev = [
  "aiohttp==3.14.*",
  "coverage",
  "coveralls",
-  "fakeredis==2.37.*",
-  "flake8==7.3.*",
+  "fakeredis==2.38.*",
+  "flake8==7.4.*",
  "freezegun",
-  "isort==8.0.*",
+  "isort==9.0.*",
  "pep8-naming==0.15.*",
  "potypo",
  "pytest-asyncio>=1.4.0",
@@ -129,7 +129,7 @@ dev = [
  "pytest==9.1.*",
  "playwright",
  "responses",
-	"django-stubs-ext"
+  "pypdfium2"
 ]

 [project.entry-points."distutils.commands"]
@@ -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/*
@@ -30,3 +30,5 @@ npminstall:
 npmbuild:
 	npm run build

+licenseheaders:
+	licenseheaders -t ../.licenseheader -E .py -x "*/migrations/*.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.9.0.dev0"
@@ -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):
+    if user.is_authenticated:
+        return f'api-upload-User-{user.pk}'
+    else:
+        return f'api-upload-{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):
+    return get_session_key_for_api_auth(request.user, request.auth)
@@ -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(
@@ -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:
@@ -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'
@@ -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,9 +41,10 @@ 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,
-    Membership, MembershipType, OrderPosition, Organizer, ReusableMedium,
-    SalesChannel, SeatingPlan, Team, TeamAPIToken, TeamInvite, User,
+    Customer, Device, EventMetaProperty, GiftCard, GiftCardAcceptance,
+    GiftCardTransaction, Membership, MembershipType, OrderPosition, Organizer,
+    ReusableMedium, SalesChannel, SeatingPlan, Team, TeamAPIToken, TeamInvite,
+    User,
 )
 from pretix.base.models.seating import SeatingPlanLayoutValidator
 from pretix.base.permissions import (
@@ -640,3 +642,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
@@ -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)
@@ -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:
@@ -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
@@ -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()
@@ -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
@@ -27,7 +27,7 @@ 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.timezone import now
 from django.utils.translation import gettext_lazy as _
@@ -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
@@ -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'),
@@ -350,16 +350,22 @@ class WrappedPhonePrefixSelect(Select):
        return super().render(name, value or self.initial, *args, **kwargs)

    def get_context(self, name, value, attrs):
-        if value and self.choices[1][0] != value:
-            matching_choices = len([1 for p, c in self.choices if p == value])
+        # self.choices is lazy evaluated, needs to be realized to be modifiable
+        choices = list(self.choices)
+        if value and choices[1][0] != value:
+            matching_choices = len([1 for p, c in choices if p == value])
            if matching_choices > 1:
                # Some countries share a phone prefix, for example +1 is used all over the Americas.
                # This causes a UX problem: If the default value or the existing data is +12125552368,
                # the widget will just show the first <option> entry with value="+1" as selected,
                # which alphabetically is America Samoa, although most numbers statistically are from
-                # the US. As a workaround, we detect this case and add an aditional choice value with
+                # the US. As a workaround, we detect this case and add an additional choice value with
                # just <option value="+1">+1</option> without an explicit country.
-                self.choices.insert(1, (value, value))
+                self.choices = [
+                    choices[0],
+                    (value, value),
+                    *choices[1:],
+                ]
        context = super().get_context(name, value, attrs)
        return context

@@ -594,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
@@ -899,7 +909,7 @@ class BaseQuestionsForm(forms.Form):
            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 = q.required and not self.all_optional
            field.required = False
        return field

@@ -1196,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()

@@ -1438,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

@@ -1493,11 +1505,12 @@ 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:
-                normalized_id = validate_vat_id(data.get('vat_id'), str(data.get('country')))
+                requester_id = self.request.event.settings.invoice_address_from_vat_id
+                normalized_id = validate_vat_id(data.get('vat_id'), str(data.get('country')), requester_id)
                self.instance.vat_id_validated = bool(normalized_id)
                self.instance.vat_id = data['vat_id'] = normalized_id
            except VATIDFinalError as e:
@@ -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)')),
    ))


@@ -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:
@@ -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 = []
@@ -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,
+        ),
+    ]
@@ -1,905 +0,0 @@
-import datetime
-import operator
-from dataclasses import asdict, dataclass, field
-from decimal import Decimal
-from itertools import chain
-from typing import (
-    TYPE_CHECKING, Any, Callable, ClassVar, Dict, Final, List, Literal,
-    Optional, Protocol, Set, Tuple, TypeAlias,
-)
-
-from django.core.exceptions import ValidationError
-from django.core.serializers.json import DjangoJSONEncoder
-from django.core.validators import MaxValueValidator, MinValueValidator
-from django.db import models
-from django.db.models import Prefetch, QuerySet
-from django.utils.timezone import make_aware
-from django.utils.translation import gettext_lazy as _
-from django_stubs_ext import StrOrPromise
-
-from pretix.base.decimal import round_decimal
-from pretix.base.models import Event, Item, ItemVariation, Order, OrderPosition
-from pretix.base.reldate import ModelRelativeDateTimeField, RelativeDateWrapper
-from pretix.base.signals import self_service_cancellation_checks
-from pretix.helpers import ensure_no_queries
-
-"""
-Supporting self-service cancellation requires us to do two main things:
-1. uphold the business logic of pretix and the installed plugins
-2. charge the customer the appropriate fees for their cancellation
-
-Number 1 is a question of bringing enough checks into place and prevent a
-cancellation if one of them is violated.
-Checks need to subclass `CancellationCheck` and can be provided via the new
-`self_service_cancellation_checks` signal.
-
-Number 2 is trickier because organizers will have complex^(TM) cancellation
-fee structures and expressing these in an understandable way is a challenge.
-Especially when taking support cases into consideration that have to debug
-certain behaviour long after.
-The cancellation fees are computed via `CancellationRules`.
-
-When a customer triggers a self service cancellation, we will:
-1. Positions
-    a. Evaluate all `CancellationChecks` that are concerned with individual positions
-    b. Evaluate all `CancellationRules` that are concerned with individual positions and compute the fees
-    c. Choose for each position the cheapest `CancellationRules` position result available
-2. Process
-    a. Evaluate all `CancellationChecks` that are concerned with the process of cancellation
-    b. Evaluate all `CancellationRules` that are concerned with the process of cancellation
-    c. Choose the cheapest `CancellationRules` process result available
-3. Return all results for Checks and Rules
-
-Step 1c. and 2c. are kept separate intentionally.
-The alternative of finding the cheapest cancellation option overall (process and position) would
-require us to check the full combinatorics of possible process and position fees, resulting
-in unfeasible runtime behaviour, and if we would optimize it in difficult to explain non-optimal
-situations.
-"""
-
-
-class FeeType(models.TextChoices):
-    """
-    Process fees can be added on top of all position fees, or they
-    can set a floor for the minimum cancellation fee that this will incur.
-    """
-    MINIMUM = "min_process_fee", _("Minimum total fee")
-    ADDITIONAL = "add_process_fee", _("Additional fee")
-    POSITION = "position_fee", _("Position fee")
-
-
-class CheckTypes(models.TextChoices):
-    POSITION = "position", _("Order Position Cancellation Rule")
-    PROCESS = "process", _("Cancellation Process Rule")
-
-
-@dataclass(frozen=True)
-class CheckResult:
-    """
-    Result of an individual cancellation check.
-    The check result only encodes if the check allows or disallows cancellation via
-    `cancellation_possible`
-    """
-    id: str
-    reason: StrOrPromise
-    cancellation_possible: bool
-    type: Literal['check'] = field(default="check")
-
-    @classmethod
-    def from_dict(cls, data: dict) -> "CheckResult":
-        return cls(**data)
-
-
-@dataclass(frozen=True)
-class RuleResult:
-    """
-    Result of evaluating a CancellationRule.
-    A rule can consist out of multiple different checks, each partial_result is recorded individually.
-
-    A RuleResult encodes both the feasibility of a cancellation via `cancellation_possible` and
-    the resulting consequences in form of fees which can be expressed as:
-    - absolute position fees of a fixed amount
-    - relative position fees of a percentage of the position price
-    - minimum process fees, the total cancellation fee across all positions and the process must be at least this
-    - additional process fee, an additional processing fee is charged in addition to the per position fees
-    """
-    id: int
-    partial_results: List[CheckResult]
-    fee_type: FeeType
-    fee: Decimal
-
-    type: Literal['rule'] = field(default="rule")
-
-    @classmethod
-    def from_dict(cls, data: dict) -> "RuleResult":
-        return cls(
-            id=data["id"],
-            partial_results=[CheckResult.from_dict(r) for r in data["partial_results"]],
-            fee_type=FeeType(data["fee_type"]),
-            fee=Decimal(data["fee"]),
-        )
-
-    @property
-    def cancellation_possible(self) -> bool:
-        return all(result.cancellation_possible for result in self.partial_results)
-
-    @classmethod
-    def from_absolute_fee(
-            cls,
-            id: int,
-            partial_results: List[CheckResult],
-            fee_type: Literal[FeeType.POSITION],
-            absolute_fee: Decimal
-    ) -> "RuleResult":
-        return RuleResult(id=id, partial_results=partial_results, fee_type=fee_type, fee=absolute_fee)
-
-    @classmethod
-    def from_relative_fee(
-            cls,
-            id: int,
-            partial_results: List[CheckResult],
-            fee_type: Literal[FeeType.POSITION],
-            position_price: Decimal,
-            percentage: Decimal,
-            currency: str
-    ) -> "RuleResult":
-        return RuleResult(id=id, partial_results=partial_results, fee_type=fee_type,
-                          fee=round_decimal(position_price * (percentage / 100), currency))
-
-    @classmethod
-    def from_process_fee(
-            cls,
-            id: int,
-            partial_results: List[CheckResult],
-            fee_type: Literal[FeeType.MINIMUM, FeeType.ADDITIONAL],
-            absolute_fee: Decimal,
-            reference_price: Decimal
-    ) -> "RuleResult":
-        if fee_type == FeeType.MINIMUM:
-            if reference_price < absolute_fee:
-                fee = absolute_fee - reference_price
-            else:
-                fee = Decimal(0)
-        elif fee_type == FeeType.ADDITIONAL:
-            fee = absolute_fee
-        else:
-            raise ValueError("Unknown fee type")
-
-        return RuleResult(id=id, partial_results=partial_results, fee_type=fee_type, fee=fee)
-
-    def __lt__(self, other: object) -> bool:
-        if not isinstance(other, RuleResult):
-            return NotImplemented
-
-        if self.cancellation_possible == other.cancellation_possible:
-            return self.fee < other.fee
-        else:
-            return self.cancellation_possible and not other.cancellation_possible
-
-
-@dataclass(frozen=True)
-class Checks:
-    position: List["CancellationCheck"]
-    process: List["CancellationCheck"]
-
-    @property
-    def prefetches(self) -> List[Callable[[], Prefetch]]:
-        return list(chain.from_iterable(
-            check.prefetches for check in [*self.position, *self.process]
-        ))
-
-    @property
-    def related_selects(self) -> List[str]:
-        return list(chain.from_iterable(
-            check.related_selects for check in [*self.position, *self.process]
-        ))
-
-
-PositionSet: TypeAlias = Set[OrderPosition]
-
-
-class PositionCheckFn(Protocol):
-    def __call__(self, order: Order, keep: PositionSet, position: OrderPosition, check_ts: datetime.datetime,
-                 /) -> Optional[CheckResult]:
-        ...
-
-
-class ProcessCheckFn(Protocol):
-    def __call__(self, order: Order, keep: PositionSet, check_ts: datetime.datetime, /) -> Optional[CheckResult]:
-        ...
-
-
-@dataclass(frozen=True)
-class CancellationCheck:
-    id: str
-    type: CheckTypes
-    check_fn: PositionCheckFn | ProcessCheckFn = field(compare=False)
-    prefetches: List[Callable[[], Prefetch]] = field(default_factory=list)
-    related_selects: List[str] = field(default_factory=list)
-
-    def evaluate(self, order: Order, keep: PositionSet,
-                 position: OrderPosition | None, check_ts: datetime.datetime) -> Optional[CheckResult]:
-        if position and self.type == CheckTypes.POSITION:
-            return self.check_fn(order, keep, position, check_ts)
-        elif position is None and self.type == CheckTypes.PROCESS:
-            return self.check_fn(order, keep, check_ts)
-        else:
-            raise ValidationError("Type of the rule doesn't match the check_fn")
-
-
-@dataclass(frozen=True)
-class PositionResult:
-    position_check_results: Dict[int, List[CheckResult]]
-    position_rule_results: Dict[int, List[RuleResult]]
-
-    @classmethod
-    def from_dict(cls, data: dict) -> "PositionResult":
-        return cls(
-            position_check_results={
-                int(pos_id): [CheckResult.from_dict(r) for r in results]
-                for pos_id, results in data["position_check_results"].items()
-            },
-            position_rule_results={
-                int(pos_id): [RuleResult.from_dict(r) for r in results]
-                for pos_id, results in data["position_rule_results"].items()
-            },
-        )
-
-    @property
-    def cancellation_possible(self) -> bool:
-        def ok(results: List[CheckResult] | List[RuleResult]) -> bool:
-            return all([val.cancellation_possible for val in results]) if results else True
-
-        return all(
-            ok(results)
-            for d in
-            (self.position_check_results,
-             {key: [min(pos_res)] for key, pos_res in self.position_rule_results.items() if pos_res})
-            for results in d.values()
-        )
-
-    @property
-    def fee_value(self) -> Decimal:
-        fee_value = Decimal("0.00")
-        for pos_id, results in self.position_rule_results.items():
-            if len(results) > 0:
-                best_option = min(results)
-                if best_option.cancellation_possible:
-                    fee_value += best_option.fee
-        return fee_value
-
-
-@dataclass(frozen=True)
-class ProcessResult:
-    process_check_results: List[CheckResult]
-    process_rule_results: List[RuleResult]
-
-    @classmethod
-    def from_dict(cls, data: dict) -> "ProcessResult":
-        return cls(
-            process_check_results=[CheckResult.from_dict(r) for r in data["process_check_results"]],
-            process_rule_results=[RuleResult.from_dict(r) for r in data["process_rule_results"]],
-        )
-
-    @property
-    def cancellation_possible(self) -> bool:
-        results: List[CheckResult | RuleResult] = [*self.process_check_results]
-        if self.process_rule_results:
-            results.append(min(self.process_rule_results))
-        return all(res.cancellation_possible for res in results)
-
-    @property
-    def fee_value(self) -> Decimal:
-        if not self.process_rule_results:
-            return Decimal("0.00")
-        best_option = min(self.process_rule_results)
-        if best_option.cancellation_possible:
-            return best_option.fee
-        return Decimal("0.00")
-
-
-@dataclass(frozen=True)
-class CancellationResult:
-    position_result: PositionResult
-    process_result: ProcessResult
-
-    @classmethod
-    def from_dict(cls, data: dict) -> "CancellationResult":
-        return cls(
-            position_result=PositionResult.from_dict(data["position_result"]),
-            process_result=ProcessResult.from_dict(data["process_result"]),
-        )
-
-    @property
-    def cancellation_possible(self) -> bool:
-        return self.position_result.cancellation_possible and self.process_result.cancellation_possible
-
-
-class Cancellation(models.Model):
-    CREATED: Final = "CREATED"
-    APPROVAL_PENDING: Final = "APPROVAL_PENDING"
-    PERFORMED: Final = "PERFORMED"
-    CANCELLED: Final = "CANCELLED"
-
-    CANCELLATION_STATE = (
-        (CREATED, _("Created")),
-        (APPROVAL_PENDING, _("Approval pending")),
-        (PERFORMED, _("Performed")),
-        (CANCELLED, _("Cancelled")),
-    )
-
-    event = models.ForeignKey(
-        Event,
-        verbose_name=_("Event"),
-        related_name="cancellations",
-        on_delete=models.CASCADE
-    )
-    order = models.ForeignKey(
-        Order,
-        verbose_name=_("Order"),
-        related_name="cancellations",
-        on_delete=models.CASCADE
-    )
-    keep = models.ManyToManyField(
-        to=OrderPosition,
-        verbose_name=_("Positions to keep"),
-    )
-    evaluation_ts = models.DateTimeField(
-        verbose_name=_("Cancellation datetime"),
-        auto_now_add=True,
-    )
-
-    state = models.CharField(
-        max_length=16,
-        choices=CANCELLATION_STATE,
-        default=CREATED,
-        verbose_name=_("State of the cancellation"),
-    )
-
-    _result = models.JSONField(default=dict, db_column="result", encoder=DjangoJSONEncoder)
-
-    @property
-    def result(self) -> CancellationResult:
-        return CancellationResult.from_dict(self._result)
-
-    @result.setter
-    def result(self, value: CancellationResult):
-        if not isinstance(value, CancellationResult):
-            raise TypeError("result must be a CancellationResult instance")
-        if self._result:
-            raise ValueError("result is write-once and has already been set")
-        self._result = asdict(value)
-
-    @property
-    def possible(self) -> bool:
-        return self.result.cancellation_possible
-
-    @staticmethod
-    def evaluate(event: Event, order: Order, keep: Set[OrderPosition],
-                 check_ts: datetime.datetime) -> "CancellationResult":
-
-        # validate that all keep order positions are part of the order
-        for p in keep:
-            if p.order_id != order.id:
-                raise ValidationError("OrderPosition {} does not belong to order {}".format(p.code, order.code))
-
-        # exclude canceled positions
-        for p in order.positions.all():
-            if p.canceled:
-                keep.add(p)
-
-        # collect all checks, position_rules and process_rules that are applicable
-        checks = CancellationRule.collect_checks(event=event)
-        position_rules: QuerySet[PositionCancellationRule] = PositionCancellationRule.objects.filter(
-            event=event).with_rule_data().all()
-        process_rules: QuerySet[ProcessCancellationRule] = ProcessCancellationRule.objects.filter(
-            event=event).with_rule_data().all()
-
-        order = CancellationRule.prefetch_order(event, order, checks)
-
-        # keep track of all decisions so we can explain them in the logs
-        position_check_results: Dict[int, List[CheckResult]] = {}
-        position_rule_results: Dict[int, List[RuleResult]] = {}
-
-        # perform all position checks and position rules
-        for position in order.positions.all():
-            position_check_results[position.id] = []
-            position_rule_results[position.id] = []
-
-            # skip this position if customer doesn't want to cancel
-            if position in keep:
-                continue
-
-            # evaluate the system/plugin checks for the position
-            for check in checks.position:
-                res = check.evaluate(order=order, keep=keep, position=position, check_ts=check_ts)
-                if res is not None:
-                    position_check_results[position.id].append(res)
-
-            # evaluate all customer specified rules for this position
-            for rule in position_rules:
-                result = rule.evaluate_position_rule(order, keep, position, check_ts)
-                if result is not None:
-                    position_rule_results[position.id].append(result)
-
-        position_results = PositionResult(position_check_results=position_check_results,
-                                          position_rule_results=position_rule_results)
-
-        # we need the current fee_value to select the cheapest process rule
-        temp_position_fees = position_results.fee_value
-
-        # again keep track of all decisions so we can explain them in the logs
-        process_check_results: List[CheckResult] = []
-        process_rule_results: List[RuleResult] = []
-
-        # evaluate all system/plugin provided checks for the cancellation process
-        for check in checks.process:
-            res = check.evaluate(order=order, keep=keep, position=None, check_ts=check_ts)
-            if res is not None:
-                process_check_results.append(res)
-
-        # evaluate all customer specified rules for the cancellation process
-        for rule in process_rules:
-            result = rule.evaluate_process_rule(order, keep, temp_position_fees, check_ts)
-            if result is not None:
-                process_rule_results.append(result)
-
-        process_result = ProcessResult(process_check_results=process_check_results,
-                                       process_rule_results=process_rule_results)
-
-        res = CancellationResult(position_result=position_results, process_result=process_result)
-
-        return res
-
-    @staticmethod
-    def prepare(event: Event, order: Order, keep: Set[OrderPosition],
-                check_ts: datetime.datetime) -> "Cancellation":
-        res = Cancellation.evaluate(event=event, order=order, keep=set(), check_ts=check_ts)
-        c = Cancellation(event=event, order=order, result=res, evaluation_ts=check_ts)
-        c.save()
-        c.keep.add(*keep)
-        return c
-
-    def execute(self):
-        # TODO load the cancellation verdict from the id  and perform the actions
-        pass
-
-
-def _send_self_service_cancellation_checks(event: Event) -> List[Tuple[Any, Any]]:
-    return self_service_cancellation_checks.send(sender=event)
-
-
-class CancellationRuleQuerySet(models.QuerySet):
-    def with_rule_data(self):
-        model = self.model
-        qs = self.prefetch_related(*[p() for p in model.rule_prefetches])
-        if model.rule_related_selects:
-            qs = qs.select_related(*model.rule_related_selects)
-        return qs
-
-
-class CancellationRuleManager(models.Manager.from_queryset(CancellationRuleQuerySet)):
-    check_type: ClassVar[CheckTypes]
-
-    def get_queryset(self):
-        return super().get_queryset().filter(type=self.check_type).order_by("pk")
-
-
-class CancellationRule(models.Model):
-    EARLIEST: Final = "EARLIEST"
-    LATEST: Final = "LATEST"
-
-    SUBEVENT_VARIANT_CHOICES = (
-        (EARLIEST, _("Earliest")),
-        (LATEST, _("Latest")),
-    )
-
-    event = models.ForeignKey(
-        Event,
-        verbose_name=_("Event"),
-        related_name="cancellation_rules",
-        on_delete=models.CASCADE
-    )
-
-    type = models.CharField(
-        verbose_name=_("Type of the cancellation rule"),
-        default=CheckTypes.POSITION,
-        choices=CheckTypes,
-        max_length=15,
-    )
-
-    allowed_until = ModelRelativeDateTimeField(null=True, blank=True, verbose_name=_("Allowed until"))
-    except_after = ModelRelativeDateTimeField(null=True, blank=True, verbose_name=_("Except after"))
-    if TYPE_CHECKING:
-        allowed_until: Optional[RelativeDateWrapper]
-        except_after: Optional[RelativeDateWrapper]
-
-    # --- position-only fields ---
-    fee_percentage_per_position = models.DecimalField(
-        max_digits=5,
-        decimal_places=2,
-        validators=[MinValueValidator(Decimal("0.00")), MaxValueValidator(Decimal("100.00"))],
-        verbose_name=_("Fee Percentage per OrderPosition"),
-        default=Decimal("0.00"),
-    )
-    fee_absolute_per_position = models.DecimalField(
-        max_digits=13,
-        decimal_places=2,
-        verbose_name=_("Absolute fee per OrderPosition"),
-        default=Decimal("0.00"),
-        validators=[MinValueValidator(Decimal("0.00"))],
-    )
-
-    all_products = models.BooleanField(
-        verbose_name=_("All products and variations"),
-        default=True,
-    )
-    limit_products = models.ManyToManyField(Item, verbose_name=_("Products"), blank=True)
-    limit_variations = models.ManyToManyField(
-        ItemVariation, blank=True, verbose_name=_("Variations")
-    )
-
-    # --- process-only fields ---
-    subevent_variant = models.CharField(
-        max_length=8,
-        choices=SUBEVENT_VARIANT_CHOICES,
-        default=EARLIEST,
-        verbose_name=_("Subevent variant"),
-        help_text=_("An order can contain tickets for multiple different events if the event has "
-                    "subevents enabled. This choice controls if the order position for the earliest "
-                    "or the latest point in time in the order is used to determine the allowed until and "
-                    "except after dates.")
-    )
-
-    fee_cancellation_process = models.DecimalField(
-        max_digits=13,
-        decimal_places=2,
-        verbose_name=_("Absolute fee per Cancellation"),
-        default=Decimal("0.00"),
-        validators=[MinValueValidator(Decimal("0.00"))],
-    )
-
-    fee_mode = models.CharField(
-        verbose_name=_("The method with which process and position fees are combined."),
-        choices=[
-            (FeeType.MINIMUM, FeeType.MINIMUM.label),
-            (FeeType.ADDITIONAL, FeeType.ADDITIONAL.label),
-        ],
-        blank=True,
-        null=True,
-        max_length=15,
-    )
-
-    class Meta:
-        constraints = [
-            models.CheckConstraint(
-                condition=models.Q(type__in=[CheckTypes.POSITION, CheckTypes.PROCESS]),
-                name="cancellation_rule_type_valid",
-            ),
-        ]
-
-    @staticmethod
-    def collect_checks(event: Event, send_fn: Callable[
-        [Event], List[Tuple[Any, Any]]
-    ] = _send_self_service_cancellation_checks) -> Checks:
-
-        position_checks: List[CancellationCheck] = []
-        process_checks: List[CancellationCheck] = []
-
-        seen = set()
-        for recv, resp in send_fn(event):
-            if resp is None:
-                continue
-
-            if not isinstance(resp, CancellationCheck):
-                raise ValueError('self_service_cancellation_checks received response of wrong type')
-            if resp.id in seen:
-                raise ValueError('self_service_cancellation_checks received multiple responses with the id')
-            seen.add(resp.id)
-
-            if resp.type == CheckTypes.POSITION:
-                position_checks.append(resp)
-            if resp.type == CheckTypes.PROCESS:
-                process_checks.append(resp)
-
-        return Checks(position=position_checks, process=process_checks)
-
-    @staticmethod
-    def prefetch_order(event: Event, order: Order, checks: Checks) -> Order:
-        prefetches = [pref() for pref in [*checks.prefetches,
-                                          *PositionCancellationRule.prefetches,
-                                          *ProcessCancellationRule.prefetches]]
-
-        related_selects = {*checks.related_selects,
-                           *PositionCancellationRule.related_selects,
-                           *ProcessCancellationRule.related_selects}
-
-        qs = Order.objects.prefetch_related(*prefetches)
-        if related_selects:
-            qs = qs.select_related(*related_selects)
-
-        return qs.get(event=event, id=order.id)
-
-    @staticmethod
-    def _resolve_date_field_common(
-            date_field: RelativeDateWrapper,
-            order: Order,
-            resolve_subevent: Callable[[Any], Any],
-    ) -> datetime.date | datetime.datetime:
-        reldate_type = date_field.choice
-
-        if reldate_type == "date":
-            return make_aware(
-                datetime.datetime.combine(date_field.date(order.event), datetime.time(hour=23, minute=59, second=59)),
-                order.event.timezone,
-            )
-        elif reldate_type == "datetime":
-            return date_field.datetime(order.event)
-
-        if reldate_type.base == "order":
-            return date_field.datetime(order)
-
-        if not order.event.has_subevents:
-            return date_field.datetime(order.event)
-
-        return date_field.datetime(resolve_subevent(reldate_type))
-
-    def clean(self):
-        super().clean()
-        errors = {}
-
-        if self.type == CheckTypes.PROCESS:
-            if self.fee_mode not in (FeeType.MINIMUM, FeeType.ADDITIONAL):
-                errors["fee_mode"] = _(
-                    "Fee mode is not valid on a process rule."
-                )
-            if self.fee_percentage_per_position or self.fee_absolute_per_position:
-                errors["fee_percentage_per_position"] = _(
-                    "Position fees must be unset on a process rule."
-                )
-            if self.pk and (self.limit_products.exists() or self.limit_variations.exists()):
-                errors["limit_products"] = _(
-                    "Product/variation limits are not valid on a process rule."
-                )
-
-        if self.type == CheckTypes.POSITION:
-            if self.fee_cancellation_process:
-                errors["fee_cancellation_process"] = _(
-                    "Process fee must be unset on a position rule."
-                )
-            if self.fee_mode:
-                errors["fee_mode"] = _(
-                    "Fee mode is not valid on a position rule."
-                )
-
-        if errors:
-            raise ValidationError(errors)
-
-
-class PositionCancellationRuleManager(CancellationRuleManager):
-    check_type = CheckTypes.POSITION
-
-
-class PositionCancellationRule(CancellationRule):
-    """
-    PositionCancellationRules answer the questions:
-    - Can this position be canceled?
-    - What is the price for cancelling this position?
-    """
-    objects = PositionCancellationRuleManager()
-
-    rule_prefetches: ClassVar[List[Callable[[], Prefetch]]] = [
-        lambda: Prefetch('limit_products'),
-        lambda: Prefetch('limit_variations'),
-    ]
-    rule_related_selects: ClassVar[List[str]] = []
-
-    prefetches: ClassVar[List[Callable[[], Prefetch]]] = [
-        lambda: Prefetch('all_positions__item'),
-        lambda: Prefetch('event'),
-    ]
-    related_selects: ClassVar[List[str]] = []
-
-    class Meta:
-        proxy = True
-
-    def save(self, *args, **kwargs):
-        self.type = CheckTypes.POSITION
-        self.full_clean()
-        super().save(*args, **kwargs)
-
-    def _position_matches_rule(self, position: OrderPosition) -> Optional[CheckResult]:
-        with ensure_no_queries():
-            res = CheckResult(
-                id=f"position_rule_{self.id}",
-                reason=_("Rule matches this product"),
-                cancellation_possible=True
-            )
-
-            if self.all_products:
-                return res
-
-            item_pks = {item.pk for item in self.limit_products.all()}
-            if position.item_id in item_pks:
-                return res
-
-            variation_pks = {variation.pk for variation in self.limit_variations.all()}
-            if position.variation_id in variation_pks:
-                return res
-
-            return None
-
-    @staticmethod
-    def _resolve_date_field(date_field: RelativeDateWrapper, order: Order,
-                            position: OrderPosition) -> datetime.date | datetime.datetime:
-        return CancellationRule._resolve_date_field_common(
-            date_field, order, resolve_subevent=lambda _reldate_type: position.subevent
-        )
-
-    def _evaluate_cancellation_moment(self, position: OrderPosition, check_ts: datetime.datetime) -> List[CheckResult]:
-        check_results = []
-
-        order = position.order
-
-        for param in ('allowed_until', 'except_after'):
-            value: RelativeDateWrapper | None = getattr(self, param, None)
-            if value is not None:
-                if check_ts <= self._resolve_date_field(value, order, position):
-                    check_results.append(
-                        CheckResult(
-                            id=f"position_rule_{self.id}_{param}",
-                            reason=_("{} is earlier than {} cutoff {}".format(check_ts, param, value)),
-                            cancellation_possible=True
-                        )
-                    )
-                else:
-                    check_results.append(
-                        CheckResult(
-                            id=f"position_rule_{self.id}_{param}",
-                            reason=_("{} is later than {} cutoff {}".format(check_ts, param, value)),
-                            cancellation_possible=False
-                        )
-                    )
-            else:
-                check_results.append(
-                    CheckResult(
-                        id=f"position_rule_{self.id}_{param}",
-                        reason=_("No {} limit defined".format(param)),
-                        cancellation_possible=True
-                    )
-                )
-
-        return check_results
-
-    def evaluate_position_rule(self, order: Order, _keep: Set[OrderPosition], position: OrderPosition,
-                               check_ts: datetime.datetime) -> Optional[RuleResult]:
-        rule_check_results = []
-        match = self._position_matches_rule(position)
-        if match:
-            rule_check_results.append(match)
-        rule_check_results.extend(self._evaluate_cancellation_moment(position, check_ts))
-
-        if self.fee_percentage_per_position and self.fee_absolute_per_position:
-            raise NotImplementedError(
-                "Combination of fee_percentage_per position and fee_absolute_per_position is not valid")
-        elif self.fee_absolute_per_position != Decimal(0.00):
-            return RuleResult.from_absolute_fee(
-                id=self.id,
-                partial_results=rule_check_results,
-                fee_type=FeeType.POSITION,
-                absolute_fee=self.fee_absolute_per_position
-            )
-        else:
-            return RuleResult.from_relative_fee(
-                id=self.id,
-                partial_results=rule_check_results,
-                fee_type=FeeType.POSITION,
-                position_price=position.price,
-                percentage=self.fee_percentage_per_position,
-                currency=order.event.currency
-            )
-
-
-class ProcessCancellationRuleManager(CancellationRuleManager):
-    check_type = CheckTypes.PROCESS
-
-
-class ProcessCancellationRule(CancellationRule):
-    """
-    ProcessCancellationRules answer the question:
-    - What is the processing fee for performing this cancellation?
-    """
-
-    objects = ProcessCancellationRuleManager()
-
-    rule_prefetches: ClassVar[List[Callable[[], Prefetch]]] = []
-    rule_related_selects: ClassVar[List[str]] = []
-
-    prefetches: ClassVar[List[Callable[[], Prefetch]]] = [
-        lambda: Prefetch('event'),
-    ]
-    related_selects: ClassVar[List[str]] = []
-
-    class Meta:
-        proxy = True
-
-    def save(self, *args, **kwargs):
-        self.type = CheckTypes.PROCESS
-        self.full_clean()
-        super().save(*args, **kwargs)
-
-    @staticmethod
-    def _resolve_date_field(date_field: RelativeDateWrapper, order: Order,
-                            mode: Literal["EARLIEST", "LATEST"] | str) -> datetime.date | datetime.datetime:
-        if mode not in ('EARLIEST', 'LATEST'):
-            raise ValidationError('Mode is invalid')
-
-        comparators = {
-            "EARLIEST": operator.lt,
-            "LATEST": operator.gt,
-        }
-        compare = comparators[mode]
-
-        def resolve_subevent(reldate_type):
-            base_event = order.event
-            base_value: None | datetime.date = None
-            for pos in order.positions.all():
-                e = pos.subevent if pos.subevent else pos.event
-                value = getattr(e, reldate_type.attribute)
-                if value is None:
-                    continue  # skip when there is no value
-                if base_value is None or compare(value, base_value):
-                    base_event = e
-                    base_value = value
-            return base_event
-
-        return CancellationRule._resolve_date_field_common(date_field, order, resolve_subevent)
-
-    def _evaluate_cancellation_moment(self, order: Order, check_ts: datetime.datetime) -> List[CheckResult]:
-
-        check_results: List[CheckResult] = []
-
-        for param in ('allowed_until', 'except_after'):
-            value: RelativeDateWrapper | None = getattr(self, param, None)
-            if value is not None:
-                if check_ts <= self._resolve_date_field(value, order, self.subevent_variant):
-                    check_results.append(
-                        CheckResult(
-                            id=f"process_rule_{self.id}_{param}",
-                            reason=_("{} is earlier than {} cutoff {}".format(check_ts, param, value)),
-                            cancellation_possible=True
-                        )
-                    )
-                else:
-                    check_results.append(
-                        CheckResult(
-                            id=f"process_rule_{self.id}_{param}",
-                            reason=_("{} is later than {} cutoff {}".format(check_ts, param, value)),
-                            cancellation_possible=False
-                        )
-                    )
-            else:
-                check_results.append(
-                    CheckResult(
-                        id=f"process_rule_{self.id}_{param}",
-                        reason=_("No {} limit defined".format(param)),
-                        cancellation_possible=True
-                    )
-                )
-        return check_results
-
-    def evaluate_process_rule(self, order: Order, _keep: Set[OrderPosition], position_fees: Decimal,
-                              check_ts: datetime.datetime) -> Optional[RuleResult]:
-        fee_mode = self.fee_mode
-        if fee_mode not in (FeeType.MINIMUM, FeeType.ADDITIONAL):
-            raise ValueError(f"Unexpected fee_mode: {fee_mode!r}")
-
-        check_results: List[CheckResult] = self._evaluate_cancellation_moment(order, check_ts)
-
-        return RuleResult.from_process_fee(
-            id=self.id,
-            partial_results=check_results,
-            fee_type=fee_mode,
-            absolute_fee=self.fee_cancellation_process,
-            reference_price=position_fees,
-        )
@@ -166,6 +166,7 @@ class Device(LoggedModel):
    )
    security_profile = models.CharField(
        max_length=190,
+        verbose_name=_('Security profile'),
        default='full',
        null=True,
        blank=False
@@ -1050,10 +1050,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,
@@ -626,47 +626,14 @@ class Order(LockModel, LoggedModel):
        self.save(update_fields=['last_modified'])

    def set_expires(self, now_dt=None, subevents=None):
-        now_dt = now_dt or now()
-        tz = ZoneInfo(self.event.settings.timezone)
+        from pretix.base.services.payment import compute_payment_deadline

-        sales_channel_suffix = "_" + self.sales_channel.identifier.replace(".", "_")
-        if not (mode := self.event.settings.get(f'payment_term_mode{sales_channel_suffix}')):
-            mode = self.event.settings.get('payment_term_mode')
-            sales_channel_suffix = ""
-
-        if mode == 'days':
-            exp_by_date = now_dt.astimezone(tz) + timedelta(days=self.event.settings.get(f'payment_term_days{sales_channel_suffix}', as_type=int))
-            exp_by_date = exp_by_date.astimezone(tz).replace(hour=23, minute=59, second=59, microsecond=0)
-            if self.event.settings.get('payment_term_weekdays'):
-                if exp_by_date.weekday() == 5:
-                    exp_by_date += timedelta(days=2)
-                elif exp_by_date.weekday() == 6:
-                    exp_by_date += timedelta(days=1)
-        elif mode == 'minutes':
-            exp_by_date = now_dt.astimezone(tz) + timedelta(minutes=self.event.settings.get(f'payment_term_minutes{sales_channel_suffix}', as_type=int))
-        else:
-            raise ValueError("'payment_term_mode' has an invalid value '{}'.".format(mode))
-
-        self.expires = exp_by_date
-
-        term_last = self.event.settings.get('payment_term_last', as_type=RelativeDateWrapper)
-        if term_last:
-            if self.event.has_subevents and subevents:
-                terms = [
-                    term_last.datetime(se).date()
-                    for se in subevents
-                ]
-                if not terms:
-                    return
-                term_last = min(terms)
-            else:
-                term_last = term_last.datetime(self.event).date()
-            term_last = make_aware(datetime.combine(
-                term_last,
-                time(hour=23, minute=59, second=59)
-            ), tz)
-            if term_last < self.expires:
-                self.expires = term_last
+        self.expires = compute_payment_deadline(
+            event=self.event,
+            sales_channel=self.sales_channel,
+            now_dt=now_dt,
+            subevents=subevents,
+        )

    @cached_property
    def tax_total(self):
@@ -677,7 +644,6 @@ class Order(LockModel, LoggedModel):
        return self.total - self.tax_total

    def cancel_allowed(self):
-        # TODO turn into check after replacing cancellation machinery
        return (
            self.status in (Order.STATUS_PENDING, Order.STATUS_PAID, Order.STATUS_EXPIRED) and self.count_positions
        )
@@ -787,10 +753,36 @@ class Order(LockModel, LoggedModel):
        """
        Returns whether or not this order can be canceled by the user.
        """
-        from pretix.base.models.cancellation import Cancellation
-        res = Cancellation.evaluate(event=self.event, order=self, keep=set(),
-                                    check_ts=datetime.now(tz=ZoneInfo(self.event.settings.timezone)))
-        return res.cancellation_possible
+        from .checkin import Checkin
+
+        if self.cancellation_requests.exists() or not self.cancel_allowed():
+            return False
+        positions = list(
+            self.positions.all().annotate(
+                has_checkin=Exists(Checkin.objects.filter(position_id=OuterRef('pk'), list__consider_tickets_used=True))
+            ).select_related('item').prefetch_related('issued_gift_cards')
+        )
+        cancelable = all([op.item.allow_cancel and not op.has_checkin and not op.blocked for op in positions])
+        if not cancelable or not positions:
+            return False
+        for op in positions:
+            for gc in op.issued_gift_cards.all():
+                if gc.value != op.price:
+                    return False
+            if op.granted_memberships.with_usages().filter(usages__gt=0):
+                return False
+        if self.user_cancel_deadline and time_machine_now() > self.user_cancel_deadline:
+            return False
+
+        if self.status == Order.STATUS_PAID:
+            if self.total == Decimal('0.00'):
+                return self.event.settings.cancel_allow_user
+            return self.event.settings.cancel_allow_user_paid
+        elif self.payment_refund_sum > Decimal('0.00'):
+            return False
+        elif self.status == Order.STATUS_PENDING:
+            return self.event.settings.cancel_allow_user
+        return False

    def propose_auto_refunds(self, amount: Decimal, payments: list=None):
        # Algorithm to choose which payments are to be refunded to create the least hassle
@@ -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)
@@ -1232,9 +1243,7 @@ class Renderer:

            for i, page in enumerate(fg_pdf.pages):
                bg_page = self.bg_pdf.pages[i]
-                _correct_page_media_box(bg_page)
-                page.merge_page(bg_page, over=False)
-                output.add_page(page)
+                _merge_with_correct_page_media_box(output, page, bg_page)

            # pdf_header is a string like "%pdf-X.X"
            if float(self.bg_pdf.pdf_header[5:]) > float(fg_pdf.pdf_header[5:]):
@@ -1299,39 +1308,36 @@ def merge_background(fg_pdf: PdfWriter, bg_pdf: PdfWriter, out_file, compress):
            bg_pdf.write(bg_filename)
            subprocess.run(pdftk_cmd, check=True, stdout=out_file)
    else:
+        output = PdfWriter()
        for i, page in enumerate(fg_pdf.pages):
            bg_page = bg_pdf.pages[i]
-            _correct_page_media_box(bg_page)
-            page.merge_page(bg_page, over=False)
+            _merge_with_correct_page_media_box(output, page, bg_page)

        # pdf_header is a string like "%pdf-X.X"
-        if float(bg_pdf.pdf_header[5:]) > float(fg_pdf.pdf_header[5:]):
-            fg_pdf.pdf_header = bg_pdf.pdf_header
-
-        fg_pdf.write(out_file)
+        output.pdf_header = (
+            bg_pdf.pdf_header
+            if float(bg_pdf.pdf_header[5:]) > float(fg_pdf.pdf_header[5:])
+            else fg_pdf.pdf_header
+        )
+        output.write(out_file)


-def _correct_page_media_box(page: pypdf.PageObject):
-    if page.rotation != 0:
-        page.transfer_rotation_to_content()
-    media_box = page.mediabox
+def _merge_with_correct_page_media_box(output: pypdf.PdfWriter, fg_page: pypdf.PageObject, bg_page: pypdf.PageObject):
+    """
+    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)
-    page.add_transformation(trsf, False)
-    for b in ["/MediaBox", "/CropBox", "/BleedBox", "/TrimBox", "/ArtBox"]:
-        if b in page:
-            rr = pypdf.generic.RectangleObject(page[b])
-            pt1 = trsf.apply_on(rr.lower_left)
-            pt2 = trsf.apply_on(rr.upper_right)
-            page[pypdf.generic.NameObject(b)] = pypdf.generic.RectangleObject((
-                min(pt1[0], pt2[0]),
-                min(pt1[1], pt2[1]),
-                max(pt1[0], pt2[0]),
-                max(pt1[1], pt2[1]),
-            ))
+    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)


@deconstructible
@@ -111,21 +111,21 @@ class RelativeDate:
    base_date_name: str = 'event__date_from__'

    def __post_init__(self) -> None:
-        if self.is_after and not self.choice.supports_after:
+        if self.is_after and not self._choice.supports_after:
            raise ValueError(
                "The selected base date and attribute combination does not support relative dates placed after the base date"
            )
-        if not self.is_after and not self.choice.supports_before:
+        if not self.is_after and not self._choice.supports_before:
            raise ValueError(
                "The selected base date and attribute combination does not support relative dates placed before the base date")

    @property
-    def choice(self):
+    def _choice(self):
        return BaseChoice.find(BASE_CHOICES, self.base_date_name)

    @property
    def key(self):
-        return self.choice.key
+        return self._choice.key

    def __eq__(self, o: object) -> bool:
        if not isinstance(o, RelativeDate):
@@ -141,7 +141,7 @@ class RelativeDate:
        """
        from .models import Event, Order, SubEvent

-        choice = self.choice
+        choice = self._choice

        if choice.base == "order" and isinstance(base, Order):
            event = base.event
@@ -210,13 +210,13 @@ class RelativeDate:
        if self.minutes is not None:
            return 'RELDATE/minutes/{}/{}/{}'.format(  #
                self.minutes,
-                self.choice.key,
+                self._choice.key,
                'after' if self.is_after else '',
            )
        return 'RELDATE/{}/{}/{}/{}'.format(  #
            self.days,
            self.time.strftime('%H:%M:%S') if self.time else '-',
-            self.choice.key,
+            self._choice.key,
            'after' if self.is_after else '',
        )

@@ -270,15 +270,6 @@ class RelativeDateWrapper:
    def __init__(self, data: Union[datetime.datetime, RelativeDate]):
        self.data = data

-    @property
-    def choice(self) -> Literal["datetime", "date"] | BaseChoice:
-        if isinstance(self.data, datetime.datetime):
-            return "datetime"
-        elif isinstance(self.data, datetime.date):
-            return "date"
-        else:
-            return self.data.choice
-
    def date(self, base: "Event | Order | SubEvent") -> datetime.date:
        """
        If the RelativeDateWrapper wraps a RelativeDate object:
@@ -1605,6 +1605,7 @@ def add_payment_to_cart_session(cart_session, provider, min_value: Decimal=None,
        'max_value': str(max_value) if max_value is not None else None,
        'info_data': info_data or {},
    })
+    cart_session['payments_postpone'] = False


 def add_payment_to_cart(request, provider, min_value: Decimal=None, max_value: Decimal=None, info_data: dict=None):
@@ -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
@@ -380,6 +380,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 +451,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")

@@ -50,8 +50,8 @@ from django.core.cache import cache
 from django.core.exceptions import ValidationError
 from django.db import models, transaction
 from django.db.models import (
-    Count, Exists, F, IntegerField, Max, Min, OuterRef, Prefetch, Q, QuerySet,
-    Subquery, Sum, Value,
+    Count, Exists, F, IntegerField, Max, Min, OuterRef, Q, QuerySet, Subquery,
+    Sum, Value,
 )
 from django.db.models.functions import Cast, Greatest
 from django.db.transaction import get_connection
@@ -71,9 +71,6 @@ from pretix.base.models import (
    Membership, Order, OrderPayment, OrderPosition, Quota, Seat,
    SeatCategoryMapping, User, Voucher,
 )
-from pretix.base.models.cancellation import (
-    Cancellation, CancellationCheck, CheckResult, CheckTypes, PositionSet,
-)
 from pretix.base.models.event import Event_SettingsStore, SubEvent
 from pretix.base.models.orders import (
    BlockedTicketSecret, CheckoutSession, InvoiceAddress, OrderFee,
@@ -106,7 +103,7 @@ from pretix.base.signals import (
    order_approved, order_canceled, order_changed, order_denied, order_expired,
    order_expiry_changed, order_fee_calculation, order_paid, order_placed,
    order_reactivated, order_split, order_valid_if_pending, periodic_task,
-    self_service_cancellation_checks, validate_order,
+    validate_order,
 )
 from pretix.base.timemachine import time_machine_now, time_machine_now_assigned
 from pretix.celery_app import app
@@ -964,7 +961,7 @@ def _check_positions(event: Event, now_dt: datetime, time_machine_now_dt: dateti


 def _apply_rounding_and_fees(positions: List[CartPosition], payment_requests: List[dict], address: InvoiceAddress,
-                             meta_info: dict, event: Event, require_approval=False):
+                             meta_info: dict, event: Event, sales_channel: SalesChannel, require_approval=False):
    fees = []
    # Pre-rounding, pre-fee total is used for fee calculation
    total = sum([c.gross_price_before_rounding for c in positions])
@@ -1024,7 +1021,14 @@ def _apply_rounding_and_fees(positions: List[CartPosition], payment_requests: Li
        payments_assigned += to_pay
        p['payment_amount'] = to_pay

-    if total != payments_assigned and not require_approval:
+    allow_postponed_payment = (
+        require_approval or
+        (
+            sales_channel.identifier in event.settings.payment_choice_postpone_allowed_channels and not payment_requests
+        )
+    )
+
+    if total != payments_assigned and not allow_postponed_payment:
        raise OrderError(_("The selected payment methods do not cover the total balance."))

    return fees
@@ -1046,7 +1050,15 @@ def _create_order(event: Event, *, email: str, positions: List[CartPosition], no

    # Final calculation of fees, also performs final rounding
    try:
-        fees = _apply_rounding_and_fees(positions, payment_requests, address, meta_info, event, require_approval=require_approval)
+        fees = _apply_rounding_and_fees(
+            positions,
+            payment_requests,
+            address,
+            meta_info,
+            event,
+            sales_channel=sales_channel,
+            require_approval=require_approval
+        )
    except TaxRule.SaleNotAllowed:
        raise OrderError(error_messages['country_blocked'])

@@ -1683,8 +1695,7 @@ class OrderChangeManager:
        @property
        def position(self) -> OrderPosition:
            if self._positions is None:
-                raise RuntimeError(
-                    "Order position has not been created yet. Call commit() first on OrderChangeManager.")
+                raise RuntimeError("Order position has not been created yet. Call commit() first on OrderChangeManager.")
            if len(self._positions) != 1:
                raise RuntimeError("More than one position created.")
            return self._positions[0]
@@ -1903,8 +1914,7 @@ class OrderChangeManager:

    def add_position(self, item: Item, variation: ItemVariation, price: Decimal, addon_to: OrderPosition = None,
                     subevent: SubEvent = None, seat: Seat = None, membership: Membership = None,
-                     valid_from: datetime = None, valid_until: datetime = None,
-                     count: int = 1) -> 'OrderChangeManager.AddPositionResult':
+                     valid_from: datetime = None, valid_until: datetime = None, count: int = 1) -> 'OrderChangeManager.AddPositionResult':
        if count < 1:
            raise ValueError("Count must be positive")
        if isinstance(seat, str):
@@ -2621,20 +2631,19 @@ class OrderChangeManager:
                    )
                    nextposid += 1
                    new_pos.append(pos)
-                    new_logs.append(
-                        self.order.log_action('pretix.event.order.changed.add', user=self.user, auth=self.auth, data={
-                            'position': pos.pk,
-                            'item': op.item.pk,
-                            'variation': op.variation.pk if op.variation else None,
-                            'addon_to': op.addon_to.pk if op.addon_to else None,
-                            'price': op.price.gross,
-                            'positionid': pos.positionid,
-                            'membership': pos.used_membership_id,
-                            'subevent': op.subevent.pk if op.subevent else None,
-                            'seat': op.seat.pk if op.seat else None,
-                            'valid_from': op.valid_from.isoformat() if op.valid_from else None,
-                            'valid_until': op.valid_until.isoformat() if op.valid_until else None,
-                        }, save=False))
+                    new_logs.append(self.order.log_action('pretix.event.order.changed.add', user=self.user, auth=self.auth, data={
+                        'position': pos.pk,
+                        'item': op.item.pk,
+                        'variation': op.variation.pk if op.variation else None,
+                        'addon_to': op.addon_to.pk if op.addon_to else None,
+                        'price': op.price.gross,
+                        'positionid': pos.positionid,
+                        'membership': pos.used_membership_id,
+                        'subevent': op.subevent.pk if op.subevent else None,
+                        'seat': op.seat.pk if op.seat else None,
+                        'valid_from': op.valid_from.isoformat() if op.valid_from else None,
+                        'valid_until': op.valid_until.isoformat() if op.valid_until else None,
+                    }, save=False))

                op.result._positions = new_pos
                LogEntry.bulk_create_and_postprocess(new_logs)
@@ -2962,8 +2971,7 @@ class OrderChangeManager:
        return total

    def _check_order_size(self):
-        if (len(self.order.positions.all()) + sum([op.count for op in self._operations if isinstance(op,
-                                                                                                     self.AddOperation)])) > settings.PRETIX_MAX_ORDER_SIZE:
+        if (len(self.order.positions.all()) + sum([op.count for op in self._operations if isinstance(op, self.AddOperation)])) > settings.PRETIX_MAX_ORDER_SIZE:
            raise OrderError(
                self.error_messages['max_order_size'] % {
                    'max': settings.PRETIX_MAX_ORDER_SIZE,
@@ -3598,239 +3606,3 @@ def signal_listener_issue_media(sender: Event, order: Order, **kwargs):
                        'customer': order.customer_id,
                    }
                )
-
-
-def position_not_used_cancellation_check(order: Order, keep: PositionSet, position: OrderPosition,
-                                         check_ts: datetime):
-    for pos in order.positions.all():
-        if pos == position and position not in keep:
-            for checkin in pos.all_checkins.all():
-                if checkin.successful and checkin.list.consider_tickets_used:
-                    return CheckResult(
-                        id="pretixbase_position_not_used",
-                        reason=f"Position used in Checkin {checkin}",
-                        cancellation_possible=False,
-                    )
-        else:
-            return CheckResult(
-                id="pretixbase_position_not_used",
-                reason="Position not up for cancellation",
-                cancellation_possible=True,
-            )
-
-    return CheckResult(
-        id="pretixbase_position_not_used",
-        reason="Ticket not used",
-        cancellation_possible=True,
-    )
-
-
-@receiver(self_service_cancellation_checks, dispatch_uid="pretixbase_position_not_used")
-def signal_listener_position_not_used(sender: Event, **kwargs):
-    return CancellationCheck(id="pretixbase_position_not_used",
-                             type=CheckTypes.POSITION,
-                             check_fn=position_not_used_cancellation_check,
-                             prefetches=[
-                                 lambda: Prefetch('all_positions__all_checkins__list', )
-                             ])
-
-
-def position_not_blocked_check(order: Order, keep: PositionSet, position: OrderPosition,
-                               check_ts: datetime):
-    for pos in order.positions.all():
-        if pos == position and position not in keep:
-            return CheckResult(
-                id="pretixbase_position_not_blocked",
-                reason="Position is blocked" if pos.blocked else "Position is not blocked",
-                cancellation_possible=not pos.blocked,
-            )
-    return None
-
-
-@receiver(self_service_cancellation_checks, dispatch_uid="pretixbase_position_not_blocked")
-def signal_listener_position_not_blocked(sender: Event, **kwargs):
-    return CancellationCheck(id="pretixbase_position_not_blocked",
-                             type=CheckTypes.POSITION,
-                             check_fn=position_not_blocked_check,
-                             prefetches=[
-                                 lambda: Prefetch('all_positions', )
-                             ])
-
-
-def position_giftcard_not_used(order: Order, keep: PositionSet, position: OrderPosition,
-                               check_ts: datetime):
-    for pos in order.positions.all():
-        if pos == position and position not in keep:
-            if len(pos.issued_gift_cards.all()) > 0:
-                for gc in pos.issued_gift_cards.all():
-                    if gc.value != pos.price:
-                        return CheckResult(
-                            id="pretixbase_position_giftcard_not_used",
-                            reason="Issued giftcard was used",
-                            cancellation_possible=False,
-                        )
-                return CheckResult(
-                    id="pretixbase_position_giftcard_not_used",
-                    reason="Issued giftcard was not used",
-                    cancellation_possible=True,
-                )
-    return None
-
-
-@receiver(self_service_cancellation_checks, dispatch_uid="pretixbase_position_giftcard_not_used")
-def signal_listener_position_giftcard_not_used(sender: Event, **kwargs):
-    return CancellationCheck(id="pretixbase_position_giftcard_not_used",
-                             type=CheckTypes.POSITION,
-                             check_fn=position_giftcard_not_used,
-                             prefetches=[
-                                 lambda: Prefetch('all_positions__issued_gift_cards', )
-                             ])
-
-
-def position_membership_not_used(order: Order, keep: PositionSet, position: OrderPosition,
-                                 check_ts: datetime):
-    for pos in order.positions.all():
-        if pos == position and position not in keep:
-            if len(pos.granted_memberships.all()) > 0:
-                for membership in pos.granted_memberships.all():
-                    if membership.usages > 0:
-                        return CheckResult(
-                            id="pretixbase_position_membership_not_used",
-                            reason="Membership was already used",
-                            cancellation_possible=False,
-                        )
-                return CheckResult(
-                    id="pretixbase_position_giftcard_not_used",
-                    reason="Included Membership was not used",
-                    cancellation_possible=True,
-                )
-            else:
-                return CheckResult(
-                    id="pretixbase_position_membership_not_used",
-                    reason="No membership included",
-                    cancellation_possible=True,
-                )
-    return None
-
-
-@receiver(self_service_cancellation_checks, dispatch_uid="pretixbase_position_membership_not_used")
-def signal_position_membership_not_used(sender: Event, **kwargs):
-    return CancellationCheck(id="pretixbase_position_membership_not_used",
-                             type=CheckTypes.POSITION,
-                             check_fn=position_membership_not_used,
-                             prefetches=[
-                                 lambda: Prefetch('all_positions__granted_memberships',
-                                                  queryset=Membership.objects.with_usages(), )
-                             ])
-
-
-def position_item_allow_cancel(order: Order, keep: PositionSet, position: OrderPosition,
-                               check_ts: datetime):
-    for pos in order.positions.all():
-        if pos == position and position not in keep:
-            return CheckResult(
-                id="pretixbase_position_item_allow_cancel",
-                reason="Item can be canceled" if pos.item.allow_cancel else "Item cannot be canceled",
-                cancellation_possible=pos.item.allow_cancel,
-            )
-    return None
-
-
-@receiver(self_service_cancellation_checks, dispatch_uid="pretixbase_position_item_allow_cancel")
-def signal_position_item_allow_cancel(sender: Event, **kwargs):
-    return CancellationCheck(id="pretixbase_position_item_allow_cancel",
-                             type=CheckTypes.POSITION,
-                             check_fn=position_item_allow_cancel,
-                             prefetches=[
-                                 lambda: Prefetch('all_positions__item')
-                             ])
-
-
-def process_order_payment_state(order: Order, keep: PositionSet, check_ts: datetime):
-    if order.status == Order.STATUS_PAID:
-        if order.total == Decimal("0.00"):
-            return CheckResult(
-                id="pretixbase_process_order_paid",
-                reason="Free orders can be canceled" if order.event.settings.cancel_allow_user else "Free orders cannot be canceled",
-                cancellation_possible=order.event.settings.cancel_allow_user,
-            )
-        return CheckResult(
-            id="pretixbase_process_order_paid",
-            reason="Paid orders can be canceled" if order.event.settings.cancel_allow_user_paid else "Paid orders cannot be canceled",
-            cancellation_possible=order.event.settings.cancel_allow_user_paid,
-        )
-    elif order.payment_refund_sum > Decimal('0.00'):
-        return CheckResult(
-            id="pretixbase_process_order_paid",
-            reason="Outstanding refund sum prevents further cancellations",
-            cancellation_possible=False,
-        )
-    elif order.status == Order.STATUS_PENDING:
-        return CheckResult(
-            id="pretixbase_process_order_paid",
-            reason="Pending orders can be canceled" if order.event.settings.cancel_allow_user else "Pending orders cannot be canceled",
-            cancellation_possible=order.event.settings.cancel_allow_user,
-        )
-    else:
-        return CheckResult(
-            id="pretixbase_process_order_paid",
-            reason="Order is in a state that does not allow cancellations",
-            cancellation_possible=False,
-        )
-
-
-@receiver(self_service_cancellation_checks, dispatch_uid="pretixbase_process_order_payment_state")
-def signal_listener_process_order_payment_state(sender: Event, **kwargs):
-    return CancellationCheck(id="pretixbase_process_order_payment_state",
-                             type=CheckTypes.PROCESS,
-                             check_fn=process_order_payment_state,
-                             prefetches=[]
-                             )
-
-
-def process_cancel_allowed(order: Order, keep: PositionSet, check_ts: datetime):
-    cancel_allowed = order.cancel_allowed()
-
-    return CheckResult(
-        id="pretixbase_process_cancel_allowed",
-        reason="Order allows cancellation" if cancel_allowed else "Order doesn't allow for cancellation",
-        cancellation_possible=cancel_allowed,
-    )
-
-
-@receiver(self_service_cancellation_checks, dispatch_uid="pretixbase_process_cancel_allowed")
-def signal_listener_process_cancel_allowed(sender: Event, **kwargs):
-    return CancellationCheck(id="pretixbase_process_process_cancel_allowed",
-                             type=CheckTypes.PROCESS,
-                             check_fn=process_cancel_allowed,
-                             prefetches=[]
-                             )
-
-
-def process_cancellation_in_progress(order: Order, keep: PositionSet, check_ts: datetime):
-    if any([c.state not in [Cancellation.PERFORMED, Cancellation.CANCELLED] for c in order.cancellations.all()]):
-        return CheckResult(
-            id="pretixbase_process_cancellation_in_progress",
-            reason="Cancellation request already in progress",
-            cancellation_possible=False,
-        )
-
-    return CheckResult(
-        id="pretixbase_process_cancellation_in_progress",
-        reason="No cancellation request in progress",
-        cancellation_possible=True,
-    )
-
-
-@receiver(self_service_cancellation_checks, dispatch_uid="pretixbase_process_cancellation_in_progress")
-def signal_listener_process_cancellation_in_progress(sender: Event, **kwargs):
-    return CancellationCheck(id="pretixbase_process_process_cancellation_in_progress",
-                             type=CheckTypes.PROCESS,
-                             check_fn=process_cancellation_in_progress,
-                             prefetches=[]
-                             )
-
-# TODO weitere System Checks
-# OrderPositions mit Item.min_per_order dürfen nur storniert werden, wenn genug übrig bleiben oder alle des gleichen Items storniert werden
-# OrderPositions mit addon_to != None dürfen nur über den bestehenden Add-On-Flow storniert werden
-# OrderPositions mit is_bundled dürfen nur mit der Parent-Position zusammen storniert werden
@@ -0,0 +1,76 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2020-today pretix GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from datetime import datetime, time, timedelta
+from zoneinfo import ZoneInfo
+
+from django.utils.timezone import make_aware, now
+
+from pretix.base.models import Event, SalesChannel
+from pretix.base.reldate import RelativeDateWrapper
+
+
+def compute_payment_deadline(event: Event, sales_channel: SalesChannel, now_dt=None, subevents=None) -> datetime:
+    now_dt = now_dt or now()
+    tz = ZoneInfo(event.settings.timezone)
+
+    sales_channel_suffix = "_" + sales_channel.identifier.replace(".", "_")
+    if not (mode := event.settings.get(f'payment_term_mode{sales_channel_suffix}')):
+        mode = event.settings.get('payment_term_mode')
+        sales_channel_suffix = ""
+
+    if mode == 'days':
+        exp_by_date = now_dt.astimezone(tz) + timedelta(
+            days=event.settings.get(f'payment_term_days{sales_channel_suffix}', as_type=int))
+        exp_by_date = exp_by_date.astimezone(tz).replace(hour=23, minute=59, second=59, microsecond=0)
+        if event.settings.get('payment_term_weekdays'):
+            if exp_by_date.weekday() == 5:
+                exp_by_date += timedelta(days=2)
+            elif exp_by_date.weekday() == 6:
+                exp_by_date += timedelta(days=1)
+    elif mode == 'minutes':
+        exp_by_date = now_dt.astimezone(tz) + timedelta(
+            minutes=event.settings.get(f'payment_term_minutes{sales_channel_suffix}', as_type=int))
+    else:
+        raise ValueError("'payment_term_mode' has an invalid value '{}'.".format(mode))
+
+    expires = exp_by_date
+
+    term_last = event.settings.get('payment_term_last', as_type=RelativeDateWrapper)
+    if term_last:
+        if event.has_subevents and subevents:
+            terms = [
+                term_last.datetime(se).date()
+                for se in subevents
+            ]
+            if not terms:
+                return expires
+            term_last = min(terms)
+        else:
+            term_last = term_last.datetime(event).date()
+        term_last = make_aware(datetime.combine(
+            term_last,
+            time(hour=23, minute=59, second=59)
+        ), tz)
+        if term_last < expires:
+            return term_last
+
+    return expires
@@ -343,6 +343,66 @@ def _validate_vat_id_EU(vat_id, country_code):
        return vat_id


+def _validate_vat_id_EU_fallback_germany(vat_id, country_code, requester_id):
+    # We can skip most static validation checks because _validate_vat_id_EU always runs before
+    vat_id = normalize_vat_id(vat_id, country_code)
+
+    # The VIES service of the European commission is overused and down due to rate limits A LOT. There is another
+    # API by German BZSt, but it only works if the requester is German and the requested is not.
+    # https://www.bzst.de/DE/Unternehmen/Identifikationsnummern/Umsatzsteuer-Identifikationsnummer/AuslaendischeUSt-IdNr/auslaendische_ust_idnr_node.html
+    try:
+        r = requests.post(
+            "https://api.evatr.vies.bzst.de/app/v1/abfrage",
+            json={
+                "anfragendeUstid": requester_id,
+                "angefragteUstid": vat_id,
+            },
+            timeout=10,
+        )
+        d = r.json()
+        if r.status_code == 200:
+            if d['status'] in ('evatr-0000', 'evatr-2008'):
+                # evatr-0000: Die angefragte Ust-IdNr. ist zum Anfragezeitpunkt gültig.
+                # evatr-2008: Die angefragte Ust-IdNr. ist zum Anfragezeitpunkt gültig.
+                #             Für die qualifizierte Bestätigungsanfrage liegt einer Besonderheit vor.
+                #             Für Rückfragen wenden Sie sich an das BZSt.
+                return vat_id
+            # evatr-2002: Die angefragte USt-IdNr. ist zum Anfragezeitpunkt nicht gültig.
+            #             Sie ist erst gültig ab dem Datum im Feld gueltigAb.
+            # evatr-2006: Die angefragte Ust-IdNr. ist zum Anfragezeitpunkt nicht gültig.
+            #             Sie war gültig im Zeitraum, der durch die Werte in den Feldern gueltigAb und gueltigBis beschrieben ist.
+            raise VATIDFinalError(error_messages['invalid'])
+        elif r.status_code == 400:
+            if d['status'] in ('evatr-0002', 'evatr-0004', 'evatr-0008'):
+                # evatr-0002: Mindestens eins der Pflichtfelder ist nicht besetzt.
+                # evatr-0004: Die anfragende DE Ust-IdNr. ist syntaktisch falsch. Sie passt nicht in das deutsche Erzeugungsschema.
+                # evatr-0008: Die maximale Anzahl von qualifizierten Bestätigungsabfragen für diese Session wurde erreicht.
+                #             Bitte starten Sie erneut mit einer einfachen Bestätigungsabfrage.
+                raise VATIDTemporaryError(error_messages['unavailable'])
+            # evatr-0005: Die angegebene angefragte Ust-IdNr. ist syntaktisch falsch.
+            # evatr-0012: Die angefrage USt-IdNr. ist syntaktisch falsch. Sie passt nicht in das Erzeugungsschema.
+            # evatr-2003: Das angegebene Länderkennzeichen der angefragten USt-IdNr. ist nicht gültig.
+            raise VATIDFinalError(error_messages['invalid'])
+        elif r.status_code == 403:
+            # evatr-0006: Die anfragende DE USt-IdNr. ist nicht berechtigt eine DE Ust-IdNr. anzufragen.
+            # evatr-0007: Fehlerhafter Aufruf.
+            raise VATIDTemporaryError(error_messages['unavailable'])
+        elif r.status_code == 404:
+            if d['status'] in ('evatr-2005'):
+                # evatr-2005: Die angegebene eigene DE Ust-IdNr. ist zum Anfragezeitpunkt nicht gültig.
+                raise VATIDTemporaryError(error_messages['unavailable'])
+            # evatr-2001: Die angefragte USt-IdNr. ist zum Anfragezeitpunkt nicht vergeben.
+            raise VATIDFinalError(error_messages['invalid'])
+        else:  # 500, 503
+            raise VATIDTemporaryError(error_messages['unavailable'])
+    except requests.RequestException:
+        logger.exception('VAT ID checking failed for country {}'.format(country_code))
+        raise VATIDTemporaryError(error_messages['unavailable'])
+    except ValueError:  # JSON parsing failed
+        logger.exception('VAT ID checking failed for country {}'.format(country_code))
+        raise VATIDTemporaryError(error_messages['unavailable'])
+
+
 def _validate_vat_id_CH(vat_id, country_code):
    if vat_id[:3] != 'CHE':
        raise VATIDFinalError(error_messages['country_mismatch'])
@@ -394,12 +454,18 @@ def _validate_vat_id_CH(vat_id, country_code):
        return vat_id


-def validate_vat_id(vat_id, country_code):
+def validate_vat_id(vat_id, country_code, requester_id=None):
    if not vat_id:
        return vat_id
    country_code = str(country_code)
    if is_eu_country(country_code):
-        return _validate_vat_id_EU(vat_id, country_code)
+        try:
+            return _validate_vat_id_EU(vat_id, country_code)
+        except VATIDTemporaryError:
+            if requester_id and requester_id.startswith("DE") and not vat_id.startswith("DE"):
+                return _validate_vat_id_EU_fallback_germany(vat_id, country_code, requester_id)
+            else:
+                raise
    elif country_code == 'CH':
        return _validate_vat_id_CH(vat_id, country_code)
    elif country_code == 'NO':
@@ -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):
@@ -1207,11 +1207,3 @@ This signal is sent out each time the information for a Device is modified.
 Both the original and updated versions of the Device are included to allow
 receivers to see what has been updated.
 """
-
-self_service_cancellation_checks = EventPluginSignal()
-"""
-This signal is sent out to collect checks to approve or deny a self service cancellation.
-You are expected to return a class instance that implements CancellationCheck.
-It is is expected that that the CheckFn will not issue any further queries.
-As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
-"""
@@ -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,
        )
@@ -44,7 +44,7 @@ def timeline_for_event(event, subevent=None):
    ev = subevent or event
    if subevent:
        ev_edit_url = reverse(
-            'control:event.subevent', kwargs={
+            'control:event.subevent.edit', kwargs={
                'event': event.slug,
                'organizer': event.organizer.slug,
                'subevent': subevent.pk
@@ -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()
@@ -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
@@ -135,6 +135,8 @@ class BaseQuestionsViewMixin:
                            question_field.initial = getattr(question_field, 'initial', None) or src['initial']
                    if 'validators' in src:
                        question_field.validators += src['validators']
+                    if 'label' in src:
+                        question_field.label = src['label']

            if len(form.fields) > 0:
                formlist.append(form)
@@ -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
@@ -172,7 +172,9 @@ 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
-            return CachedFile.objects.filter(id=data[name + '-cachedfile']).first()
+            v = CachedFile.objects.filter(id=data[name + '-cachedfile']).first()
+            if not v.allowed_for_session(self.request):
+                v = None
        return v

    def get_context(self, name, value, attrs):
@@ -244,6 +246,11 @@ class ExtFileField(ExtValidationMixin, SizeFileField):
 class CachedFileField(ExtFileField):
    widget = CachedFileInput

+    def __init__(self, *args, **kwargs):
+        self.request = kwargs.pop("request", None)
+        super().__init__(*args, **kwargs)
+        self.widget.request = self.request
+
    def to_python(self, data):
        from ...base.models import CachedFile

@@ -271,6 +278,8 @@ class CachedFileField(ExtFileField):
                filename=data.name,
                type=data.content_type,
            )
+            if self.request:
+                cf.bind_to_session(self.request)  # no salt because we want direct web access
            cf.file.save(data.name, data.file)
            cf.save()
            data._uploaded_to = cf
@@ -294,6 +303,8 @@ class CachedFileField(ExtFileField):
                filename=data.name,
                type=data.content_type,
            )
+            if self.request:
+                cf.bind_to_session(self.request)  # no salt because we want direct web access
            cf.file.save(data.name, data.file)
            cf.save()
            data._uploaded_to = cf
@@ -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):
@@ -855,14 +856,21 @@ class PaymentSettingsForm(EventSettingsValidationMixin, SettingsForm):
        'payment_term_accept_late',
        'payment_pending_hidden',
        'payment_explanation',
+        'payment_choice_postpone_allowed_channels',
        'tax_rule_payment',
    ]

    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)

+        channels = list(self.obj.organizer.sales_channels.all())
+        self.fields['payment_choice_postpone_allowed_channels'].choices = [
+            (c.identifier, c.label) for c in channels
+            if c.type_instance.payment_restrictions_supported
+        ]
+
        self.term_channel_fields = {}
-        for c in self.obj.organizer.sales_channels.all():
+        for c in channels:
            if c.type_instance.payment_restrictions_supported and c.identifier != "web":
                # At the moment, it seems sufficient to allow this for the same channel types as other payment settings
                # We can always introduce more flags later if needed
@@ -1628,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):
@@ -105,13 +105,6 @@ class GlobalSettingsForm(SettingsForm):
                    domain=settings.SITE_URL
                )
            )),
-            ('widget_vite_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="Vite widget origins",
-                help_text="One origin per line (e.g. https://example.com). Requests from these origins will be served the new vite-based widget.",
-            ))
        ])
        responses = register_global_settings.send(self)
        for r, response in sorted(responses, key=lambda r: str(r[0])):
@@ -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),
            )

    def get_columns(self):
@@ -364,7 +364,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),
                initial=initial,
                widget=forms.RadioSelect,
            )
@@ -389,7 +389,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),
                initial=initial,
                widget=forms.RadioSelect,
            )
@@ -87,6 +87,7 @@ class RRuleForm(forms.Form):
            ('1', pgettext_lazy('rrule', 'first')),
            ('2', pgettext_lazy('rrule', 'second')),
            ('3', pgettext_lazy('rrule', 'third')),
+            ('4', pgettext_lazy('rrule', 'fourth')),
            ('-1', pgettext_lazy('rrule', 'last')),
        ],
        required=False
@@ -134,6 +135,7 @@ class RRuleForm(forms.Form):
            ('1', pgettext_lazy('rrule', 'first')),
            ('2', pgettext_lazy('rrule', 'second')),
            ('3', pgettext_lazy('rrule', 'third')),
+            ('4', pgettext_lazy('rrule', 'fourth')),
            ('-1', pgettext_lazy('rrule', 'last')),
        ],
        required=False
@@ -435,10 +435,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
@@ -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):
@@ -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 '
@@ -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",
@@ -133,22 +133,14 @@ This signal is sent out to include custom HTML in the top part of the the event
 Receivers should return a SafeString containing HTML, or a string that will be HTML-escaped.

 As with all event plugin signals, the ``sender`` keyword argument will contain the event.
-An additional keyword argument ``subevent`` *can* contain a sub-event.
 """

-event_dashboard_widgets = EventPluginSignal()
+event_dashboard_statistics = EventPluginSignal()
 """
-This signal is sent out to include widgets in the event dashboard. Receivers
-should return a list of dictionaries, where each dictionary can have the keys:
-
-* content (SafeString, containing HTML)
-* display_size (str, one of "full" (whole row), "big" (half a row) or "small"
-  (quarter of a row). May be ignored on small displays, default is "small")
-* priority (int, used for ordering, higher comes first, default is 1)
-* url (str, optional, if the full widget should be a link)
+This signal is sent out to include statistical content on the event dashboard.
+Receivers should return a SafeString containing HTML, or a string that will be HTML-escaped.

 As with all event plugin signals, the ``sender`` keyword argument will contain the event.
-An additional keyword argument ``subevent`` *can* contain a sub-event.
 """

 user_dashboard_widgets = GlobalSignal()
@@ -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 %}
@@ -23,6 +23,7 @@
        {% endif %}
 		{% compress js %}
            <script type="text/javascript" src="{% static "jquery/js/jquery-3.6.4.min.js" %}"></script>
+            <script type="text/javascript" src="{% static "htmx/htmx-2.0.10.min.js" %}"></script>
            <script type="text/javascript" src="{% static "js/jquery.formset.js" %}"></script>
            <script type="text/javascript" src="{% static "typeahead/typeahead.bundle.js" %}"></script>
            <script type="text/javascript" src="{% static "bootstrap/js/bootstrap.js" %}"></script>
@@ -0,0 +1,23 @@
+{% load i18n %}
+{% load icon %}
+{% load humanize %}
+{% for cl in lists %}
+    <a class="quotabox quotabox-full availability"
+       href="{% url "control:event.orders.checkinlists.show" organizer=request.event.organizer.slug event=request.event.slug list=cl.id %}">
+        <strong>{{ cl.name }}</strong>
+        <div class="progress">
+            <div class="progress-bar progress-bar-success progress-bar-{{ cl.percent }}">
+            </div>
+        </div>
+        <div class="numbers">
+            {% icon "sign-in" %}
+            {{ cl.checkin_count|default_if_none:0|intcomma }} /
+            {{ cl.position_count|default_if_none:0|intcomma }}
+            <br>
+            {% icon "user" %}
+            {% blocktrans trimmed with n=cl.inside_count|intcomma %}
+                {{ n }} present
+            {% endblocktrans %}
+        </div>
+    </a>
+{% endfor %}
@@ -0,0 +1,17 @@
+{% load i18n %}
+{% load icon %}
+<div id="comment-form">
+    <strong>{% trans "Comment" %}:</strong>
+    {% if "event.settings.general:write" in request.eventpermset %}
+        <button type="button" class="btn btn-default btn-xs"
+                hx-get="{% url "control:event.index.comment" organizer=request.organizer.slug event=request.event.slug %}"
+                hx-target="#comment-form">
+            {% icon "edit" %}
+        </button>
+    {% endif %}
+    {% if request.event.comment %}
+        <p>
+            {{ request.event.comment|linebreaksbr }}
+        </p>
+    {% endif %}
+</div>
@@ -0,0 +1,16 @@
+{% load i18n %}
+{% load bootstrap3 %}
+<form class="form" method="post"
+      hx-post="{% url "control:event.index.comment" event=request.event.slug organizer=request.event.organizer.slug %}">
+    {% csrf_token %}
+    <div>
+        <p>
+            {% bootstrap_field form.comment layout="inline" show_help=True show_label=False horizontal_field_class="col-md-12" %}
+        </p>
+        <p class="text-right flip">
+            <button class="btn btn-default">
+                {% trans "Update comment" %}
+            </button>
+        </p>
+    </div>
+</form>
@@ -0,0 +1,4 @@
+{% load i18n %}
+{% for q in quotas %}
+    {% include "pretixcontrol/fragment_quota_box.html" with quota=q full=1 %}
+{% endfor %}
@@ -0,0 +1,11 @@
+{% load i18n %}
+{% load humanize %}
+{% if count %}
+    <a href="{% url "control:event.orders.waitinglist" event=request.event.slug organizer=request.organizer.slug %}">
+        {% blocktrans trimmed with number=count|intcomma count count=count %}
+            {{ number }} person waiting
+        {% plural %}
+            {{ number }} persons waiting
+        {% endblocktrans %}
+    </a>
+{% endif %}
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load eventsignal %}
 {% if has_overpaid_orders %}
    <div class="alert alert-warning">
        {% blocktrans trimmed %}
@@ -56,3 +57,4 @@
           class="btn btn-primary">{% trans "Show sync problems" %}</a>
    </div>
 {% endif %}
+{% eventsignal request.event "pretix.control.signals.event_dashboard_top" request=request %}
@@ -0,0 +1,19 @@
+{% load i18n %}
+<div class="panel panel-primary">
+    <div class="panel-heading">
+        <h2 class="panel-title">{% trans "Welcome to pretix!" %}</h2>
+    </div>
+    <div class="panel-body">
+        <div class="attentionline">{% trans "Get started with our setup tool" %}</div>
+        <p>
+            {% blocktrans trimmed %}
+                To start selling tickets, you need to create products or quotas. The fastest way to create
+                this is to use our setup tool.
+            {% endblocktrans %}
+        </p>
+        <a href="{% url "control:event.quick" organizer=request.organizer.slug event=request.event.slug %}"
+           class="btn btn-primary btn-lg">
+            {% trans "Set up event" %}
+        </a>
+    </div>
+</div>
@@ -1,12 +0,0 @@
-<div class="welcome-wizard">
-    <h3>{{ title }}</h3>
-    {% if subtitle %}
-        <div class="attentionline">{{ subtitle }}</div>
-    {% endif %}
-    {% if text %}
-        <p>{{ text }}</p>
-    {% endif %}
-    {% if button_text %}
-        <p><a href="{{ button_url }}" class="btn btn-primary btn-lg">{{ button_text }}</a></p>
-    {% endif %}
-</div>
@@ -1,10 +1,10 @@
 {% load i18n %}
-<div class="panel panel-default items">
-    <div class="panel-heading">
+<details class="panel panel-default items" open>
+    <summary class="panel-heading">
        <h3 class="panel-title">
-            {% trans "Your timeline" %}
+            {% trans "Timeline" %}
        </h3>
-    </div>
+    </summary>
    <div class="panel-body timeline">
        {% regroup timeline by date as tl_list %}
        {% for day in tl_list %}
@@ -33,4 +33,4 @@
            </div>
        {% endfor %}
    </div>
-</div>
+</details>
@@ -3,10 +3,10 @@
 {% load eventurl %}
 {% load bootstrap3 %}
 {% load static %}
-{% load eventsignal %}
+{% load icon %}
 {% block title %}{{ request.event.name }}{% endblock %}
 {% block content %}
-    <h1>
+    <h1 class="event-dashboard-header">
        {{ request.event.name }}
        <small>
            {% if request.event.has_subevents %}
@@ -14,11 +14,43 @@
            {% else %}
                {{ request.event.get_date_range_display }}
            {% endif %}
-            <span id="warnings_loading" class="fa fa-cog fa-spin"></span>
+            <span id="warnings_indicator" class="htmx-indicator">{% icon "cog fa-spin" %}</span>
        </small>
+        <div class="pull-right flip">
+            <a href="{% url "control:event.live" organizer=request.organizer.slug event=request.event.slug %}"
+               data-toggle="tooltip"
+               title="{% trans "Click to change shop status" %}">
+                {% icon "pencil" %}</a>
+            <a href="{% url "control:event.live" organizer=request.organizer.slug event=request.event.slug %}"
+               data-toggle="tooltip"
+               title="{% trans "Click to change shop status" %}">
+                {% if request.event.live and request.event.testmode %}
+                    <span class="label label-warning">
+                        <span class="fa fa-warning"></span>
+                        {% trans "public test mode" %}
+                    </span>
+                {% elif request.event.live %}
+                    <span class="label label-success">
+                        <span class="fa fa-check"></span>
+                        {% trans "live" %}
+                    </span>
+                {% elif request.event.testmode %}
+                    <span class="label label-warning">
+                        <span class="fa fa-power-off"></span>
+                        {% trans "private test mode" %}
+                    </span>
+                {% else %}
+                    <span class="label label-danger">
+                        <span class="fa fa-power-off"></span>
+                        {% trans "offline" %}
+                    </span>
+                {% endif %}
+            </a>
+        </div>
+        <div class="clearfix"></div>
    </h1>
    <div class="helper-space-below">
-        {% trans "Shop URL:" %}
+        <strong>{% trans "Shop URL:" %}</strong>
        <span id="shop_url" class="text-muted">{% abseventurl request.event "presale:event.index" %}</span>
        <button type="button" class="btn btn-default btn-xs btn-clipboard js-only" data-clipboard-target="#shop_url">
            <i class="fa fa-clipboard" aria-hidden="true"></i>
@@ -31,75 +63,80 @@
            {% include "pretixcontrol/event/fragment_qr_dropdown.html" with url=0 %}
        </div>
        <div class="clearfix"></div>
-    </div>
-    <div id="warnings_target"></div>
-    {% eventsignal request.event "pretix.control.signals.event_dashboard_top" request=request %}
-
-    {% if request.event.has_subevents %}
-        <form class="form-inline helper-display-inline" action="" method="get">
-            {% include "pretixcontrol/event/fragment_subevent_choice_simple.html" %}
-        </form>
-    {% endif %}
-    {% if not request.event.has_subevents or subevent %}
-        {% include "pretixcontrol/event/fragment_timeline.html" %}
-    {% endif %}
-    <div class="dashboard">
-        {% for w in widgets %}
-            <div class="widget-container widget-{{ w.display_size|default:"small" }} {% if w.lazy %}widget-lazy-loading{% endif %}" data-lazy-id="{{ w.lazy }}">
-                {% if w.url %}{# backwards compatibility #}
-                    <a href="{{ w.url }}" class="widget">
-                        {% if w.lazy %}
-                            <span class="fa fa-cog fa-4x"></span>
-                        {% else %}
-                            {{ w.content }}
-                        {% endif %}
-                    </a>
-                {% elif w.link %}
-                    <a href="{{ w.link }}" class="widget">
-                        {% if w.lazy %}
-                            <span class="fa fa-cog fa-4x´"></span>
-                        {% else %}
-                            {{ w.content }}
-                        {% endif %}
-                    </a>
-                {% else %}
-                    <div class="widget">
-                        {% if w.lazy %}
-                            <span class="fa fa-cog fa-4x"></span>
-                        {% else %}
-                            {{ w.content }}
-                        {% endif %}
-                    </div>
-                {% endif %}
-            </div>
-        {% endfor %}
+        {% include "pretixcontrol/event/dashboard_partial_comment.html" with url=0 %}
    </div>

+    {% if not request.event.items.exists %}
+        {% include "pretixcontrol/event/dashboard_partial_welcome.html" %}
+    {% endif %}
+
+    <div hx-get="{% url "control:event.index.warnings" organizer=request.organizer.slug event=request.event.slug %}"
+         {# loading indicator is somewhere else because the happy case is "no warnings" and shouldn't make the page jump #}
+         hx-indicator="#warnings_indicator"
+         hx-trigger="load"></div>
+
+    {% if stats %}
+        {{ stats }}
+    {% endif %}
    <p>&nbsp;</p>
-    <div class="panel panel-default items">
-        <div class="panel-heading">
-            <h3 class="panel-title">
-                {% trans "Internal comment" %}
-            </h3>
-        </div>
-        <div class="panel-body">
-            <form class="form" method="post"
-                  action="{% url "control:event.comment" event=request.event.slug organizer=request.event.organizer.slug %}">
-                {% csrf_token %}
-                <div class="row">
-                    {% bootstrap_field comment_form.comment layout="horizontal" show_help=True show_label=False horizontal_field_class="col-md-12" %}
+
+    {% if not request.event.items.exists %}
+        {# pass #}
+    {% elif not request.event.has_subevents %}
+        {% include "pretixcontrol/event/fragment_timeline.html" %}
+        <div class="row">
+            <div class="col-md-6 col-sm-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <div class="pull-right">
+                            <div hx-get="{% url "control:event.index.waiting" organizer=request.organizer.slug event=request.event.slug %}"
+                                 hx-trigger="load">
+                                <span class="loading-mock loading-mock-text-short"></span>
+                            </div>
+                        </div>
+                        <h2 class="panel-title">{% trans "Quotas" %}</h2>
+                    </div>
+                    <div class="panel-body">
+                        <div hx-get="{% url "control:event.index.quotas" organizer=request.organizer.slug event=request.event.slug %}"
+                             hx-trigger="load">
+                            {% for i in "12" %}
+                                {% include "pretixcontrol/fragment_quota_box_mock.html" %}
+                            {% endfor %}
+                        </div>
+                    </div>
                </div>
-                {% if not comment_form.readonly %}
-                    <p class="text-right flip">
-                        <br>
-                        <button class="btn btn-default">
-                            {% trans "Update comment" %}
-                        </button>
-                    </p>
-                {% endif %}
-            </form>
+            </div>
+            <div class="col-md-6 col-sm-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h2 class="panel-title">{% trans "Check-in lists" %}</h2>
+                    </div>
+                    <div class="panel-body">
+                        <div hx-get="{% url "control:event.index.checkin" organizer=request.organizer.slug event=request.event.slug %}"
+                             hx-trigger="load">
+                            {% for i in "12" %}
+                                {% include "pretixcontrol/fragment_quota_box_mock.html" %}
+                            {% endfor %}
+                        </div>
+                    </div>
+                </div>
+            </div>
        </div>
-    </div>
+    {% elif has_checkin_widgets %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h2 class="panel-title">{% trans "Check-in lists" %}</h2>
+            </div>
+            <div class="panel-body">
+                <div hx-get="{% url "control:event.index.checkin" organizer=request.organizer.slug event=request.event.slug %}"
+                     hx-trigger="load">
+                    {% for i in "12" %}
+                        {% include "pretixcontrol/fragment_quota_box_mock.html" %}
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+    {% endif %}
    {% if "event.orders:read" in request.eventpermset or "event.orders:write" in request.eventpermset or "event.settings.general:write" in request.eventpermset or "event.items:write" in request.eventpermset %}
        <div class="panel panel-default">
            <div class="panel-heading">
@@ -107,10 +144,27 @@
                    {% trans "Event logs" %}
                </h3>
            </div>
-            <ul class="list-group" id="logs_target">
-                <div class="logs-lazy-loading">
-                    <span class="fa fa-cog fa-4x"></span>
-                </div>
+            <ul class="list-group"
+                hx-get="{% url "control:event.index.logs" organizer=request.organizer.slug event=request.event.slug %}"
+                hx-trigger="load">
+                {% for i in "12345" %}
+                    <li class="list-group-item logentry">
+                        <div class="row">
+                            <div class="col-lg-2 col-sm-6 col-xs-12">
+                                <span class="loading-mock loading-mock-text-medium"></span>
+                            </div>
+                            <div class="col-lg-2 col-sm-6 col-xs-12">
+                                <span class="loading-mock loading-mock-text-short"></span>
+                            </div>
+                            <div class="col-lg-2 col-sm-12 col-xs-12">
+                                <span class="loading-mock loading-mock-text-medium"></span>
+                            </div>
+                            <div class="col-lg-6 col-sm-12 col-xs-12">
+                                <span class="loading-mock loading-mock-text-long"></span>
+                            </div>
+                        </div>
+                    </li>
+                {% endfor %}
            </ul>
            <div class="panel-footer">
                <a href="{% url "control:event.log" event=request.event.slug organizer=request.event.organizer.slug %}">
@@ -109,6 +109,7 @@
                {% bootstrap_form_errors form layout="control" %}
                {% bootstrap_field form.tax_rule_payment layout="control" %}
                {% bootstrap_field form.payment_explanation layout="control" %}
+                {% bootstrap_field form.payment_choice_postpone_allowed_channels layout="control" %}
            </fieldset>
        </div>
        {% if "event.settings.payment:write" in request.eventpermset %}
@@ -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>
@@ -86,7 +86,7 @@
                    <a href="?{% url_replace request 'ordering' 'date_to' %}"><i class="fa fa-caret-up"></i></a>
                </th>
                <th>
-                    {% trans "Paid tickets per quota" %}
+                    {% trans "Quota utilization" %}
                </th>
                <th>
                    {% trans "Status" %}
@@ -151,7 +151,7 @@
                    </td>
                    <td>
                        {% for q in e.first_quotas|slice:":3" %}
-                            {% include "pretixcontrol/fragment_quota_box_paid.html" with quota=q %}
+                            {% include "pretixcontrol/fragment_quota_box.html" with quota=q %}
                        {% endfor %}
                        {% if e.first_quotas|length > 3 %}
                            <a href="{% url "control:event.items.quotas" organizer=e.organizer.slug event=e.slug %}"
@@ -1,18 +1,26 @@
 {% load i18n %}
-<div class="quotabox availability" data-toggle="tooltip_html" data-placement="top"
-        title="{% trans "Quota:" %} {{ q.name|force_escape|force_escape }}<br>{% blocktrans with date=q.cached_availability_time|date:"SHORT_DATETIME_FORMAT" %}Numbers as of {{ date }}{% endblocktrans %}">
+{% load humanize %}
+<a class="quotabox {% if full %}quotabox-full{% endif %}" data-toggle="tooltip_html" data-placement="top"
+        title="{% trans "Quota:" %} {{ q.name|force_escape|force_escape }}{% if q.cached_avail.1 is not None %}<br>{% blocktrans with num=q.cached_avail.1 %}Currently available: {{ num }}{% endblocktrans %}{% endif %}"
+    href="{% url "control:event.items.quotas.show" event=q.event.slug organizer=q.event.organizer.slug quota=q.pk %}">
+    {% if full %}
+        <strong>{{ q.name }}</strong>
+    {% endif %}
    {% if q.size|default_if_none:"NONE" == "NONE" %}
        <div class="progress">
-            <div class="progress-bar progress-bar-success progress-bar-100">
-            </div>
        </div>
    {% else %}
        <div class="progress">
-            <div class="progress-bar progress-bar-{% if q.cached_avail.0 <= 10 or q.cached_avail.0 >= 100 %}danger{% else %}warning{% endif %} progress-bar-{{ q.inv_percent }}">
+            <div class="progress-bar progress-bar-{% if q.cached_avail.0 < 10 %}danger{% elif q.cached_avail.0 < 100  %}warning{% else %}success{% endif %} progress-bar-{{ q.percent_paid }}">
+            </div>
+            <div class="progress-bar progress-bar-{% if q.cached_avail.0 < 10 %}danger{% elif q.cached_avail.0 < 100  %}warning{% else %}success{% endif %} progress-bar-unconfirmed progress-bar-{{ q.percent_other }}">
            </div>
        </div>
    {% endif %}
    <div class="numbers">
-        {{ q.cached_avail.1|default_if_none:"∞" }} / {{ q.size|default_if_none:"∞" }}
+        {{ q.used|default_if_none:"∞" }} / {{ q.size|default_if_none:"∞" }}<br>
+        {% blocktrans trimmed with n=q.cached_availability_paid_orders %}
+            {{ n }} paid
+        {% endblocktrans %}
    </div>
-</div>
+</a>
@@ -0,0 +1,10 @@
+<a class="quotabox quotabox-full">
+    <strong>
+        <span class="loading-mock loading-mock-text-short"></span>
+    </strong>
+    <div class="progress loading-mock"></div>
+    <div class="numbers">
+        <span class="loading-mock loading-mock-text-short"></span>
+        <br><span class="loading-mock loading-mock-text-short"></span>
+    </div>
+</a>
@@ -1,17 +0,0 @@
-{% load i18n %}
-<a class="quotabox" data-toggle="tooltip_html" data-placement="top"
-        title="{% trans "Quota:" %} {{ q.name|force_escape|force_escape }}{% if q.cached_avail.1 is not None %}<br>{% blocktrans with num=q.cached_avail.1 %}Currently available: {{ num }}{% endblocktrans %}{% endif %}"
-    href="{% url "control:event.items.quotas.show" event=q.event.slug organizer=q.event.organizer.slug quota=q.pk %}">
-    {% if q.size|default_if_none:"NONE" == "NONE" %}
-        <div class="progress">
-        </div>
-    {% else %}
-        <div class="progress">
-            <div class="progress-bar progress-bar-{% if q.cached_avail.0 < 10 %}danger{% elif q.cached_avail.0 < 100  %}warning{% else %}success{% endif %} progress-bar-{{ q.percent_paid }}">
-            </div>
-        </div>
-    {% endif %}
-    <div class="numbers">
-        {{ q.cached_availability_paid_orders|default_if_none:"?" }} / {{ q.size|default_if_none:"∞" }}
-    </div>
-</a>
@@ -72,6 +72,7 @@
                    {% endif %}
                </dl>
            </fieldset>
+            {% include "pretixcontrol/event/fragment_timeline.html" %}
            <fieldset>
                <legend>{% trans "Quotas" %}</legend>
                <div class="table-responsive">
@@ -102,7 +102,7 @@
                            <a href="?{% url_replace request 'filter-ordering' 'date_from' %}"><i class="fa fa-caret-up"></i></a>
                        </th>
                        <th>
-                            {% trans "Paid tickets per quota" %}
+                            {% trans "Quota utilization" %}
                        </th>
                        <th>
                            {% trans "Status" %}
@@ -155,7 +155,7 @@
                            </td>
                            <td>
                                {% for q in s.first_quotas|slice:":3" %}
-                                    {% include "pretixcontrol/fragment_quota_box_paid.html" with quota=q %}
+                                    {% include "pretixcontrol/fragment_quota_box.html" with quota=q %}
                                {% endfor %}
                                {% if s.first_quotas|length > 3 %}
                                    <a href="{% url "control:event.items.quotas" organizer=request.event.organizer.slug event=request.event.slug %}?subevent={{ s.id }}"
@@ -15,7 +15,7 @@
                <div>
                    <div class="big-radio radio">
                        <label>
-                            <input type="radio" required value="totp" name="{{ form.devicetype.html_name }}" {% if form.devicetype.value == "totp" %}checked{% endif %}>
+                            <input type="radio" required value="otp_totp.totpdevice" name="{{ form.devicetype.html_name }}" {% if form.devicetype.value == "otp_totp.totpdevice" %}checked{% endif %}>
                            <strong>{% trans "Smartphone with Authenticator app" %}</strong><br>
                            <div class="help-block">
                                {% blocktrans trimmed %}
@@ -26,7 +26,7 @@
                    </div>
                    <div class="big-radio radio">
                        <label>
-                            <input type="radio" required value="webauthn" name="{{ form.devicetype.html_name }}" {% if form.devicetype.value == "webauthn" %}checked{% endif %}>
+                            <input type="radio" required value="pretixbase.webauthndevice" name="{{ form.devicetype.html_name }}" {% if form.devicetype.value == "pretixbase.webauthndevice" %}checked{% endif %}>
                            <strong>{% trans "WebAuthn-compatible hardware token" %}</strong><br>
                            <div class="help-block">
                                {% blocktrans trimmed %}
@@ -116,14 +116,14 @@
            {% for d in devices %}
                <li class="list-group-item">
                    <a class="btn btn-danger btn-xs pull-right flip"
-                       href="{% url "control:user.settings.2fa.delete" devicetype=d.devicetype device=d.pk %}">
+                       href="{% url "control:user.settings.2fa.delete" devicetype=d.model_label device=d.pk %}">
                        Delete
                    </a>
-                    {% if d.devicetype == "totp" %}
+                    {% if d.model_label == "otp_totp.totpdevice" %}
                        <span class="fa fa-mobile"></span>
-                    {% elif d.devicetype == "webauthn" %}
+                    {% elif d.model_label == "pretixbase.webauthndevice" %}
                        <span class="fa fa-usb"></span>
-                    {% elif d.devicetype == "u2f" %}
+                    {% elif d.model_label == "pretixbase.u2fdevice" %}
                        <span class="fa fa-usb"></span>
                    {% endif %}
                    {{ d.name }}
@@ -1,6 +1,7 @@
 {% extends "pretixcontrol/base.html" %}
 {% load i18n %}
 {% load bootstrap3 %}
+{% load icon %}
 {% block title %}{% trans "User" %}{% endblock %}
 {% block content %}
    <h1>{% trans "User" %} {{ user.email }}</h1>
@@ -59,8 +60,83 @@
                        {% bootstrap_field form.is_verified layout='control' %}
                    {% endif %}
                    {% bootstrap_field form.last_login layout='control' %}
-                    {% bootstrap_field form.require_2fa layout='control' %}
                    {% bootstrap_field form.needs_password_change layout='control' %}
+                    {% bootstrap_field form.require_2fa layout='control' %}
+                    <div class="form-group">
+                        <div class="col-md-9 col-md-offset-3">
+                            <div class="panel panel-default">
+                                <div class="panel-heading">
+                                    <button class="btn btn-default btn-xs pull-right" type="submit" form="resetdriftthrottle">
+                                        {% trans "Reset drift and throttle" %}
+                                    </button>
+                                    <h3 class="panel-title">
+                                        {% trans "Available two-factor authentication methods" %}
+                                    </h3>
+                                </div>
+                                <table class="panel-body table table-hover">
+                                    {% for d in devices %}
+                                    <tr>
+                                        <td>
+                                            {% if d.model_label == 'otp_totp.totpdevice' %}
+                                                TOTP
+                                            {% elif d.model_label == 'pretixbase.u2fdevice' %}
+                                                U2F
+                                            {% elif d.model_label == 'pretixbase.webauthndevice' %}
+                                                WebAuthn
+                                            {% elif d.model_label == 'otp_static.staticdevice' %}
+                                                {% trans "Emergency tokens" %}
+                                            {% endif %}
+                                            {% if d.confirmed %}
+                                                {% icon "check" %}
+                                            {% else %}
+                                                {% icon "warning" %}
+                                            {% endif %}
+                                        </td>
+                                        <td>
+                                            {{ d.name }}
+                                        </td>
+                                        <td>
+                                            {% if d.throttling_failure_timestamp %}
+                                                {% blocktrans trimmed with date=d.throttling_failure_timestamp|date:"SHORT_DATETIME_FORMAT" count cnt=d.throttling_failure_count %}
+                                                    1 failed attempt since {{ date }}
+                                                {% plural %}
+                                                    {{ cnt }} failed attempts since {{ date }}
+                                                {% endblocktrans %}
+                                                <br>
+                                            {% endif %}
+                                            {% if d.throttling_enabled and not d.verify_is_allowed.0 %}
+                                                <strong>
+                                                    {% blocktrans trimmed with date=d.verify_is_allowed.1.locked_until|date:"SHORT_DATETIME_FORMAT" %}
+                                                        Currently locked until {{ date }}
+                                                    {% endblocktrans %}
+                                                </strong>
+                                                <br>
+                                            {% endif %}
+                                            {% if d.model_label == 'otp_totp.totpdevice' %}
+                                                <small>
+                                                    <code>step = {{ d.step }},
+                                                    t0 = {{ d.t0 }},
+                                                    digits = {{ d.digits }},
+                                                    tolerance = {{ d.tolerance }},
+                                                    drift = {{ d.drift }},
+                                                    last_t = {{ d.last_t }}</code>
+                                                </small>
+                                            {% elif d.model_label == 'pretixbase.u2fdevice' %}
+                                                <small>
+                                                    <code>sign_count = {{ d.sign_count }}</code>
+                                                </small>
+                                            {% elif d.model_label == 'otp_static.staticdevice' %}
+                                                <small>
+                                                    <code>token_count = {{ d.token_set.count }}</code>
+                                                </small>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                    {% endfor %}
+                                </table>
+                            </div>
+                        </div>
+                    </div>
                </fieldset>
                <fieldset>
                    <legend>{% trans "Team memberships" %}</legend>
@@ -102,4 +178,8 @@
            </div>
        </div>
    </div>
+
+    <form action="{% url "control:users.resetdriftthrottle" id=user.pk %}" id="resetdriftthrottle" method="post">
+        {% csrf_token %}
+    </form>
 {% endblock %}
@@ -78,6 +78,7 @@ urlpatterns = [
    re_path(r'^users/(?P<id>\d+)/impersonate$', users.UserImpersonateView.as_view(), name='users.impersonate'),
    re_path(r'^users/(?P<id>\d+)/anonymize$', users.UserAnonymizeView.as_view(), name='users.anonymize'),
    re_path(r'^users/(?P<id>\d+)/emergencytoken$', users.UserEmergencyTokenView.as_view(), name='users.emergencytoken'),
+    re_path(r'^users/(?P<id>\d+)/resetdriftthrottle$', users.Reset2FADriftThrottleView.as_view(), name='users.resetdriftthrottle'),
    re_path(r'^pdf/editor/webfonts.css', pdf.FontsCSSView.as_view(), name='pdf.css'),
    re_path(r'^settings/?$', user.UserSettings.as_view(), name='user.settings'),
    re_path(r'^settings/history/$', user.UserHistoryView.as_view(), name='user.settings.history'),
@@ -106,9 +107,9 @@ urlpatterns = [
    re_path(r'^settings/2fa/regenemergency', user.User2FARegenerateEmergencyView.as_view(),
            name='user.settings.2fa.regenemergency'),
    re_path(r'^settings/2fa/totp/(?P<device>[0-9]+)/confirm', user.User2FADeviceConfirmTOTPView.as_view(),
-            name='user.settings.2fa.confirm.totp'),
+            name='user.settings.2fa.confirm.otp_totp.totpdevice'),
    re_path(r'^settings/2fa/webauthn/(?P<device>[0-9]+)/confirm', user.User2FADeviceConfirmWebAuthnView.as_view(),
-            name='user.settings.2fa.confirm.webauthn'),
+            name='user.settings.2fa.confirm.pretixbase.webauthndevice'),
    re_path(r'^settings/2fa/(?P<devicetype>[^/]+)/(?P<device>[0-9]+)/delete', user.User2FADeviceDeleteView.as_view(),
            name='user.settings.2fa.delete'),
    re_path(r'^settings/email/confirm$', user.UserEmailConfirmView.as_view(), name='user.settings.email.confirm'),
@@ -272,15 +273,16 @@ urlpatterns = [
    re_path(r'^event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include([
        re_path(r'^$', dashboards.event_index, name='event.index'),
        re_path(r'^qrcode.(?P<filetype>(png|jpeg|gif|svg))$', event.EventQRCode.as_view(), name='event.qrcode'),
-        re_path(r'^widgets.json$', dashboards.event_index_widgets_lazy, name='event.index.widgets'),
        re_path(r'^dashboard/partials/logs$', dashboards.event_index_log_lazy, name='event.index.logs'),
        re_path(r'^dashboard/partials/warnings$', dashboards.event_index_warnings_lazy, name='event.index.warnings'),
+        re_path(r'^dashboard/partials/quotas$', dashboards.event_index_quotas_lazy, name='event.index.quotas'),
+        re_path(r'^dashboard/partials/waiting$', dashboards.event_index_waiting_lazy, name='event.index.waiting'),
+        re_path(r'^dashboard/partials/checkin$', dashboards.event_index_checkin_lazy, name='event.index.checkin'),
+        re_path(r'^dashboard/partials/comment$', event.EventComment.as_view(), name='event.index.comment'),
        re_path(r'^live/$', event.EventLive.as_view(), name='event.live'),
        re_path(r'^transfer_session/$', event.EventTransferSession.as_view(), name='event.transfer_session'),
        re_path(r'^logs/$', event.EventLog.as_view(), name='event.log'),
        re_path(r'^delete/$', event.EventDelete.as_view(), name='event.delete'),
-        re_path(r'^comment/$', event.EventComment.as_view(),
-                name='event.comment'),
        re_path(r'^quickstart/$', event.QuickSetupView.as_view(), name='event.quick'),
        re_path(r'^settings/$', event.EventUpdate.as_view(), name='event.settings'),
        re_path(r'^settings/plugins$', event.EventPlugins.as_view(), name='event.settings.plugins'),
@@ -35,6 +35,7 @@
 import base64
 import json
 import logging
+import math
 import time
 from urllib.parse import quote, urljoin, urlparse

@@ -50,11 +51,12 @@ from django.shortcuts import redirect, render
 from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.http import url_has_allowed_host_and_scheme
-from django.utils.translation import gettext_lazy as _
+from django.utils.timezone import now
+from django.utils.translation import gettext_lazy as _, ngettext
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
 from django.views.generic import TemplateView
-from django_otp import match_token
+from django_otp import devices_for_user
 from django_otp.plugins.otp_static.models import StaticDevice
 from webauthn.helpers import generate_challenge

@@ -64,6 +66,7 @@ from pretix.base.forms.auth import (
 )
 from pretix.base.metrics import pretix_failed_logins, pretix_successful_logins
 from pretix.base.models import TeamInvite, U2FDevice, User, WebAuthnDevice
+from pretix.helpers import OF_SELF
 from pretix.helpers.http import get_client_ip, redirect_to_url
 from pretix.helpers.ratelimit import rate_limit, rate_limit_reset
 from pretix.helpers.security import handle_login_source, session_login
@@ -395,15 +398,17 @@ class Recover(TemplateView):

    def post(self, request, *args, **kwargs):
        if self.form.is_valid():
-            try:
-                user = User.objects.get(id=self.request.GET.get('id'), auth_backend='native')
-            except User.DoesNotExist:
-                return self.invalid('unknownuser')
-            if not default_token_generator.check_token(user, self.request.GET.get('token')):
-                return self.invalid('invalid')
-            user.set_password(self.form.cleaned_data['password'])
-            user.needs_password_change = False
-            user.save()
+            with transaction.atomic():
+                # Check token in transaction to prevent race condition
+                try:
+                    user = User.objects.select_for_update(of=OF_SELF).get(id=self.request.GET.get('id'), auth_backend='native')
+                except User.DoesNotExist:
+                    return self.invalid('unknownuser')
+                if not default_token_generator.check_token(user, self.request.GET.get('token')):
+                    return self.invalid('invalid')
+                user.set_password(self.form.cleaned_data['password'])
+                user.needs_password_change = False
+                user.save()
            messages.success(request, _('You can now login using your new password.'))
            user.log_action('pretix.control.auth.user.forgot_password.recovered')

@@ -460,6 +465,7 @@ class Login2FAView(TemplateView):
        token = request.POST.get('token', '').strip().replace(' ', '')

        valid = False
+        retry_after = None
        if 'webauthn_challenge' in self.request.session and token.startswith('{'):
            challenge = self.request.session['webauthn_challenge']

@@ -515,12 +521,28 @@ class Login2FAView(TemplateView):
                    valid = True
                    break
        else:
-            valid = match_token(self.user, token)
-            if isinstance(valid, StaticDevice):
+            with transaction.atomic():
+                for device in devices_for_user(self.user, for_verify=True):
+                    if isinstance(device, StaticDevice) and len(token) < 12:
+                        # If we enter a wrong TOTP token (which is 6 characters), do not even try if it is a valid
+                        # emergency token, which will only "lock up" the StaticDevice due to the throttling plugin
+                        # and just locks people out without security gain.
+                        continue
+                    if device.verify_token(token):
+                        valid = True
+                        break
+                    elif hasattr(device, 'verify_is_allowed'):
+                        verify_allowed, reason_dict = device.verify_is_allowed()
+                        if not verify_allowed:
+                            if not retry_after or reason_dict['locked_until'] > retry_after:
+                                retry_after = reason_dict['locked_until']
+                else:
+                    device = None
+
+            if isinstance(device, StaticDevice):
                self.user.send_security_notice([
                    _("A recovery code for two-factor authentification was used to log in.")
                ])
-
        if valid:
            logger.info(f"Backend login successful for user {self.user.pk} with 2FA.")
            pretix_successful_logins.inc(1)
@@ -533,7 +555,23 @@ class Login2FAView(TemplateView):
            return redirect('control:index')
        else:
            pretix_failed_logins.inc(1, reason="2fa")
-            messages.error(request, _('Invalid code, please try again.'))
+            msg = _('Invalid code, please try again.')
+            if retry_after:
+                seconds = (retry_after - now()).total_seconds()
+                minutes = seconds / 60
+                if minutes >= 1:
+                    msg = ngettext(
+                        'Invalid code. Please try again after waiting {value} minute.',
+                        'Invalid code. Please try again after waiting {value} minutes.',
+                        minutes,
+                    ).format(value=math.ceil(minutes))
+                elif seconds >= 1:
+                    msg = ngettext(
+                        'Invalid code. Please try again after waiting {value} second.',
+                        'Invalid code. Please try again after waiting {value} seconds.',
+                        seconds,
+                    ).format(value=math.ceil(seconds))
+            messages.error(request, msg)
            return redirect('control:auth.login.2fa')

    def get_context_data(self, **kwargs):
@@ -33,317 +33,48 @@
 # License for the specific language governing permissions and limitations under the License.

 from datetime import timedelta
-from decimal import Decimal
 from zoneinfo import ZoneInfo

-from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.humanize.templatetags.humanize import intcomma
 from django.db.models import (
-    Count, IntegerField, Max, Min, OuterRef, Prefetch, Q, Subquery, Sum,
+    Count, IntegerField, Max, Min, OuterRef, Q, Subquery,
 )
 from django.db.models.functions import Coalesce, Greatest
-from django.dispatch import receiver
-from django.http import JsonResponse
+from django.http import Http404, JsonResponse
 from django.shortcuts import render
-from django.template.loader import get_template
 from django.urls import reverse
 from django.utils.formats import date_format
-from django.utils.html import conditional_escape, escape, format_html
+from django.utils.html import (
+    conditional_escape, escape, format_html, format_html_join,
+)
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, ngettext, pgettext

-from pretix.base.decimal import round_decimal
 from pretix.base.models import (
-    Item, ItemCategory, ItemVariation, Order, OrderPosition, OrderRefund,
-    Question, Quota, SubEvent, Voucher, WaitingListEntry,
+    Item, ItemCategory, Order, OrderRefund, Question, Quota, Voucher,
+    WaitingListEntry,
 )
-from pretix.base.services.quotas import QuotaAvailability
 from pretix.base.timeline import timeline_for_event
 from pretix.control.signals import (
-    event_dashboard_widgets, user_dashboard_widgets,
+    event_dashboard_statistics, user_dashboard_widgets,
 )
 from pretix.helpers.daterange import daterange

 from ...base.models.orders import CancellationRequest
 from ...base.models.organizer import TeamQuerySet
-from ...base.templatetags.money import money_filter
 from ..logdisplay import OVERVIEW_BANLIST
-
-NUM_WIDGET = '<div class="numwidget"><span class="num">{num}</span><span class="text">{text}</span></div>'
+from .utils import prepare_quotas_for_boxes


-@receiver(signal=event_dashboard_widgets)
-def base_widgets(sender, subevent=None, lazy=False, **kwargs):
-    if not lazy:
-        prodc = Item.objects.filter(
-            event=sender, active=True,
-        ).filter(
-            (Q(available_until__isnull=True) | Q(available_until__gte=now())) &
-            (Q(available_from__isnull=True) | Q(available_from__lte=now()))
-        ).count()
-
-        if subevent:
-            opqs = OrderPosition.objects.filter(subevent=subevent)
-        else:
-            opqs = OrderPosition.objects
-
-        tickc = opqs.filter(
-            order__event=sender, item__admission=True,
-            order__status__in=(Order.STATUS_PAID, Order.STATUS_PENDING),
-        ).count()
-
-        paidc = opqs.filter(
-            order__event=sender, item__admission=True,
-            order__status=Order.STATUS_PAID,
-        ).count()
-
-        if subevent:
-            rev = opqs.filter(
-                order__event=sender, order__status=Order.STATUS_PAID
-            ).aggregate(
-                sum=Sum('price')
-            )['sum'] or Decimal('0.00')
-        else:
-            rev = Order.objects.filter(
-                event=sender,
-                status=Order.STATUS_PAID
-            ).aggregate(sum=Sum('total'))['sum'] or Decimal('0.00')
-
-    return [
+def event_index_waiting_lazy(request, organizer, event):
+    wles = WaitingListEntry.objects.filter(event=request.event, voucher__isnull=True)
+    return render(
+        request,
+        'pretixcontrol/event/dashboard_partial_waiting.html',
        {
-            'content': None if lazy else format_html(NUM_WIDGET, num=intcomma(tickc), text=_('Attendees (ordered)')),
-            'lazy': 'attendees-ordered',
-            'display_size': 'small',
-            'priority': 100,
-            'url': reverse('control:event.orders', kwargs={
-                'event': sender.slug,
-                'organizer': sender.organizer.slug
-            }) + ('?subevent={}'.format(subevent.pk) if subevent else '')
-        },
-        {
-            'content': None if lazy else format_html(NUM_WIDGET, num=intcomma(paidc), text=_('Attendees (paid)')),
-            'lazy': 'attendees-paid',
-            'display_size': 'small',
-            'priority': 100,
-            'url': reverse('control:event.orders.overview', kwargs={
-                'event': sender.slug,
-                'organizer': sender.organizer.slug
-            }) + ('?subevent={}'.format(subevent.pk) if subevent else '')
-        },
-        {
-            'content': None if lazy else format_html(
-                NUM_WIDGET,
-                num=money_filter(round_decimal(rev, sender.currency), sender.currency, hide_currency=True),
-                text=_('Total revenue ({currency})').format(currency=sender.currency)
-            ),
-            'lazy': 'total-revenue',
-            'display_size': 'small',
-            'priority': 100,
-            'url': reverse('control:event.orders.overview', kwargs={
-                'event': sender.slug,
-                'organizer': sender.organizer.slug
-            }) + ('?subevent={}'.format(subevent.pk) if subevent else '')
-        },
-        {
-            'content': None if lazy else format_html(NUM_WIDGET, num=prodc, text=_('Active products')),
-            'lazy': 'active-products',
-            'display_size': 'small',
-            'priority': 100,
-            'url': reverse('control:event.items', kwargs={
-                'event': sender.slug,
-                'organizer': sender.organizer.slug
-            })
-        },
-    ]
-
-
-@receiver(signal=event_dashboard_widgets)
-def waitinglist_widgets(sender, subevent=None, lazy=False, **kwargs):
-    widgets = []
-
-    wles = WaitingListEntry.objects.filter(event=sender, subevent=subevent, voucher__isnull=True)
-    if wles.exists():
-        if not lazy:
-            quota_cache = {}
-            happy = 0
-            tuples = wles.values('item', 'variation').order_by().annotate(cnt=Count('id'))
-
-            items = {
-                i.pk: i for i in sender.items.filter(id__in=[t['item'] for t in tuples]).prefetch_related(
-                    Prefetch('quotas',
-                             to_attr='_subevent_quotas',
-                             queryset=sender.quotas.using(settings.DATABASE_REPLICA).filter(subevent=subevent)),
-                )
-            }
-            vars = {
-                i.pk: i for i in ItemVariation.objects.filter(
-                    item__event=sender, id__in=[t['variation'] for t in tuples if t['variation']]
-                ).prefetch_related(
-                    Prefetch('quotas',
-                             to_attr='_subevent_quotas',
-                             queryset=sender.quotas.using(settings.DATABASE_REPLICA).filter(subevent=subevent)),
-                )
-            }
-
-            for wlt in tuples:
-                item = items.get(wlt['item'])
-                variation = vars.get(wlt['variation'])
-                if not item:
-                    continue
-                quotas = (
-                    variation._get_quotas(subevent=subevent)
-                    if variation
-                    else item._get_quotas(subevent=subevent)
-                )
-                row = (
-                    variation.check_quotas(subevent=subevent, count_waitinglist=False, _cache=quota_cache)
-                    if variation
-                    else item.check_quotas(subevent=subevent, count_waitinglist=False, _cache=quota_cache)
-                )
-                if row[1] is None:
-                    happy += wlt['cnt']
-                elif row[1] > 0:
-                    happy += min(wlt['cnt'], row[1])
-                    for q in quotas:
-                        if q.size is not None:
-                            quota_cache[q.pk] = (quota_cache[q.pk][0], quota_cache[q.pk][1] - min(wlt['cnt'], row[1]))
-
-        widgets.append({
-            'content': None if lazy else format_html(
-                NUM_WIDGET, num=intcomma(happy), text=_('available to give to people on waiting list')
-            ),
-            'lazy': 'waitinglist-avail',
-            'priority': 50,
-            'url': reverse('control:event.orders.waitinglist', kwargs={
-                'event': sender.slug,
-                'organizer': sender.organizer.slug,
-            })
-        })
-        widgets.append({
-            'content': None if lazy else format_html(
-                NUM_WIDGET, num=intcomma(wles.count()), text=_('total waiting list length')
-            ),
-            'lazy': 'waitinglist-length',
-            'display_size': 'small',
-            'priority': 50,
-            'url': reverse('control:event.orders.waitinglist', kwargs={
-                'event': sender.slug,
-                'organizer': sender.organizer.slug,
-            })
-        })
-
-    return widgets
-
-
-@receiver(signal=event_dashboard_widgets)
-def quota_widgets(sender, subevent=None, lazy=False, **kwargs):
-    widgets = []
-    quotas = sender.quotas.filter(subevent=subevent)
-
-    qa = QuotaAvailability()
-    if quotas:
-        qa.queue(*quotas)
-        qa.compute(allow_cache=True)
-
-    for q in quotas:
-        if not lazy:
-            status, left = qa.results[q] if q in qa.results else q.availability(allow_cache=True)
-        widgets.append({
-            'content': None if lazy else format_html(
-                NUM_WIDGET,
-                num='{}/{}'.format(intcomma(left), intcomma(q.size)) if q.size is not None else '\u221e',
-                text=format_html(_('{quota} left'), quota=q.name)
-            ),
-            'lazy': 'quota-{}'.format(q.pk),
-            'display_size': 'small',
-            'priority': 50,
-            'url': reverse('control:event.items.quotas.show', kwargs={
-                'event': sender.slug,
-                'organizer': sender.organizer.slug,
-                'quota': q.id
-            })
-        })
-    return widgets
-
-
-@receiver(signal=event_dashboard_widgets)
-def shop_state_widget(sender, **kwargs):
-    return [{
-        'display_size': 'small',
-        'priority': 1000,
-        'content': format_html(
-            '<div class="shopstate">{t1}<br><span class="{cls}"><span class="fa {icon}"></span> {state}</span>{t2}</div>',
-            t1=_('Your ticket shop is'), t2=_('Click here to change'),
-            state=_('live') if sender.live and not sender.testmode else (
-                _('live and in test mode') if sender.live else (
-                    _('not yet public') if not sender.testmode else (
-                        _('in private test mode')
-                    )
-                )
-            ),
-            icon='fa-check-circle' if sender.live and not sender.testmode else (
-                'fa-warning' if sender.live else (
-                    'fa-times-circle' if not sender.testmode else (
-                        'fa-times-circle'
-                    )
-                )
-            ),
-            cls='live' if sender.live else 'off'
-        ),
-        'url': reverse('control:event.live', kwargs={
-            'event': sender.slug,
-            'organizer': sender.organizer.slug
-        })
-    }]
-
-
-@receiver(signal=event_dashboard_widgets)
-def checkin_widget(sender, subevent=None, lazy=False, **kwargs):
-    widgets = []
-    qs = sender.checkin_lists.filter(subevent=subevent)
-    for cl in qs:
-        widgets.append({
-            'content': None if lazy else format_html(
-                NUM_WIDGET,
-                num='{}/{}'.format(intcomma(cl.inside_count), intcomma(cl.position_count)),
-                text=format_html(_('Present – {list}'), list=cl.name)
-            ),
-            'lazy': 'checkin-{}'.format(cl.pk),
-            'display_size': 'small',
-            'priority': 50,
-            'url': reverse('control:event.orders.checkinlists.show', kwargs={
-                'event': sender.slug,
-                'organizer': sender.organizer.slug,
-                'list': cl.pk
-            })
-        })
-    return widgets
-
-
-@receiver(signal=event_dashboard_widgets)
-def welcome_wizard_widget(sender, **kwargs):
-    template = get_template('pretixcontrol/event/dashboard_widget_welcome.html')
-    ctx = {
-        'title': _('Welcome to pretix!')
-    }
-    kwargs = {'event': sender.slug, 'organizer': sender.organizer.slug}
-
-    if not sender.items.exists():
-        ctx.update({
-            'subtitle': _('Get started with our setup tool'),
-            'text': _('To start selling tickets, you need to create products or quotas. The fastest way to create '
-                      'this is to use our setup tool.'),
-            'button_text': _('Set up event'),
-            'button_url': reverse('control:event.quick', kwargs=kwargs)
-        })
-    else:
-        return []
-    return [{
-        'display_size': 'full',
-        'priority': 2000,
-        'content': template.render(ctx)
-    }]
+            'count': wles.count,
+        }
+    )


 def build_json_response(widgets):
@@ -353,62 +84,38 @@ def build_json_response(widgets):


 def event_index(request, organizer, event):
-    from pretix.control.forms.event import CommentForm
+    can_view_orders = request.user.has_event_permission(
+        request.organizer,
+        request.event,
+        'event.orders:read',
+        request=request
+    )

-    subevent = None
-    if request.GET.get("subevent", "") != "" and request.event.has_subevents:
-        i = request.GET.get("subevent", "")
-        try:
-            subevent = request.event.subevents.get(pk=i)
-        except SubEvent.DoesNotExist:
-            pass
-
-    can_view_orders = request.user.has_event_permission(request.organizer, request.event, 'event.orders:read',
-                                                        request=request)
-    can_change_event_settings = request.user.has_event_permission(request.organizer, request.event,
-                                                                  'event.settings.general:write', request=request)
-
-    widgets = []
+    stats = []
    if can_view_orders:
-        for r, result in event_dashboard_widgets.send(sender=request.event, subevent=subevent, lazy=True):
-            widgets.extend(result)
+        for r, result in event_dashboard_statistics.send(sender=request.event, request=request):
+            stats.append(result)

    ctx = {
-        'widgets': rearrange(widgets),
-        'subevent': subevent,
-        'comment_form': CommentForm(initial={'comment': request.event.comment}, readonly=not can_change_event_settings),
+        'stats': format_html_join("", "{}", [(s,) for s in stats]),
    }

-    ctx['timeline'] = [
-        {
-            'date': t.datetime.astimezone(request.event.timezone).date(),
-            'entry': t,
-            'time': t.datetime.astimezone(request.event.timezone)
-        }
-        for t in timeline_for_event(request.event, subevent)
-    ]
+    if not request.event.has_subevents:
+        ctx['timeline'] = [
+            {
+                'date': t.datetime.astimezone(request.event.timezone).date(),
+                'entry': t,
+                'time': t.datetime.astimezone(request.event.timezone)
+            }
+            for t in timeline_for_event(request.event, None)
+        ]
    ctx['today'] = now().astimezone(request.event.timezone).date()
    ctx['nearly_now'] = now().astimezone(request.event.timezone) - timedelta(seconds=20)
+    ctx['has_checkin_widgets'] = not request.event.has_subevents or request.event.checkin_lists.filter(subevent=None).exists()
    resp = render(request, 'pretixcontrol/event/index.html', ctx)
    return resp


-def event_index_widgets_lazy(request, organizer, event):
-    subevent = None
-    if request.GET.get("subevent", "") != "" and request.event.has_subevents:
-        i = request.GET.get("subevent", "")
-        try:
-            subevent = request.event.subevents.get(pk=i)
-        except SubEvent.DoesNotExist:
-            pass
-
-    widgets = []
-    for r, result in event_dashboard_widgets.send(sender=request.event, subevent=subevent, lazy=False):
-        widgets.extend(result)
-
-    return build_json_response(widgets)
-
-
 def event_index_warnings_lazy(request, organizer, event):
    can_view_orders = request.user.has_event_permission(request.organizer, request.event, 'event.orders:read',
                                                        request=request)
@@ -445,6 +152,32 @@ def event_index_warnings_lazy(request, organizer, event):
    )


+def event_index_quotas_lazy(request, organizer, event):
+    if request.event.has_subevents:
+        raise Http404()
+
+    quotas = request.event.quotas.filter(subevent=None)[:10]
+    prepare_quotas_for_boxes(quotas)
+    return render(
+        request,
+        'pretixcontrol/event/dashboard_partial_quotas.html',
+        {
+            'quotas': quotas,
+        }
+    )
+
+
+def event_index_checkin_lazy(request, organizer, event):
+    lists = request.event.checkin_lists.filter(subevent=None)[:10]
+    return render(
+        request,
+        'pretixcontrol/event/dashboard_partial_checkin.html',
+        {
+            'lists': lists,
+        }
+    )
+
+
 def event_index_log_lazy(request, organizer, event):
    qs = request.event.logentry_set.all().select_related('user', 'content_type', 'api_token', 'oauth_application',
                                                         'device').order_by('-datetime')
@@ -163,6 +163,9 @@ class DiscountCreate(EventPermissionRequiredMixin, CreateView):
            i = modelcopy(self.copy_from)
            i.pk = None
            kwargs['instance'] = i
+            kwargs["initial"]["limit_sales_channels"] = self.copy_from.limit_sales_channels.all()
+            kwargs["initial"]["condition_limit_products"] = self.copy_from.condition_limit_products.all()
+            kwargs["initial"]["benefit_limit_products"] = self.copy_from.benefit_limit_products.all()
        else:
            kwargs['instance'] = Discount(event=self.request.event)

@@ -57,10 +57,9 @@ from django.db import transaction
 from django.db.models import Count, ProtectedError
 from django.forms import inlineformset_factory
 from django.http import (
-    Http404, HttpResponse, HttpResponseBadRequest, HttpResponseNotAllowed,
-    JsonResponse,
+    Http404, HttpResponse, HttpResponseBadRequest, JsonResponse,
 )
-from django.shortcuts import redirect
+from django.shortcuts import redirect, render
 from django.urls import NoReverseMatch, reverse
 from django.utils.functional import cached_property
 from django.utils.html import conditional_escape, format_html
@@ -1299,24 +1298,23 @@ class EventLog(EventPermissionRequiredMixin, PaginationMixin, ListView):
        return LogFilterForm(data=self.request.GET, organizer=self.request.organizer)


-class EventComment(EventPermissionRequiredMixin, View):
+class EventComment(EventPermissionRequiredMixin, UpdateView):
    permission = 'event.settings.general:write'
+    form_class = CommentForm
+    template_name = 'pretixcontrol/event/dashboard_partial_comment_form.html'

-    def post(self, *args, **kwargs):
-        form = CommentForm(self.request.POST)
-        if form.is_valid():
-            self.request.event.comment = form.cleaned_data.get('comment')
-            self.request.event.save()
-            self.request.event.log_action('pretix.event.comment', user=self.request.user, data={
-                'new_comment': form.cleaned_data.get('comment')
-            })
-            messages.success(self.request, _('The comment has been updated.'))
-        else:
-            messages.error(self.request, _('Could not update the comment.'))
-        return redirect(self.get_success_url())
+    def get_object(self, queryset=None):
+        return self.request.event

-    def get(self, *args, **kwargs):
-        return HttpResponseNotAllowed(['POST'])
+    def form_valid(self, form):
+        form.save()
+        self.request.event.log_action('pretix.event.comment', user=self.request.user, data={
+            'new_comment': form.cleaned_data.get('comment')
+        })
+        return render(
+            self.request,
+            'pretixcontrol/event/dashboard_partial_comment.html',
+        )

    def get_success_url(self) -> str:
        return reverse('control:event.index', kwargs={
@@ -52,13 +52,13 @@ from pretix.base.forms import SafeSessionWizardView
 from pretix.base.i18n import language
 from pretix.base.models import Event, EventMetaValue, Organizer, Quota, Team
 from pretix.base.models.organizer import TeamQuerySet
-from pretix.base.services.quotas import QuotaAvailability
 from pretix.control.forms.event import (
    EventWizardBasicsForm, EventWizardCopyForm, EventWizardFoundationForm,
 )
 from pretix.control.forms.filter import EventFilterForm
 from pretix.control.permissions import OrganizerPermissionRequiredMixin
 from pretix.control.views import PaginationMixin
+from pretix.control.views.utils import prepare_quotas_for_boxes


 class EventList(PaginationMixin, ListView):
@@ -117,19 +117,7 @@ class EventList(PaginationMixin, ListView):
            s.first_quotas = s.first_quotas[:4]
            quotas += list(s.first_quotas)

-        qa = QuotaAvailability(early_out=False)
-        for q in quotas:
-            qa.queue(q)
-        qa.compute()
-
-        for q in quotas:
-            q.cached_avail = qa.results[q]
-            q.cached_availability_paid_orders = qa.count_paid_orders.get(q, 0)
-            if q.size is not None:
-                q.percent_paid = min(
-                    100,
-                    round(q.cached_availability_paid_orders / q.size * 100) if q.size > 0 else 100
-                )
+        prepare_quotas_for_boxes(quotas)
        return ctx

    @cached_property
@@ -1177,6 +1177,8 @@ class OrderRefundView(OrderView):
        manual_value = formats.sanitize_separators(manual_value)
        try:
            manual_value = Decimal(manual_value)
+            if manual_value < Decimal("0.00"):
+                raise TypeError("Please do not use negative numbers")
        except (DecimalException, TypeError):
            messages.error(self.request, _('You entered an invalid number.'))
            is_valid = False
@@ -1206,6 +1208,8 @@ class OrderRefundView(OrderView):
        giftcard_value = formats.sanitize_separators(giftcard_value)
        try:
            giftcard_value = Decimal(giftcard_value)
+            if giftcard_value < Decimal("0.00"):
+                raise TypeError("Please do not use negative numbers")
        except (DecimalException, TypeError):
            messages.error(self.request, _('You entered an invalid number.'))
            is_valid = False
@@ -1255,6 +1259,8 @@ class OrderRefundView(OrderView):
        offsetting_value = formats.sanitize_separators(offsetting_value)
        try:
            offsetting_value = Decimal(offsetting_value)
+            if offsetting_value < Decimal("0.00"):
+                raise TypeError("Please do not use negative numbers")
        except (DecimalException, TypeError):
            messages.error(self.request, _('You entered an invalid number.'))
            is_valid = False
@@ -1271,6 +1277,9 @@ class OrderRefundView(OrderView):
                    if offset_order.event.currency != self.request.event.currency:
                        messages.error(self.request, _('You entered an order in an event with a different currency.'))
                        is_valid = False
+                    if not self.request.user.has_event_permission(self.request.organizer, offset_order.event, 'event.orders:write', request=self.request):
+                        messages.error(self.request, _('You entered an order in an event that you do not have access to.'))
+                        is_valid = False
                    refunds.append(OrderRefund(
                        order=order,
                        payment=None,
@@ -1286,10 +1295,13 @@ class OrderRefundView(OrderView):
                    ))

        for identifier, prov in self.request.event.get_payment_providers().items():
+            # prof = process form, not a typo for prov(ider)
            prof_value = self.request.POST.get(f'newrefund-{identifier}', '0') or '0'
            prof_value = formats.sanitize_separators(prof_value)
            try:
                prof_value = Decimal(prof_value)
+                if prof_value < Decimal("0.00"):
+                    raise TypeError("Please do not use negative numbers")
            except (DecimalException, TypeError):
                messages.error(self.request, _('You entered an invalid number.'))
                is_valid = False
@@ -1313,6 +1325,8 @@ class OrderRefundView(OrderView):
            value = formats.sanitize_separators(value)
            try:
                value = Decimal(value)
+                if value < Decimal("0.00"):
+                    raise TypeError("Please do not use negative numbers")
            except (DecimalException, TypeError):
                messages.error(self.request, _('You entered an invalid number.'))
                is_valid = False
@@ -1342,7 +1356,12 @@ class OrderRefundView(OrderView):
                    ))

        any_success = False
-        if refund_selected == full_refund and is_valid:
+        if refund_selected != full_refund:
+            messages.error(self.request, _('The refunds you selected do not match the selected total refund '
+                                           'amount.'))
+            is_valid = False
+
+        if is_valid:
            for r in refunds:
                r.save()
                order.log_action('pretix.event.order.refund.created', {
@@ -1414,9 +1433,6 @@ class OrderRefundView(OrderView):
                            )
                        }))
            return redirect(self.get_order_url())
-        else:
-            messages.error(self.request, _('The refunds you selected do not match the selected total refund '
-                                           'amount.'))

    def post(self, *args, **kwargs):
        if self.start_form.is_valid():
@@ -1646,7 +1662,8 @@ class OrderCheckVATID(OrderView):
                return redirect(self.get_order_url())

            try:
-                normalized_id = validate_vat_id(ia.vat_id, str(ia.country))
+                requester_id = self.request.event.settings.invoice_address_from_vat_id
+                normalized_id = validate_vat_id(ia.vat_id, str(ia.country), requester_id)
                with transaction.atomic():
                    ia.vat_id_validated = True
                    ia.vat_id = normalized_id
@@ -778,9 +778,9 @@ class OrganizerPluginEvents(OrganizerDetailViewMixin, OrganizerPermissionRequire

    def get_form_kwargs(self):
        kwargs = super().get_form_kwargs()
-        kwargs["events"] = self.request.user.get_events_with_permission(
-            "event.settings.general:write", request=self.request
-        ).filter(organizer=self.request.organizer)
+        # Assumption: Who has access to modify organizer settings may see all events and disable/enable plugins
+        # for them. Otherwise, inconsistent situations occur.
+        kwargs["events"] = self.request.organizer.events.all()
        kwargs["initial"] = {
            "events": self.request.organizer.events.filter(plugins__regex='(^|,)' + self.plugin.module + '(,|$)')
        }
@@ -2202,7 +2202,7 @@ class ExportView(OrganizerPermissionRequiredMixin, ExportMixin, ListView):
                owner=self.request.user,
                timezone=str(get_current_timezone()),
            )
-        if not self.scheduled:
+        if not self.scheduled and not self.scheduled_copy_from:
            initial = {
                "mail_subject": gettext("Export: {title}").format(title=self.exporter.verbose_name),
                "mail_template": gettext(
@@ -27,6 +27,7 @@ from decimal import Decimal
 from io import BytesIO

 from django.conf import settings
+from django.core.exceptions import PermissionDenied
 from django.core.files import File
 from django.core.files.base import ContentFile
 from django.core.files.storage import default_storage
@@ -193,6 +194,7 @@ class BaseEditorView(EventPermissionRequiredMixin, TemplateView):
            c.expires = now() + timedelta(days=7)
            c.date = now()
            c.filename = 'background_preview.pdf'
+            c.bind_to_session(request, "ticketoutput-pdf-background")
            c.type = 'application/pdf'
            c.save()
            c.file.save('empty.pdf', ContentFile(buffer.read()))
@@ -218,6 +220,7 @@ class BaseEditorView(EventPermissionRequiredMixin, TemplateView):
            c.expires = now() + timedelta(days=7)
            c.date = now()
            c.filename = 'background_preview.pdf'
+            c.bind_to_session(request, "ticketoutput-pdf-background")
            c.type = 'application/pdf'
            c.file = fileobj
            c.save()
@@ -303,5 +306,7 @@ class FontsCSSView(TemplateView):
 class PdfView(TemplateView):
    def get(self, request, *args, **kwargs):
        cf = get_object_or_404(CachedFile, id=kwargs.get("filename"), filename="background_preview.pdf")
+        if not cf.allowed_for_session(request, "ticketoutput-pdf-background"):
+            raise PermissionDenied()
        resp = FileResponse(cf.file, filename=cf.filename, content_type='application/pdf')
        return resp
@@ -69,6 +69,7 @@ from pretix.base.models.orders import CancellationRequest
 from pretix.base.reldate import RelativeDate, RelativeDateWrapper
 from pretix.base.services import tickets
 from pretix.base.services.quotas import QuotaAvailability
+from pretix.base.timeline import timeline_for_event
 from pretix.base.views.tasks import AsyncFormView
 from pretix.control.forms.checkin import SimpleCheckinListForm
 from pretix.control.forms.filter import SubEventFilterForm
@@ -83,6 +84,7 @@ from pretix.control.permissions import EventPermissionRequiredMixin
 from pretix.control.signals import subevent_forms
 from pretix.control.views import PaginationMixin
 from pretix.control.views.event import MetaDataEditorMixin
+from pretix.control.views.utils import prepare_quotas_for_boxes
 from pretix.helpers import GroupConcat
 from pretix.helpers.compat import CompatDeleteView
 from pretix.helpers.i18n import get_format_without_seconds
@@ -144,19 +146,7 @@ class SubEventList(EventPermissionRequiredMixin, PaginationMixin, SubEventQueryM
            s.first_quotas = s.first_quotas[:4]
            quotas += list(s.first_quotas)

-        qa = QuotaAvailability(early_out=False)
-        for q in quotas:
-            qa.queue(q)
-        qa.compute()
-
-        for q in quotas:
-            q.cached_avail = qa.results[q]
-            q.cached_availability_paid_orders = qa.count_paid_orders.get(q, 0)
-            if q.size is not None:
-                q.percent_paid = min(
-                    100,
-                    round(q.cached_availability_paid_orders / q.size * 100) if q.size > 0 else 100
-                )
+        prepare_quotas_for_boxes(quotas)
        return ctx


@@ -566,6 +556,17 @@ class SubEventDetail(EventPermissionRequiredMixin, DetailView):
        for quota in ctx["quotas"]:
            quota.cached_avail = qa.results[quota]

+        ctx['timeline'] = [
+            {
+                'date': t.datetime.astimezone(self.request.event.timezone).date(),
+                'entry': t,
+                'time': t.datetime.astimezone(self.request.event.timezone)
+            }
+            for t in timeline_for_event(self.request.event, self.object)
+        ]
+        ctx['today'] = now().astimezone(self.request.event.timezone).date()
+        ctx['nearly_now'] = now().astimezone(self.request.event.timezone) - timedelta(seconds=20)
+
        return super().get_context_data(
            **kwargs,
            **ctx,
@@ -1276,6 +1277,11 @@ class SubEventBulkEdit(SubEventQueryMixin, EventPermissionRequiredMixin, FormVie
            self._default_meta = self.request.event.meta_data

        for p in self.request.organizer.meta_properties.all():
+            if p.protected and not self.request.user.has_organizer_permission(
+                    self.request.organizer, 'organizer.settings.general:write', request=self.request
+            ):
+                continue
+
            inst = SubEventMetaValue(property=p)
            if len(matches[p.id]) == 1 and matches[p.id][0]['c'] == total:
                inst.value = matches[p.id][0]['value']
@@ -59,6 +59,7 @@ from django.utils.translation import gettext_lazy as _
 from django.views import View
 from django.views.decorators.cache import never_cache
 from django.views.generic import FormView, ListView, TemplateView, UpdateView
+from django_otp import devices_for_user
 from django_otp.plugins.otp_static.models import StaticDevice
 from django_otp.plugins.otp_totp.models import TOTPDevice
 from django_scopes import scopes_disabled
@@ -85,7 +86,6 @@ from pretix.helpers.ratelimit import rate_limit, rate_limit_reset
 from pretix.helpers.security import session_reauth
 from pretix.helpers.u2f import websafe_encode

-REAL_DEVICE_TYPES = (TOTPDevice, WebAuthnDevice, U2FDevice)
 logger = logging.getLogger(__name__)


@@ -313,17 +313,7 @@ class User2FAMainView(RecentAuthenticationRequiredMixin, TemplateView):
        except StaticDevice.DoesNotExist:
            ctx['static_tokens_device'] = None

-        ctx['devices'] = []
-        for dt in REAL_DEVICE_TYPES:
-            objs = list(dt.objects.filter(user=self.request.user, confirmed=True))
-            for obj in objs:
-                if dt == TOTPDevice:
-                    obj.devicetype = 'totp'
-                elif dt == U2FDevice:
-                    obj.devicetype = 'u2f'
-                elif dt == WebAuthnDevice:
-                    obj.devicetype = 'webauthn'
-            ctx['devices'] += objs
+        ctx['devices'] = [d for d in devices_for_user(self.request.user) if not isinstance(d, StaticDevice)]

        ctx['obligatory'] = None
        if settings.PRETIX_OBLIGATORY_2FA is True:
@@ -342,9 +332,9 @@ class User2FADeviceAddView(RecentAuthenticationRequiredMixin, FormView):
    template_name = 'pretixcontrol/user/2fa_add.html'

    def form_valid(self, form):
-        if form.cleaned_data['devicetype'] == 'totp':
+        if form.cleaned_data['devicetype'] == 'otp_totp.totpdevice':
            dev = TOTPDevice.objects.create(user=self.request.user, confirmed=False, name=form.cleaned_data['name'])
-        elif form.cleaned_data['devicetype'] == 'webauthn':
+        elif form.cleaned_data['devicetype'] == 'pretixbase.webauthndevice':
            if not self.request.is_secure():
                messages.error(self.request,
                               _('Security devices are only available if pretix is served via HTTPS.'))
@@ -364,11 +354,11 @@ class User2FADeviceDeleteView(RecentAuthenticationRequiredMixin, TemplateView):

    @cached_property
    def device(self):
-        if self.kwargs['devicetype'] == 'totp':
+        if self.kwargs['devicetype'] == 'otp_totp.totpdevice':
            return get_object_or_404(TOTPDevice, user=self.request.user, pk=self.kwargs['device'], confirmed=True)
-        elif self.kwargs['devicetype'] == 'webauthn':
+        elif self.kwargs['devicetype'] == 'pretixbase.webauthndevice':
            return get_object_or_404(WebAuthnDevice, user=self.request.user, pk=self.kwargs['device'], confirmed=True)
-        elif self.kwargs['devicetype'] == 'u2f':
+        elif self.kwargs['devicetype'] == 'pretixbase.u2fdevice':
            return get_object_or_404(U2FDevice, user=self.request.user, pk=self.kwargs['device'], confirmed=True)

    def get_context_data(self, **kwargs):
@@ -386,7 +376,7 @@ class User2FADeviceDeleteView(RecentAuthenticationRequiredMixin, TemplateView):
        msgs = [
            _('A two-factor authentication device has been removed from your account.')
        ]
-        if not any(dt.objects.filter(user=self.request.user, confirmed=True) for dt in REAL_DEVICE_TYPES):
+        if not any(d.confirmed for d in devices_for_user(self.request.user) if not isinstance(d, StaticDevice)):
            self.request.user.require_2fa = False
            self.request.user.save()
            self.request.user.log_action('pretix.user.settings.2fa.disabled', user=self.request.user)
@@ -461,7 +451,7 @@ class User2FADeviceConfirmWebAuthnView(RecentAuthenticationRequiredMixin, Templa
            ).first()
            if credential_id_exists:
                messages.error(request, _('This security device is already registered.'))
-                return redirect(reverse('control:user.settings.2fa.confirm.webauthn', kwargs={
+                return redirect(reverse('control:user.settings.2fa.confirm.pretixbase.webauthndevice', kwargs={
                    'device': self.device.pk
                }))

@@ -475,7 +465,7 @@ class User2FADeviceConfirmWebAuthnView(RecentAuthenticationRequiredMixin, Templa
            self.device.save()
            self.request.user.log_action('pretix.user.settings.2fa.device.added', user=self.request.user, data={
                'id': self.device.pk,
-                'devicetype': 'u2f',
+                'devicetype': 'pretixbase.webauthndevice',
                'name': self.device.name,
            })
            notices = [
@@ -503,7 +493,7 @@ class User2FADeviceConfirmWebAuthnView(RecentAuthenticationRequiredMixin, Templa
        except Exception:
            messages.error(request, _('The registration could not be completed. Please try again.'))
            logger.exception('WebAuthn registration failed')
-            return redirect(reverse('control:user.settings.2fa.confirm.webauthn', kwargs={
+            return redirect(reverse('control:user.settings.2fa.confirm.pretixbase.webauthndevice', kwargs={
                'device': self.device.pk
            }))

@@ -537,7 +527,7 @@ class User2FADeviceConfirmTOTPView(RecentAuthenticationRequiredMixin, TemplateVi
            self.request.user.log_action('pretix.user.settings.2fa.device.added', user=self.request.user, data={
                'id': self.device.pk,
                'name': self.device.name,
-                'devicetype': 'totp'
+                'devicetype': 'otp_totp.totpdevice'
            })
            notices = [
                _('A new two-factor authentication device has been added to your account.')
@@ -563,7 +553,7 @@ class User2FADeviceConfirmTOTPView(RecentAuthenticationRequiredMixin, TemplateVi
        else:
            messages.error(request, _('The code you entered was not valid. If this problem persists, please check '
                                      'that the date and time of your phone are configured correctly.'))
-            return redirect(reverse('control:user.settings.2fa.confirm.totp', kwargs={
+            return redirect(reverse('control:user.settings.2fa.confirm.otp_totp.totpdevice', kwargs={
                'device': self.device.pk
            }))

@@ -594,7 +584,7 @@ class User2FAEnableView(RecentAuthenticationRequiredMixin, TemplateView):
    template_name = 'pretixcontrol/user/2fa_enable.html'

    def dispatch(self, request, *args, **kwargs):
-        if not any(dt.objects.filter(user=self.request.user, confirmed=True) for dt in REAL_DEVICE_TYPES):
+        if not any(d.confirmed for d in devices_for_user(self.request.user) if not isinstance(d, StaticDevice)):
            messages.error(request, _('Please configure at least one device before enabling two-factor '
                                      'authentication.'))
            return redirect(reverse('control:user.settings.2fa'))
@@ -956,7 +946,7 @@ class UserEmailConfirmView(FormView):

    @transaction.atomic()
    def form_valid(self, form):
-        reason = self.request.GET['reason']
+        reason = self.request.GET.get('reason')
        if reason not in ('email_change', 'email_verify'):
            raise PermissionDenied
        try:
@@ -40,6 +40,7 @@ from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 from django.views import View
 from django.views.generic import ListView, TemplateView
+from django_otp import devices_for_user
 from django_otp.plugins.otp_static.models import StaticDevice
 from hijack import signals

@@ -107,6 +108,9 @@ class UserEditView(AdministratorPermissionRequiredMixin, RecentAuthenticationReq
        ctx['backend'] = (
            b[self.object.auth_backend].verbose_name if self.object.auth_backend in b else self.object.auth_backend
        )
+
+        ctx['devices'] = devices_for_user(self.object)
+
        return ctx

    def get_success_url(self):
@@ -183,6 +187,25 @@ class UserEmergencyTokenView(AdministratorPermissionRequiredMixin, RecentAuthent
        return reverse('control:users.edit', kwargs=self.kwargs)


+class Reset2FADriftThrottleView(AdministratorPermissionRequiredMixin, RecentAuthenticationRequiredMixin, View):
+
+    def get(self, request, *args, **kwargs):
+        return redirect(reverse('control:users.edit', kwargs=self.kwargs))
+
+    def post(self, request, *args, **kwargs):
+        self.object = get_object_or_404(User, pk=self.kwargs.get("id"))
+        self.object.totpdevice_set.update(drift=0, throttling_failure_timestamp=None, throttling_failure_count=0)
+        self.object.staticdevice_set.update(throttling_failure_timestamp=None, throttling_failure_count=0)
+        self.object.log_action('pretix.user.settings.2fa.resetdrift', user=self.request.user)
+        messages.success(request, _(
+            'The drift values for TOTP devices have been reset.'
+        ))
+        return redirect(self.get_success_url())
+
+    def get_success_url(self):
+        return reverse('control:users.edit', kwargs=self.kwargs)
+
+
 class UserAnonymizeView(AdministratorPermissionRequiredMixin, RecentAuthenticationRequiredMixin, TemplateView):
    template_name = "pretixcontrol/users/anonymize.html"

@@ -19,15 +19,33 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
+from pretix.base.services.quotas import QuotaAvailability

-# This file is based on an earlier version of pretix which was released under the Apache License 2.0. The full text of
-# the Apache License 2.0 can be obtained at <http://www.apache.org/licenses/LICENSE-2.0>.
-#
-# This file may have since been changed and any changes are released under the terms of AGPLv3 as described above. A
-# full history of changes and contributors is available at <https://github.com/pretix/pretix>.
-#
-# This file contains Apache-licensed contributions copyrighted by: Tobias Kunze
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under the License.
+
+def prepare_quotas_for_boxes(quotas):
+    qa = QuotaAvailability(early_out=False)
+    for q in quotas:
+        qa.queue(q)
+    qa.compute()
+
+    for q in quotas:
+        q.cached_avail = qa.results[q]
+        q.cached_availability_paid_orders = qa.count_paid_orders.get(q, 0)
+        q.used = (
+            qa.count_paid_orders.get(q, 0) +
+            qa.count_pending_orders.get(q, 0) +
+            qa.count_exited_orders.get(q, 0) +
+            qa.count_vouchers.get(q, 0) +
+            qa.count_waitinglist.get(q, 0) +
+            qa.count_cart.get(q, 0)
+        )
+        if q.size is not None:
+            other_blocked = q.size - q.cached_availability_paid_orders - q.cached_avail[1]
+            q.percent_paid = min(
+                100,
+                round(q.cached_availability_paid_orders / q.size * 100) if q.size > 0 else 100
+            )
+            q.percent_other = min(
+                100,
+                round(other_blocked / q.size * 100) if q.size > 0 else 100
+            )
@@ -144,7 +144,7 @@ class VoucherList(VoucherQueryMixin, PaginationMixin, EventPermissionRequiredMix
        headers = [
            _('Voucher code'), _('Valid until'), _('Product'), _('Reserve quota'), _('Bypass quota'),
            _('Price effect'), _('Value'), _('Tag'), _('Redeemed'), _('Maximum usages'), _('Seat'),
-            _('Comment')
+            _('Comment'), _('Budget'), _('Budget used')
        ]
        writer.writerow(headers)

@@ -170,7 +170,9 @@ class VoucherList(VoucherQueryMixin, PaginationMixin, EventPermissionRequiredMix
                str(v.redeemed),
                str(v.max_usages),
                str(v.seat) if v.seat else "",
-                str(v.comment) if v.comment else ""
+                str(v.comment) if v.comment else "",
+                str(v.budget) if v.budget is not None else "",
+                str(v.budget_used) if v.budget is not None else "",
            ]
            writer.writerow(row)

@@ -20,8 +20,6 @@
 # <https://www.gnu.org/licenses/>.
 #
 import contextlib
-import logging
-import os

 from django.conf import settings
 from django.contrib.postgres.indexes import BrinIndex
@@ -32,8 +30,6 @@ from django.db.models import (
 )
 from django.utils.functional import lazy

-logger = logging.getLogger(__name__)
-

 class DummyRollbackException(Exception):
    pass
@@ -292,23 +288,6 @@ def get_deterministic_ordering(model, ordering):
    return ordering


-@contextlib.contextmanager
-def ensure_no_queries():
-    """
-    Ensures that no database queries are being made in that context.
-    Raises a RuntimeError if running in DEBUG mode, otherwise logs
-    an error.
-    :return:
-    """
-    def blocker(*args, **kwargs):
-        if settings.DEBUG or "PYTEST_CURRENT_TEST" in os.environ and "ENSURE_NO_QUERIES_OVERRIDE" not in os.environ:
-            raise RuntimeError(f"Unexpected DB query: {args[1]}")
-        logger.error("Unexpected DB query: %s", args[1])
-
-    with connection.execute_wrapper(blocker):
-        yield
-
-
@contextlib.contextmanager
 def conditional_atomic(do_atomic, **kwargs):
    if do_atomic:
--- a/Show More
+++ b/Show More