Fix header and info display

Add quota capacity indicator tag
Show quota use in table
2024-01-23 18:05:36 +01:00 · 2024-01-22 16:39:03 +01:00 · 2024-01-22 16:39:03 +01:00 · 2024-01-22 16:39:03 +01:00 · 2024-01-22 16:39:03 +01:00 · 2024-01-22 16:39:03 +01:00
353 changed files with 166078 additions and 162943 deletions
@@ -276,7 +276,8 @@ Restarting the service can take a few seconds, especially if the update requires
 Replace ``stable`` above with a specific version number like ``1.0`` or with ``latest`` for the development
 version, if you want to.

-Make sure to also read :ref:`update_notes` and the release notes of the version you are updating to.
+Make sure to also read :ref:`update_notes` and the release notes of the version you are updating to. Pay special
+attention to the "Runtime and server environment" section of all release notes between your current and new version.

 .. _`docker_plugininstall`:

@@ -286,7 +286,8 @@ To upgrade to a new pretix release, pull the latest code changes and run the fol
    (venv)$ python -m pretix updatestyles
    # systemctl restart pretix-web pretix-worker

-Make sure to also read :ref:`update_notes` and the release notes of the version you are updating to.
+Make sure to also read :ref:`update_notes` and the release notes of the version you are updating to. Pay special
+attention to the "Runtime and server environment" section of all release notes between your current and new version.

 .. _`manual_plugininstall`:

@@ -47,5 +47,30 @@ Or, with a docker installation::

    $ docker exec -it pretix.service pretix create_order_transactions

+Upgrade to 2023.6.0 or newer
+""""""""""""""""""""""""""""
+
+MariaDB and MySQL are no longer supported.
+
+Upgrade to 2023.8.0 or newer
+""""""""""""""""""""""""""""
+
+PostgreSQL 11 is now required.
+
+Upgrade to 2023.9.0 or newer
+""""""""""""""""""""""""""""
+
+This release includes a migration that changes the `id` column of all core database tables from `integer`
+to `bigint`. If you have a large database, the migration step of the upgrade might take significantly longer than
+usual, so plan the update accordingly.
+
+The default value for the `registration` setting in `pretix.cfg` has changed to `false`.
+
+Upgrade to 2023.10.0 or newer
+"""""""""""""""""""""""""""""
+
+This release includes a migration that changes retroactively fills an `organizer` column in the table
+`pretixbase_logentry`. If you have a large database, the migration step of the upgrade might take significantly
+longer than usual, so plan the update accordingly.

 .. _blog: https://pretix.eu/about/en/blog/
@@ -31,6 +31,7 @@ Checking a ticket in
   This endpoint supports passing multiple check-in lists to perform a multi-event scan. However, each check-in list
   passed needs to be from a distinct event.

+   :query string expand: Expand a field inside the ``position`` object into a full object. Currently ``subevent``, ``item``, ``variation``, and ``answers.question`` are supported. Can be passed multiple times.
   :<json string secret: Scanned QR code corresponding to the ``secret`` attribute of a ticket.
   :<json string source_type: Type of source the ``secret`` was obtained form. Defaults to ``"barcode"``.
   :<json array lists: List of check-in list IDs to search on. No two check-in lists may be from the same event.
@@ -63,6 +64,7 @@ Checking a ticket in
                           ``checkin_attention`` flag set. (3) If ``attendee_name`` is empty, it may automatically fall
                           back to values from a parent product or from invoice addresses.
   :>json boolean require_attention: Whether or not the ``require_attention`` flag is set on the item or order.
+   :>json list checkin_texts: List of additional texts to show to the user.
   :>json object list: Excerpt of information about the matching :ref:`check-in list <rest-checkinlists>` (if any was found),
                       including the attributes ``id``, ``name``, ``event``, ``subevent``, and ``include_pending``.
   :>json object questions: List of questions to be answered for check-in, only set on status ``"incomplete"``.
@@ -103,6 +105,7 @@ Checking a ticket in
          …
        },
        "require_attention": false,
+        "checkin_texts": [],
        "list": {
          "id": 1,
          "name": "Default check-in list",
@@ -125,6 +128,7 @@ Checking a ticket in
          …
        },
        "require_attention": false,
+        "checkin_texts": [],
        "list": {
          "id": 1,
          "name": "Default check-in list",
@@ -142,6 +146,7 @@ Checking a ticket in
            "position": 1,
            "identifier": "WY3TP9SL",
            "ask_during_checkin": true,
+            "show_during_checkin": true,
            "options": [
              {
                "id": 1,
@@ -178,7 +183,8 @@ Checking a ticket in
        "status": "error",
        "reason": "invalid",
        "reason_explanation": null,
-        "require_attention": false
+        "require_attention": false,
+        "checkin_texts": []
      }

   **Example error response (known, but invalid ticket)**:
@@ -193,6 +199,7 @@ Checking a ticket in
        "reason": "unpaid",
        "reason_explanation": null,
        "require_attention": false,
+        "checkin_texts": [],
        "list": {
          "id": 1,
          "name": "Default check-in list",
@@ -217,6 +224,7 @@ Checking a ticket in
   * ``rules`` - Check-in prevented by a user-defined rule.
   * ``ambiguous`` - Multiple tickets match scan, rejected.
   * ``revoked`` - Ticket code has been revoked.
+   * ``unapproved`` - Order has not yet been approved.
   * ``error`` - Internal error.

   In case of reason ``rules`` and ``invalid_time``, there might be an additional response field ``reason_explanation``
@@ -498,7 +498,7 @@ Order position endpoints
                           ``attendee_name,positionid``
   :query string order: Only return positions of the order with the given order code
   :query string search: Fuzzy search matching the attendee name, order code, invoice address name as well as to the beginning of the secret.
-   :query string expand: Expand a field into a full object. Currently only ``subevent``, ``item``, and ``variation`` are supported. Can be passed multiple times.
+   :query string expand: Expand a field into a full object. Currently ``subevent``, ``item``, ``variation``, and ``answers.question`` are supported. Can be passed multiple times.
   :query integer item: Only return positions with the purchased item matching the given ID.
   :query integer item__in: Only return positions with the purchased item matching one of the given comma-separated IDs.
   :query integer variation: Only return positions with the purchased item variation matching the given ID.
@@ -632,7 +632,8 @@ Order position endpoints
                                       set this to ``false``. In that case, questions will just be ignored. Defaults
                                       to ``true``.
   :<json boolean canceled_supported: When this parameter is set to ``true``, the response code ``canceled`` may be
-                                      returned. Otherwise, canceled orders will return ``unpaid``.
+                                      returned. Otherwise, canceled orders will return ``unpaid``. (**Deprecated**, in
+                                      the future, this will be ignored and ``canceled`` may always be returned.)
   :<json datetime datetime: Specifies the datetime of the check-in. If not supplied, the current time will be used.
   :<json boolean force: Specifies that the check-in should succeed regardless of revoked barcode, previous check-ins or required
                         questions that have not been filled. This is usually used to upload offline scans that already happened,
@@ -706,6 +707,7 @@ Order position endpoints
            "position": 1,
            "identifier": "WY3TP9SL",
            "ask_during_checkin": true,
+            "show_during_checkin": true,
            "options": [
              {
                "id": 1,
@@ -758,6 +760,7 @@ Order position endpoints
   * ``rules`` - Check-in prevented by a user-defined rule.
   * ``ambiguous`` - Multiple tickets match scan, rejected.
   * ``revoked`` - Ticket code has been revoked.
+   * ``unapproved`` - Order has not yet been approved.

   In case of reason ``rules`` or ``invalid_time``, there might be an additional response field ``reason_explanation``
   with a human-readable description of the violated rules. However, that field can also be missing or be ``null``.
@@ -343,8 +343,8 @@ Endpoints
   Creates a new event with properties as set in the request body. The properties that are copied are: ``is_public``,
   ``testmode``, ``has_subevents``, settings, plugin settings, items, variations, add-ons, quotas, categories, tax rules, questions.

-   If the ``plugins``, ``has_subevents`` and/or ``is_public`` fields are present in the post body this will determine their
-   value. Otherwise their value will be copied from the existing event.
+   If the ``plugins``, ``has_subevents``, ``meta_data`` and/or ``is_public`` fields are present in the post body this will
+   determine their  value. Otherwise their value will be copied from the existing event.

   Please note that you can only copy from events under the same organizer this way. Use the ``clone_from`` parameter
   when creating a new event for this instead.
@@ -565,6 +565,8 @@ organizer level.
 .. warning:: This API is intended for advanced users. Even though we take care to validate your input, you will be
             able to break your event using this API by creating situations of conflicting settings. Please take care.

+.. note:: When authenticating with :ref:`rest-deviceauth`, only a limited subset of settings is available.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/settings/

   Get current values of event settings.
@@ -1,5 +1,7 @@
 .. spelling:word-list:: checkin

+.. _rest-exporters:
+
 Data exporters
 ==============

@@ -40,6 +40,7 @@ at :ref:`plugin-docs`.
   webhooks
   seatingplans
   exporters
+   scheduled_exports
   shredders
   sendmail_rules
   billing_invoices
@@ -18,6 +18,8 @@ default_price                         money (string)             The price set d
 price                                 money (string)             The price used for this variation. This is either the
                                                                 same as ``default_price`` if that value is set or equal
                                                                 to the item's ``default_price`` (read-only).
+free_price_suggestion                 money (string)             A suggested price, used as a default value if
+                                                                 ``Item.free_price`` is set (or ``null``).
 original_price                        money (string)             An original price, shown for comparison, not used
                                                                 for price calculations (or ``null``).
 active                                boolean                    If ``false``, this variation will not be sold or shown.
@@ -27,6 +29,8 @@ position                              integer                    An integer, use
 checkin_attention                     boolean                    If ``true``, the check-in app should show a warning
                                                                 that this ticket requires special attention if such
                                                                 a variation is being scanned.
+checkin_text                          string                     Text that will be shown if a ticket of this type is
+                                                                 scanned (or ``null``).
 require_approval                      boolean                    If ``true``, orders with this variation will need to be
                                                                 approved by the event organizer before they can be
                                                                 paid.
@@ -53,6 +57,12 @@ meta_data                             object                     Values set for

   The ``meta_data`` and ``checkin_attention`` attributes have been added.

+.. versionchanged:: 2023.10
+
+   The ``free_price_suggestion`` attribute has been added.
+   The ``checkin_text`` attribute has been added.
+
+
 Endpoints
 ---------

@@ -88,6 +98,7 @@ Endpoints
            },
            "active": true,
            "checkin_attention": false,
+            "checkin_text": null,
            "require_approval": false,
            "require_membership": false,
            "require_membership_hidden": false,
@@ -103,6 +114,7 @@ Endpoints
            "default_price": "223.00",
            "price": 223.0,
            "original_price": null,
+            "free_price_suggestion": null,
            "meta_data": {}
          },
          {
@@ -112,14 +124,21 @@ Endpoints
            },
            "active": true,
            "checkin_attention": false,
+            "checkin_text": null,
            "require_approval": false,
            "require_membership": false,
            "require_membership_hidden": false,
            "require_membership_types": [],
+            "sales_channels": ["web"],
+            "available_from": null,
+            "available_until": null,
+            "hide_without_voucher": false,
            "description": {},
            "position": 1,
-            "default_price": null,
-            "price": 15.0,
+            "default_price": "223.00",
+            "price": 223.0,
+            "original_price": null,
+            "free_price_suggestion": null,
            "meta_data": {}
          }
        ]
@@ -163,8 +182,10 @@ Endpoints
        "default_price": "10.00",
        "price": "10.00",
        "original_price": null,
+        "free_price_suggestion": null,
        "active": true,
        "checkin_attention": false,
+        "checkin_text": null,
        "require_approval": false,
        "require_membership": false,
        "require_membership_hidden": false,
@@ -204,6 +225,7 @@ Endpoints
        "default_price": "10.00",
        "active": true,
        "checkin_attention": false,
+        "checkin_text": null,
        "require_approval": false,
        "require_membership": false,
        "require_membership_hidden": false,
@@ -231,8 +253,10 @@ Endpoints
        "default_price": "10.00",
        "price": "10.00",
        "original_price": null,
+        "free_price_suggestion": null,
        "active": true,
        "checkin_attention": false,
+        "checkin_text": null,
        "require_approval": false,
        "require_membership": false,
        "require_membership_hidden": false,
@@ -291,8 +315,10 @@ Endpoints
        "default_price": "10.00",
        "price": "10.00",
        "original_price": null,
+        "free_price_suggestion": null,
        "active": false,
        "checkin_attention": false,
+        "checkin_text": null,
        "require_approval": false,
        "require_membership": false,
        "require_membership_hidden": false,
@@ -29,6 +29,8 @@ free_price                              boolean                    If ``true``,
                                                                   they buy the product (however, the price can't be set
                                                                   lower than the price defined by ``default_price`` or
                                                                   otherwise).
+free_price_suggestion                   money (string)             A suggested price, used as a default value if
+                                                                   ``free_price`` is set (or ``null``).
 tax_rate                                decimal (string)           The VAT rate to be applied for this item (read-only,
                                                                   set through ``tax_rule``).
 tax_rule                                integer                    The internal ID of the applied tax rule (or ``null``).
@@ -50,9 +52,12 @@ available_from                          datetime                   The first dat
                                                                   (or ``null``).
 available_until                         datetime                   The last date time at which this item can be bought
                                                                   (or ``null``).
-hidden_if_available                     integer                    The internal ID of a quota object, or ``null``. If
+hidden_if_available                     integer                    **DEPRECATED** The internal ID of a quota object, or ``null``. If
                                                                   set, this item won't be shown publicly as long as this
                                                                   quota is available.
+hidden_if_item_available                integer                    The internal ID of a different item, or ``null``. If
+                                                                   set, this item won't be shown publicly as long as this
+                                                                   other item is available.
 require_voucher                         boolean                    If ``true``, this item can only be bought using a
                                                                   voucher that is specifically assigned to this item.
 hide_without_voucher                    boolean                    If ``true``, this item is only shown during the voucher
@@ -69,6 +74,8 @@ max_per_order                           integer                    This product
 checkin_attention                       boolean                    If ``true``, the check-in app should show a warning
                                                                   that this ticket requires special attention if such
                                                                   a product is being scanned.
+checkin_text                            string                     Text that will be shown if a ticket of this type is
+                                                                   scanned (or ``null``).
 original_price                          money (string)             An original price, shown for comparison, not used
                                                                   for price calculations (or ``null``).
 require_approval                        boolean                    If ``true``, orders with this product will need to be
@@ -123,6 +130,8 @@ variations                              list of objects            A list with o
 ├ price                                 money (string)             The price used for this variation. This is either the
                                                                   same as ``default_price`` if that value is set or equal
                                                                   to the item's ``default_price``.
+├ free_price_suggestion                 money (string)             A suggested price, used as a default value if
+                                                                   ``free_price`` is set (or ``null``).
 ├ original_price                        money (string)             An original price, shown for comparison, not used
                                                                   for price calculations (or ``null``).
 ├ active                                boolean                    If ``false``, this variation will not be sold or shown.
@@ -130,6 +139,8 @@ variations                              list of objects            A list with o
 ├ checkin_attention                     boolean                    If ``true``, the check-in app should show a warning
                                                                   that this ticket requires special attention if such
                                                                   a variation is being scanned.
+├ checkin_text                          string                     Text that will be shown if a ticket of this type is
+                                                                   scanned (or ``null``).
 ├ require_approval                      boolean                    If ``true``, orders with this variation will need to be
                                                                   approved by the event organizer before they can be
                                                                   paid.
@@ -196,6 +207,16 @@ meta_data                               object                     Values set fo

   The ``media_policy`` and ``media_type`` attributes have been added.

+.. versionchanged:: 2023.10
+
+   The ``checkin_text`` and ``variations[x].checkin_text`` attributes have been added.
+   The ``free_price_suggestion`` and ``variations[x].free_price_suggestion`` attributes have been added.
+
+.. versionchanged:: 2023.10
+
+   The ``hidden_if_item_available`` attributes has been added, the ``hidden_if_available`` attribute has been
+   deprecated.
+
 Notes
 -----

@@ -246,6 +267,7 @@ Endpoints
            "active": true,
            "description": null,
            "free_price": false,
+            "free_price_suggestion": null,
            "tax_rate": "0.00",
            "tax_rule": 1,
            "admission": false,
@@ -259,12 +281,14 @@ Endpoints
            "available_from": null,
            "available_until": null,
            "hidden_if_available": null,
+            "hidden_if_item_available": null,
            "require_voucher": false,
            "hide_without_voucher": false,
            "allow_cancel": true,
            "min_per_order": null,
            "max_per_order": null,
            "checkin_attention": false,
+            "checkin_text": null,
            "has_variations": false,
            "generate_tickets": null,
            "allow_waitinglist": true,
@@ -291,8 +315,10 @@ Endpoints
                 "default_price": "10.00",
                 "price": "10.00",
                 "original_price": null,
+                 "free_price_suggestion": null,
                 "active": true,
                 "checkin_attention": false,
+                 "checkin_text": null,
                 "require_approval": false,
                 "require_membership": false,
                 "require_membership_types": [],
@@ -309,8 +335,10 @@ Endpoints
                 "default_price": null,
                 "price": "23.00",
                 "original_price": null,
+                 "free_price_suggestion": null,
                 "active": true,
                 "checkin_attention": false,
+                 "checkin_text": null,
                 "require_approval": false,
                 "require_membership": false,
                 "require_membership_types": [],
@@ -377,6 +405,7 @@ Endpoints
        "active": true,
        "description": null,
        "free_price": false,
+        "free_price_suggestion": null,
        "tax_rate": "0.00",
        "tax_rule": 1,
        "admission": false,
@@ -390,6 +419,7 @@ Endpoints
        "available_from": null,
        "available_until": null,
        "hidden_if_available": null,
+        "hidden_if_item_available": null,
        "require_voucher": false,
        "hide_without_voucher": false,
        "allow_cancel": true,
@@ -399,6 +429,7 @@ Endpoints
        "min_per_order": null,
        "max_per_order": null,
        "checkin_attention": false,
+        "checkin_text": null,
        "has_variations": false,
        "require_approval": false,
        "require_bundling": false,
@@ -422,8 +453,10 @@ Endpoints
             "default_price": "10.00",
             "price": "10.00",
             "original_price": null,
+             "free_price_suggestion": null,
             "active": true,
             "checkin_attention": false,
+             "checkin_text": null,
             "require_approval": false,
             "require_membership": false,
             "require_membership_types": [],
@@ -440,8 +473,10 @@ Endpoints
             "default_price": null,
             "price": "23.00",
             "original_price": null,
+             "free_price_suggestion": null,
             "active": true,
             "checkin_attention": false,
+             "checkin_text": null,
             "require_approval": false,
             "require_membership": false,
             "require_membership_types": [],
@@ -489,6 +524,7 @@ Endpoints
        "active": true,
        "description": null,
        "free_price": false,
+        "free_price_suggestion": null,
        "tax_rate": "0.00",
        "tax_rule": 1,
        "admission": false,
@@ -502,6 +538,7 @@ Endpoints
        "available_from": null,
        "available_until": null,
        "hidden_if_available": null,
+        "hidden_if_item_available": null,
        "require_voucher": false,
        "hide_without_voucher": false,
        "allow_cancel": true,
@@ -511,6 +548,7 @@ Endpoints
        "min_per_order": null,
        "max_per_order": null,
        "checkin_attention": false,
+        "checkin_text": null,
        "require_approval": false,
        "require_bundling": false,
        "require_membership": false,
@@ -533,8 +571,10 @@ Endpoints
             "default_price": "10.00",
             "price": "10.00",
             "original_price": null,
+             "free_price_suggestion": null,
             "active": true,
             "checkin_attention": false,
+             "checkin_text": null,
             "require_approval": false,
             "require_membership": false,
             "require_membership_types": [],
@@ -551,8 +591,10 @@ Endpoints
             "default_price": null,
             "price": "23.00",
             "original_price": null,
+             "free_price_suggestion": null,
             "active": true,
             "checkin_attention": false,
+             "checkin_text": null,
             "require_approval": false,
             "require_membership": false,
             "require_membership_types": [],
@@ -588,6 +630,7 @@ Endpoints
        "active": true,
        "description": null,
        "free_price": false,
+        "free_price_suggestion": null,
        "tax_rate": "0.00",
        "tax_rule": 1,
        "admission": false,
@@ -601,6 +644,7 @@ Endpoints
        "available_from": null,
        "available_until": null,
        "hidden_if_available": null,
+        "hidden_if_item_available": null,
        "require_voucher": false,
        "hide_without_voucher": false,
        "allow_cancel": true,
@@ -610,6 +654,7 @@ Endpoints
        "allow_waitinglist": true,
        "show_quota_left": null,
        "checkin_attention": false,
+        "checkin_text": null,
        "has_variations": true,
        "require_approval": false,
        "require_bundling": false,
@@ -633,8 +678,10 @@ Endpoints
             "default_price": "10.00",
             "price": "10.00",
             "original_price": null,
+             "free_price_suggestion": null,
             "active": true,
             "checkin_attention": false,
+             "checkin_text": null,
             "require_approval": false,
             "require_membership": false,
             "require_membership_types": [],
@@ -651,8 +698,10 @@ Endpoints
             "default_price": null,
             "price": "23.00",
             "original_price": null,
+             "free_price_suggestion": null,
             "active": true,
             "checkin_attention": false,
+             "checkin_text": null,
             "require_approval": false,
             "require_membership": false,
             "require_membership_types": [],
@@ -719,6 +768,7 @@ Endpoints
        "active": true,
        "description": null,
        "free_price": false,
+        "free_price_suggestion": null,
        "tax_rate": "0.00",
        "tax_rule": 1,
        "admission": false,
@@ -732,6 +782,7 @@ Endpoints
        "available_from": null,
        "available_until": null,
        "hidden_if_available": null,
+        "hidden_if_item_available": null,
        "require_voucher": false,
        "hide_without_voucher": false,
        "generate_tickets": null,
@@ -741,6 +792,7 @@ Endpoints
        "min_per_order": null,
        "max_per_order": null,
        "checkin_attention": false,
+        "checkin_text": null,
        "has_variations": true,
        "require_approval": false,
        "require_bundling": false,
@@ -764,8 +816,10 @@ Endpoints
             "default_price": "10.00",
             "price": "10.00",
             "original_price": null,
+             "free_price_suggestion": null,
             "active": true,
             "checkin_attention": false,
+             "checkin_text": null,
             "require_approval": false,
             "require_membership": false,
             "require_membership_types": [],
@@ -782,8 +836,10 @@ Endpoints
             "default_price": null,
             "price": "23.00",
             "original_price": null,
+             "free_price_suggestion": null,
             "active": true,
             "checkin_attention": false,
+             "checkin_text": null,
             "require_approval": false,
             "require_membership": false,
             "require_membership_types": [],
@@ -46,6 +46,8 @@ custom_followup_at                    date                       Internal date f
 checkin_attention                     boolean                    If ``true``, the check-in app should show a warning
                                                                 that this ticket requires special attention if a ticket
                                                                 of this order is scanned.
+checkin_text                          string                     Text that will be shown if a ticket of this order is
+                                                                 scanned (or ``null``).
 invoice_address                       object                     Invoice address information (can be ``null``)
 ├ last_modified                       datetime                   Last modification date of the address
 ├ company                             string                     Customer company name
@@ -139,6 +141,14 @@ last_modified                         datetime                   Last modificati

   The ``customer`` query parameter has been added.

+.. versionchanged:: 2023.10
+
+   The ``checkin_text`` attribute has been added.
+
+.. versionchanged:: 2024.1
+
+   The ``expires`` attribute can now be passed during order creation.
+

 .. _order-position-resource:

@@ -318,6 +328,7 @@ List of all orders
            "comment": "",
            "custom_followup_at": null,
            "checkin_attention": false,
+            "checkin_text": null,
            "require_approval": false,
            "valid_if_pending": false,
            "invoice_address": {
@@ -539,6 +550,7 @@ Fetching individual orders
        "comment": "",
        "custom_followup_at": null,
        "checkin_attention": false,
+        "checkin_text": null,
        "require_approval": false,
        "valid_if_pending": false,
        "invoice_address": {
@@ -709,6 +721,8 @@ Updating order fields

   * ``checkin_attention``

+   * ``checkin_text``
+
   * ``locale``

   * ``comment``
@@ -719,6 +733,8 @@ Updating order fields

   * ``valid_if_pending``

+   * ``expires``
+
   **Example request**:

   .. sourcecode:: http
@@ -924,6 +940,7 @@ Creating orders
   * ``comment`` (optional)
   * ``custom_followup_at`` (optional)
   * ``checkin_attention`` (optional)
+   * ``checkin_text`` (optional)
   * ``require_approval`` (optional)
   * ``valid_if_pending`` (optional)
   * ``invoice_address`` (optional)
@@ -44,6 +44,8 @@ identifier                            string                     An arbitrary st
 ask_during_checkin                    boolean                    If ``true``, this question will not be asked while
                                                                 buying the ticket, but will show up when redeeming
                                                                 the ticket instead.
+show_during_checkin                   boolean                    If ``true``, the answer to the question will be shown
+                                                                 during check-in (if the check-in client supports it).
 hidden                                boolean                    If ``true``, the question will only be shown in the
                                                                 backend.
 print_on_invoice                      boolean                    If ``true``, the question will only be shown on
@@ -77,6 +79,10 @@ dependency_value                      string                     An old version
                                                                 for one value. **Deprecated.**
 ===================================== ========================== =======================================================

+.. versionchanged:: 2023.8
+
+   The ``show_during_checkin`` attribute has been added.
+
 Endpoints
 ---------

@@ -115,6 +121,7 @@ Endpoints
            "position": 1,
            "identifier": "WY3TP9SL",
            "ask_during_checkin": false,
+            "show_during_checkin": false,
            "hidden": false,
            "print_on_invoice": false,
            "valid_number_min": null,
@@ -194,6 +201,7 @@ Endpoints
        "position": 1,
        "identifier": "WY3TP9SL",
        "ask_during_checkin": false,
+        "show_during_checkin": false,
        "hidden": false,
        "print_on_invoice": false,
        "valid_number_min": null,
@@ -257,6 +265,7 @@ Endpoints
        "items": [1, 2],
        "position": 1,
        "ask_during_checkin": false,
+        "show_during_checkin": false,
        "hidden": false,
        "print_on_invoice": false,
        "dependency_question": null,
@@ -293,6 +302,7 @@ Endpoints
        "position": 1,
        "identifier": "WY3TP9SL",
        "ask_during_checkin": false,
+        "show_during_checkin": false,
        "hidden": false,
        "print_on_invoice": false,
        "dependency_question": null,
@@ -348,7 +358,7 @@ Endpoints

   .. sourcecode:: http

-      PATCH /api/v1/organizers/bigevents/events/sampleconf/items/1/ HTTP/1.1
+      PATCH /api/v1/organizers/bigevents/events/sampleconf/questions/1/ HTTP/1.1
      Host: pretix.eu
      Accept: application/json, text/javascript
      Content-Type: application/json
@@ -376,6 +386,7 @@ Endpoints
        "position": 2,
        "identifier": "WY3TP9SL",
        "ask_during_checkin": false,
+        "show_during_checkin": false,
        "hidden": false,
        "print_on_invoice": false,
        "dependency_question": null,
@@ -415,7 +426,7 @@ Endpoints
   :param event: The ``slug`` field of the event to modify
   :param id: The ``id`` field of the question to modify
   :statuscode 200: no error
-   :statuscode 400: The item could not be modified due to invalid submitted data
+   :statuscode 400: The question could not be modified due to invalid submitted data
   :statuscode 401: Authentication failure
   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.

@@ -427,7 +438,7 @@ Endpoints

   .. sourcecode:: http

-      DELETE /api/v1/organizers/bigevents/events/sampleconf/items/1/ HTTP/1.1
+      DELETE /api/v1/organizers/bigevents/events/sampleconf/questions/1/ HTTP/1.1
      Host: pretix.eu
      Accept: application/json, text/javascript

@@ -440,7 +451,7 @@ Endpoints

   :param organizer: The ``slug`` field of the organizer to modify
   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the item to delete
+   :param id: The ``id`` field of the question to delete
   :statuscode 204: no error
   :statuscode 401: Authentication failure
   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.
@@ -0,0 +1,556 @@
+.. spelling:word-list:: checkin
+
+Scheduled data exports
+======================
+
+pretix and it's plugins include a number of data exporters that allow you to bulk download various data from pretix in
+different formats. You should read :ref:`rest-exporters` first to get an understanding of the basic mechanism.
+
+Exports can be scheduled to be sent at specific times automatically, both on organizer level and event level.
+
+Scheduled export resource
+-------------------------
+
+The scheduled export contains the following public fields:
+
+.. rst-class:: rest-resource-table
+
+===================================== ========================== =======================================================
+Field                                 Type                       Description
+===================================== ========================== =======================================================
+id                                    integer                    Internal ID of the schedule
+owner                                 string                     Email address of the user who created this schedule (read-only).
+                                                                 This address will always receive the export and the export
+                                                                 will only contain data that this user has permission
+                                                                 to access at the time of the export. **We consider this
+                                                                 field experimental, it's behaviour might change in the future.
+                                                                 Note that the email address of a user can change at any time.**
+export_identifier                     string                     Identifier of the export to run, see :ref:`rest-exporters`
+export_form_data                      object                     Input data for the export, format depends on the export,
+                                                                 see :ref:`rest-exporters` for more details.
+locale                                string                     Language to run the export in
+mail_additional_recipients            string                     Email addresses to receive the export, comma-separated (or empty string)
+mail_additional_recipients_cc         string                     Email addresses to receive the export in copy, comma-separated (or empty string)
+mail_additional_recipients_bcc        string                     Email addresses to receive the exportin blind copy, comma-separated (or empty string)
+mail_subject                          string                     Subject to use for the email (currently no variables supported)
+mail_template                         string                     Text to use for the email (currently no variables supported)
+schedule_rrule                        string                     Recurrence specification to determine the **days** this
+                                                                 schedule runs on in ``RRULE`` syntax following `RFC 5545`_
+                                                                 with some restrictions. Only one rule is allowed, only
+                                                                 one occurrence per day is allowed, and some features
+                                                                 are not supported (``BYMONTHDAY``, ``BYYEARDAY``,
+                                                                 ``BYEASTER``, ``BYWEEKNO``).
+schedule_rrule_time                   time                       Time of day to run this on on the specified days.
+                                                                 Will be interpreted as local time of the event for event-level
+                                                                 exports. For organizer-level exports, the timezone is given
+                                                                 in the field ``timezone``. The export will never run **before**
+                                                                 this time but it **may** run **later**.
+timezone                              string                     Time zone to interpret the schedule in (only for organizer-level exports)
+schedule_next_run                     datetime                   Next planned execution (read-only, computed by server)
+error_counter                         integer                    Number of consecutive times this export failed (read-only).
+                                                                 After a number of failures (currently 5), the schedule no
+                                                                 longer is executed. Changing parameters resets the value.
+===================================== ========================== =======================================================
+
+Special notes on permissions
+----------------------------
+
+Permission handling for scheduled exports is more complex than for most other objects. The reason for this is that
+there are two levels of access control involved here: First, you need permission to access or change the configuration
+of the scheduled exports in the moment you are doing it. Second, you **continuously** need permission to access the
+**data** that is exported as part of the schedule. For this reason, scheduled exports always need one user account
+to be their **owner**.
+
+Therefore, scheduled exports **must** be created by an API client using :ref:`OAuth authentication <rest-oauth>`.
+It is impossible to create a scheduled export using token authentication. After the export is created, it can also be
+modified using token authentication.
+
+A user or token with the "can change settings" permission for a given organizer or event can see and change
+**all** scheduled exports created for the respective organizer or event, regardless of who created them.
+A user without this permission can only see **their own** scheduled exports.
+A token without this permission can not see scheduled exports as all.
+
+
+
+Endpoints for event exports
+---------------------------
+
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/scheduled_exports/
+
+   Returns a list of all scheduled exports the client has access to.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/events/sampleconf/scheduled_exports/ 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,
+            "owner": "john@example.com",
+            "export_identifier": "orderlist",
+            "export_form_data": {"_format": "xlsx", "date_range": "week_previous"},
+            "locale": "en",
+            "mail_additional_recipients": "mary@example.org",
+            "mail_additional_recipients_cc": "",
+            "mail_additional_recipients_bcc": "",
+            "mail_subject": "Order list",
+            "mail_template": "Here is last week's order list\n\nCheers\nJohn",
+            "schedule_rrule": "DTSTART:20230118T000000\nRRULE:FREQ=WEEKLY;BYDAY=TU,WE,TH",
+            "schedule_rrule_time": "04:00:00",
+            "schedule_next_run": "2023-10-26T02:00:00Z",
+            "error_counter": 0
+          }
+        ]
+      }
+
+   :query integer page: The page number in case of a multi-page result set, default is 1
+   :query string ordering: Manually set the ordering of results. Valid fields to be used are ``id``, ``export_identifier``, and ``schedule_next_run``.
+                           Default: ``id``
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param event: The ``slug`` field of the event to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
+
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/scheduled_exports/(id)/
+
+   Returns information on one scheduled export, identified by its ID.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/events/sampleconf/scheduled_exports/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "owner": "john@example.com",
+        "export_identifier": "orderlist",
+        "export_form_data": {"_format": "xlsx", "date_range": "week_previous"},
+        "locale": "en",
+        "mail_additional_recipients": "mary@example.org",
+        "mail_additional_recipients_cc": "",
+        "mail_additional_recipients_bcc": "",
+        "mail_subject": "Order list",
+        "mail_template": "Here is last week's order list\n\nCheers\nJohn",
+        "schedule_rrule": "DTSTART:20230118T000000\nRRULE:FREQ=WEEKLY;BYDAY=TU,WE,TH",
+        "schedule_rrule_time": "04:00:00",
+        "schedule_next_run": "2023-10-26T02:00:00Z",
+        "error_counter": 0
+      }
+
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param event: The ``slug`` field of the event to fetch
+   :param id: The ``id`` field of the scheduled export to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
+
+.. http:post:: /api/v1/organizers/(organizer)/events/(event)/scheduled_exports/
+
+   Schedule a new export.
+
+   .. note:: See above for special notes on permissions.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      POST /api/v1/organizers/bigevents/events/sampleconf/scheduled_exports/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+
+      {
+        "export_identifier": "orderlist",
+        "export_form_data": {"_format": "xlsx", "date_range": "week_previous"},
+        "locale": "en",
+        "mail_additional_recipients": "mary@example.org",
+        "mail_additional_recipients_cc": "",
+        "mail_additional_recipients_bcc": "",
+        "mail_subject": "Order list",
+        "mail_template": "Here is last week's order list\n\nCheers\nJohn",
+        "schedule_rrule": "DTSTART:20230118T000000\nRRULE:FREQ=WEEKLY;BYDAY=TU,WE,TH",
+        "schedule_rrule_time": "04:00:00"
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 201 Created
+      Vary: Accept
+      Content-Type: application/json
+
+
+      {
+        "id": 1,
+        "owner": "john@example.com",
+        "export_identifier": "orderlist",
+        "export_form_data": {"_format": "xlsx", "date_range": "week_previous"},
+        "locale": "en",
+        "mail_additional_recipients": "mary@example.org",
+        "mail_additional_recipients_cc": "",
+        "mail_additional_recipients_bcc": "",
+        "mail_subject": "Order list",
+        "mail_template": "Here is last week's order list\n\nCheers\nJohn",
+        "schedule_rrule": "DTSTART:20230118T000000\nRRULE:FREQ=WEEKLY;BYDAY=TU,WE,TH",
+        "schedule_rrule_time": "04:00:00",
+        "schedule_next_run": "2023-10-26T02:00:00Z",
+        "error_counter": 0
+      }
+
+   :param organizer: The ``slug`` field of the organizer of the event to create an item for
+   :param event: The ``slug`` field of the event to create an item for
+   :statuscode 201: no error
+   :statuscode 400: The item could not be created due to invalid submitted data.
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
+
+.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/scheduled_exports/(id)/
+
+   Update a scheduled export. 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.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      PATCH /api/v1/organizers/bigevents/events/sampleconf/scheduled_exports/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+      Content-Length: 94
+
+      {
+        "export_form_data": {"_format": "xlsx", "date_range": "week_this"},
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "owner": "john@example.com",
+        "export_identifier": "orderlist",
+        "export_form_data": {"_format": "xlsx", "date_range": "week_this"},
+        "locale": "en",
+        "mail_additional_recipients": "mary@example.org",
+        "mail_additional_recipients_cc": "",
+        "mail_additional_recipients_bcc": "",
+        "mail_subject": "Order list",
+        "mail_template": "Here is last week's order list\n\nCheers\nJohn",
+        "schedule_rrule": "DTSTART:20230118T000000\nRRULE:FREQ=WEEKLY;BYDAY=TU,WE,TH",
+        "schedule_rrule_time": "04:00:00",
+        "schedule_next_run": "2023-10-26T02:00:00Z",
+        "error_counter": 0
+      }
+
+   :param organizer: The ``slug`` field of the organizer to modify
+   :param event: The ``slug`` field of the event to modify
+   :param id: The ``id`` field of the export to modify
+   :statuscode 200: no error
+   :statuscode 400: The export could not be modified due to invalid submitted data
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
+
+.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/scheduled_exports/(id)/
+
+   Delete a scheduled export.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      DELETE /api/v1/organizers/bigevents/events/sampleconf/scheduled_exports/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 204 No Content
+      Vary: Accept
+
+   :param organizer: The ``slug`` field of the organizer to modify
+   :param event: The ``slug`` field of the event to modify
+   :param id: The ``id`` field of the export to delete
+   :statuscode 204: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.
+
+Endpoints for organizer exports
+---------------------------
+
+.. http:get:: /api/v1/organizers/(organizer)/scheduled_exports/
+
+   Returns a list of all scheduled exports the client has access to.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/scheduled_exports/ 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,
+            "owner": "john@example.com",
+            "export_identifier": "orderlist",
+            "export_form_data": {"_format": "xlsx", "date_range": "week_previous"},
+            "locale": "en",
+            "mail_additional_recipients": "mary@example.org",
+            "mail_additional_recipients_cc": "",
+            "mail_additional_recipients_bcc": "",
+            "mail_subject": "Order list",
+            "mail_template": "Here is last week's order list\n\nCheers\nJohn",
+            "schedule_rrule": "DTSTART:20230118T000000\nRRULE:FREQ=WEEKLY;BYDAY=TU,WE,TH",
+            "schedule_rrule_time": "04:00:00",
+            "schedule_next_run": "2023-10-26T02:00:00Z",
+            "timezone": "Europe/Berlin",
+            "error_counter": 0
+          }
+        ]
+      }
+
+   :query integer page: The page number in case of a multi-page result set, default is 1
+   :query string ordering: Manually set the ordering of results. Valid fields to be used are ``id``, ``export_identifier``, and ``schedule_next_run``.
+                           Default: ``id``
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :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)/scheduled_exports/(id)/
+
+   Returns information on one scheduled export, identified by its ID.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/scheduled_exports/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "owner": "john@example.com",
+        "export_identifier": "orderlist",
+        "export_form_data": {"_format": "xlsx", "date_range": "week_previous"},
+        "locale": "en",
+        "mail_additional_recipients": "mary@example.org",
+        "mail_additional_recipients_cc": "",
+        "mail_additional_recipients_bcc": "",
+        "mail_subject": "Order list",
+        "mail_template": "Here is last week's order list\n\nCheers\nJohn",
+        "schedule_rrule": "DTSTART:20230118T000000\nRRULE:FREQ=WEEKLY;BYDAY=TU,WE,TH",
+        "schedule_rrule_time": "04:00:00",
+        "schedule_next_run": "2023-10-26T02:00:00Z",
+        "timezone": "Europe/Berlin",
+        "error_counter": 0
+      }
+
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param id: The ``id`` field of the scheduled export to fetch
+   :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)/scheduled_exports/
+
+   Schedule a new export.
+
+   .. note:: See above for special notes on permissions.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      POST /api/v1/organizers/bigevents/scheduled_exports/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+
+      {
+        "export_identifier": "orderlist",
+        "export_form_data": {"_format": "xlsx", "date_range": "week_previous"},
+        "locale": "en",
+        "mail_additional_recipients": "mary@example.org",
+        "mail_additional_recipients_cc": "",
+        "mail_additional_recipients_bcc": "",
+        "mail_subject": "Order list",
+        "mail_template": "Here is last week's order list\n\nCheers\nJohn",
+        "schedule_rrule": "DTSTART:20230118T000000\nRRULE:FREQ=WEEKLY;BYDAY=TU,WE,TH",
+        "schedule_rrule_time": "04:00:00",
+        "timezone": "Europe/Berlin"
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 201 Created
+      Vary: Accept
+      Content-Type: application/json
+
+
+      {
+        "id": 1,
+        "owner": "john@example.com",
+        "export_identifier": "orderlist",
+        "export_form_data": {"_format": "xlsx", "date_range": "week_previous"},
+        "locale": "en",
+        "mail_additional_recipients": "mary@example.org",
+        "mail_additional_recipients_cc": "",
+        "mail_additional_recipients_bcc": "",
+        "mail_subject": "Order list",
+        "mail_template": "Here is last week's order list\n\nCheers\nJohn",
+        "schedule_rrule": "DTSTART:20230118T000000\nRRULE:FREQ=WEEKLY;BYDAY=TU,WE,TH",
+        "schedule_rrule_time": "04:00:00",
+        "schedule_next_run": "2023-10-26T02:00:00Z",
+        "timezone": "Europe/Berlin",
+        "error_counter": 0
+      }
+
+   :param organizer: The ``slug`` field of the organizer of the event to create an item for
+   :statuscode 201: no error
+   :statuscode 400: The item could not be created due to invalid submitted data.
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.
+
+.. http:patch:: /api/v1/organizers/(organizer)/scheduled_exports/(id)/
+
+   Update a scheduled export. 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.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      PATCH /api/v1/organizers/bigevents/scheduled_exports/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+      Content-Length: 94
+
+      {
+        "export_form_data": {"_format": "xlsx", "date_range": "week_this"},
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "owner": "john@example.com",
+        "export_identifier": "orderlist",
+        "export_form_data": {"_format": "xlsx", "date_range": "week_this"},
+        "locale": "en",
+        "mail_additional_recipients": "mary@example.org",
+        "mail_additional_recipients_cc": "",
+        "mail_additional_recipients_bcc": "",
+        "mail_subject": "Order list",
+        "mail_template": "Here is last week's order list\n\nCheers\nJohn",
+        "schedule_rrule": "DTSTART:20230118T000000\nRRULE:FREQ=WEEKLY;BYDAY=TU,WE,TH",
+        "schedule_rrule_time": "04:00:00",
+        "schedule_next_run": "2023-10-26T02:00:00Z",
+        "timezone": "Europe/Berlin",
+        "error_counter": 0
+      }
+
+   :param organizer: The ``slug`` field of the organizer to modify
+   :param id: The ``id`` field of the export to modify
+   :statuscode 200: no error
+   :statuscode 400: The export 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)/scheduled_exports/(id)/
+
+   Delete a scheduled export.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      DELETE /api/v1/organizers/bigevents/scheduled_exports/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 204 No Content
+      Vary: Accept
+
+   :param organizer: The ``slug`` field of the organizer to modify
+   :param id: The ``id`` field of the export 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.
+
+
+.. _RFC 5545: https://datatracker.ietf.org/doc/html/rfc5545#section-3.8.5.3
@@ -11,7 +11,7 @@ Core
 ----

 .. automodule:: pretix.base.signals
-   :members: periodic_task, event_live_issues, event_copy_data, email_filter, register_notification_types,
+   :members: periodic_task, event_live_issues, event_copy_data, email_filter, register_notification_types, notification,
      item_copy_data, register_sales_channels, register_global_settings, quota_availability, global_email_filter,
      register_ticket_secret_generators, gift_card_transaction_display

@@ -25,27 +25,27 @@ partition "data-based check" {
    else
        -down->[yes] "Is one or more block set on the ticket?"
        --> if "" then
-            -right->[no] "Return error BLOCKED"
+            -right->[yes] "Return error BLOCKED"
        else
-            -down->[yes] "If this is not an exit, is the valid_from/valid_until\nconstraint on the ticket fulfilled?"
+            -down->[no] "Is the order in status PENDING and not yet approved?"
            --> if "" then
-                -right->[no] "Return error INVALID_TIME"
+                -right->[yes] "Return error UNAPPROVED"
            else
-                -down->[yes] "Is the product part of the check-in list?"
+                -down->[no] "If this is not an exit, is the valid_from/valid_until\nconstraint on the ticket fulfilled?"
                --> if "" then
-                    -right->[no] "Return error PRODUCT"
+                    -right->[no] "Return error INVALID_TIME"
                else
-                    -down->[yes] "Is the subevent part of the check-in list?"
+                    -down->[yes] "Is the product part of the check-in list?"
                    --> if "" then
-                        -right->[no] "Return error INVALID"
-                        note bottom: TODO\ninconsistent\nwith online\ncheck
+                        -right->[no] "Return error PRODUCT"
                    else
-                        -down->[yes] "Is the order in status PAID?"
+                        -down->[yes] "Is the subevent part of the check-in list?"
                        --> if "" then
-                            -right->[no] "Is Order.require_approval set?"
+                            -right->[no] "Return error INVALID"
+                            note bottom: TODO\ninconsistent\nwith online\ncheck
+                        else
+                            -down->[yes] "Is the order in status PAID?"
                            --> if "" then
-                                -->[yes] "Return error UNPAID "
-                            else
                                -right->[no] "Is Order.valid_if_pending set?"
                                --> if "" then
                                    -->[yes] "Is this an entry or exit?"
@@ -62,9 +62,9 @@ partition "data-based check" {
                                        endif
                                    endif
                                endif
+                            else
+                                -down->[yes] "Is this an entry or exit?"
                            endif
-                        else
-                            -down->[yes] "Is this an entry or exit?"
                        endif
                    endif
                endif
@@ -42,23 +42,25 @@ endif
 else
    -down->[yes || force] "Is one or more block set on the ticket?"
    --> if "" then
-        -right->[no && !force] "Return error BLOCKED"
+        -right->[yes && !force] "Return error BLOCKED"
    else
-        -down->[yes || force] "If this is not an exit, is the valid_from/valid_until\nconstraint on the ticket fulfilled?"
+        -down->[no || force] "Is the order in status PENDING and not yet approved?"
        --> if "" then
-            -right->[no && !force] "Return error INVALID_TIME"
+            -right->[yes && !force] "Return error UNAPPROVED"
        else
-            -down->[yes || force] "Is the product part of the check-in list?"
+            -down->[no || force] "If this is not an exit, is the valid_from/valid_until\nconstraint on the ticket fulfilled?"
            --> if "" then
-                -right->[no && !force] "Return error PRODUCT"
+                -right->[no && !force] "Return error INVALID_TIME"
            else
-                -down->[yes || force] "Is the subevent part of the check-in list?"
+                -down->[yes || force] "Is the product part of the check-in list?"
                --> if "" then
-                    -right->[no && !force] "Return error PRODUCT "
+                    -right->[no && !force] "Return error PRODUCT"
                else
-                    -down->[yes] "Is the order in status PAID?"
+                    -down->[yes || force] "Is the subevent part of the check-in list?"
                    --> if "" then
-                        -right->[no && !force] "Is Order.require_approval set?"
+                        -right->[no && !force] "Return error PRODUCT "
+                    else
+                        -down->[yes] "Is the order in status PAID?"
                        --> if "" then
                            -->[no] "Is Order.valid_if_pending set?"
                            --> if "" then
@@ -77,10 +79,8 @@ else
                                endif
                            endif
                        else
-                            -->[yes] "Return error UNPAID "
+                            -down->[yes || force] "Is this an entry or exit?\nIs the upload forced?"
                        endif
-                    else
-                        -down->[yes || force] "Is this an entry or exit?\nIs the upload forced?"
                    endif
                endif
            endif
@@ -32,6 +32,7 @@ transactions                          list of objects            Transactions in
 ├ checksum                            string                     Checksum computed from payer, reference, amount and
                                                                 date
 ├ payer                               string                     Payment source
+├ external_id                         string                     Unique ID of the payment from an external source
 ├ reference                           string                     Payment reference
 ├ amount                              string                     Payment amount
 ├ iban                                string                     Payment IBAN
@@ -85,6 +86,7 @@ Endpoints
                "date": "26.06.2017",
                "payer": "John Doe",
                "order": null,
+                "external_id": null,
                "iban": "",
                "bic": "",
                "checksum": "5de03a601644dfa63420dacfd285565f8375a8f2",
@@ -139,6 +141,7 @@ Endpoints
            "iban": "",
            "bic": "",
            "order": null,
+            "external_id": null,
            "checksum": "5de03a601644dfa63420dacfd285565f8375a8f2",
            "reference": "GUTSCHRIFT\r\nSAMPLECONF-NAB12 EREF: SAMPLECONF-NAB12\r\nIBAN: DE1234556…",
            "state": "nomatch",
@@ -24,3 +24,4 @@ If you want to **create** a plugin, please go to the
   imported_secrets
   webinar
   presale-saml
+   kulturpass
@@ -0,0 +1,193 @@
+KulturPass
+=========
+
+.. note::
+
+    Since the KulturPass is specific to event organizers within Germany, the following page is also  only provided in
+    German. Should you require assistance with the KulturPass and do not speak this language, please feel free reach
+    out to support@pretix.eu.
+
+
+Einführung
+----------
+Der `KulturPass`_ ist ein Angebot der Bundesregierung für alle, die im laufenden Jahr ihren 18. Geburtstag feiern.
+Sie erhalten ab ihrem 18. Geburtstag ein Budget von 200 Euro, das sie für Eintrittskarten, Bücher, CDs, Platten und
+vieles andere einsetzen können. So wird Kultur vor Ort noch einfacher erlebbar. Gleichzeitig stärkt das die Nachfrage
+bei den Anbietenden.
+
+Da pretix ein Ticketing-System ist, stellen wir ausschließlich einen automatisierten Prozess für den Verkauf von
+Eintrittskarten über den KulturPass-Marktplatz bereit.
+
+
+Registrierung und Einrichtung
+-----------------------------
+Um als Unternehmen oder Kultureinrichtung Angebote auf dem KulturPass-Marktplatz anbieten zu können, ist zunächst eine
+Registerung und die Einrichtung eines "Shops" sowie der dazugehörigen Angebote notwendig.
+
+1. Registrierung
+    Registrieren Sie sich zunächst unter https://www.kulturpass.de/anbietende/layer als Anbieter. Im Zuge der
+    Registrierung beantworten Sie einige Fragen zu Ihrem Unternehmen/Ihrer Kultureinrichtung, hinterlegen Ihre
+    E-Mail-Adresse und beantworten Fragen zu Ihren Angebotsformen sowie Finanzierung Ihrer Einrichtung.
+
+2. Anlegen eines KulturPass Shops
+    Nach Ihrer Registrierung müssen Sie der Weitergabe Ihrer Daten an die technische Platform hinter dem KulturPass,
+    Mirakl, zustimmen. Hier benennen Sie auch Ihren Shop.
+
+3. Identifizierung mit ELSTER-Zertifikat
+    Als nächsten Schritt müssen Sie Ihr Unternehmen oder Ihre Einrichtung mit Hilfe eines sog. ELSTER-Zertifikates
+    identifizieren. Dieses Zertifikat nutzen Sie auch bereits jetzt schon, wenn Sie auf elektronischem Wege mit der
+    Finanzverwaltung kommunizieren.
+
+4. Ersteinrichtung in pretix
+    Hinterlegen Sie nun die ID-Nummer Ihres KulturPass Marktplatz-Shops sowie einen API-Key in den
+    `Einstellungen Ihres Veranstalterkontos`_ (Veranstalter-Konto -> Einstellungen -> KulturPass). Diese Daten müssen
+    Sie nur einmalig für alle Ihre Veranstaltungen angeben.
+
+    Im `KulturPass-Backend`_ finden Sie die benötigten Informationen indem Sie auf das Benutzer-Symbol in der oberen,
+    rechten Ecke klicken, "Profil" und dann "API Schlüssel" auswählen bzw. indem Sie auf "Einstellungen" in der
+    Navigation links und dann "Shop" auswählen.
+
+.. note::
+
+    Zu jedem Zeitpunkt kann nur ein Hintergrundsystem mit dem KulturPass-System verbunden sein. Werden
+    unterschiedliche Systeme oder gar mehrere pretix-Veranstalterkonten mit dem gleichen KulturPass-System verbunden,
+    können keine Bestellungen mehr verarbeitet werden und Angebote nicht automatisiert an den KulturPass-Marktplatz
+    übermittelt werden. Eingehende Bestellungen von Jugendlichen werden in diesem Fall automatisch abgelehnt, da diese
+    nicht eindeutig zugeordnet werden können. Ebenso überschreibt die Bereitstellung der Angebote eines Systems die
+    Angebote eines anderen Systems.
+
+    Wenn Sie mehrere Systeme haben, die den KulturPass-Marktplatz bedienen sollen, wenden Sie sich bitte an den
+    KulturPass-Support, um sich einen weiteren Shop einrichten zu lassen.
+
+5. Aktivierung der KulturPass-Erweiterungen
+    Alle Veranstaltungen, die Sie über den KulturPass anbieten möchten, benötigen die `KulturPass-Erweiterung`_.
+    Aktivieren Sie diese bitte in jeder relevanten Veranstaltung über Einstellungen -> Erweiterungen -> Tab
+    "Integrationen" -> KulturPass.
+
+6. Konfiguration der Artikel
+    Nachdem die KulturPass-Erweiterung aktiviert wurde, müssen Sie sich entscheiden, welche Produkte Sie über den
+    KulturPass-Marktplatz anbieten möchten. In der Bearbeitungs-Ansicht des jeweiligen Produktes finden Sie hierzu im
+    Tab "Zusätzliche Einstellungen" eine Checkbox "Das Produkt kann mit dem KulturPass erworben werden".
+
+.. note::
+
+    Die Eigenschaft, dass ein Produkt durch den KulturPass-Marktplatz erworben werden kann, kann für beliebig viele
+    Produkte aktiviert werden. Auf Grund der Funktionsweise des KulturPasses sollten Sie jedoch gerade bei vielen
+    Artikeln mit unterschiedlich hohen Preisen darauf achten, dass die Preisspanne nicht zu hoch ausfällt.
+
+    Aktivieren Sie die Option für drei Produkte für 1, 10 und 100 Euro, so wird Ihr Angebot im KulturPass-Marktplatz
+    für 100 Euro gelistet werden. Dies bedeutet im Umkehrschluss auch, dass das KulturPass-Guthaben eines Jugendlichen
+    auch mindestens 100 Euro betragen muss, damit er Ihr Angebot in Anspruch nehmen kann - auch wenn die betroffene
+    Person lediglich das 1 Euro-Angebot wahrnehmen möchte. Erst mit dem 100 Euro KulturPass-Einlösecode wählt die
+    kaufende Person in Ihrem pretix-Shop aus, welches Produkt erworben werden soll. Ein Restguthaben wird nach dem Kauf
+    automatisch zurückerstattet und dem KulturPass-Konto wieder gutgeschrieben.
+
+7. Konfiguration des Marktplatz-Eintrages
+    Je nach dem, ob es sich bei Ihrer Veranstaltung um eine Einzelveranstaltung oder eine Veranstaltungsreihe handelt,
+    müssen Sie die folgende Einstellung einmalig oder pro Veranstaltungstermin vornehmen.
+
+    Einzelveranstaltungen konfigurieren Sie über den Menüpunkt "KulturPass" in den Einstellungen Ihrer Veranstaltung;
+    Veranstaltungsreihen beim Anlegen oder Editieren eines jeden einzelnen Termins am Ende der Seite.
+
+    Um eine Veranstaltung oder einen Veranstaltungstermin im KulturPass-Marktplatz anzubieten, aktivieren Sie zunächst
+    die Option "Diese Veranstaltung via KulturPass anbieten". Geben Sie im folgenden die benötigten Informationen an.
+
+    Bitte beachten Sie, dass Sie bei den Angaben präzise Titel und Beschreibungen verwenden, da der KulturPass-
+    Marktplatz ausschließlich die Informationen aus diesem Bereich verwendet. Etwaige andere Informationen die Sie
+    bspw. in den "Text auf Startseite"-Felder eingeben haben, erreichen das KulturPass-System nicht.
+
+.. note::
+
+    Gerade bei Veranstaltungsreihen nutzen viele pretix-Veranstalter gerne verkürzte Termin-Namen. Ein Schwimmbad würde
+    beispielsweise Ihre Veranstaltungsreihe "Freibad Musterstadt" und die einzelnen Termine nur "Schwimmen" nennen.
+
+    Während dies im pretix-Shop in einem gemeinsamen Kontext wunderbar funktioniert, würde eine Veranstaltung mit dem
+    Titel "Schwimmen" im KulturPass-Marktplatz Informationen vermissen lassen. Wählen Sie daher für das Eingabefeld
+    "Veranstaltungstitel" in der KulturPass-Konfiguration einen sprechenden Wert.
+
+8. Übermittlung der Angebote
+    Sobald Sie Ihre ersten Veranstaltungen konfiguriert und live geschaltet haben, übermittelt pretix automatisch in
+    regelmäßigen Abständen alle von Ihnen angebotenen Veranstaltungen an das KulturPass System (Mirakl). Bitte beachten
+    Sie jedoch, dass der Import der Produkte und Angebote einige Zeit in Anspruch nehmen kann. Zum einen müssen
+    Angebote initial händisch von den Betreibern der KulturPass-Platform freigegeben werden, zum anderen muss auch eine
+    Synchronisation zwischen dem Hintergrundsystem und der KulturPass-App erfolgen. Auf die Dauer dieser Prozesse hat
+    pretix keinen Einfluss.
+
+9. Freischalten des Marktplatz-Shops
+    Nachdem pretix erstmalig Angebote an das KulturPass-System übermittelt hat, müssen Sie Ihren Shop KulturPass-Shop
+    einmalig freischalten. Loggen Sie sich hierzu in das `KulturPass-Backend`_ ein.
+
+
+Verwalten von KulturPass-Bestellungen
+-------------------------------------
+Durch die Nutzung der pretix-Integration mit dem KulturPass-System müssen Sie sich - bis auf die Kennzeichnung von
+Produkten, die per KulturPass erworben werden dürfen, sowie die Bereitstellung von Veranstaltungs-Informationen für den
+KulturPass-Marktplatz - um nichts kümmern: pretix übermittelt automatisch Ihre Veranstaltungen, wickelt die Einlösung
+der Tickets ab und führt die Abrechnung mit dem Hintergrund-System durch.
+
+Für Ihre Kunden verhält sich der KulturPass wie eine Zahlungsmethode im Bestellprozess und wird dort neben Ihren
+anderen Zahlungsmethoden mit angeboten.
+
+Die Gelder für mit dem KulturPass bezahlte Tickets erhalten Sie in Form einer Sammel-Überweisung von der Stiftung
+Digitale Chancen auf das von Ihnen beim KulturPass Onboarding angegeben Bankkonto.
+
+In Ihrem `KulturPass-Backend`_ können Sie über den Menüpunkt "Buchhaltung" Ihre bereits erfolgten und kommenden
+Auszahlungen betrachten.
+
+.. note::
+
+    Es ist von äußerster Wichtigkeit, dass Sie weder die eingehenden Bestellungen noch die Produkte und Angebote im
+    KulturPass-Backend händisch bearbeiten - auch wenn dies möglich wäre.
+
+    Bei händischen Änderungen riskieren Sie, dass die Datenbasis zwischen pretix und dem KulturPass-System divergiert
+    und es zu fehlerhaften Buchungen kommt. Wann immer möglich, sollten Sie Korrekturbuchungen und Änderungen
+    ausschließlich über pretix vornehmen.
+
+    Sollte eine händische Änderung/Korrektur notwendig werden, wenden Sie sich bitte an den pretix-Support, damit wir
+    die Auswirkungen evaluieren und vorab mit Ihnen besprechen können!
+
+Erstattungen für Stornos und Absagen können Sie wie gehabt über das pretix-Backend vornehmen. Der jeweilige Betrag wird
+dem KulturPass-Konto dann automatisch gutgeschrieben.
+
+Da nach Ausgabe eines KulturPass Einlöse-Codes dieser vom Kunden jederzeit oder vom System bei
+Nicht-(Komplett)Einlösung binnen 48 Stunden storniert werden kann, kann das im KulturPass-Backend angezeigte,
+auszuzahlende Guthaben fluktuieren. Da in der Regel Auszahlungen frühestens 48 Stunden nach der Aufgabe einer
+KulturPass-Bestellungen erfolgen, sollte Ihr Guthaben in der Regel nicht ins Negative gehen.
+
+Ablauf für Kunden
+-----------------
+Ihre Kunden erhalten - nachdem sie sich ein eigenes Konto in der KulturPass-App angelegt und sich mit ihrem
+elektronischen Personalausweis identifiziert haben - ein Guthaben von 200 Euro, welches für Leistungen aus dem
+KulturPass-Marktplatz eingelöst werden kann.
+
+Im Falle von Veranstaltungen, die per pretix verkauft werden, wählt der Kunde ein Angebot aus und erhält im folgenden
+binnen kurzer Zeit (ca. 10-20 Minuten) einen Code und einen Link, um diesen einzulösen. Der Link bringt den Kunden direkt auf die Seite der
+betreffenden pretix-Veranstaltung. Hier wird der Kunde darauf hingewiesen, für welche Produkte der Code genutzt werden
+kann.
+
+Im Bezahlschritt des Verkaufsprozesses wird dem Kunden vorgeschlagen, seinen KulturPass Einlösecode nun zu nutzen, um
+die gewünschte Leistung zu erhalten.
+
+Wurde ein Artikel gewählt, welcher günstiger als der Wert des Einlösecodes war, wird das Restguthaben automatisch auf
+das KulturPass-Konto erstattet.
+
+Wurden hingegen mehrere Artikel in den Warenkorb gelegt, so kann die Differenz mit einem anderen, regulären
+Zahlungsmittel erfolgen.
+
+Einlösecodes, die vom Kunden nicht binnen 48 Stunden eingelöst werden, werden automatisch storniert und dem
+KulturPass-Konto wieder gutgeschrieben. Dieser Mechanismus greift auch, wenn eine Veranstaltung mittlerweile
+ausverkauft ist und daher der Einlösecode nicht mehr Nutzbar ist.
+
+
+Unterstützung
+-------------
+Weitergehende Informationen zum KulturPass finden Sie auch auf der `Webseite des KulturPasses`_, sowie im
+`KulturPass Serviceportal`_.
+
+
+.. _KulturPass: https://www.kulturpass.de/
+.. _Einstellungen Ihres Veranstalterkontos: https://pretix.eu/control/organizer/-/settings/kulturpass
+.. _KulturPass-Erweiterung: https://pretix.eu/control/event/-/-/settings/plugins#tab-0-2-open
+.. _KulturPass-Backend: https://kulturpass-de.mirakl.net/
+.. _Webseite des KulturPasses: https://www.kulturpass.de/
+.. _KulturPass Serviceportal: https://service.kulturpass.de/help/
@@ -194,17 +194,23 @@ A complete record could look like this::

   v=spf1 a mx include:_spf.pretix.eu ~all

-Make sure to read up on the `SPF specification`_. If you want to authenticate your emails with DKIM, set up a DNS TXT
-record for the subdomain ``pretix._domainkey`` with the following contents::
+Make sure to read up on the `SPF specification`_.

-   v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXrDk6lwOWX00e2MbiiJac6huI+gnzLf9N4G1FnBv3PXq8fz3i2q1szH72OF5mAlKm3zXO4cl/uxx+lfidS1ERbX6Bn9BRstBTQUKWC4JFj8Yk9+fwT7LWehDURazLdTzfsIjJFudLLvxtOKSaOCtMhbPX05DIhziaqVCBqgz/NQIDAQAB
+If you want to authenticate your emails with `DKIM`_, set up a ``CNAME`` record for the subdomain ``pretix._domainkey``
+pointing to ``dkim.pretix.eu``::
+
+   pretix._domainkey.mydomain.com. CNAME dkim.pretix.eu.

 Then, please contact support@pretix.eu and we will enable DKIM for your domain on our mail servers.

+For senders with larger volumes, Google Mail also requires you to have a `DMARC`_ policy (that may however be ``p=none``).
+
 .. note:: Many SMTP servers impose rate limits on the sent emails, such as a maximum number of emails sent per hour.
          These SMTP servers are often not suitable for use with pretix, in case you want to send an email to many
          hundreds or thousands of ticket buyers. Depending on how the rate limit is implemented, emails might be lost
          in this case, as pretix only retries email delivery for a certain time period.

+.. _DKIM: https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail
 .. _Sender Policy Framework: https://en.wikipedia.org/wiki/Sender_Policy_Framework
 .. _SPF specification: http://www.open-spf.org/SPF_Record_Syntax
+.. _DMARC: https://en.wikipedia.org/wiki/DMARC
@@ -138,7 +138,7 @@ the button-style of that checkbox with the one in the pretix shop, you can use t

 .. note::

-        Due to compatibilty with existing widget installations, the default value for ``single-item-select``
+        Due to compatibility with existing widget installations, the default value for ``single-item-select``
        is ``checkbox``. This might change in the future, so make sure, to set the attribute to 
        ``single-item-select="checkbox"`` if you need it.

@@ -196,6 +196,10 @@ settings. For example, if you set up a meta data property called "Promoted" that

   <pretix-widget event="https://pretix.eu/demo/series/" list-type="list" filter="attr[Promoted]=Yes"></pretix-widget>

+If you have enabled public filters in your meta data attribute configuration, a filter-form shows up. To disable, use::
+
+   <pretix-widget event="https://pretix.eu/demo/democon/" disable-filters></pretix-widget>
+
 pretix Button
 -------------

@@ -145,7 +145,7 @@ to get a better plain text representation of your text. Note however, that for
 security reasons you can only use the following HTML elements::

    a, abbr, acronym, b, br, code, div, em, h1, h2,
-    h3, h4, h5, h6, hr, i, li, ol, p, pre, span, strong,
+    h3, h4, h5, h6, hr, i, li, ol, p, pre, s, span, strong,
    table, tbody, td, thead, tr, ul

 Additionally, only the following attributes are allowed on them::
@@ -59,7 +59,7 @@ dependencies = [
  "dnspython==2.3.*",
  "drf_ujson2==1.7.*",
  "geoip2==4.*",
-  "importlib_metadata==6.*",  # Polyfill, we can probably drop this once we require Python 3.10+
+  "importlib_metadata==7.*",  # Polyfill, we can probably drop this once we require Python 3.10+
  "isoweek",
  "jsonschema",
  "kombu==5.3.*",
@@ -97,7 +97,7 @@ dependencies = [
  "sepaxml==2.6.*",
  "slimit",
  "static3==0.7.*",
-  "stripe==5.4.*",
+  "stripe==7.9.*",
  "text-unidecode==1.*",
  "tlds>=2020041600",
  "tqdm==4.*",
@@ -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__ = "2023.9.0"
+__version__ = "2023.11.0.dev0"
@@ -92,6 +92,7 @@ ALL_LANGUAGES = [
    ('id', _('Indonesian')),
    ('it', _('Italian')),
    ('lv', _('Latvian')),
+    ('nb-no', _('Norwegian Bokmål')),
    ('pl', _('Polish')),
    ('pt-pt', _('Portuguese (Portugal)')),
    ('pt-br', _('Portuguese (Brazil)')),
@@ -108,7 +109,7 @@ LANGUAGES_RTL = {
    'ar', 'hw'
 }
 LANGUAGES_INCUBATING = {
-    'pl', 'fi', 'pt-br', 'gl',
+    'fi', 'pt-br', 'gl',
 }
 LOCALE_PATHS = [
    os.path.join(os.path.dirname(__file__), 'locale'),
@@ -266,9 +267,10 @@ CACHE_LARGE_VALUES_ALIAS = 'default'
 FILE_UPLOAD_EXTENSIONS_IMAGE = (".png", ".jpg", ".gif", ".jpeg")
 PILLOW_FORMATS_IMAGE = ('PNG', 'GIF', 'JPEG')

-FILE_UPLOAD_EXTENSIONS_FAVICON = (".ico", ".png", "jpg", ".gif", ".jpeg")
+FILE_UPLOAD_EXTENSIONS_FAVICON = (".ico", ".png", ".jpg", ".gif", ".jpeg")
+PILLOW_FORMATS_QUESTIONS_FAVICON = ('PNG', 'GIF', 'JPEG', 'ICO')

-FILE_UPLOAD_EXTENSIONS_QUESTION_IMAGE = (".png", "jpg", ".gif", ".jpeg", ".bmp", ".tif", ".tiff", ".jfif")
+FILE_UPLOAD_EXTENSIONS_QUESTION_IMAGE = (".png", ".jpg", ".gif", ".jpeg", ".bmp", ".tif", ".tiff", ".jfif")
 PILLOW_FORMATS_QUESTIONS_IMAGE = ('PNG', 'GIF', 'JPEG', 'BMP', 'TIFF')

 FILE_UPLOAD_EXTENSIONS_EMAIL_ATTACHMENT = (
@@ -277,3 +279,5 @@ FILE_UPLOAD_EXTENSIONS_EMAIL_ATTACHMENT = (
    ".bmp", ".tif", ".tiff"
 )
 FILE_UPLOAD_EXTENSIONS_OTHER = FILE_UPLOAD_EXTENSIONS_EMAIL_ATTACHMENT
+
+PRETIX_MAX_ORDER_SIZE = 500
@@ -38,6 +38,7 @@ MAIL_FROM_ORGANIZERS = 'invalid@invalid'
 FILE_UPLOAD_MAX_SIZE_EMAIL_AUTO_ATTACHMENT = 10
 FILE_UPLOAD_MAX_SIZE_EMAIL_ATTACHMENT = 10
 FILE_UPLOAD_MAX_SIZE_IMAGE = 10
+FILE_UPLOAD_MAX_SIZE_FAVICON = 10
 DEFAULT_CURRENCY = 'EUR'
 SECRET_KEY = "build-time-secret-key"
 HAS_REDIS = False
@@ -230,8 +230,8 @@ class EventSerializer(I18nAwareModelSerializer):
        for key, v in value['meta_data'].items():
            if key not in self.meta_properties:
                raise ValidationError(_('Meta data property \'{name}\' does not exist.').format(name=key))
-            if self.meta_properties[key].allowed_values:
-                if v not in [_v.strip() for _v in self.meta_properties[key].allowed_values.splitlines()]:
+            if self.meta_properties[key].choices:
+                if v not in self.meta_properties[key].choice_keys:
                    raise ValidationError(_('Meta data property \'{name}\' does not allow value \'{value}\'.').format(name=key, value=v))
        return value

@@ -424,7 +424,7 @@ class CloneEventSerializer(EventSerializer):
        new_event = super().create({**validated_data, 'plugins': None})

        event = Event.objects.filter(slug=self.context['event'], organizer=self.context['organizer'].pk).first()
-        new_event.copy_data_from(event)
+        new_event.copy_data_from(event, skip_meta_data='meta_data' in validated_data)

        if plugins is not None:
            new_event.set_active_plugins(plugins)
@@ -528,8 +528,8 @@ class SubEventSerializer(I18nAwareModelSerializer):
        for key, v in value['meta_data'].items():
            if key not in self.meta_properties:
                raise ValidationError(_('Meta data property \'{name}\' does not exist.').format(name=key))
-            if self.meta_properties[key].allowed_values:
-                if v not in [_v.strip() for _v in self.meta_properties[key].allowed_values.splitlines()]:
+            if self.meta_properties[key].choices:
+                if v not in self.meta_properties[key].choice_keys:
                    raise ValidationError(_('Meta data property \'{name}\' does not allow value \'{value}\'.').format(name=key, value=v))
        return value

@@ -705,6 +705,7 @@ class EventSettingsSerializer(SettingsSerializer):
        'frontpage_subevent_ordering',
        'event_list_type',
        'event_list_available_only',
+        'event_list_filters',
        'event_calendar_future_only',
        'frontpage_text',
        'event_info_text',
@@ -795,6 +796,8 @@ class EventSettingsSerializer(SettingsSerializer):
        'cancel_allow_user_paid_refund_as_giftcard',
        'cancel_allow_user_paid_require_approval',
        'cancel_allow_user_paid_require_approval_fee_unknown',
+        'cancel_terms_paid',
+        'cancel_terms_unpaid',
        'change_allow_user_variation',
        'change_allow_user_addons',
        'change_allow_user_until',
@@ -20,11 +20,14 @@
 # <https://www.gnu.org/licenses/>.
 #
 from django import forms
+from django.conf import settings
 from django.http import QueryDict
+from pytz import common_timezones
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError

 from pretix.base.exporter import OrganizerLevelExportMixin
+from pretix.base.models import ScheduledEventExport, ScheduledOrganizerExport
 from pretix.base.timeframes import DateFrameField, SerializerDateFrameField


@@ -197,3 +200,92 @@ class JobRunSerializer(serializers.Serializer):
            raise ValidationError(self.errors)

        return not bool(self._errors)
+
+
+class ScheduledExportSerializer(serializers.ModelSerializer):
+    schedule_next_run = serializers.DateTimeField(read_only=True)
+    export_identifier = serializers.ChoiceField(choices=[])
+    locale = serializers.ChoiceField(choices=settings.LANGUAGES, default='en')
+    owner = serializers.SlugRelatedField(slug_field='email', read_only=True)
+    error_counter = serializers.IntegerField(read_only=True)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['export_identifier'].choices = [(e, e) for e in self.context['exporters']]
+
+    def validate(self, attrs):
+        if attrs.get("export_form_data"):
+            identifier = attrs.get('export_identifier', self.instance.export_identifier if self.instance else None)
+            exporter = self.context['exporters'].get(identifier)
+            if exporter:
+                try:
+                    JobRunSerializer(exporter=exporter).to_internal_value(attrs["export_form_data"])
+                except ValidationError as e:
+                    raise ValidationError({"export_form_data": e.detail})
+            else:
+                raise ValidationError({"export_identifier": ["Unknown exporter."]})
+        return attrs
+
+    def validate_mail_additional_recipients(self, value):
+        d = value.replace(' ', '')
+        if len(d.split(',')) > 25:
+            raise ValidationError('Please enter less than 25 recipients.')
+        return d
+
+    def validate_mail_additional_recipients_cc(self, value):
+        d = value.replace(' ', '')
+        if len(d.split(',')) > 25:
+            raise ValidationError('Please enter less than 25 recipients.')
+        return d
+
+    def validate_mail_additional_recipients_bcc(self, value):
+        d = value.replace(' ', '')
+        if len(d.split(',')) > 25:
+            raise ValidationError('Please enter less than 25 recipients.')
+        return d
+
+
+class ScheduledEventExportSerializer(ScheduledExportSerializer):
+
+    class Meta:
+        model = ScheduledEventExport
+        fields = [
+            'id',
+            'owner',
+            'export_identifier',
+            'export_form_data',
+            'locale',
+            'mail_additional_recipients',
+            'mail_additional_recipients_cc',
+            'mail_additional_recipients_bcc',
+            'mail_subject',
+            'mail_template',
+            'schedule_rrule',
+            'schedule_rrule_time',
+            'schedule_next_run',
+            'error_counter',
+        ]
+
+
+class ScheduledOrganizerExportSerializer(ScheduledExportSerializer):
+    timezone = serializers.ChoiceField(default=settings.TIME_ZONE, choices=[(a, a) for a in common_timezones])
+
+    class Meta:
+        model = ScheduledOrganizerExport
+        fields = [
+            'id',
+            'owner',
+            'export_identifier',
+            'export_form_data',
+            'locale',
+            'mail_additional_recipients',
+            'mail_additional_recipients_cc',
+            'mail_additional_recipients_bcc',
+            'mail_subject',
+            'mail_template',
+            'schedule_rrule',
+            'schedule_rrule_time',
+            'schedule_next_run',
+            'timezone',
+            'error_counter',
+        ]
@@ -59,9 +59,9 @@ class InlineItemVariationSerializer(I18nAwareModelSerializer):
    class Meta:
        model = ItemVariation
        fields = ('id', 'value', 'active', 'description',
-                  'position', 'default_price', 'price', 'original_price', 'require_approval',
+                  'position', 'default_price', 'price', 'original_price', 'free_price_suggestion', 'require_approval',
                  'require_membership', 'require_membership_types', 'require_membership_hidden',
-                  'checkin_attention', 'available_from', 'available_until',
+                  'checkin_attention', 'checkin_text', 'available_from', 'available_until',
                  'sales_channels', 'hide_without_voucher', 'meta_data')

    def __init__(self, *args, **kwargs):
@@ -83,9 +83,9 @@ class ItemVariationSerializer(I18nAwareModelSerializer):
    class Meta:
        model = ItemVariation
        fields = ('id', 'value', 'active', 'description',
-                  'position', 'default_price', 'price', 'original_price', 'require_approval',
+                  'position', 'default_price', 'price', 'original_price', 'free_price_suggestion', 'require_approval',
                  'require_membership', 'require_membership_types', 'require_membership_hidden',
-                  'checkin_attention', 'available_from', 'available_until',
+                  'checkin_attention', 'checkin_text', 'available_from', 'available_until',
                  'sales_channels', 'hide_without_voucher', 'meta_data')

    def __init__(self, *args, **kwargs):
@@ -234,12 +234,13 @@ class ItemSerializer(I18nAwareModelSerializer):
    class Meta:
        model = Item
        fields = ('id', 'category', 'name', 'internal_name', 'active', 'sales_channels', 'description',
-                  'default_price', 'free_price', 'tax_rate', 'tax_rule', 'admission', 'personalized',
-                  'position', 'picture', 'available_from', 'available_until',
+                  'default_price', 'free_price', 'free_price_suggestion', 'tax_rate', 'tax_rule', 'admission',
+                  'personalized', 'position', 'picture', 'available_from', 'available_until',
                  'require_voucher', 'hide_without_voucher', 'allow_cancel', 'require_bundling',
-                  'min_per_order', 'max_per_order', 'checkin_attention', 'has_variations', 'variations',
+                  'min_per_order', 'max_per_order', 'checkin_attention', 'checkin_text', 'has_variations', 'variations',
                  'addons', 'bundles', 'original_price', 'require_approval', 'generate_tickets',
-                  'show_quota_left', 'hidden_if_available', 'allow_waitinglist', 'issue_giftcard', 'meta_data',
+                  'show_quota_left', 'hidden_if_available', 'hidden_if_item_available', 'allow_waitinglist',
+                  'issue_giftcard', 'meta_data',
                  'require_membership', 'require_membership_types', 'require_membership_hidden', 'grant_membership_type',
                  'grant_membership_duration_like_event', 'grant_membership_duration_days',
                  'grant_membership_duration_months', 'validity_mode', 'validity_fixed_from', 'validity_fixed_until',
@@ -439,7 +440,7 @@ class QuestionSerializer(I18nAwareModelSerializer):
    class Meta:
        model = Question
        fields = ('id', 'question', 'type', 'required', 'items', 'options', 'position',
-                  'ask_during_checkin', 'identifier', 'dependency_question', 'dependency_values',
+                  'ask_during_checkin', 'show_during_checkin', 'identifier', 'dependency_question', 'dependency_values',
                  'hidden', 'dependency_value', 'print_on_invoice', 'help_text', 'valid_number_min',
                  'valid_number_max', 'valid_date_min', 'valid_date_max', 'valid_datetime_min', 'valid_datetime_max',
                  'valid_string_length_max', 'valid_file_portrait')
@@ -485,6 +486,9 @@ class QuestionSerializer(I18nAwareModelSerializer):
        if full_data.get('ask_during_checkin') and full_data.get('type') in Question.ASK_DURING_CHECKIN_UNSUPPORTED:
            raise ValidationError(_('This type of question cannot be asked during check-in.'))

+        if full_data.get('show_during_checkin') and full_data.get('type') in Question.SHOW_DURING_CHECKIN_UNSUPPORTED:
+            raise ValidationError(_('This type of question cannot be shown during check-in.'))
+
        Question.clean_items(event, full_data.get('items'))
        return data

@@ -44,7 +44,7 @@ from pretix.api.serializers import CompatibleJSONField
 from pretix.api.serializers.event import SubEventSerializer
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.api.serializers.item import (
-    InlineItemVariationSerializer, ItemSerializer,
+    InlineItemVariationSerializer, ItemSerializer, QuestionSerializer,
 )
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.decimal import round_decimal
@@ -501,7 +501,7 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
            # /events/…/checkinlists/…/positions/
            # We're unable to check this on this level if we're on /checkinrpc/, in which case we rely on the view
            # layer to not set pdf_data=true in the first place.
-            request and hasattr(request, 'event') and 'can_view_orders' not in request.eventpermset
+            request and hasattr(request, 'eventpermset') and 'can_view_orders' not in request.eventpermset
        )
        if ('pdf_data' in self.context and not self.context['pdf_data']) or pdf_data_forbidden:
            self.fields.pop('pdf_data', None)
@@ -585,6 +585,9 @@ class CheckinListOrderPositionSerializer(OrderPositionSerializer):
        if 'variation' in self.context['expand']:
            self.fields['variation'] = InlineItemVariationSerializer(read_only=True)

+        if 'answers.question' in self.context['expand']:
+            self.fields['answers'].child.fields['question'] = QuestionSerializer(read_only=True)
+

 class OrderPaymentTypeField(serializers.Field):
    # TODO: Remove after pretix 2.2
@@ -715,7 +718,7 @@ class OrderSerializer(I18nAwareModelSerializer):
        fields = (
            'code', 'event', 'status', 'testmode', 'secret', 'email', 'phone', 'locale', 'datetime', 'expires', 'payment_date',
            'payment_provider', 'fees', 'total', 'comment', 'custom_followup_at', 'invoice_address', 'positions', 'downloads',
-            'checkin_attention', 'last_modified', 'payments', 'refunds', 'require_approval', 'sales_channel',
+            'checkin_attention', 'checkin_text', 'last_modified', 'payments', 'refunds', 'require_approval', 'sales_channel',
            'url', 'customer', 'valid_if_pending'
        )
        read_only_fields = (
@@ -771,8 +774,8 @@ class OrderSerializer(I18nAwareModelSerializer):
    def update(self, instance, validated_data):
        # Even though all fields that shouldn't be edited are marked as read_only in the serializer
        # (hopefully), we'll be extra careful here and be explicit about the model fields we update.
-        update_fields = ['comment', 'custom_followup_at', 'checkin_attention', 'email', 'locale', 'phone',
-                         'valid_if_pending']
+        update_fields = ['comment', 'custom_followup_at', 'checkin_attention', 'checkin_text', 'email', 'locale',
+                         'phone', 'valid_if_pending']

        if 'invoice_address' in validated_data:
            iadata = validated_data.pop('invoice_address')
@@ -1032,13 +1035,14 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
        super().__init__(*args, **kwargs)
        self.fields['positions'].child.fields['voucher'].queryset = self.context['event'].vouchers.all()
        self.fields['customer'].queryset = self.context['event'].organizer.customers.all()
+        self.fields['expires'].required = False

    class Meta:
        model = Order
        fields = ('code', 'status', 'testmode', 'email', 'phone', 'locale', 'payment_provider', 'fees', 'comment', 'sales_channel',
-                  'invoice_address', 'positions', 'checkin_attention', 'payment_info', 'payment_date', 'consume_carts',
-                  'force', 'send_email', 'simulate', 'customer', 'custom_followup_at', 'require_approval',
-                  'valid_if_pending')
+                  'invoice_address', 'positions', 'checkin_attention', 'checkin_text', 'payment_info', 'payment_date',
+                  'consume_carts', 'force', 'send_email', 'simulate', 'customer', 'custom_followup_at',
+                  'require_approval', 'valid_if_pending', 'expires')

    def validate_payment_provider(self, pp):
        if pp is None:
@@ -1047,6 +1051,11 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
            raise ValidationError('The given payment provider is not known.')
        return pp

+    def validate_expires(self, expires):
+        if expires < now():
+            raise ValidationError('Expiration date must be in the future.')
+        return expires
+
    def validate_sales_channel(self, channel):
        if channel not in get_all_sales_channels():
            raise ValidationError('Unknown sales channel.')
@@ -1068,6 +1077,10 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
            raise ValidationError(
                'An order cannot be empty.'
            )
+        if len(data) > settings.PRETIX_MAX_ORDER_SIZE:
+            raise ValidationError(
+                'Orders cannot have more than %(max)s positions.' % {'max': settings.PRETIX_MAX_ORDER_SIZE}
+            )
        errs = [{} for p in data]
        if any([p.get('positionid') for p in data]):
            if not all([p.get('positionid') for p in data]):
@@ -1353,7 +1366,8 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
        if validated_data.get('locale', None) is None:
            validated_data['locale'] = self.context['event'].settings.locale
        order = Order(event=self.context['event'], **validated_data)
-        order.set_expires(subevents=[p.get('subevent') for p in positions_data])
+        if not validated_data.get('expires'):
+            order.set_expires(subevents=[p.get('subevent') for p in positions_data])
        order.meta_info = "{}"
        order.total = Decimal('0.00')
        if validated_data.get('require_approval') is not None:
@@ -63,6 +63,7 @@ orga_router.register(r'teams', organizer.TeamViewSet)
 orga_router.register(r'devices', organizer.DeviceViewSet)
 orga_router.register(r'orders', order.OrganizerOrderViewSet)
 orga_router.register(r'invoices', order.InvoiceViewSet)
+orga_router.register(r'scheduled_exports', exporters.ScheduledOrganizerExportViewSet)
 orga_router.register(r'exporters', exporters.OrganizerExportersViewSet, basename='exporters')

 team_router = routers.DefaultRouter()
@@ -88,6 +89,7 @@ event_router.register(r'taxrules', event.TaxRuleViewSet)
 event_router.register(r'waitinglistentries', waitinglist.WaitingListViewSet)
 event_router.register(r'checkinlists', checkin.CheckinListViewSet)
 event_router.register(r'cartpositions', cart.CartPositionViewSet)
+event_router.register(r'scheduled_exports', exporters.ScheduledEventExportViewSet)
 event_router.register(r'exporters', exporters.EventExportersViewSet, basename='exporters')
 event_router.register(r'shredders', shredders.EventShreddersViewSet, basename='shredders')
 event_router.register(r'item_meta_properties', event.ItemMetaPropertiesViewSet)
@@ -536,6 +536,7 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
                                'reason': Checkin.REASON_ALREADY_REDEEMED,
                                'reason_explanation': None,
                                'require_attention': False,
+                                'checkin_texts': [],
                                '__warning': 'Compatibility hack active due to detected old pretixSCAN version',
                            }, status=400)
                    except:  # we don't care e.g. about invalid version numbers
@@ -547,6 +548,7 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
                    'reason': Checkin.REASON_INVALID,
                    'reason_explanation': None,
                    'require_attention': False,
+                    'checkin_texts': [],
                    'list': MiniCheckinListSerializer(checkinlists[0]).data,
                }, status=404)
            elif revoked_matches and force:
@@ -576,6 +578,7 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
                    'reason': Checkin.REASON_REVOKED,
                    'reason_explanation': None,
                    'require_attention': False,
+                    'checkin_texts': [],
                    'position': CheckinListOrderPositionSerializer(op, context=_make_context(context, revoked_matches[
                        0].event)).data,
                    'list': MiniCheckinListSerializer(list_by_event[revoked_matches[0].event_id]).data,
@@ -631,6 +634,7 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
                'reason': Checkin.REASON_AMBIGUOUS,
                'reason_explanation': None,
                'require_attention': op.require_checkin_attention,
+                'checkin_texts': op.checkin_texts,
                'position': CheckinListOrderPositionSerializer(op, context=_make_context(context, op.order.event)).data,
                'list': MiniCheckinListSerializer(list_by_event[op.order.event_id]).data,
            }, status=400)
@@ -679,6 +683,7 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
            return Response({
                'status': 'incomplete',
                'require_attention': op.require_checkin_attention,
+                'checkin_texts': op.checkin_texts,
                'position': CheckinListOrderPositionSerializer(op, context=_make_context(context, op.order.event)).data,
                'questions': [
                    QuestionSerializer(q).data for q in e.questions
@@ -709,6 +714,7 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
                'reason': e.code,
                'reason_explanation': e.reason,
                'require_attention': op.require_checkin_attention,
+                'checkin_texts': op.checkin_texts,
                'position': CheckinListOrderPositionSerializer(op, context=_make_context(context, op.order.event)).data,
                'list': MiniCheckinListSerializer(list_by_event[op.order.event_id]).data,
            }, status=400)
@@ -716,6 +722,7 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
            return Response({
                'status': 'ok',
                'require_attention': op.require_checkin_attention,
+                'checkin_texts': op.checkin_texts,
                'position': CheckinListOrderPositionSerializer(op, context=_make_context(context, op.order.event)).data,
                'list': MiniCheckinListSerializer(list_by_event[op.order.event_id]).data,
            }, status=201)
@@ -89,6 +89,8 @@ class UpdateRequestSerializer(serializers.Serializer):

 class RSAEncryptedField(serializers.Field):
    def to_representation(self, value):
+        if isinstance(value, memoryview):
+            value = value.tobytes()
        public_key = load_pem_public_key(
            self.context['device'].rsa_pubkey.encode(), Backend()
        )
@@ -254,7 +254,7 @@ class EventViewSet(viewsets.ModelViewSet):
        new_event = serializer.save(organizer=self.request.organizer)

        if copy_from:
-            new_event.copy_data_from(copy_from)
+            new_event.copy_data_from(copy_from, skip_meta_data='meta_data' in serializer.validated_data)

            if plugins is not None:
                new_event.set_active_plugins(plugins)
@@ -29,14 +29,20 @@ from django.utils.functional import cached_property
 from django.utils.timezone import now
 from rest_framework import status, viewsets
 from rest_framework.decorators import action
+from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
 from rest_framework.reverse import reverse

+from pretix.api.pagination import TotalOrderingFilter
 from pretix.api.serializers.exporters import (
-    ExporterSerializer, JobRunSerializer,
+    ExporterSerializer, JobRunSerializer, ScheduledEventExportSerializer,
+    ScheduledOrganizerExportSerializer,
 )
 from pretix.base.exporter import OrganizerLevelExportMixin
-from pretix.base.models import CachedFile, Device, Event, TeamAPIToken
+from pretix.base.models import (
+    CachedFile, Device, Event, ScheduledEventExport, ScheduledOrganizerExport,
+    TeamAPIToken,
+)
 from pretix.base.services.export import export, multiexport
 from pretix.base.signals import (
    register_data_exporters, register_multievent_data_exporters,
@@ -199,3 +205,152 @@ class OrganizerExportersViewSet(ExportersMixin, viewsets.ViewSet):
            'provider': instance.identifier,
            'form_data': data
        })
+
+
+class ScheduledExportersViewSet(viewsets.ModelViewSet):
+    filter_backends = (TotalOrderingFilter,)
+    ordering = ('id',)
+    ordering_fields = ('id', 'export_identifier', 'schedule_next_run')
+
+
+class ScheduledEventExportViewSet(ScheduledExportersViewSet):
+    serializer_class = ScheduledEventExportSerializer
+    queryset = ScheduledEventExport.objects.none()
+    permission = 'can_view_orders'
+
+    def get_queryset(self):
+        perm_holder = self.request.auth if isinstance(self.request.auth, (TeamAPIToken, Device)) else self.request.user
+        if not perm_holder.has_event_permission(self.request.organizer, self.request.event, 'can_change_event_settings',
+                                                request=self.request):
+            if self.request.user.is_authenticated:
+                qs = self.request.event.scheduled_exports.filter(owner=self.request.user)
+            else:
+                raise PermissionDenied('Scheduled exports require either permission to change event settings or '
+                                       'user-specific API access.')
+        else:
+            qs = self.request.event.scheduled_exports
+        return qs.select_related("owner")
+
+    def perform_create(self, serializer):
+        if not self.request.user.is_authenticated:
+            raise PermissionDenied('Creation of exports requires user-specific API access.')
+        serializer.save(event=self.request.event, owner=self.request.user)
+        serializer.instance.compute_next_run()
+        serializer.instance.save(update_fields=["schedule_next_run"])
+        self.request.event.log_action(
+            'pretix.event.export.schedule.added',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=self.request.data
+        )
+
+    def get_serializer_context(self):
+        ctx = super().get_serializer_context()
+        ctx['event'] = self.request.event
+        ctx['exporters'] = self.exporters
+        return ctx
+
+    @cached_property
+    def exporters(self):
+        responses = register_data_exporters.send(self.request.event)
+        exporters = [response(self.request.event, self.request.organizer) for r, response in responses if response]
+        return {e.identifier: e for e in exporters}
+
+    def perform_update(self, serializer):
+        serializer.save(event=self.request.event)
+        serializer.instance.compute_next_run()
+        serializer.instance.error_counter = 0
+        serializer.instance.error_last_message = None
+        serializer.instance.save(update_fields=["schedule_next_run", "error_counter", "error_last_message"])
+        self.request.event.log_action(
+            'pretix.event.export.schedule.changed',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=self.request.data
+        )
+
+    def perform_destroy(self, instance):
+        self.request.event.log_action(
+            'pretix.event.export.schedule.deleted',
+            user=self.request.user,
+            auth=self.request.auth,
+        )
+        super().perform_destroy(instance)
+
+
+class ScheduledOrganizerExportViewSet(ScheduledExportersViewSet):
+    serializer_class = ScheduledOrganizerExportSerializer
+    queryset = ScheduledOrganizerExport.objects.none()
+    permission = None
+
+    def get_queryset(self):
+        perm_holder = self.request.auth if isinstance(self.request.auth, (TeamAPIToken, Device)) else self.request.user
+        if not perm_holder.has_organizer_permission(self.request.organizer, 'can_change_organizer_settings',
+                                                    request=self.request):
+            if self.request.user.is_authenticated:
+                qs = self.request.organizer.scheduled_exports.filter(owner=self.request.user)
+            else:
+                raise PermissionDenied('Scheduled exports require either permission to change organizer settings or '
+                                       'user-specific API access.')
+        else:
+            qs = self.request.organizer.scheduled_exports
+        return qs.select_related("owner")
+
+    def perform_create(self, serializer):
+        if not self.request.user.is_authenticated:
+            raise PermissionDenied('Creation of exports requires user-specific API access.')
+        serializer.save(organizer=self.request.organizer, owner=self.request.user)
+        serializer.instance.compute_next_run()
+        serializer.instance.save(update_fields=["schedule_next_run"])
+        self.request.organizer.log_action(
+            'pretix.organizer.export.schedule.added',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=self.request.data
+        )
+
+    def get_serializer_context(self):
+        ctx = super().get_serializer_context()
+        ctx['organizer'] = self.request.organizer
+        ctx['exporters'] = self.exporters
+        return ctx
+
+    @cached_property
+    def events(self):
+        if isinstance(self.request.auth, (TeamAPIToken, Device)):
+            return self.request.auth.get_events_with_permission('can_view_orders')
+        elif self.request.user.is_authenticated:
+            return self.request.user.get_events_with_permission('can_view_orders', self.request).filter(
+                organizer=self.request.organizer
+            )
+
+    @cached_property
+    def exporters(self):
+        responses = register_multievent_data_exporters.send(self.request.organizer)
+        exporters = [
+            response(Event.objects.none() if issubclass(response, OrganizerLevelExportMixin) else self.events,
+                     self.request.organizer)
+            for r, response in responses if response
+        ]
+        return {e.identifier: e for e in exporters}
+
+    def perform_update(self, serializer):
+        serializer.save(organizer=self.request.organizer)
+        serializer.instance.compute_next_run()
+        serializer.instance.error_counter = 0
+        serializer.instance.error_last_message = None
+        serializer.instance.save(update_fields=["schedule_next_run", "error_counter", "error_last_message"])
+        self.request.organizer.log_action(
+            'pretix.organizer.export.schedule.changed',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=self.request.data
+        )
+
+    def perform_destroy(self, instance):
+        self.request.organizer.log_action(
+            'pretix.organizer.export.schedule.deleted',
+            user=self.request.user,
+            auth=self.request.auth,
+        )
+        super().perform_destroy(instance)
@@ -222,6 +222,8 @@ class OrderViewSetMixin:
            qs = qs.prefetch_related('refunds', 'refunds__payment')
        if 'invoice_address' not in self.request.GET.getlist('exclude'):
            qs = qs.select_related('invoice_address')
+        if 'customer' not in self.request.GET.getlist('exclude'):
+            qs = qs.select_related('customer')

        qs = qs.prefetch_related(self._positions_prefetch(self.request))
        return qs
@@ -827,6 +829,16 @@ class EventOrderViewSet(OrderViewSetMixin, viewsets.ModelViewSet):
                    }
                )

+            if 'checkin_text' in self.request.data and serializer.instance.checkin_text != self.request.data.get('checkin_text'):
+                serializer.instance.log_action(
+                    'pretix.event.order.checkin_text',
+                    user=self.request.user,
+                    auth=self.request.auth,
+                    data={
+                        'new_value': self.request.data.get('checkin_text')
+                    }
+                )
+
            if 'valid_if_pending' in self.request.data and serializer.instance.valid_if_pending != self.request.data.get('valid_if_pending'):
                serializer.instance.log_action(
                    'pretix.event.order.valid_if_pending',
@@ -384,7 +384,7 @@ def register_default_webhook_events(sender, **kwargs):
 def notify_webhooks(logentry_ids: list):
    if not isinstance(logentry_ids, list):
        logentry_ids = [logentry_ids]
-    qs = LogEntry.all.select_related('event', 'event__organizer').filter(id__in=logentry_ids)
+    qs = LogEntry.all.select_related('event', 'event__organizer', 'organizer').filter(id__in=logentry_ids)
    _org, _at, webhooks = None, None, None
    for logentry in qs:
        if not logentry.organizer:
@@ -103,15 +103,17 @@ def get_all_sales_channels():
    if _ALL_CHANNELS:
        return _ALL_CHANNELS

-    types = OrderedDict()
+    channels = []
    for recv, ret in register_sales_channels.send(None):
        if isinstance(ret, (list, tuple)):
-            for r in ret:
-                types[r.identifier] = r
+            channels += ret
        else:
-            types[ret.identifier] = ret
-    _ALL_CHANNELS = types
-    return types
+            channels.append(ret)
+    channels.sort(key=lambda c: c.identifier)
+    _ALL_CHANNELS = OrderedDict([(c.identifier, c) for c in channels])
+    if 'web' in _ALL_CHANNELS:
+        _ALL_CHANNELS.move_to_end('web', last=False)
+    return _ALL_CHANNELS


 class WebshopSalesChannel(SalesChannel):
@@ -149,6 +149,7 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
        }
        if self.organizer:
            htmlctx['organizer'] = self.organizer
+            htmlctx['color'] = self.organizer.settings.primary_color

        if self.event:
            htmlctx['event'] = self.event
@@ -28,4 +28,5 @@ from .items import *  # noqa
 from .json import *  # noqa
 from .mail import *  # noqa
 from .orderlist import *  # noqa
+from .reusablemedia import *  # noqa
 from .waitinglist import *  # noqa
@@ -88,6 +88,7 @@ class ItemDataExporter(ListExporter):
            _("Minimum amount per order"),
            _("Maximum amount per order"),
            _("Requires special attention"),
+            _("Check-in text"),
            _("Original price"),
            _("This product is a gift card"),
            _("Require a valid membership"),
@@ -162,6 +163,7 @@ class ItemDataExporter(ListExporter):
                        i.min_per_order if i.min_per_order is not None else "",
                        i.max_per_order if i.max_per_order is not None else "",
                        _("Yes") if i.checkin_attention else "",
+                        i.checkin_text or "",
                        v.original_price or i.original_price or "",
                        _("Yes") if i.issue_giftcard else "",
                        _("Yes") if i.require_membership or v.require_membership else "",
@@ -206,6 +208,7 @@ class ItemDataExporter(ListExporter):
                    i.min_per_order if i.min_per_order is not None else "",
                    i.max_per_order if i.max_per_order is not None else "",
                    _("Yes") if i.checkin_attention else "",
+                    i.checkin_text or "",
                    i.original_price or "",
                    _("Yes") if i.issue_giftcard else "",
                    _("Yes") if i.require_membership else "",
@@ -96,6 +96,7 @@ class JSONExporter(BaseExporter):
                        'min_per_order': item.min_per_order,
                        'max_per_order': item.max_per_order,
                        'checkin_attention': item.checkin_attention,
+                        'checkin_text': item.checkin_text,
                        'original_price': item.original_price,
                        'issue_giftcard': item.issue_giftcard,
                        'meta_data': item.meta_data,
@@ -110,6 +111,7 @@ class JSONExporter(BaseExporter):
                                'description': str(variation.description),
                                'position': variation.position,
                                'checkin_attention': variation.checkin_attention,
+                                'checkin_text': variation.checkin_text,
                                'require_approval': variation.require_approval,
                                'require_membership': variation.require_membership,
                                'sales_channels': variation.sales_channels,
@@ -164,6 +166,7 @@ class JSONExporter(BaseExporter):
                        'custom_followup_at': order.custom_followup_at,
                        'require_approval': order.require_approval,
                        'checkin_attention': order.checkin_attention,
+                        'checkin_text': order.checkin_text,
                        'sales_channel': order.sales_channel,
                        'expires': order.expires,
                        'datetime': order.datetime,
@@ -275,6 +275,7 @@ class OrderListExporter(MultiSheetListExporter):
        headers.append(_('Invoice numbers'))
        headers.append(_('Sales channel'))
        headers.append(_('Requires special attention'))
+        headers.append(_('Check-in text'))
        headers.append(_('Comment'))
        headers.append(_('Follow-up date'))
        headers.append(_('Positions'))
@@ -332,7 +333,7 @@ class OrderListExporter(MultiSheetListExporter):
                self.event_object_cache[order.event_id].slug,
                order.code,
                order.total,
-                order.get_status_display(),
+                order.get_extended_status_display(),
                order.email,
                str(order.phone) if order.phone else '',
                order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
@@ -384,6 +385,7 @@ class OrderListExporter(MultiSheetListExporter):
            row.append(order.invoice_numbers)
            row.append(order.sales_channel)
            row.append(_('Yes') if order.checkin_attention else _('No'))
+            row.append(order.checkin_text or "")
            row.append(order.comment or "")
            row.append(order.custom_followup_at.strftime("%Y-%m-%d") if order.custom_followup_at else "")
            row.append(order.pcnt)
@@ -463,7 +465,7 @@ class OrderListExporter(MultiSheetListExporter):
            row = [
                self.event_object_cache[order.event_id].slug,
                order.code,
-                _("canceled") if op.canceled else order.get_status_display(),
+                _("canceled") if op.canceled else order.get_extended_status_display(),
                order.email,
                str(order.phone) if order.phone else '',
                order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
@@ -638,7 +640,7 @@ class OrderListExporter(MultiSheetListExporter):
                    self.event_object_cache[order.event_id].slug,
                    order.code,
                    op.positionid,
-                    _("canceled") if op.canceled else order.get_status_display(),
+                    _("canceled") if op.canceled else order.get_extended_status_display(),
                    order.email,
                    str(order.phone) if order.phone else '',
                    order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
@@ -1007,20 +1009,20 @@ class PaymentListExporter(ListExporter):
        if form_data.get('end_date_range'):
            dt_start, dt_end = resolve_timeframe_to_datetime_start_inclusive_end_exclusive(now(), form_data['end_date_range'], self.timezone)
            if dt_start:
-                payments = payments.filter(created__gte=dt_start)
-                refunds = refunds .filter(created__gte=dt_start)
+                payments = payments.filter(payment_date__gte=dt_start)
+                refunds = refunds.filter(execution_date__gte=dt_start)
            if dt_end:
-                payments = payments.filter(created__lt=dt_end)
-                refunds = refunds .filter(created__lt=dt_end)
+                payments = payments.filter(payment_date__lt=dt_end)
+                refunds = refunds.filter(execution_date__lt=dt_end)

        if form_data.get('start_end_date_range'):
            dt_start, dt_end = resolve_timeframe_to_datetime_start_inclusive_end_exclusive(now(), form_data['start_date_range'], self.timezone)
            if dt_start:
-                payments = payments.filter(payment_date__gte=dt_start)
-                refunds = refunds .filter(execution_date__gte=dt_start)
+                payments = payments.filter(created__gte=dt_start)
+                refunds = refunds.filter(created__gte=dt_start)
            if dt_end:
-                payments = payments.filter(payment_date__lt=dt_end)
-                refunds = refunds.filter(execution_date__lt=dt_end)
+                payments = payments.filter(created__lt=dt_end)
+                refunds = refunds.filter(created__lt=dt_end)

        objs = sorted(list(payments) + list(refunds), key=lambda o: o.created)

@@ -0,0 +1,78 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+
+from django.dispatch import receiver
+from django.utils.formats import date_format
+from django.utils.translation import gettext_lazy as _, pgettext, pgettext_lazy
+
+from ..exporter import ListExporter, OrganizerLevelExportMixin
+from ..models import ReusableMedium
+from ..signals import register_multievent_data_exporters
+
+
+class ReusableMediaExporter(OrganizerLevelExportMixin, ListExporter):
+    identifier = 'reusablemedia'
+    verbose_name = _('Reusable media')
+    category = pgettext_lazy('export_category', 'Reusable media')
+    description = _('Download a spread sheet with the data of all reusable medias on your account.')
+
+    def iterate_list(self, form_data):
+        media = ReusableMedium.objects.filter(
+            organizer=self.organizer,
+        ).select_related(
+            'customer', 'linked_orderposition', 'linked_giftcard',
+        ).order_by('created')
+
+        headers = [
+            pgettext('reusable_medium', 'Media type'),
+            pgettext('reusable_medium', 'Identifier'),
+            _('Active'),
+            _('Expiration date'),
+            _('Customer account'),
+            _('Linked ticket'),
+            _('Linked gift card'),
+            _('Notes'),
+        ]
+
+        yield headers
+        yield self.ProgressSetTotal(total=media.count())
+
+        for medium in media.iterator(chunk_size=1000):
+            row = [
+                medium.type,
+                medium.identifier,
+                _('Yes') if medium.active else _('No'),
+                date_format(medium.expires, 'SHORT_DATETIME_FORMAT') if medium.expires else '',
+                medium.customer.identifier if medium.customer_id else '',
+                f"{medium.linked_orderposition.order.code}-{medium.linked_orderposition.positionid}" if medium.linked_orderposition_id else '',
+                medium.linked_giftcard.secret if medium.linked_giftcard_id else '',
+                medium.notes,
+            ]
+            yield row
+
+    def get_filename(self):
+        return f'{self.organizer.slug}_media'
+
+
+@receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_reusablemedia")
+def register_multievent_i_reusable_media_exporter(sender, **kwargs):
+    return ReusableMediaExporter
@@ -125,7 +125,7 @@ class NamePartsWidget(forms.MultiWidget):
            if fname == 'title' and self.titles:
                widgets.append(Select(attrs=a, choices=[('', '')] + [(d, d) for d in self.titles[1]]))
            elif fname == 'salutation':
-                widgets.append(Select(attrs=a, choices=[('', '---')] + PERSON_NAME_SALUTATIONS))
+                widgets.append(Select(attrs=a, choices=[('', '---'), ('empty', '')] + PERSON_NAME_SALUTATIONS))
            else:
                widgets.append(self.widget(attrs=a))
        super().__init__(widgets, attrs)
@@ -136,7 +136,10 @@ class NamePartsWidget(forms.MultiWidget):
        data = []
        for i, field in enumerate(self.scheme['fields']):
            fname, label, size = field
-            data.append(value.get(fname, ""))
+            fval = value.get(fname, "")
+            if fname == "salutation" and fname in value and fval == "":
+                fval = "empty"
+            data.append(fval)
        if '_legacy' in value and not data[-1]:
            data[-1] = value.get('_legacy', '')
        elif not any(d for d in data) and '_scheme' in value:
@@ -190,7 +193,8 @@ class NamePartsFormField(forms.MultiValueField):
        data = {}
        data['_scheme'] = self.scheme_name
        for i, value in enumerate(data_list):
-            data[self.scheme['fields'][i][0]] = value or ''
+            key = self.scheme['fields'][i][0]
+            data[key] = value or ''
        return data

    def __init__(self, *args, **kwargs):
@@ -239,7 +243,7 @@ class NamePartsFormField(forms.MultiValueField):
                d.pop('validators', None)
                field = forms.ChoiceField(
                    **d,
-                    choices=[('', '---')] + PERSON_NAME_SALUTATIONS
+                    choices=[('', '---'), ('empty', '')] + PERSON_NAME_SALUTATIONS
                )
            else:
                field = forms.CharField(**defaults)
@@ -265,6 +269,9 @@ class NamePartsFormField(forms.MultiValueField):
        if sum(len(v) for v in value.values() if v) > 250:
            raise forms.ValidationError(_('Please enter a shorter name.'), code='max_length')

+        if value.get("salutation") == "empty":
+            value["salutation"] = ""
+
        return value


@@ -209,7 +209,10 @@ class SplitDateTimePickerWidget(forms.SplitDateTimeWidget):

        date_attrs['placeholder'] = lazy(date_placeholder, str)
        time_attrs['placeholder'] = lazy(time_placeholder, str)
-
+        date_attrs['aria-label'] = _('Date')
+        time_attrs['aria-label'] = _('Time')
+        if 'aria-label' in attrs:
+            del attrs['aria-label']
        widgets = (
            forms.DateInput(attrs=date_attrs, format=date_format),
            forms.TimeInput(attrs=time_attrs, format=time_format),
@@ -104,7 +104,7 @@ class Command(BaseCommand):
            with language(locale), override(timezone):
                for receiver, response in signal_result:
                    if not response:
-                        return None
+                        continue
                    ex = response(e, o, report_status)
                    if ex.identifier == options['export_provider']:
                        params = json.loads(options.get('parameters') or '{}')
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.4 on 2023-10-25 12:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("pretixbase", "0247_checkinlist"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="item",
+            name="free_price_suggestion",
+            field=models.DecimalField(decimal_places=2, max_digits=13, null=True),
+        ),
+        migrations.AddField(
+            model_name="itemvariation",
+            name="free_price_suggestion",
+            field=models.DecimalField(decimal_places=2, max_digits=13, null=True),
+        ),
+    ]
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.4 on 2023-10-30 11:50
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("pretixbase", "0248_item_free_price_suggestion"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="item",
+            name="hidden_if_item_available",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="pretixbase.item",
+            ),
+        ),
+    ]
@@ -0,0 +1,52 @@
+# Generated by Django 4.2.4 on 2023-10-31 10:08
+import i18nfield.fields
+from django.db import migrations, models
+
+import pretix.helpers.json
+
+
+def convert_allowed_values(apps, schema_editor):
+    EventMetaProperty = apps.get_model('pretixbase', 'EventMetaProperty')
+    for emp in EventMetaProperty.objects.filter(allowed_values__isnull=False):
+        emp.choices = [
+            {"key": _v.strip(), "label": {"en": _v.strip()}}
+            for _v in emp.allowed_values.splitlines()
+        ]
+        emp.save(update_fields=["choices"])
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("pretixbase", "0249_hidden_if_item_available"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="eventmetaproperty",
+            name="filter_public",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="eventmetaproperty",
+            name="public_label",
+            field=i18nfield.fields.I18nCharField(null=True),
+        ),
+        migrations.AddField(
+            model_name="eventmetaproperty",
+            name="position",
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name="eventmetaproperty",
+            name="choices",
+            field=models.JSONField(null=True, encoder=pretix.helpers.json.CustomJSONEncoder),
+        ),
+        migrations.RunPython(
+            convert_allowed_values,
+            migrations.RunPython.noop
+        ),
+        migrations.RemoveField(
+            model_name="eventmetaproperty",
+            name="allowed_values",
+        ),
+    ]
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.4 on 2023-11-13 16:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("pretixbase", "0250_eventmetaproperty_filter_public"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="order",
+            name="invoice_dirty",
+            field=models.BooleanField(default=False),
+        ),
+    ]
@@ -0,0 +1,56 @@
+# Generated by Django 4.2.4 on 2023-11-20 12:38
+
+import django.db.models.deletion
+from django.db import migrations, models
+from django.db.models import F, OuterRef, Subquery
+
+
+def backfill_organizer(apps, schema_editor):
+    LogEntry = apps.get_model("pretixbase", "LogEntry")
+    Event = apps.get_model("pretixbase", "Event")
+    ContentType = apps.get_model("contenttypes", "ContentType")
+
+    LogEntry.objects.filter(
+        organizer_link__isnull=True, event__isnull=False
+    ).update(organizer_link_id=Subquery(
+            Event.objects.filter(pk=OuterRef('event_id')).values('organizer_id'),
+        )
+    )
+    for ct in ContentType.objects.all():
+        try:
+            model = apps.get_model(ct.app_label, ct.model)
+        except LookupError:
+            continue
+        if "organizer" in model._meta.fields:
+            LogEntry.objects.filter(
+                organizer_link__isnull=True, event__isnull=True, content_type=ct,
+            ).update(
+                organizer_link_id=Subquery(model.objects.filter(pk=OuterRef('object_id')).values('organizer_id'))
+            )
+        elif "event" in model._meta.fields:
+            LogEntry.objects.filter(
+                organizer_link__isnull=True, event__isnull=True, content_type=ct,
+            ).update(
+                organizer_link_id=Subquery(model.objects.filter(pk=OuterRef('object_id')).values('event__organizer_id'))
+            )
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("pretixbase", "0251_order_invoice_dirty"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="logentry",
+            name="organizer_link",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="pretixbase.organizer",
+            ),
+        ),
+        migrations.RunPython(
+            backfill_organizer,
+        )
+    ]
@@ -0,0 +1,32 @@
+# Generated by Django 4.2.4 on 2023-09-06 09:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("pretixbase", "0252_logentry_organizer"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="item",
+            name="checkin_text",
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name="itemvariation",
+            name="checkin_text",
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name="order",
+            name="checkin_text",
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name="question",
+            name="show_during_checkin",
+            field=models.BooleanField(default=False),
+        ),
+    ]
@@ -0,0 +1,28 @@
+# Generated by Django 4.2.4 on 2023-12-06 14:53
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("pretixbase", "0253_checkin_info"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="logentry",
+            name="organizer_link",
+            field=models.ForeignKey(
+                db_column="organizer_link_id",
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="pretixbase.organizer",
+            ),
+        ),
+        migrations.RenameField(
+            model_name="logentry",
+            old_name="organizer_link",
+            new_name="organizer",
+        ),
+    ]
@@ -84,13 +84,21 @@ class LoggingMixin:
        from .devices import Device
        from .event import Event
        from .log import LogEntry
-        from .organizer import TeamAPIToken
+        from .organizer import Organizer, TeamAPIToken

        event = None
-        if isinstance(self, Event):
+        organizer_id = None
+        if isinstance(self, Organizer):
+            organizer_id = self.pk
+        elif isinstance(self, Event):
            event = self
+            organizer_id = self.organizer_id
        elif hasattr(self, 'event'):
            event = self.event
+            organizer_id = self.event.organizer_id
+        elif hasattr(self, 'organizer_id'):
+            organizer_id = self.organizer_id
+
        if user and not user.is_authenticated:
            user = None

@@ -106,7 +114,8 @@ class LoggingMixin:
        elif isinstance(api_token, TeamAPIToken):
            kwargs['api_token'] = api_token

-        logentry = LogEntry(content_object=self, user=user, action_type=action, event=event, **kwargs)
+        logentry = LogEntry(content_object=self, user=user, action_type=action, event=event,
+                            organizer_id=organizer_id, **kwargs)
        if isinstance(data, dict):
            sensitivekeys = ['password', 'secret', 'api_key']

@@ -280,7 +280,8 @@ class CheckinList(LoggedModel):
            '<', '<=', '>', '>=', '==', '!=', 'inList', 'isBefore', 'isAfter', 'or', 'and'
        }
        allowed_operators = top_level_operators | {
-            'buildTime', 'objectList', 'lookup', 'var', 'entries_since', 'entries_before'
+            'buildTime', 'objectList', 'lookup', 'var', 'entries_since', 'entries_before', 'entries_days_since',
+            'entries_days_before',
        }
        allowed_vars = {
            'product', 'variation', 'now', 'now_isoweekday', 'entries_number', 'entries_today', 'entries_days',
@@ -309,7 +310,7 @@ class CheckinList(LoggedModel):
                raise ValidationError(f'Logic variable "{values[0]}" is currently not allowed.')
            return rules

-        if operator in ('entries_since', 'entries_before'):
+        if operator in ('entries_since', 'entries_before', 'entries_days_since', 'entries_days_before'):
            if len(values) != 1 or "buildTime" not in values[0]:
                raise ValidationError(f'Operator "{operator}" takes exactly one "buildTime" argument.')

@@ -352,6 +353,7 @@ class Checkin(models.Model):
    REASON_AMBIGUOUS = 'ambiguous'
    REASON_ERROR = 'error'
    REASON_BLOCKED = 'blocked'
+    REASON_UNAPPROVED = 'unapproved'
    REASON_INVALID_TIME = 'invalid_time'
    REASONS = (
        (REASON_CANCELED, _('Order canceled')),
@@ -365,6 +367,7 @@ class Checkin(models.Model):
        (REASON_AMBIGUOUS, _('Ticket code is ambiguous on list')),
        (REASON_ERROR, _('Server error')),
        (REASON_BLOCKED, _('Ticket blocked')),
+        (REASON_UNAPPROVED, _('Order not approved')),
        (REASON_INVALID_TIME, _('Ticket not valid at this time')),
    )

@@ -344,7 +344,7 @@ class Discount(LoggedModel):

        elif self.subevent_mode == self.SUBEVENT_MODE_SAME:
            def key(idx):
-                return positions[idx][1]  # subevent_id
+                return positions[idx][1] or 0  # subevent_id

            # Build groups of candidates with the same subevent, then apply our regular algorithm
            # to each group
@@ -424,5 +424,10 @@ class Discount(LoggedModel):
                                break

            for g in candidate_groups:
-                self._apply_min_count(positions, g, g, result)
+                self._apply_min_count(
+                    positions,
+                    [idx for idx in g if idx in condition_candidates],
+                    [idx for idx in g if idx in benefit_candidates],
+                    result
+                )
        return result
@@ -20,7 +20,6 @@
 # <https://www.gnu.org/licenses/>.
 #

-import logging
 # 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>.
 #
@@ -33,6 +32,7 @@ import logging
 # 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.
+import logging
 import os
 import string
 import uuid
@@ -71,7 +71,7 @@ from pretix.base.validators import EventSlugBanlistValidator
 from pretix.helpers.database import GroupConcat
 from pretix.helpers.daterange import daterange
 from pretix.helpers.hierarkey import clean_filename
-from pretix.helpers.json import safe_string
+from pretix.helpers.json import CustomJSONEncoder, safe_string
 from pretix.helpers.thumb import get_thumbnail

 from ..settings import settings_hierarkey
@@ -775,7 +775,7 @@ class Event(EventMixin, LoggedModel):
            time(hour=23, minute=59, second=59)
        ), tz)

-    def copy_data_from(self, other):
+    def copy_data_from(self, other, skip_meta_data=False):
        from pretix.presale.style import regenerate_css

        from ..signals import event_copy_data
@@ -798,6 +798,12 @@ class Event(EventMixin, LoggedModel):
        self.save()
        self.log_action('pretix.object.cloned', data={'source': other.slug, 'source_id': other.pk})

+        if not skip_meta_data:
+            for emv in EventMetaValue.objects.filter(event=other):
+                emv.pk = None
+                emv.event = self
+                emv.save(force_insert=True)
+
        for fl in EventFooterLink.objects.filter(event=other):
            fl.pk = None
            fl.event = self
@@ -857,6 +863,10 @@ class Event(EventMixin, LoggedModel):
                v.item = i
                v.save(force_insert=True)

+        for i in self.items.filter(hidden_if_item_available__isnull=False):
+            i.hidden_if_item_available = item_map[i.hidden_if_item_available_id]
+            i.save()
+
        for imv in ItemMetaValue.objects.filter(item__event=other):
            imv.pk = None
            imv.property = item_meta_properties_map[imv.property_id]
@@ -997,6 +1007,7 @@ class Event(EventMixin, LoggedModel):
            'presale_widget_css_file',
            'presale_widget_css_checksum',
        )
+        settings_to_save = []
        for s in other.settings._objects.all():
            if s.key in skip_settings:
                continue
@@ -1014,16 +1025,17 @@ class Event(EventMixin, LoggedModel):
                )
                newname = default_storage.save(fname, fi)
                s.value = 'file://' + newname
-                s.save()
+                settings_to_save.append(s)
            elif s.key == 'tax_rate_default':
                try:
                    if int(s.value) in tax_map:
                        s.value = tax_map.get(int(s.value)).pk
-                        s.save()
+                        settings_to_save.append(s)
                except ValueError:
                    pass
            else:
-                s.save()
+                settings_to_save.append(s)
+        other.settings._objects.bulk_create(settings_to_save)

        self.settings.flush()
        event_copy_data.send(
@@ -1052,7 +1064,7 @@ class Event(EventMixin, LoggedModel):
                    providers[pp.identifier] = pp

            self._cached_payment_providers = OrderedDict(sorted(
-                providers.items(), key=lambda v: (-v[1].priority, str(v[1].verbose_name))
+                providers.items(), key=lambda v: (-v[1].priority, str(v[1].verbose_name).title())
            ))
        return self._cached_payment_providers

@@ -1641,26 +1653,40 @@ class EventMetaProperty(LoggedModel):
        help_text=_("If checked, an event can only be taken live if the property is set. In event series, its always "
                    "optional to set a value for individual dates")
    )
-    allowed_values = models.TextField(
+    choices = models.JSONField(
        null=True, blank=True,
+        encoder=CustomJSONEncoder,
        verbose_name=_("Valid values"),
-        help_text=_("If you keep this empty, any value is allowed. Otherwise, enter one possible value per line.")
+    )
+    filter_public = models.BooleanField(
+        default=False, verbose_name=_("Show filter option to customers"),
+        help_text=_("This field will be shown to filter events in the public event list and calendar.")
+    )
+    public_label = I18nCharField(
+        verbose_name=_("Public name"),
+        null=True, blank=True,
    )
    filter_allowed = models.BooleanField(
        default=True, verbose_name=_("Can be used for filtering"),
        help_text=_("This field will be shown to filter events or reports in the backend, and it can also be used "
                    "for hidden filter parameters in the frontend (e.g. using the widget).")
    )
+    position = models.IntegerField(
+        default=0
+    )

    def full_clean(self, exclude=None, validate_unique=True):
        super().full_clean(exclude, validate_unique)
        if self.default and self.required:
            raise ValidationError(_("A property can either be required or have a default value, not both."))
-        if self.default and self.allowed_values and self.default not in self.allowed_values.splitlines():
-            raise ValidationError(_("You cannot set a default value that is not a valid value."))

    class Meta:
-        ordering = ("name",)
+        ordering = ("position", "name",)
+
+    @property
+    def choice_keys(self):
+        if self.choices:
+            return [v["key"] for v in self.choices]


 class EventMetaValue(LoggedModel):
@@ -79,7 +79,7 @@ class AbstractScheduledExport(LoggedModel):
    )

    schedule_rrule = models.TextField(
-        null=True, blank=True, validators=[RRuleValidator()]
+        null=True, blank=True, validators=[RRuleValidator(enforce_simple=True)]
    )
    schedule_rrule_time = models.TimeField(
        verbose_name=_("Requested start time"),
@@ -336,6 +336,8 @@ class Item(LoggedModel):
    :type min_per_order: int
    :param checkin_attention: Requires special attention at check-in
    :type checkin_attention: bool
+    :param checkin_text: Additional text to show at check-in
+    :type checkin_text: bool
    :param original_price: The item's "original" price. Will not be used for any calculations, will just be shown.
    :type original_price: decimal.Decimal
    :param require_approval: If set to ``True``, orders containing this product can only be processed and paid after approved by an administrator
@@ -431,6 +433,12 @@ class Item(LoggedModel):
                    "additional donations for your event. This is currently not supported for products that are "
                    "bought as an add-on to other products.")
    )
+    free_price_suggestion = models.DecimalField(
+        verbose_name=_("Suggested price"),
+        help_text=_("This price will be used as the default value of the input field. The user can choose a lower "
+                    "value, but not lower than the price this product would have without the free price option."),
+        max_digits=13, decimal_places=2, null=True, blank=True,
+    )
    tax_rule = models.ForeignKey(
        'TaxRule',
        verbose_name=_('Sales tax'),
@@ -488,13 +496,24 @@ class Item(LoggedModel):
        'Quota',
        null=True, blank=True,
        on_delete=models.SET_NULL,
-        verbose_name=_("Only show after sellout of"),
+        verbose_name=pgettext_lazy("hidden_if_available_legacy", "Only show after sellout of"),
        help_text=_("If you select a quota here, this product will only be shown when that quota is "
                    "unavailable. If combined with the option to hide sold-out products, this allows you to "
                    "swap out products for more expensive ones once they are sold out. There might be a short period "
                    "in which both products are visible while all tickets in the referenced quota are reserved, "
                    "but not yet sold.")
    )
+    hidden_if_item_available = models.ForeignKey(
+        'Item',
+        null=True, blank=True,
+        on_delete=models.SET_NULL,
+        verbose_name=_("Only show after sellout of"),
+        help_text=_("If you select a product here, this product will only be shown when that product is "
+                    "sold out. If combined with the option to hide sold-out products, this allows you to "
+                    "swap out products for more expensive ones once the cheaper option is sold out. There might "
+                    "be a short period in which both products are visible while all tickets of the referenced "
+                    "product are reserved, but not yet sold.")
+    )
    require_voucher = models.BooleanField(
        verbose_name=_('This product can only be bought using a voucher.'),
        default=False,
@@ -549,6 +568,11 @@ class Item(LoggedModel):
                    'attention. You can use this for example for student tickets to indicate to the person at '
                    'check-in that the student ID card still needs to be checked.')
    )
+    checkin_text = models.TextField(
+        verbose_name=_('Check-in text'),
+        null=True, blank=True,
+        help_text=_('This text will be shown by the check-in app if a ticket of this type is scanned.')
+    )
    original_price = models.DecimalField(
        verbose_name=_('Original price'),
        blank=True, null=True,
@@ -607,7 +631,7 @@ class Item(LoggedModel):
        null=True, blank=True, max_length=16,
        verbose_name=_('Validity'),
        help_text=_(
-            'When setting up a regular event, or an event series with time slots, you typically to NOT need to change '
+            'When setting up a regular event, or an event series with time slots, you typically do NOT need to change '
            'this value. The default setting means that the validity time of tickets will not be decided by the '
            'product, but by the event and check-in configuration. Only use the other options if you need them to '
            'realize e.g. a booking of a year-long ticket with a dynamic start date. Note that the validity will be '
@@ -1021,6 +1045,12 @@ class ItemVariation(models.Model):
        help_text=_('If set, this will be displayed next to the current price to show that the current price is a '
                    'discounted one. This is just a cosmetic setting and will not actually impact pricing.')
    )
+    free_price_suggestion = models.DecimalField(
+        verbose_name=_("Suggested price"),
+        help_text=_("This price will be used as the default value of the input field. The user can choose a lower "
+                    "value, but not lower than the price this product would have without the free price option."),
+        max_digits=13, decimal_places=2, null=True, blank=True,
+    )
    require_approval = models.BooleanField(
        verbose_name=_('Require approval'),
        default=False,
@@ -1073,6 +1103,11 @@ class ItemVariation(models.Model):
                    'attention. You can use this for example for student tickets to indicate to the person at '
                    'check-in that the student ID card still needs to be checked.')
    )
+    checkin_text = models.TextField(
+        verbose_name=_('Check-in text'),
+        null=True, blank=True,
+        help_text=_('This text will be shown by the check-in app if a ticket of this type is scanned.')
+    )

    objects = ScopedManager(organizer='item__event__organizer')

@@ -1427,6 +1462,8 @@ class Question(LoggedModel):
    :param items: A set of ``Items`` objects that this question should be applied to
    :param ask_during_checkin: Whether to ask this question during check-in instead of during check-out.
    :type ask_during_checkin: bool
+    :param show_during_checkin: Whether to show the answer to this question during check-in.
+    :type show_during_checkin: bool
    :param hidden: Whether to only show the question in the backend
    :type hidden: bool
    :param identifier: An arbitrary, internal identifier
@@ -1464,6 +1501,7 @@ class Question(LoggedModel):
    )
    UNLOCALIZED_TYPES = [TYPE_DATE, TYPE_TIME, TYPE_DATETIME]
    ASK_DURING_CHECKIN_UNSUPPORTED = []
+    SHOW_DURING_CHECKIN_UNSUPPORTED = [TYPE_FILE]

    event = models.ForeignKey(
        Event,
@@ -1515,6 +1553,11 @@ class Question(LoggedModel):
        help_text=_('Not supported by all check-in apps for all question types.'),
        default=False
    )
+    show_during_checkin = models.BooleanField(
+        verbose_name=_('Show answer during check-in'),
+        help_text=_('Not supported by all check-in apps for all question types.'),
+        default=False
+    )
    hidden = models.BooleanField(
        verbose_name=_('Hidden question'),
        help_text=_('This question will only show up in the backend.'),
@@ -78,6 +78,7 @@ class LogEntry(models.Model):
    device = models.ForeignKey('Device', null=True, blank=True, on_delete=models.PROTECT)
    oauth_application = models.ForeignKey('pretixapi.OAuthApplication', null=True, blank=True, on_delete=models.PROTECT)
    event = models.ForeignKey('Event', null=True, blank=True, on_delete=models.SET_NULL)
+    organizer = models.ForeignKey('Organizer', null=True, blank=True, on_delete=models.PROTECT, db_column='organizer_link_id')
    action_type = models.CharField(max_length=255)
    data = models.TextField(default='{}')
    visible = models.BooleanField(default=True)
@@ -122,20 +123,6 @@ class LogEntry(models.Model):
            typepath = typepath.rsplit('.', 1)[0]
        return no_type

-    @cached_property
-    def organizer(self):
-        from .organizer import Organizer
-
-        if self.event:
-            return self.event.organizer
-        elif hasattr(self.content_object, 'event'):
-            return self.content_object.event.organizer
-        elif hasattr(self.content_object, 'organizer'):
-            return self.content_object.organizer
-        elif isinstance(self.content_object, Organizer):
-            return self.content_object
-        return None
-
    @cached_property
    def display_object(self):
        from . import (
@@ -244,6 +244,11 @@ class Order(LockModel, LoggedModel):
                    'special attention. This will not show any details or custom message, so you need to brief your '
                    'check-in staff how to handle these cases.')
    )
+    checkin_text = models.TextField(
+        verbose_name=_('Check-in text'),
+        null=True, blank=True,
+        help_text=_('This text will be shown by the check-in app if a ticket of this order is scanned.')
+    )
    expiry_reminder_sent = models.BooleanField(
        default=False
    )
@@ -266,6 +271,10 @@ class Order(LockModel, LoggedModel):
        default=False,
        verbose_name=_('E-mail address verified')
    )
+    invoice_dirty = models.BooleanField(
+        # Invoice needs to be re-issued when the order is paid again
+        default=False,
+    )

    objects = ScopedManager(organizer='event__organizer')

@@ -325,6 +334,18 @@ class Order(LockModel, LoggedModel):
    def email_confirm_hash(self):
        return hashlib.sha256(settings.SECRET_KEY.encode() + self.secret.encode()).hexdigest()[:9]

+    def get_extended_status_display(self):
+        # Changes in this method should to be replicated in pretixcontrol/orders/fragment_order_status.html
+        # and pretixpresale/event/fragment_order_status.html
+        if self.status == Order.STATUS_PENDING:
+            if self.require_approval:
+                return _("approval pending")
+            elif self.valid_if_pending:
+                return pgettext_lazy("order state", "pending (confirmed)")
+        elif self.status == Order.STATUS_PAID and self.count_positions == 0:
+            return _("canceled (paid fee)")
+        return self.get_status_display()
+
    @property
    def fees(self):
        """
@@ -1271,6 +1292,21 @@ class QuestionAnswer(models.Model):
        return self.file.name.split('.', 1)[-1]

    def __str__(self):
+        return self.to_string(use_cached=True)
+
+    def to_string_i18n(self):
+        return self.to_string(use_cached=False)
+
+    def to_string(self, use_cached=True):
+        """
+        Render this answer as a string.
+
+        :param use_cached: If ``True`` (default), choice and multiple choice questions will show their cached
+                           value, i.e. the value of the selected options at the time of saving and in the language
+                           the answer was saved in. If ``False``, the values will instead be loaded from the
+                           database, yielding current and translated values of the options. However, additional database
+                           queries might be required.
+        """
        if self.question.type == Question.TYPE_BOOLEAN and self.answer == "True":
            return str(_("Yes"))
        elif self.question.type == Question.TYPE_BOOLEAN and self.answer == "False":
@@ -1305,6 +1341,8 @@ class QuestionAnswer(models.Model):
                return PhoneNumber.from_string(self.answer).as_international
            except NumberParseException:
                return self.answer
+        elif self.question.type in (Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE) and self.answer and not use_cached:
+            return ", ".join(str(o.answer) for o in self.options.all())
        else:
            return self.answer

@@ -1806,7 +1844,7 @@ class OrderPayment(models.Model):
    def _mark_order_paid(self, count_waitinglist=True, send_mail=True, force=False, user=None, auth=None, mail_text='',
                         ignore_date=False, lock=True, payment_refund_sum=0, allow_generate_invoice=True):
        from pretix.base.services.invoices import (
-            generate_invoice, invoice_qualified,
+            generate_cancellation, generate_invoice, invoice_qualified,
        )
        from pretix.base.services.locking import LOCK_TRUST_WINDOW

@@ -1824,9 +1862,14 @@ class OrderPayment(models.Model):
            cancellations = self.order.invoices.filter(is_cancellation=True).count()
            gen_invoice = (
                (invoices == 0 and self.order.event.settings.get('invoice_generate') in ('True', 'paid')) or
-                0 < invoices <= cancellations
+                0 < invoices <= cancellations or
+                self.order.invoice_dirty
            )
            if gen_invoice:
+                if invoices:
+                    last_i = self.order.invoices.filter(is_cancellation=False).last()
+                    if not last_i.canceled:
+                        generate_cancellation(last_i)
                invoice = generate_invoice(
                    self.order,
                    trigger_pdf=not send_mail or not self.order.event.settings.invoice_email_attachment
@@ -2100,6 +2143,12 @@ class OrderRefund(models.Model):
            self.local_id = (self.order.refunds.aggregate(m=Max('local_id'))['m'] or 0) + 1
            if 'update_fields' in kwargs:
                kwargs['update_fields'] = {'local_id'}.union(kwargs['update_fields'])
+
+        if self.state == OrderRefund.REFUND_STATE_DONE and not self.execution_date:
+            self.execution_date = now()
+            if 'update_fields' in kwargs:
+                kwargs['update_fields'] = {'execution_date'}.union(kwargs['update_fields'])
+
        super().save(*args, **kwargs)


@@ -2387,6 +2436,17 @@ class OrderPosition(AbstractPosition):
            return True
        return False

+    @cached_property
+    def checkin_texts(self):
+        texts = []
+        if self.order.checkin_text:
+            texts.append(self.order.checkin_text)
+        if self.variation_id and self.variation.checkin_text:
+            texts.append(self.variation.checkin_text)
+        if self.item.checkin_text:
+            texts.append(self.item.checkin_text)
+        return texts
+
    @property
    def checkins(self):
        """
@@ -817,7 +817,7 @@ class BasePaymentProvider:
        """
        return ""

-    def order_change_allowed(self, order: Order) -> bool:
+    def order_change_allowed(self, order: Order, request: HttpRequest=None) -> bool:
        """
        Will be called to check whether it is allowed to change the payment method of
        an order to this one.
@@ -835,7 +835,12 @@ class BasePaymentProvider:
            return False

        if self.settings.get('_hidden', as_type=bool):
-            return False
+            if request:
+                hashes = set(request.session.get('pretix_unlock_hashes', [])) | set(order.meta_info_data.get('unlock_hashes', []))
+                if hashlib.sha256((self.settings._hidden_seed + self.event.slug).encode()).hexdigest() not in hashes:
+                    return False
+            else:
+                return False

        restricted_countries = self.settings.get('_restricted_countries', as_type=list)
        if restricted_countries:
@@ -567,7 +567,7 @@ def variables_from_questions(sender, *args, **kwargs):
        if not a:
            return ""
        else:
-            return str(a)
+            return a.to_string_i18n()

    d = {}
    for q in sender.questions.all():
@@ -39,7 +39,7 @@ BASE_CHOICES = (
    ('presale_end', _('Presale end')),
 )

-RelativeDate = namedtuple('RelativeDate', ['days_before', 'minutes_before', 'time', 'base_date_name'])
+RelativeDate = namedtuple('RelativeDate', ['days', 'minutes', 'time', 'is_after', 'base_date_name'], defaults=(0, None, None, False, 'date_from'))


 class RelativeDateWrapper:
@@ -64,7 +64,7 @@ class RelativeDateWrapper:
        elif isinstance(self.data, datetime.date):
            return self.data
        else:
-            if self.data.minutes_before is not None:
+            if self.data.minutes is not None:
                raise ValueError('A minute-based relative datetime can not be used as a date')

            tz = ZoneInfo(event.settings.timezone)
@@ -77,7 +77,10 @@ class RelativeDateWrapper:
            else:
                base_date = getattr(event, self.data.base_date_name) or event.date_from

-            new_date = base_date.astimezone(tz) - datetime.timedelta(days=self.data.days_before)
+            if self.data.is_after:
+                new_date = base_date.astimezone(tz) + datetime.timedelta(days=self.data.days)
+            else:
+                new_date = base_date.astimezone(tz) - datetime.timedelta(days=self.data.days)
            return new_date.date()

    def datetime(self, event) -> datetime.datetime:
@@ -96,10 +99,16 @@ class RelativeDateWrapper:
            else:
                base_date = getattr(event, self.data.base_date_name) or event.date_from

-            if self.data.minutes_before is not None:
-                return base_date.astimezone(tz) - datetime.timedelta(minutes=self.data.minutes_before)
+            if self.data.minutes is not None:
+                if self.data.is_after:
+                    return base_date.astimezone(tz) + datetime.timedelta(minutes=self.data.minutes)
+                else:
+                    return base_date.astimezone(tz) - datetime.timedelta(minutes=self.data.minutes)
            else:
-                new_date = (base_date.astimezone(tz) - datetime.timedelta(days=self.data.days_before)).astimezone(tz)
+                if self.data.is_after:
+                    new_date = (base_date.astimezone(tz) + datetime.timedelta(days=self.data.days)).astimezone(tz)
+                else:
+                    new_date = (base_date.astimezone(tz) - datetime.timedelta(days=self.data.days)).astimezone(tz)
                if self.data.time:
                    new_date = new_date.replace(
                        hour=self.data.time.hour,
@@ -113,15 +122,17 @@ class RelativeDateWrapper:
        if isinstance(self.data, (datetime.datetime, datetime.date)):
            return self.data.isoformat()
        else:
-            if self.data.minutes_before is not None:
-                return 'RELDATE/minutes/{}/{}/'.format(  #
-                    self.data.minutes_before,
-                    self.data.base_date_name
+            if self.data.minutes is not None:
+                return 'RELDATE/minutes/{}/{}/{}'.format(  #
+                    self.data.minutes,
+                    self.data.base_date_name,
+                    'after' if self.data.is_after else '',
                )
-            return 'RELDATE/{}/{}/{}/'.format(  #
-                self.data.days_before,
+            return 'RELDATE/{}/{}/{}/{}'.format(  #
+                self.data.days,
                self.data.time.strftime('%H:%M:%S') if self.data.time else '-',
-                self.data.base_date_name
+                self.data.base_date_name,
+                'after' if self.data.is_after else '',
            )

    @classmethod
@@ -130,10 +141,11 @@ class RelativeDateWrapper:
            parts = input.split('/')
            if parts[1] == 'minutes':
                data = RelativeDate(
-                    days_before=0,
-                    minutes_before=int(parts[2]),
+                    days=0,
+                    minutes=int(parts[2]),
                    base_date_name=parts[3],
-                    time=None
+                    time=None,
+                    is_after=len(parts) > 4 and parts[4] == "after",
                )
            else:
                if parts[2] == '-':
@@ -143,17 +155,19 @@ class RelativeDateWrapper:
                    time = datetime.time(hour=int(timeparts[0]), minute=int(timeparts[1]), second=int(timeparts[2]))
                try:
                    data = RelativeDate(
-                        days_before=int(parts[1] or 0),
+                        days=int(parts[1] or 0),
                        base_date_name=parts[3],
                        time=time,
-                        minutes_before=None
+                        minutes=None,
+                        is_after=len(parts) > 4 and parts[4] == "after",
                    )
                except ValueError:
                    data = RelativeDate(
-                        days_before=0,
+                        days=0,
                        base_date_name=parts[3],
                        time=time,
-                        minutes_before=None
+                        minutes=None,
+                        is_after=len(parts) > 4 and parts[4] == "after",
                    )
            if data.base_date_name not in [k[0] for k in BASE_CHOICES]:
                raise ValueError('{} is not a valid base date'.format(data.base_date_name))
@@ -165,20 +179,30 @@ class RelativeDateWrapper:
        return len(self.to_string())


+BEFORE_AFTER_CHOICE = (
+    ('before', _('before')),
+    ('after', _('after')),
+)
+
+
 class RelativeDateTimeWidget(forms.MultiWidget):
    template_name = 'pretixbase/forms/widgets/reldatetime.html'

    def __init__(self, *args, **kwargs):
        self.status_choices = kwargs.pop('status_choices')
+        base_choices = kwargs.pop('base_choices')
        widgets = (
            forms.RadioSelect(choices=self.status_choices),
            forms.DateTimeInput(
                attrs={'class': 'datetimepicker'}
            ),
            forms.NumberInput(),
-            forms.Select(choices=kwargs.pop('base_choices')),
+            forms.Select(choices=base_choices),
            forms.TimeInput(attrs={'placeholder': _('Time'), 'class': 'timepickerfield'}),
            forms.NumberInput(),
+            forms.Select(choices=base_choices),
+            forms.Select(choices=BEFORE_AFTER_CHOICE),
+            forms.Select(choices=BEFORE_AFTER_CHOICE),
        )
        super().__init__(widgets=widgets, *args, **kwargs)

@@ -186,12 +210,14 @@ class RelativeDateTimeWidget(forms.MultiWidget):
        if isinstance(value, str):
            value = RelativeDateWrapper.from_string(value)
        if not value:
-            return ['unset', None, 1, 'date_from', None, 0]
+            return ['unset', None, 1, 'date_from', None, 0, "date_from", "before", "before"]
        elif isinstance(value.data, (datetime.datetime, datetime.date)):
-            return ['absolute', value.data, 1, 'date_from', None, 0]
-        elif value.data.minutes_before is not None:
-            return ['relative_minutes', None, None, value.data.base_date_name, None, value.data.minutes_before]
-        return ['relative', None, value.data.days_before, value.data.base_date_name, value.data.time, 0]
+            return ['absolute', value.data, 1, 'date_from', None, 0, "date_from", "before", "before"]
+        elif value.data.minutes is not None:
+            return ['relative_minutes', None, None, value.data.base_date_name, None, value.data.minutes, value.data.base_date_name,
+                    "after" if value.data.is_after else "before", "after" if value.data.is_after else "before"]
+        return ['relative', None, value.data.days, value.data.base_date_name, value.data.time, 0, value.data.base_date_name,
+                "after" if value.data.is_after else "before", "after" if value.data.is_after else "before"]

    def get_context(self, name, value, attrs):
        ctx = super().get_context(name, value, attrs)
@@ -234,6 +260,18 @@ class RelativeDateTimeField(forms.MultiValueField):
            forms.IntegerField(
                required=False
            ),
+            forms.ChoiceField(
+                choices=choices,
+                required=False
+            ),
+            forms.ChoiceField(
+                choices=BEFORE_AFTER_CHOICE,
+                required=False
+            ),
+            forms.ChoiceField(
+                choices=BEFORE_AFTER_CHOICE,
+                required=False
+            ),
        )
        if 'widget' not in kwargs:
            kwargs['widget'] = RelativeDateTimeWidget(status_choices=status_choices, base_choices=choices)
@@ -257,17 +295,19 @@ class RelativeDateTimeField(forms.MultiValueField):
            return None
        elif data_list[0] == 'relative_minutes':
            return RelativeDateWrapper(RelativeDate(
-                days_before=0,
+                days=0,
                base_date_name=data_list[3],
                time=None,
-                minutes_before=data_list[5]
+                minutes=data_list[5],
+                is_after=data_list[7] == "after",
            ))
        else:
            return RelativeDateWrapper(RelativeDate(
-                days_before=data_list[2],
-                base_date_name=data_list[3],
+                days=data_list[2],
+                base_date_name=data_list[6],
                time=data_list[4],
-                minutes_before=None
+                minutes=None,
+                is_after=data_list[8] == "after",
            ))

    def has_changed(self, initial, data):
@@ -298,6 +338,7 @@ class RelativeDateWidget(RelativeDateTimeWidget):
            ),
            forms.NumberInput(),
            forms.Select(choices=kwargs.pop('base_choices')),
+            forms.Select(choices=BEFORE_AFTER_CHOICE),
        )
        forms.MultiWidget.__init__(self, widgets=widgets, *args, **kwargs)

@@ -305,10 +346,10 @@ class RelativeDateWidget(RelativeDateTimeWidget):
        if isinstance(value, str):
            value = RelativeDateWrapper.from_string(value)
        if not value:
-            return ['unset', None, 1, 'date_from']
+            return ['unset', None, 1, 'date_from', 'before']
        elif isinstance(value.data, (datetime.datetime, datetime.date)):
-            return ['absolute', value.data, 1, 'date_from']
-        return ['relative', None, value.data.days_before, value.data.base_date_name]
+            return ['absolute', value.data, 1, 'date_from', 'before']
+        return ['relative', None, value.data.days, value.data.base_date_name, "after" if value.data.is_after else "before"]


 class RelativeDateField(RelativeDateTimeField):
@@ -335,6 +376,10 @@ class RelativeDateField(RelativeDateTimeField):
                choices=BASE_CHOICES,
                required=False
            ),
+            forms.ChoiceField(
+                choices=BEFORE_AFTER_CHOICE,
+                required=False
+            ),
        )
        if 'widget' not in kwargs:
            kwargs['widget'] = RelativeDateWidget(status_choices=status_choices, base_choices=BASE_CHOICES)
@@ -351,9 +396,10 @@ class RelativeDateField(RelativeDateTimeField):
            return None
        else:
            return RelativeDateWrapper(RelativeDate(
-                days_before=data_list[2],
+                days=data_list[2],
                base_date_name=data_list[3],
-                time=None, minutes_before=None
+                time=None, minutes=None,
+                is_after=data_list[4] == "after"
            ))

    def clean(self, value):
@@ -41,6 +41,7 @@ from typing import List, Optional

 from celery.exceptions import MaxRetriesExceededError
 from django import forms
+from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import DatabaseError, transaction
 from django.db.models import Count, Exists, IntegerField, OuterRef, Q, Value
@@ -378,8 +379,9 @@ class CartManager:
            cartsize += sum([op.count for op in self._operations if isinstance(op, self.AddOperation) and not op.addon_to])
            cartsize -= len([1 for op in self._operations if isinstance(op, self.RemoveOperation) if
                             not op.position.addon_to_id])
-            if cartsize > int(self.event.settings.max_items_per_order):
-                raise CartError(error_messages['max_items'] % self.event.settings.max_items_per_order)
+            limit = min(int(self.event.settings.max_items_per_order), settings.PRETIX_MAX_ORDER_SIZE)
+            if cartsize > limit:
+                raise CartError(error_messages['max_items'] % limit)

    def _check_item_constraints(self, op, current_ops=[]):
        if isinstance(op, (self.AddOperation, self.ExtendOperation)):
@@ -31,6 +31,7 @@
 # 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.
+import logging
 import os
 from datetime import datetime, timedelta, timezone
 from functools import partial, reduce
@@ -65,6 +66,8 @@ from pretix.helpers.jsonlogic_query import (
    MinutesSince, tolerance,
 )

+logger = logging.getLogger(__name__)
+

 def _build_time(t=None, value=None, ev=None, now_dt=None):
    now_dt = now_dt or now()
@@ -199,7 +202,7 @@ def _logic_explain(rules, ev, rule_data, now_dt=None):
                    'var': values[0]["var"],
                    'rhs': values[1:],
                }
-            elif "entries_since" in values[0] or "entries_before" in values[0]:
+            elif any(t in values[0] for t in ("entries_since", "entries_before", "entries_days_since", "entries_days_before")):
                _var_explanations[new_var_name] = {
                    'operator': operator,
                    'var': values[0],
@@ -277,11 +280,13 @@ def _logic_explain(rules, ev, rule_data, now_dt=None):
            var_weights[vname] = (500, 0)
            var_texts[vname] = _('Wrong entrance gate')
        elif var in ('entries_number', 'entries_today', 'entries_days', 'minutes_since_last_entry', 'minutes_since_first_entry', 'now_isoweekday') \
-                or (isinstance(var, dict) and ("entries_since" in var or "entries_before" in var)):
+                or (isinstance(var, dict) and any(t in var for t in ("entries_since", "entries_before", "entries_days_since", "entries_days_before"))):
            w = {
                'minutes_since_first_entry': 80,
                'minutes_since_last_entry': 90,
                'entries_days': 100,
+                'entries_days_since': 105,
+                'entries_days_before': 105,
                'entries_since': 110,
                'entries_before': 110,
                'entries_number': 120,
@@ -304,10 +309,12 @@ def _logic_explain(rules, ev, rule_data, now_dt=None):
                'entries_today': _('number of entries today'),
                'entries_since': _('number of entries since {datetime}'),
                'entries_before': _('number of entries before {datetime}'),
+                'entries_days_since': _('number of days with an entry since {datetime}'),
+                'entries_days_before': _('number of days with an entry before {datetime}'),
                'now_isoweekday': _('week day'),
            }

-            if isinstance(var, dict) and ("entries_since" in var or "entries_before" in var):
+            if isinstance(var, dict) and any(t in var for t in ("entries_since", "entries_before", "entries_days_since", "entries_days_before")):
                varname = list(var.keys())[0]
                cutoff = _build_time(*var[varname][0]['buildTime'], ev=ev, now_dt=now_dt).astimezone(ev.timezone)
                if abs(now_dt - cutoff) < timedelta(hours=12):
@@ -407,6 +414,8 @@ def _get_logic_environment(ev, rule_data, now_dt):
    logic.add_operation('isAfter', lambda t1, t2, tol=None: is_before(t2, t1, tol))
    logic.add_operation('entries_since', lambda t1: rule_data.entries_since(t1))
    logic.add_operation('entries_before', lambda t1: rule_data.entries_before(t1))
+    logic.add_operation('entries_days_since', lambda t1: rule_data.entries_days_since(t1))
+    logic.add_operation('entries_days_before', lambda t1: rule_data.entries_days_before(t1))
    return logic


@@ -464,6 +473,32 @@ class LazyRuleVars:
            self.__cache['entries_before', cutoff] = self._position.checkins.filter(type=Checkin.TYPE_ENTRY, list=self._clist, datetime__lt=cutoff).count()
        return self.__cache['entries_before', cutoff]

+    def entries_days_since(self, cutoff):
+        tz = self._clist.event.timezone
+        with override(tz):
+            if ('entries_days_since', cutoff) not in self.__cache:
+                self.__cache['entries_days_since', cutoff] = self._position.checkins.filter(
+                    type=Checkin.TYPE_ENTRY,
+                    list=self._clist,
+                    datetime__gte=cutoff
+                ).annotate(
+                    day=TruncDate('datetime', tzinfo=tz)
+                ).values('day').distinct().count()
+            return self.__cache['entries_days_since', cutoff]
+
+    def entries_days_before(self, cutoff):
+        tz = self._clist.event.timezone
+        with override(tz):
+            if ('entries_days_before', cutoff) not in self.__cache:
+                self.__cache['entries_days_before', cutoff] = self._position.checkins.filter(
+                    type=Checkin.TYPE_ENTRY,
+                    list=self._clist,
+                    datetime__lt=cutoff
+                ).annotate(
+                    day=TruncDate('datetime', tzinfo=tz)
+                ).values('day').distinct().count()
+            return self.__cache['entries_days_before', cutoff]
+
    @cached_property
    def entries_days(self):
        tz = self._clist.event.timezone
@@ -530,7 +565,8 @@ class SQLLogic:
            "isBefore": partial(self.comparison_to_q, operator=LowerThan, modifier=partial(tolerance, sign=1)),
            "isAfter": partial(self.comparison_to_q, operator=GreaterThan, modifier=partial(tolerance, sign=-1)),
        }
-        self.expression_ops = {'buildTime', 'objectList', 'lookup', 'var', 'entries_since', 'entries_before'}
+        self.expression_ops = {'buildTime', 'objectList', 'lookup', 'var', 'entries_since', 'entries_before',
+                               'entries_days_since', 'entries_days_before'}

    def operation_to_expression(self, rule):
        if not isinstance(rule, dict):
@@ -608,6 +644,42 @@ class SQLLogic:
                Value(0),
                output_field=IntegerField()
            )
+        elif operator == 'entries_days_since':
+            tz = self.list.event.timezone
+            return Coalesce(
+                Subquery(
+                    Checkin.objects.filter(
+                        position_id=OuterRef('pk'),
+                        type=Checkin.TYPE_ENTRY,
+                        list_id=self.list.pk,
+                        datetime__gte=self.operation_to_expression(values[0]),
+                    ).annotate(
+                        day=TruncDate('datetime', tzinfo=tz)
+                    ).values('position_id').order_by().annotate(
+                        c=Count('day', distinct=True)
+                    ).values('c')
+                ),
+                Value(0),
+                output_field=IntegerField()
+            )
+        elif operator == 'entries_days_before':
+            tz = self.list.event.timezone
+            return Coalesce(
+                Subquery(
+                    Checkin.objects.filter(
+                        position_id=OuterRef('pk'),
+                        type=Checkin.TYPE_ENTRY,
+                        list_id=self.list.pk,
+                        datetime__lt=self.operation_to_expression(values[0]),
+                    ).annotate(
+                        day=TruncDate('datetime', tzinfo=tz)
+                    ).values('position_id').order_by().annotate(
+                        c=Count('day', distinct=True)
+                    ).values('c')
+                ),
+                Value(0),
+                output_field=IntegerField()
+            )
        elif operator == 'var':
            if values[0] == 'now':
                return Value(now().astimezone(timezone.utc))
@@ -874,6 +946,15 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
                'blocked'
            )

+    if op.order.status == Order.STATUS_PENDING and op.order.require_approval:
+        if force:
+            force_used = True
+        else:
+            raise CheckInError(
+                _('This order is not yet approved.'),
+                'unapproved',
+            )
+
    if type != Checkin.TYPE_EXIT and op.valid_from and op.valid_from > dt:
        if force:
            force_used = True
@@ -941,14 +1022,6 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
                    'product'
                )

-        if op.order.status != Order.STATUS_PAID and op.order.require_approval:
-            if force:
-                force_used = True
-            else:
-                raise CheckInError(
-                    _('This order is not yet approved.'),
-                    'unpaid'
-                )
        elif op.order.status != Order.STATUS_PAID and not op.order.valid_if_pending and not (
            ignore_unpaid and clist.include_pending and op.order.status == Order.STATUS_PENDING
        ):
@@ -963,7 +1036,16 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
        if type == Checkin.TYPE_ENTRY and clist.rules:
            rule_data = LazyRuleVars(op, clist, dt, gate=gate)
            logic = _get_logic_environment(op.subevent or clist.event, rule_data, now_dt=dt)
-            if not logic.apply(clist.rules, rule_data):
+            try:
+                logic_result = logic.apply(clist.rules, rule_data)
+            except Exception:
+                logger.exception("Check-in rule evaluation failed")
+                raise CheckInError(
+                    _('Evaluation of custom rules has failed.'),
+                    'rules',
+                )
+
+            if not logic_result:
                if force:
                    force_used = True
                else:
@@ -199,7 +199,7 @@ def build_invoice(invoice: Invoice) -> Invoice:
        positions = list(
            invoice.order.positions.select_related('addon_to', 'item', 'tax_rule', 'subevent', 'variation').annotate(
                addon_c=Count('addons')
-            ).prefetch_related('answers', 'answers__question').order_by('positionid', 'id')
+            ).prefetch_related('answers', 'answers__options', 'answers__question').order_by('positionid', 'id')
        )

        reverse_charge = False
@@ -247,7 +247,7 @@ def build_invoice(invoice: Invoice) -> Invoice:
                desc += "<br />{}{} {}".format(
                    answ.question.question,
                    "" if str(answ.question.question).endswith("?") else ":",
-                    str(answ)
+                    answ.to_string_i18n()
                )

            if invoice.event.has_subevents:
@@ -395,6 +395,10 @@ def generate_invoice(order: Order, trigger_pdf=True):
    if order.status == Order.STATUS_CANCELED:
        generate_cancellation(invoice, trigger_pdf)

+    if order.invoice_dirty:
+        order.invoice_dirty = False
+        order.save(update_fields=['invoice_dirty'])
+
    return invoice


@@ -100,7 +100,8 @@ def lock_objects(objects, *, shared_lock_objects=None, replace_exclusive_with_sh
    if 'postgresql' in settings.DATABASES['default']['ENGINE']:
        shared_keys = set(pg_lock_key(obj) for obj in shared_lock_objects) if shared_lock_objects else set()
        exclusive_keys = set(pg_lock_key(obj) for obj in objects)
-        if replace_exclusive_with_shared_when_exclusive_are_more_than and len(exclusive_keys) > replace_exclusive_with_shared_when_exclusive_are_more_than:
+        if replace_exclusive_with_shared_when_exclusive_are_more_than and shared_keys and \
+                len(exclusive_keys) > replace_exclusive_with_shared_when_exclusive_are_more_than:
            exclusive_keys = shared_keys
        keys = sorted(list(shared_keys | exclusive_keys))
        calls = ", ".join([
@@ -183,6 +183,7 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
    if auto_email:
        headers['X-Auto-Response-Suppress'] = 'OOF, NRN, AutoReply, RN'
        headers['Auto-Submitted'] = 'auto-generated'
+    headers.setdefault('X-Mailer', 'pretix')

    with language(locale):
        if isinstance(context, dict) and event:
@@ -573,8 +574,11 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
        except smtplib.SMTPRecipientsRefused as e:
            smtp_codes = [a[0] for a in e.recipients.values()]

-            if not any(c >= 500 for c in smtp_codes):
-                # Not a permanent failure (mailbox full, service unavailable), retry later, but with large intervals
+            if not any(c >= 500 for c in smtp_codes) or any(b'Message is too large' in a[1] for a in e.recipients.values()):
+                # This is not a permanent failure (mailbox full, service unavailable), retry later, but with large
+                # intervals. One would think that "Message is too lage" is a permanent failure, but apparently it is not.
+                # We have documented cases of emails to Microsoft returning the error occasionally and then later
+                # allowing the very same email.
                try:
                    self.retry(max_retries=5, countdown=[60, 300, 600, 1200, 1800, 1800][self.request.retries])
                except MaxRetriesExceededError:
@@ -30,6 +30,7 @@ from pretix.base.models import LogEntry, NotificationSetting, User
 from pretix.base.notifications import Notification, get_all_notification_types
 from pretix.base.services.mail import mail_send_task
 from pretix.base.services.tasks import ProfiledTask, TransactionAwareTask
+from pretix.base.signals import notification
 from pretix.celery_app import app
 from pretix.helpers.urls import build_absolute_uri

@@ -90,6 +91,8 @@ def notify(logentry_ids: list):
            if enabled and um not in notify_specific:
                send_notification.apply_async(args=(logentry.id, notification_type.action_type, user.pk, method))

+        notification.send(logentry.event, logentry_id=logentry.id, notification_type=notification_type.action_type)
+

@app.task(base=ProfiledTask, acks_late=True, max_retries=9, default_retry_delay=900)
 def send_notification(logentry_id: int, action_type: str, user_id: int, method: str):
@@ -23,6 +23,7 @@ import csv
 import io
 from decimal import Decimal

+from django.conf import settings as django_settings
 from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.utils.timezone import now
@@ -91,7 +92,15 @@ def import_orders(event: Event, fileid: str, settings: dict, locale: str, user,
    user = User.objects.get(pk=user)
    with language(locale, event.settings.region):
        cols = get_all_columns(event)
-        parsed = parse_csv(cf.file, charset=charset)
+        try:
+            parsed = parse_csv(cf.file, charset=charset)
+        except UnicodeDecodeError as e:
+            raise DataImportError(
+                _(
+                    'Error decoding special characters in your file: {message}').format(
+                    message=str(e)
+                )
+            )
        orders = []
        order = None
        data = []
@@ -116,6 +125,11 @@ def import_orders(event: Event, fileid: str, settings: dict, locale: str, user,
                    )
            data.append(values)

+        if settings['orders'] == 'one' and len(data) > django_settings.PRETIX_MAX_ORDER_SIZE:
+            raise DataImportError(
+                _('Orders cannot have more than %(max)s positions.') % {'max': django_settings.PRETIX_MAX_ORDER_SIZE}
+            )
+
        # Prepare model objects. Yes, this might consume lots of RAM, but allows us to make the actual SQL transaction
        # shorter. We'll see what works better in reality…
        lock_seats = []
@@ -1380,7 +1380,9 @@ def send_download_reminders(sender, **kwargs):
        download_reminder_sent=False,
        datetime__lte=now() - timedelta(hours=2),
        first_date__gte=today,
-    ).only('pk', 'event_id', 'sales_channel').order_by('event_id')
+    ).only(
+        'pk', 'event_id', 'sales_channel', 'datetime',
+    ).order_by('event_id')
    event_id = None
    days = None
    event = None
@@ -1510,6 +1512,7 @@ class OrderChangeManager:
            "You need to select at least %(min)s items of the product %(product)s.",
            "min"
        ),
+        'max_order_size': gettext_lazy('Orders cannot have more than %(max)s positions.'),
    }
    ItemOperation = namedtuple('ItemOperation', ('position', 'item', 'variation'))
    SubeventOperation = namedtuple('SubeventOperation', ('position', 'subevent'))
@@ -2597,6 +2600,14 @@ class OrderChangeManager:
        self.order.total = total + payment_fee
        self.order.save()

+    def _check_order_size(self):
+        if (len(self.order.positions.all()) + len([op 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,
+                }
+            )
+
    def _payment_fee_diff(self):
        total = self.order.total + self._totaldiff
        if self.open_payment:
@@ -2617,14 +2628,37 @@ class OrderChangeManager:
    def _reissue_invoice(self):
        i = self.order.invoices.filter(is_cancellation=False).last()
        if self.reissue_invoice and self._invoice_dirty:
-            if i and not i.refered.exists():
-                self._invoices.append(generate_cancellation(i))
-            if invoice_qualified(self.order) and \
-                (i or
-                 self.event.settings.invoice_generate == 'True' or (
-                     self.open_payment is not None and self.event.settings.invoice_generate == 'paid' and
-                     self.open_payment.payment_provider.requires_invoice_immediately)):
-                self._invoices.append(generate_invoice(self.order))
+            order_now_qualified = invoice_qualified(self.order)
+            invoice_should_be_generated_now = (
+                self.event.settings.invoice_generate == "True" or (
+                    self.event.settings.invoice_generate == "paid" and
+                    self.open_payment is not None and
+                    self.open_payment.payment_provider.requires_invoice_immediately
+                ) or (
+                    self.event.settings.invoice_generate == "paid" and
+                    self.order.status == Order.STATUS_PAID
+                ) or (
+                    # Backwards-compatible behaviour
+                    self.event.settings.invoice_generate not in ("True", "paid") and
+                    i and
+                    not i.canceled
+                )
+            )
+            invoice_should_be_generated_later = not invoice_should_be_generated_now and (
+                self.event.settings.invoice_generate in ("True", "paid")
+            )
+
+            if order_now_qualified:
+                if invoice_should_be_generated_now:
+                    if i and not i.canceled:
+                        self._invoices.append(generate_cancellation(i))
+                    self._invoices.append(generate_invoice(self.order))
+                elif invoice_should_be_generated_later:
+                    self.order.invoice_dirty = True
+                    self.order.save(update_fields=["invoice_dirty"])
+            else:
+                if i and not i.canceled:
+                    self._invoices.append(generate_cancellation(i))

    def _check_complete_cancel(self):
        current = self.order.positions.count()
@@ -2714,6 +2748,7 @@ class OrderChangeManager:

        # finally, incorporate difference in payment fees
        self._payment_fee_diff()
+        self._check_order_size()

        with transaction.atomic():
            locked_instance = Order.objects.select_for_update(of=OF_SELF).get(pk=self.order.pk)
@@ -112,7 +112,7 @@ def dictsum(*dicts) -> dict:

 def order_overview(
        event: Event, subevent: SubEvent=None, date_filter='', date_from=None, date_until=None, fees=False,
-        admission_only=False, base_qs=None, base_fees_qs=None,
+        admission_only=False, base_qs=None, base_fees_qs=None, subevent_date_from=None, subevent_date_until=None
 ) -> Tuple[List[Tuple[ItemCategory, List[Item]]], Dict[str, Tuple[Decimal, Decimal]]]:
    items = event.items.all().select_related(
        'category',  # for re-grouping
@@ -125,6 +125,11 @@ def order_overview(
        qs = qs.filter(subevent__in=subevent)
    elif subevent:
        qs = qs.filter(subevent=subevent)
+    if subevent_date_from:
+        qs = qs.filter(subevent__date_from__gte=subevent_date_from)
+    if subevent_date_until:
+        qs = qs.filter(subevent__date_from__lt=subevent_date_until)
+
    if admission_only:
        qs = qs.filter(item__admission=True)
        items = items.filter(admission=True)
@@ -232,7 +237,7 @@ def order_overview(
    payment_cat_obj.name = _('Fees')
    payment_items = []

-    if subevent is None and fees:
+    if subevent is None and not subevent_date_from and not subevent_date_until and fees:
        qs = OrderFee.all if base_fees_qs is None else base_fees_qs
        qs = qs.filter(
            order__event=event
@@ -80,7 +80,7 @@ def assign_automatically(event: Event, user_id: int=None, subevent_id: int=None)
        voucher__isnull=True
    ).select_related('item', 'variation', 'subevent').prefetch_related(
        'item__quotas', 'variation__quotas'
-    ).order_by('-priority', 'created')
+    ).order_by('-priority', 'created', 'pk')

    if subevent_id and event.has_subevents:
        subevent = event.subevents.get(id=subevent_id)
@@ -306,9 +306,11 @@ DEFAULTS = {
        'serializer_class': serializers.IntegerField,
        'serializer_kwargs': dict(
            min_value=1,
+            max_value=settings.PRETIX_MAX_ORDER_SIZE,
        ),
        'form_kwargs': dict(
            min_value=1,
+            max_value=settings.PRETIX_MAX_ORDER_SIZE,
            required=True,
            label=_("Maximum number of items per order"),
            help_text=_("Add-on products will not be counted.")
@@ -1606,6 +1608,16 @@ DEFAULTS = {
            help_text=_('If your event series has more than 50 dates in the future, only the month or week calendar can be used.')
        ),
    },
+    'event_list_filters': {
+        'default': 'True',
+        'type': bool,
+        'form_class': forms.BooleanField,
+        'serializer_class': serializers.BooleanField,
+        'form_kwargs': dict(
+            label=_("Show filter options for calendar or list view"),
+            help_text=_("You can set up possible filters as meta properties in your organizer settings.")
+        )
+    },
    'event_list_available_only': {
        'default': 'False',
        'type': bool,
@@ -1677,6 +1689,8 @@ DEFAULTS = {
                ('gte', _('Only allow changes if the resulting price is higher or equal than the previous price.')),
                ('gt', _('Only allow changes if the resulting price is higher than the previous price.')),
                ('eq', _('Only allow changes if the resulting price is equal to the previous price.')),
+                ('gte_paid', _('Allow changes regardless of price, as long as no refund is required (i.e. the resulting '
+                               'price is not lower than what has already been paid).')),
                ('any', _('Allow changes regardless of price, even if this results in a refund.')),
            )
        ),
@@ -1686,6 +1700,8 @@ DEFAULTS = {
                ('gte', _('Only allow changes if the resulting price is higher or equal than the previous price.')),
                ('gt', _('Only allow changes if the resulting price is higher than the previous price.')),
                ('eq', _('Only allow changes if the resulting price is equal to the previous price.')),
+                ('gte_paid', _('Allow changes regardless of price, as long as no refund is required (i.e. the resulting '
+                               'price is not lower than what has already been paid).')),
                ('any', _('Allow changes regardless of price, even if this results in a refund.')),
            ),
            widget=forms.RadioSelect,
@@ -1922,6 +1938,32 @@ DEFAULTS = {
            label=_("Do not allow cancellations after"),
        )
    },
+    'cancel_terms_paid': {
+        'default': None,
+        'type': LazyI18nString,
+        'serializer_class': I18nField,
+        'form_class': I18nFormField,
+        'form_kwargs': dict(
+            label=_("Terms of cancellation"),
+            widget=I18nTextarea,
+            widget_kwargs={'attrs': {'rows': '2'}},
+            help_text=_("This text will be shown when cancellation is allowed for a paid order. Leave empty if you "
+                        "want pretix to automatically generate the terms of cancellation based on your settings.")
+        )
+    },
+    'cancel_terms_unpaid': {
+        'default': None,
+        'type': LazyI18nString,
+        'serializer_class': I18nField,
+        'form_class': I18nFormField,
+        'form_kwargs': dict(
+            label=_("Terms of cancellation"),
+            widget=I18nTextarea,
+            widget_kwargs={'attrs': {'rows': '2'}},
+            help_text=_("This text will be shown when cancellation is allowed for an unpaid or free order. Leave empty "
+                        "if you want pretix to automatically generate the terms of cancellation based on your settings.")
+        )
+    },
    'contact_mail': {
        'default': None,
        'type': str,
@@ -2870,6 +2912,25 @@ Your {organizer} team"""))  # noqa: W291
            label=_('Use header image also for events without an individually uploaded logo'),
        )
    },
+    'favicon': {
+        'default': None,
+        'type': File,
+        'form_class': ExtFileField,
+        'form_kwargs': dict(
+            label=_('Favicon'),
+            ext_whitelist=settings.FILE_UPLOAD_EXTENSIONS_FAVICON,
+            max_size=settings.FILE_UPLOAD_MAX_SIZE_FAVICON,
+            help_text=_('If you provide a favicon, we will show it instead of the default pretix icon. '
+                        'We recommend a size of at least 200x200px to accommodate most devices.')
+        ),
+        'serializer_class': UploadedFileField,
+        'serializer_kwargs': dict(
+            allowed_types=[
+                'image/png', 'image/jpeg', 'image/gif', 'image/x-icon', 'image/vnd.microsoft.icon',
+            ],
+            max_size=settings.FILE_UPLOAD_MAX_SIZE_FAVICON,
+        )
+    },
    'og_image': {
        'default': None,
        'type': File,
@@ -153,19 +153,47 @@ class BaseDataShredder:


 def shred_log_fields(logentry, banlist=None, whitelist=None):
+    def _shred(d, banlist, whitelist):
+        shredded = False
+        if whitelist:
+            for k, v in d.items():
+                if k not in whitelist:
+                    if isinstance(d[k], list):
+                        newlist = []
+                        for i in d[k]:
+                            if isinstance(i, dict):
+                                _shred(i, None, [None])
+                            else:
+                                i = '█'
+                            newlist.append(i)
+                        d[k] = newlist
+                    elif isinstance(d[k], dict):
+                        _shred(d[k], None, [None])
+                    elif d[k]:
+                        d[k] = '█'
+                    shredded = True
+        elif banlist:
+            for k in banlist:
+                if k in d:
+                    if isinstance(d[k], list):
+                        newlist = []
+                        for i in d[k]:
+                            if isinstance(i, dict):
+                                _shred(i, None, [None])
+                            else:
+                                i = '█'
+                            newlist.append(i)
+                        d[k] = newlist
+                    elif isinstance(d[k], dict):
+                        _shred(d[k], None, [None])
+                    elif d[k]:
+                        d[k] = '█'
+                    shredded = True
+        return shredded
+
    d = logentry.parsed_data
    initial_data = copy.copy(d)
-    shredded = False
-    if whitelist:
-        for k, v in d.items():
-            if k not in whitelist:
-                d[k] = '█'
-                shredded = True
-    elif banlist:
-        for f in banlist:
-            if f in d:
-                d[f] = '█'
-                shredded = True
+    shredded = _shred(d, banlist, whitelist)
    if d != initial_data:
        logentry.data = json.dumps(d)
        logentry.shredded = logentry.shredded or shredded
@@ -279,6 +279,15 @@ however for this signal, the ``sender`` **may also be None** to allow creating t
 notification settings!
 """

+notification = EventPluginSignal()
+"""
+Arguments: ``logentry_id``, ``notification_type``
+
+This signal is sent out when a notification is sent.
+
+As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
+"""
+
 register_sales_channels = django.dispatch.Signal()
 """
 This signal is sent out to get all known sales channels types. Receivers should return an
@@ -12,7 +12,8 @@
                    {% include widget.subwidgets.1.template_name with widget=widget.subwidgets.1 %}
                {% elif selopt.value == "relative" %}
                    {% include widget.subwidgets.2.template_name with widget=widget.subwidgets.2 %}
-                    {% trans "days before" %}
+                    {% trans "days" %}
+                    {% include widget.subwidgets.4.template_name with widget=widget.subwidgets.4 %}
                    {% include widget.subwidgets.3.template_name with widget=widget.subwidgets.3 %}
                {% endif %}
            </div>
@@ -12,12 +12,14 @@
                    {% include widget.subwidgets.1.template_name with widget=widget.subwidgets.1 %}
                {% elif selopt.value == "relative_minutes" %}
                    {% include widget.subwidgets.5.template_name with widget=widget.subwidgets.5 %}
-                    {% trans "minutes before" %}
+                    {% trans "minutes" %}
+                    {% include widget.subwidgets.7.template_name with widget=widget.subwidgets.7 %}
                    {% include widget.subwidgets.3.template_name with widget=widget.subwidgets.3 %}
                {% elif selopt.value == "relative" %}
                    {% include widget.subwidgets.2.template_name with widget=widget.subwidgets.2 %}
-                    {% trans "days before" %}
-                    {% include widget.subwidgets.3.template_name with widget=widget.subwidgets.3 %}
+                    {% trans "days" %}
+                    {% include widget.subwidgets.8.template_name with widget=widget.subwidgets.8 %}
+                    {% include widget.subwidgets.6.template_name with widget=widget.subwidgets.6 %}
                    {% trans "at" %}
                    {% include widget.subwidgets.4.template_name with widget=widget.subwidgets.4 %}
                {% endif %}
@@ -21,6 +21,7 @@
 #
 from decimal import ROUND_HALF_UP, Decimal

+from babel import Locale, UnknownLocaleError
 from babel.numbers import format_currency
 from django import template
 from django.conf import settings
@@ -47,25 +48,29 @@ def money_filter(value: Decimal, arg='', hide_currency=False):
    places = settings.CURRENCY_PLACES.get(arg, 2)
    rounded = value.quantize(Decimal('1') / 10 ** places, ROUND_HALF_UP)
    if places < 2 and rounded != value:
-        places = 2
+        # 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, 2)
+        else:
+            return '{} {}'.format(arg, floatformat(value, 2))
+
    if hide_currency:
        return floatformat(value, places)

+    locale_parts = translation.get_language().split("-", 1)
+    locale = locale_parts[0]
+    if len(locale_parts) > 1 and len(locale_parts[1]) == 2:
+        try:
+            locale = Locale(locale_parts[0], locale_parts[1].upper())
+        except UnknownLocaleError:
+            pass
+
    try:
-        if 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!
-            return '{} {}'.format(
-                arg,
-                floatformat(value, 2)
-            )
-        return format_currency(value, arg, locale=translation.get_language()[:2])
+        return format_currency(value, arg, locale=locale)
    except:
-        return '{} {}'.format(
-            arg,
-            floatformat(value, places)
-        )
+        return '{} {}'.format(arg, floatformat(value, places))


@register.filter("money_numberfield")
@@ -65,6 +65,8 @@ ALLOWED_TAGS_SNIPPET = [
    'i',
    'strong',
    'span',
+    'strike',
+    's',
    # Update doc/user/markdown.rst if you change this!
 ]
 ALLOWED_TAGS = ALLOWED_TAGS_SNIPPET + [
@@ -19,7 +19,9 @@
 # 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 dateutil.rrule import rrulestr
+import calendar
+
+from dateutil.rrule import DAILY, MONTHLY, WEEKLY, YEARLY, rrule, rrulestr
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.validators import validate_email
@@ -40,7 +42,6 @@ from django.utils.translation import gettext_lazy as _


 class BanlistValidator:
-
    banlist = []

    def __call__(self, value):
@@ -55,7 +56,6 @@ class BanlistValidator:

@deconstructible
 class EventSlugBanlistValidator(BanlistValidator):
-
    banlist = [
        'download',
        'healthcheck',
@@ -77,7 +77,6 @@ class EventSlugBanlistValidator(BanlistValidator):

@deconstructible
 class OrganizerSlugBanlistValidator(BanlistValidator):
-
    banlist = [
        'download',
        'healthcheck',
@@ -98,7 +97,6 @@ class OrganizerSlugBanlistValidator(BanlistValidator):

@deconstructible
 class EmailBanlistValidator(BanlistValidator):
-
    banlist = [
        settings.PRETIX_EMAIL_NONE_VALUE,
    ]
@@ -112,8 +110,45 @@ def multimail_validate(val):


 class RRuleValidator:
+    def __init__(self, enforce_simple=False):
+        self.enforce_simple = enforce_simple
+
    def __call__(self, value):
        try:
-            rrulestr(value)
+            parsed = rrulestr(value)
        except Exception:
            raise ValidationError("Not a valid rrule.")
+
+        if self.enforce_simple:
+            # Validate that only things are used that we can represent in our UI for later editing
+
+            if not isinstance(parsed, rrule):
+                raise ValidationError("Only a single RRULE is allowed, no combination of rules.")
+
+            if parsed._freq not in (YEARLY, MONTHLY, WEEKLY, DAILY):
+                raise ValidationError("Unsupported FREQ value")
+            if parsed._wkst != calendar.firstweekday():
+                raise ValidationError("Unsupported WKST value")
+            if parsed._bysetpos:
+                if len(parsed._bysetpos) > 1:
+                    raise ValidationError("Only one BYSETPOS value allowed")
+                if parsed._freq == YEARLY and parsed._bysetpos not in (1, 2, 3, -1):
+                    raise ValidationError("BYSETPOS value not allowed, should be 1, 2, 3 or -1")
+                elif parsed._freq == MONTHLY and parsed._bysetpos not in (1, 2, 3, -1):
+                    raise ValidationError("BYSETPOS value not allowed, should be 1, 2, 3 or -1")
+                elif parsed._freq not in (YEARLY, MONTHLY):
+                    raise ValidationError("BYSETPOS not allowed for this FREQ")
+            if parsed._bymonthday:
+                raise ValidationError("BYMONTHDAY not supported")
+            if parsed._byyearday:
+                raise ValidationError("BYYEARDAY not supported")
+            if parsed._byeaster:
+                raise ValidationError("BYEASTER not supported")
+            if parsed._byweekno:
+                raise ValidationError("BYWEEKNO not supported")
+            if len(parsed._byhour) > 1 or set(parsed._byhour) != {parsed._dtstart.hour}:
+                raise ValidationError("BYHOUR not supported")
+            if len(parsed._byminute) > 1 or set(parsed._byminute) != {parsed._dtstart.minute}:
+                raise ValidationError("BYMINUTE not supported")
+            if len(parsed._bysecond) > 1 or set(parsed._bysecond) != {parsed._dtstart.second}:
+                raise ValidationError("BYSECOND not supported")
@@ -34,7 +34,7 @@ from django.core.exceptions import PermissionDenied, ValidationError
 from django.core.files.uploadedfile import UploadedFile
 from django.db import transaction
 from django.http import HttpResponse, JsonResponse, QueryDict
-from django.shortcuts import redirect, render
+from django.shortcuts import render
 from django.test import RequestFactory
 from django.utils import timezone, translation
 from django.utils.datastructures import MultiValueDict
@@ -47,6 +47,7 @@ from redis import ResponseError
 from pretix.base.models import CachedFile, User
 from pretix.base.services.tasks import ProfiledEventTask
 from pretix.celery_app import app
+from pretix.helpers.http import redirect_to_url

 logger = logging.getLogger('pretix.base.tasks')

@@ -152,7 +153,7 @@ class AsyncMixin:
                'redirect': self.get_success_url(value),
                'message': str(self.get_success_message(value))
            })
-        return redirect(self.get_success_url(value))
+        return redirect_to_url(self.get_success_url(value))

    def error(self, exception):
        if isinstance(exception, PermissionDenied):
@@ -165,7 +166,7 @@ class AsyncMixin:
                'redirect': self.get_error_url(),
                'message': str(self.get_error_message(exception))
            })
-        return redirect(self.get_error_url())
+        return redirect_to_url(self.get_error_url())

    def get_error_message(self, exception):
        if isinstance(exception, dict) and exception['exc_type'] in self.known_errortypes:
@@ -203,7 +204,7 @@ class AsyncAction(AsyncMixin):
                    return self.success(res.info)
                else:
                    return self.error(res.info)
-            return redirect(self.get_check_url(res.id, False))
+            return redirect_to_url(self.get_check_url(res.id, False))

    def get(self, request, *args, **kwargs):
        if 'async_id' in request.GET and settings.HAS_CELERY:
@@ -375,7 +376,7 @@ class AsyncFormView(AsyncMixin, FormView):
                    return self.success(res.info)
                else:
                    return self.error(res.info)
-            return redirect(self.get_check_url(res.id, False))
+            return redirect_to_url(self.get_check_url(res.id, False))


 class AsyncPostView(AsyncMixin, View):
@@ -478,4 +479,4 @@ class AsyncPostView(AsyncMixin, View):
                    return self.success(res.info)
                else:
                    return self.error(res.info)
-            return redirect(self.get_check_url(res.id, False))
+            return redirect_to_url(self.get_check_url(res.id, False))
@@ -208,7 +208,7 @@ class EventWizardBasicsForm(I18nModelForm):
            del self.fields['team']
        else:
            self.fields['team'].queryset = self.user.teams.filter(organizer=self.organizer)
-            if not self.organizer.settings.get("event_team_provisioning", True, as_type=bool):
+            if self.organizer.pk and not self.organizer.settings.get("event_team_provisioning", True, as_type=bool):
                self.fields['team'].required = True
                self.fields['team'].empty_label = None
                self.fields['team'].initial = 0
@@ -316,12 +316,12 @@ class EventMetaValueForm(forms.ModelForm):
        self.property = kwargs.pop('property')
        self.disabled = kwargs.pop('disabled')
        super().__init__(*args, **kwargs)
-        if self.property.allowed_values:
+        if self.property.choices:
            self.fields['value'] = forms.ChoiceField(
                label=self.property.name,
                choices=[
                    ('', _('Default ({value})').format(value=self.property.default) if self.property.default else ''),
-                ] + [(a.strip(), a.strip()) for a in self.property.allowed_values.splitlines()],
+                ] + [(a.strip(), a.strip()) for a in self.property.choice_keys],
            )
        else:
            self.fields['value'].label = self.property.name
@@ -558,6 +558,7 @@ class EventSettingsForm(EventSettingsValidationMixin, SettingsForm):
        'low_availability_percentage',
        'event_list_type',
        'event_list_available_only',
+        'event_list_filters',
        'event_calendar_future_only',
        'frontpage_text',
        'event_info_text',
@@ -645,6 +646,7 @@ class EventSettingsForm(EventSettingsValidationMixin, SettingsForm):
            del self.fields['frontpage_subevent_ordering']
            del self.fields['event_list_type']
            del self.fields['event_list_available_only']
+            del self.fields['event_list_filters']
            del self.fields['event_calendar_future_only']

        # create "virtual" fields for better UX when editing <name>_asked and <name>_required fields
@@ -728,6 +730,8 @@ class CancelSettingsForm(SettingsForm):
        'cancel_allow_user_paid_refund_as_giftcard',
        'cancel_allow_user_paid_require_approval',
        'cancel_allow_user_paid_require_approval_fee_unknown',
+        'cancel_terms_paid',
+        'cancel_terms_unpaid',
        'change_allow_user_variation',
        'change_allow_user_price',
        'change_allow_user_until',
@@ -57,7 +57,7 @@ from pretix.base.forms.widgets import (
 from pretix.base.models import (
    Checkin, CheckinList, Device, Event, EventMetaProperty, EventMetaValue,
    Gate, Invoice, InvoiceAddress, Item, Order, OrderPayment, OrderPosition,
-    OrderRefund, Organizer, Question, QuestionAnswer, SubEvent,
+    OrderRefund, Organizer, Question, QuestionAnswer, Quota, SubEvent,
    SubEventMetaValue, Team, TeamAPIToken, TeamInvite, Voucher,
 )
 from pretix.base.signals import register_payment_providers
@@ -230,6 +230,7 @@ class OrderFilterForm(FilterForm):
                ('partially_paid', _('Partially paid')),
                ('underpaid', _('Underpaid (but confirmed)')),
                ('pendingpaid', _('Pending (but fully paid)')),
+                ('pendingnopayment', _('Pending (but no current payment)')),
            )),
            (_('Approval process'), (
                ('na', _('Approved, payment pending')),
@@ -327,6 +328,18 @@ class OrderFilterForm(FilterForm):
                    Q(status__in=(Order.STATUS_EXPIRED, Order.STATUS_PENDING)) & Q(pending_sum_t__lte=0)
                    & Q(require_approval=False)
                )
+            elif s == 'pendingnopayment':
+                qs = qs.exclude(
+                    Exists(
+                        OrderPayment.objects.filter(
+                            order=OuterRef('pk'),
+                            state__in=(OrderPayment.PAYMENT_STATE_CREATED, OrderPayment.PAYMENT_STATE_PENDING)
+                        )
+                    )
+                ).filter(
+                    status=Order.STATUS_PENDING,
+                    require_approval=False,
+                )
            elif s == 'partially_paid':
                qs = Order.annotate_overpayments(qs, refunds=False, results=False, sums=True)
                qs = qs.filter(
@@ -578,11 +591,10 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
        widget=FilterNullBooleanSelect,
        label=_('At least one ticket with check-in'),
    )
-    checkin_attention = forms.NullBooleanField(
+    quota = SafeModelChoiceField(
+        queryset=Quota.objects.none(),
+        label=_('Affected quota'),
        required=False,
-        widget=FilterNullBooleanSelect,
-        label=_('Requires special attention'),
-        help_text=_('Only matches orders with the attention checkbox set directly for the order, not based on the product.'),
    )

    def __init__(self, *args, **kwargs):
@@ -667,6 +679,17 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
            label=_('Ticket secret'),
            required=False
        )
+        self.fields['quota'].queryset = self.event.quotas.all()
+        self.fields['quota'].widget = Select2(
+            attrs={
+                'data-model-select2': 'generic',
+                'data-select2-url': reverse('control:event.items.quotas.select2', kwargs={
+                    'event': self.event.slug,
+                    'organizer': self.event.organizer.slug,
+                }),
+            }
+        )
+        self.fields['quota'].widget.choices = self.fields['quota'].choices
        for q in self.event.questions.all():
            self.fields['question_{}'.format(q.pk)] = forms.CharField(
                label=q.question,
@@ -760,6 +783,12 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
            qs = qs.filter(
                all_positions__secret__icontains=fdata.get('ticket_secret')
            ).distinct()
+        if fdata.get('quota'):
+            quota = fdata['quota']
+            qs = qs.filter(
+                Q(all_positions__item__in=quota.items.all(), all_positions__variation__isnull=True) |
+                Q(all_positions__variation__in=quota.variations.all())
+            ).distinct()
        for q in self.event.questions.all():
            if fdata.get(f'question_{q.pk}'):
                answers = QuestionAnswer.objects.filter(
@@ -1599,6 +1628,20 @@ class EventFilterForm(FilterForm):
        }),
        required=False
    )
+    date_from = forms.DateField(
+        label=_('Date from'),
+        required=False,
+        widget=DatePickerWidget({
+            'placeholder': _('Date from'),
+        }),
+    )
+    date_until = forms.DateField(
+        label=_('Date until'),
+        required=False,
+        widget=DatePickerWidget({
+            'placeholder': _('Date until'),
+        }),
+    )

    def __init__(self, *args, **kwargs):
        self.request = kwargs.pop('request')
@@ -1680,6 +1723,22 @@ class EventFilterForm(FilterForm):
                Q(name__icontains=i18ncomp(query)) | Q(slug__icontains=query)
            )

+        if fdata.get('date_until'):
+            date_end = make_aware(datetime.combine(
+                fdata.get('date_until') + timedelta(days=1),
+                time(hour=0, minute=0, second=0, microsecond=0)
+            ), get_current_timezone())
+            qs = qs.filter(
+                Q(date_to__isnull=True, date_from__lt=date_end) |
+                Q(date_to__isnull=False, date_to__lt=date_end)
+            )
+        if fdata.get('date_from'):
+            date_start = make_aware(datetime.combine(
+                fdata.get('date_from'),
+                time(hour=0, minute=0, second=0, microsecond=0)
+            ), get_current_timezone())
+            qs = qs.filter(date_from__gte=date_start)
+
        filters_by_property_name = {}
        for i, p in enumerate(self.meta_properties):
            d = fdata.get('meta_{}'.format(p.name))
@@ -45,7 +45,7 @@ from django.db.models import Max
 from django.forms.formsets import DELETION_FIELD_NAME
 from django.urls import reverse
 from django.utils.functional import cached_property
-from django.utils.html import escape
+from django.utils.html import escape, format_html
 from django.utils.safestring import mark_safe
 from django.utils.translation import (
    gettext as __, gettext_lazy as _, pgettext_lazy,
@@ -133,6 +133,14 @@ class QuestionForm(I18nModelForm):

        return val

+    def clean_show_during_checkin(self):
+        val = self.cleaned_data.get('show_during_checkin')
+
+        if val and self.cleaned_data.get('type') in Question.SHOW_DURING_CHECKIN_UNSUPPORTED:
+            raise ValidationError(_('This type of question cannot be shown during check-in.'))
+
+        return val
+
    def clean_identifier(self):
        val = self.cleaned_data.get('identifier')
        Question._clean_identifier(self.instance.event, val, self.instance)
@@ -155,6 +163,7 @@ class QuestionForm(I18nModelForm):
            'type',
            'required',
            'ask_during_checkin',
+            'show_during_checkin',
            'hidden',
            'identifier',
            'items',
@@ -379,6 +388,7 @@ class ItemCreateForm(I18nModelForm):
                'max_per_order',
                'generate_tickets',
                'checkin_attention',
+                'checkin_text',
                'free_price',
                'original_price',
                'sales_channels',
@@ -387,6 +397,7 @@ class ItemCreateForm(I18nModelForm):
                'allow_waitinglist',
                'show_quota_left',
                'hidden_if_available',
+                'hidden_if_item_available',
                'require_bundling',
                'require_membership',
                'grant_membership_type',
@@ -550,19 +561,43 @@ class ItemUpdateForm(I18nModelForm):
            widget=forms.CheckboxSelectMultiple
        )
        change_decimal_field(self.fields['default_price'], self.event.currency)
-        self.fields['hidden_if_available'].queryset = self.event.quotas.all()
-        self.fields['hidden_if_available'].widget = Select2(
+
+        if self.instance.hidden_if_available_id:
+            self.fields['hidden_if_available'].queryset = self.event.quotas.all()
+            self.fields['hidden_if_available'].help_text = format_html(
+                "<strong>{}</strong> {}",
+                _("This option is deprecated. For new products, use the newer option below that refers to another "
+                  "product instead of a quota."),
+                self.fields['hidden_if_available'].help_text
+            )
+            self.fields['hidden_if_available'].widget = Select2(
+                attrs={
+                    'data-model-select2': 'generic',
+                    'data-select2-url': reverse('control:event.items.quotas.select2', kwargs={
+                        'event': self.event.slug,
+                        'organizer': self.event.organizer.slug,
+                    }),
+                    'data-placeholder': _('Shown independently of other products')
+                }
+            )
+            self.fields['hidden_if_available'].widget.choices = self.fields['hidden_if_available'].choices
+            self.fields['hidden_if_available'].required = False
+        else:
+            del self.fields['hidden_if_available']
+
+        self.fields['hidden_if_item_available'].queryset = self.event.items.exclude(id=self.instance.id)
+        self.fields['hidden_if_item_available'].widget = Select2(
            attrs={
                'data-model-select2': 'generic',
-                'data-select2-url': reverse('control:event.items.quotas.select2', kwargs={
+                'data-select2-url': reverse('control:event.items.select2', kwargs={
                    'event': self.event.slug,
                    'organizer': self.event.organizer.slug,
                }),
                'data-placeholder': _('Shown independently of other products')
            }
        )
-        self.fields['hidden_if_available'].widget.choices = self.fields['hidden_if_available'].choices
-        self.fields['hidden_if_available'].required = False
+        self.fields['hidden_if_item_available'].widget.choices = self.fields['hidden_if_item_available'].choices
+        self.fields['hidden_if_item_available'].required = False

        self.fields['category'].queryset = self.instance.event.categories.all()
        self.fields['category'].widget = Select2(
@@ -577,6 +612,17 @@ class ItemUpdateForm(I18nModelForm):
        )
        self.fields['category'].widget.choices = self.fields['category'].choices

+        self.fields['free_price_suggestion'].widget.attrs['data-display-dependency'] = '#id_free_price'
+
+        self.fields['validity_dynamic_start_choice'] = forms.TypedChoiceField(
+            label=_("Start of validity"),
+            choices=(
+                ("False", _("Purchase date")),
+                ("True", _("Date chosen by customer")),
+            ),
+            coerce=lambda x: x == 'True',
+        )
+
        qs = self.event.organizer.membership_types.all()
        if qs:
            self.fields['require_membership_types'].queryset = qs
@@ -624,7 +670,7 @@ class ItemUpdateForm(I18nModelForm):
        if d.get('grant_membership_type'):
            if not d['grant_membership_type'].transferable and not d['personalized']:
                self.add_error(
-                    'personalized' if d['admission'] else 'admission',
+                    'personalized' if d.get('admission') else 'admission',
                    _("Your product grants a non-transferable membership and should therefore be a personalized "
                      "admission ticket. Otherwise customers might not be able to use the membership later. If you "
                      "want the membership to be non-personalized, set the membership type to be transferable.")
@@ -664,6 +710,7 @@ class ItemUpdateForm(I18nModelForm):
            'picture',
            'default_price',
            'free_price',
+            'free_price_suggestion',
            'tax_rule',
            'available_from',
            'available_until',
@@ -675,11 +722,13 @@ class ItemUpdateForm(I18nModelForm):
            'max_per_order',
            'min_per_order',
            'checkin_attention',
+            'checkin_text',
            'generate_tickets',
            'original_price',
            'require_bundling',
            'show_quota_left',
            'hidden_if_available',
+            'hidden_if_item_available',
            'issue_giftcard',
            'require_membership',
            'require_membership_types',
@@ -706,6 +755,7 @@ class ItemUpdateForm(I18nModelForm):
            'validity_fixed_from': SplitDateTimeField,
            'validity_fixed_until': SplitDateTimeField,
            'hidden_if_available': SafeModelChoiceField,
+            'hidden_if_item_available': SafeModelChoiceField,
            'grant_membership_type': SafeModelChoiceField,
            'require_membership_types': SafeModelMultipleChoiceField,
        }
@@ -721,6 +771,7 @@ class ItemUpdateForm(I18nModelForm):
            'show_quota_left': ShowQuotaNullBooleanSelect(),
            'max_per_order': forms.widgets.NumberInput(attrs={'min': 0}),
            'min_per_order': forms.widgets.NumberInput(attrs={'min': 0}),
+            'checkin_text': forms.TextInput(),
        }


@@ -797,6 +848,8 @@ class ItemVariationForm(I18nModelForm):
            del self.fields['require_membership']
            del self.fields['require_membership_types']

+        self.fields['free_price_suggestion'].widget.attrs['data-display-dependency'] = '#id_free_price'
+
        self.meta_fields = []
        meta_defaults = {}
        if self.instance.pk:
@@ -829,6 +882,7 @@ class ItemVariationForm(I18nModelForm):
            'value',
            'active',
            'default_price',
+            'free_price_suggestion',
            'original_price',
            'description',
            'require_approval',
@@ -836,6 +890,7 @@ class ItemVariationForm(I18nModelForm):
            'require_membership_hidden',
            'require_membership_types',
            'checkin_attention',
+            'checkin_text',
            'available_from',
            'available_until',
            'sales_channels',
@@ -851,6 +906,7 @@ class ItemVariationForm(I18nModelForm):
            'require_membership_types': forms.CheckboxSelectMultiple(attrs={
                'class': 'scrolling-multiple-choice'
            }),
+            'checkin_text': forms.TextInput(),
        }

    def clean(self):
@@ -265,12 +265,13 @@ class ExporterForm(forms.Form):
 class CommentForm(I18nModelForm):
    class Meta:
        model = Order
-        fields = ['comment', 'checkin_attention', 'custom_followup_at']
+        fields = ['comment', 'checkin_attention', 'checkin_text', 'custom_followup_at']
        widgets = {
            'comment': forms.Textarea(attrs={
                'rows': 3,
                'class': 'helper-width-100',
            }),
+            'checkin_text': forms.TextInput(),
            'custom_followup_at': DatePickerWidget(),
        }

@@ -704,6 +705,7 @@ class OrderMailForm(forms.Form):
        )
        self.fields['attach_invoices'].queryset = order.invoices.all()
        self._set_field_placeholders('message', ['event', 'order'])
+        self._set_field_placeholders('subject', ['event', 'order'])


 class OrderPositionMailForm(OrderMailForm):
@@ -719,6 +721,7 @@ class OrderPositionMailForm(OrderMailForm):
            initial=self.order.event.settings.mail_text_order_custom_mail.localize(self.order.locale),
        )
        self._set_field_placeholders('message', ['event', 'order', 'position'])
+        self._set_field_placeholders('subject', ['event', 'order'])


 class OrderRefundForm(forms.Form):
@@ -39,7 +39,7 @@ from django import forms
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db.models import Q
-from django.forms import inlineformset_factory
+from django.forms import formset_factory, inlineformset_factory
 from django.forms.utils import ErrorDict
 from django.urls import reverse
 from django.utils.crypto import get_random_string
@@ -48,7 +48,7 @@ from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes.forms import SafeModelChoiceField
 from i18nfield.forms import (
-    I18nFormField, I18nFormSetMixin, I18nTextarea, I18nTextInput,
+    I18nForm, I18nFormField, I18nFormSetMixin, I18nTextarea, I18nTextInput,
 )
 from phonenumber_field.formfields import PhoneNumberField
 from pytz import common_timezones
@@ -195,14 +195,50 @@ class SafeOrderPositionChoiceField(forms.ModelChoiceField):
        return f'{op.order.code}-{op.positionid} ({str(op.item) + ((" - " + str(op.variation)) if op.variation else "")})'


-class EventMetaPropertyForm(forms.ModelForm):
+class EventMetaPropertyForm(I18nModelForm):
    class Meta:
        model = EventMetaProperty
-        fields = ['name', 'default', 'required', 'protected', 'allowed_values', 'filter_allowed']
+        fields = ['name', 'default', 'required', 'protected', 'filter_public', 'public_label', 'filter_allowed']
        widgets = {
-            'default': forms.TextInput()
+            'default': forms.TextInput(),
        }

+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['public_label'].widget.attrs['data-display-dependency'] = '#id_filter_public'
+
+
+class EventMetaPropertyAllowedValueForm(I18nForm):
+    key = forms.CharField(
+        label=_('Internal name'),
+        max_length=250,
+        required=True
+    )
+    label = I18nFormField(
+        label=_('Public name'),
+        required=False,
+        widget=I18nTextInput,
+        widget_kwargs=dict(attrs={
+            'placeholder': _('Public name'),
+        })
+    )
+
+
+class I18nBaseFormSet(I18nFormSetMixin, forms.BaseFormSet):
+    # compatibility shim for django-i18nfield library
+
+    def __init__(self, *args, **kwargs):
+        self.organizer = kwargs.pop('organizer', None)
+        if self.organizer:
+            kwargs['locales'] = self.organizer.settings.get('locales')
+        super().__init__(*args, **kwargs)
+
+
+EventMetaPropertyAllowedValueFormSet = formset_factory(
+    EventMetaPropertyAllowedValueForm, formset=I18nBaseFormSet,
+    can_order=True, can_delete=True, extra=0
+)
+

 class MembershipTypeForm(I18nModelForm):
    class Meta:
@@ -387,6 +423,7 @@ class OrganizerSettingsForm(SettingsForm):
        'organizer_link_back',
        'organizer_logo_image_large',
        'organizer_logo_image_inherit',
+        'favicon',
        'giftcard_length',
        'giftcard_expiry_years',
        'locales',
@@ -428,14 +465,6 @@ class OrganizerSettingsForm(SettingsForm):
                    'can increase the size with the setting below. We recommend not using small details on the picture '
                    'as it will be resized on smaller screens.')
    )
-    favicon = ExtFileField(
-        label=_('Favicon'),
-        ext_whitelist=settings.FILE_UPLOAD_EXTENSIONS_FAVICON,
-        required=False,
-        max_size=settings.FILE_UPLOAD_MAX_SIZE_FAVICON,
-        help_text=_('If you provide a favicon, we will show it instead of the default pretix icon. '
-                    'We recommend a size of at least 200x200px to accommodate most devices.')
-    )

    def __init__(self, *args, **kwargs):
        is_admin = kwargs.pop('is_admin', False)
@@ -20,7 +20,7 @@
 # <https://www.gnu.org/licenses/>.
 #
 from bootstrap3.text import text_value
-from django.forms import CheckboxInput
+from django.forms import CheckboxInput, CheckboxSelectMultiple, RadioSelect
 from django.forms.utils import flatatt
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
@@ -30,7 +30,7 @@ from i18nfield.forms import I18nFormField
 from pretix.base.forms.renderers import FieldRenderer, InlineFieldRenderer


-def render_label(content, label_for=None, label_class=None, label_title='', optional=False):
+def render_label(content, label_for=None, label_class=None, label_title='', label_id='', optional=False):
    """
    Render a label with content
    """
@@ -41,6 +41,8 @@ def render_label(content, label_for=None, label_class=None, label_title='', opti
        attrs['class'] = label_class
    if label_title:
        attrs['title'] = label_title
+    if label_id:
+        attrs['id'] = label_id

    if text_value(content) == '&#160;':
        # Empty label, e.g. checkbox
@@ -61,6 +63,7 @@ class ControlFieldRenderer(FieldRenderer):
    def __init__(self, *args, **kwargs):
        kwargs['layout'] = 'horizontal'
        super().__init__(*args, **kwargs)
+        self.is_group_widget = isinstance(self.widget, (CheckboxSelectMultiple, RadioSelect, )) or (self.is_multi_widget and len(self.widget.widgets) > 1)

    def add_label(self, html):
        label = self.get_label()
@@ -73,14 +76,29 @@ class ControlFieldRenderer(FieldRenderer):
        else:
            required = self.field.field.required

+        if self.is_group_widget:
+            label_for = ""
+            label_id = "legend-{}".format(self.field.html_name)
+        else:
+            label_for = self.field.id_for_label
+            label_id = ""
+
        html = render_label(
            label,
-            label_for=self.field.id_for_label,
+            label_for=label_for,
            label_class=self.get_label_class(),
+            label_id=label_id,
            optional=not required and not isinstance(self.widget, CheckboxInput)
        ) + html
        return html

+    def wrap_label_and_field(self, html):
+        if self.is_group_widget:
+            attrs = ' role="group" aria-labelledby="legend-{}"'.format(self.field.html_name)
+        else:
+            attrs = ''
+        return '<div class="{klass}"{attrs}>{html}</div>'.format(klass=self.get_form_group_class(), html=html, attrs=attrs)
+

 class BulkEditMixin:

@@ -393,12 +393,12 @@ class SubEventMetaValueForm(forms.ModelForm):
        self.default = kwargs.pop('default', None)
        self.disabled = kwargs.pop('disabled', False)
        super().__init__(*args, **kwargs)
-        if self.property.allowed_values:
+        if self.property.choices:
            self.fields['value'] = forms.ChoiceField(
                label=self.property.name,
                choices=[
                    ('', _('Default ({value})').format(value=self.default or self.property.default) if self.default or self.property.default else ''),
-                ] + [(a.strip(), a.strip()) for a in self.property.allowed_values.splitlines()],
+                ] + [(a.strip(), a.strip()) for a in self.property.choice_keys],
            )
        else:
            self.fields['value'].label = self.property.name
@@ -463,7 +463,8 @@ class RRuleFormSetForm(RRuleForm):

 RRuleFormSet = formset_factory(
    RRuleFormSetForm,
-    can_order=False, can_delete=True, extra=1
+    min_num=1, validate_min=True,
+    can_order=False, can_delete=True, extra=0
 )


@@ -201,6 +201,8 @@ class VoucherForm(I18nModelForm):
            cnt = len(data['codes']) * data.get('max_usages', 0)
        else:
            cnt = data.get('max_usages', 0)
+            if self.instance and self.instance.pk:
+                cnt -= self.instance.redeemed  # these do not need quota any more

        Voucher.clean_item_properties(
            data, self.instance.event,
@@ -407,6 +407,7 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
        'pretix.event.order.custom_followup_at': _('The order\'s follow-up date has been updated.'),
        'pretix.event.order.checkin_attention': _('The order\'s flag to require attention at check-in has been '
                                                  'toggled.'),
+        'pretix.event.order.checkin_text': _('The order\'s check-in text has been changed.'),
        'pretix.event.order.pretix.event.order.valid_if_pending': _('The order\'s flag to be considered valid even if '
                                                                    'unpaid has been toggled.'),
        'pretix.event.order.payment.changed': _('A new payment {local_id} has been started instead of the previous one.'),
@@ -37,7 +37,7 @@ from urllib.parse import quote, urljoin, urlparse
 from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME, logout
 from django.http import Http404
-from django.shortcuts import get_object_or_404, redirect, resolve_url
+from django.shortcuts import get_object_or_404, resolve_url
 from django.template.response import TemplateResponse
 from django.urls import get_script_prefix, resolve, reverse
 from django.utils.encoding import force_str
@@ -46,6 +46,7 @@ from django_scopes import scope

 from pretix.base.models import Event, Organizer
 from pretix.base.models.auth import SuperuserPermissionSet, User
+from pretix.helpers.http import redirect_to_url
 from pretix.helpers.security import (
    SessionInvalid, SessionReauthRequired, assert_session_valid,
 )
@@ -118,7 +119,7 @@ class PermissionMiddleware:

        if hasattr(request, 'organizer'):
            # If the user is on a organizer's subdomain, he should be redirected to pretix
-            return redirect(urljoin(settings.SITE_URL, request.get_full_path()))
+            return redirect_to_url(urljoin(settings.SITE_URL, request.get_full_path()))
        if url_name in self.EXCEPTIONS:
            return self.get_response(request)
        if not request.user.is_authenticated:
@@ -132,14 +133,14 @@ class PermissionMiddleware:
            return self._login_redirect(request)
        except SessionReauthRequired:
            if url_name not in ('user.reauth', 'auth.logout'):
-                return redirect(reverse('control:user.reauth') + '?next=' + quote(request.get_full_path()))
+                return redirect_to_url(reverse('control:user.reauth') + '?next=' + quote(request.get_full_path()))

        if request.user.needs_password_change and url_name not in self.EXCEPTIONS_FORCED_PW_CHANGE:
-            return redirect(reverse('control:user.settings') + '?next=' + quote(request.get_full_path()))
+            return redirect_to_url(reverse('control:user.settings') + '?next=' + quote(request.get_full_path()))

        if not request.user.require_2fa and settings.PRETIX_OBLIGATORY_2FA \
-                and url_name not in self.EXCEPTIONS_2FA:
-            return redirect(reverse('control:user.settings.2fa'))
+                and url_name not in self.EXCEPTIONS_2FA and not request.user.needs_password_change:
+            return redirect_to_url(reverse('control:user.settings.2fa'))

        if 'event' in url.kwargs and 'organizer' in url.kwargs:
            if url.kwargs['organizer'] == '-' and url.kwargs['event'] == '-':
@@ -152,7 +153,7 @@ class PermissionMiddleware:
                k = dict(url.kwargs)
                k['organizer'] = ev.organizer.slug
                k['event'] = ev.slug
-                return redirect(reverse(url.view_name, kwargs=k, args=url.args))
+                return redirect_to_url(reverse(url.view_name, kwargs=k, args=url.args))

            with scope(organizer=None):
                request.event = Event.objects.filter(
@@ -178,7 +179,7 @@ class PermissionMiddleware:
                                    "have no permission to administrate it."))
                k = dict(url.kwargs)
                k['organizer'] = org.slug
-                return redirect(reverse(url.view_name, kwargs=k, args=url.args))
+                return redirect_to_url(reverse(url.view_name, kwargs=k, args=url.args))

            request.organizer = Organizer.objects.filter(
                slug=url.kwargs['organizer'],
@@ -35,10 +35,11 @@
 from urllib.parse import quote

 from django.core.exceptions import PermissionDenied
-from django.shortcuts import redirect
 from django.urls import reverse
 from django.utils.translation import gettext as _

+from pretix.helpers.http import redirect_to_url
+

 def current_url(request):
    if request.GET:
@@ -135,7 +136,7 @@ def administrator_permission_required():
                raise PermissionDenied()
            if not request.user.has_active_staff_session(request.session.session_key):
                if request.user.is_staff:
-                    return redirect(reverse('control:user.sudo') + '?next=' + quote(current_url(request)))
+                    return redirect_to_url(reverse('control:user.sudo') + '?next=' + quote(current_url(request)))
                raise PermissionDenied(_('You do not have permission to view this content.'))
            return function(request, *args, **kw)
        return wrapper
@@ -0,0 +1,31 @@
+{% extends "pretixcontrol/items/base.html" %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% block title %}{% trans "Delete check-ins" %}{% endblock %}
+{% block inside %}
+	<h1>{% trans "Delete check-ins" %}</h1>
+	<form action="{% url "control:event.orders.checkinlists.bulk_action" event=request.event.slug organizer=request.event.organizer.slug list=checkinlist.pk %}" method="post" class="form-horizontal" data-asynctask>
+		{% csrf_token %}
+        {% for k, l in request.POST.lists %}
+            {% for v in l %}
+                <input type="hidden" name="{{ k }}" value="{{ v }}">
+            {% endfor %}
+        {% endfor %}
+		<p>
+            {% blocktrans trimmed count count=cnt %}
+                Are you sure you want to permanently delete the check-ins of <strong>one ticket</strong>.
+            {% plural %}
+                Are you sure you want to permanently delete the check-ins of <strong>{{ count }} tickets</strong>?
+            {% endblocktrans %}
+        </p>
+		<div class="form-group submit-group">
+            <a href="{% url "control:event.orders.checkinlists" organizer=request.event.organizer.slug event=request.event.slug %}"
+                    class="btn btn-default btn-cancel">
+                {% trans "Cancel" %}
+            </a>
+            <button type="submit" class="btn btn-danger btn-save">
+                {% trans "Delete" %}
+            </button>
+		</div>
+	</form>
+{% endblock %}
@@ -205,22 +205,27 @@
                    </tbody>
                </table>
            </div>
-            {% if "can_change_orders" in request.eventpermset or "can_checkin_orders" in request.eventpermset %}
-                <button type="submit" class="btn btn-primary btn-save">
-                    <span class="fa fa-sign-in" aria-hidden="true"></span>
-                    {% trans "Check-In selected attendees" %}
-                </button>
-                <button type="submit" class="btn btn-default btn-save" name="checkout" value="true">
-                    <span class="fa fa-sign-out" aria-hidden="true"></span>
-                    {% trans "Check-Out selected attendees" %}
-                </button>
-            {% endif %}
-            {% if "can_change_orders" in request.eventpermset %}
-                <button type="submit" class="btn btn-danger btn-save" name="revert" value="true">
-                    <span class="fa fa-trash" aria-hidden="true"></span>
-                    {% trans "Delete all check-ins of selected attendees" %}
-                </button>
-            {% endif %}
+            <div class="batch-select-actions">
+                {% if "can_change_orders" in request.eventpermset or "can_checkin_orders" in request.eventpermset %}
+                    <button type="submit" class="btn btn-primary btn-save">
+                        <span class="fa fa-sign-in" aria-hidden="true"></span>
+                        {% trans "Check-In selected attendees" %}
+                    </button>
+                    <button type="submit" class="btn btn-default btn-save" name="checkout" value="true">
+                        <span class="fa fa-sign-out" aria-hidden="true"></span>
+                        {% trans "Check-Out selected attendees" %}
+                    </button>
+                {% endif %}
+                {% if "can_change_orders" in request.eventpermset %}
+                    <button type="submit" class="btn btn-danger btn-save" name="revert"
+                            formaction="{% url "control:event.orders.checkinlists.bulk_revert" event=request.event.slug organizer=request.event.organizer.slug list=checkinlist.pk %}"
+                            data-no-asynctask
+                            value="true">
+                        <span class="fa fa-trash" aria-hidden="true"></span>
+                        {% trans "Delete all check-ins of selected attendees" %}
+                    </button>
+                {% endif %}
+            </div>
        </form>
        {% include "pretixcontrol/pagination.html" %}
    {% endif %}
@@ -7,10 +7,10 @@
 	<form action="" method="post" class="form-horizontal">
 		{% csrf_token %}
 		<p>{% blocktrans with name=checkinlist.name %}Are you sure you want to delete the check-in list <strong>{{ name }}</strong>?{% endblocktrans %}</p>
-		{% if checkinlist.checkins.exists > 0 %}
-			<p>{% blocktrans trimmed with num=checkinlist.checkins.count %}
+		{% if checkinlist.checkins.exists %}
+			<div class="alert alert-warning">{% blocktrans trimmed with num=checkinlist.checkins.count %}
                This will delete the information of <strong>{{ num }}</strong> check-ins as well.
-            {% endblocktrans %}</p>
+            {% endblocktrans %}</div>
 		{% endif %}
 		<div class="form-group submit-group">
            <a href="{% url "control:event.orders.checkinlists" organizer=request.event.organizer.slug event=request.event.slug %}"
@@ -18,7 +18,11 @@
                {% trans "Cancel" %}
            </a>
            <button type="submit" class="btn btn-danger btn-save">
-                {% trans "Delete" %}
+                {% if checkinlist.checkins.exists %}
+                    {% trans "Delete list and all check-ins" %}
+                {% else %}
+                    {% trans "Delete" %}
+                {% endif %}
            </button>
 		</div>
 	</form>
--- a/Show More
+++ b/Show More