Thumbnails: Store creation date

.github/dependabot.yml

@@ -9,7 +9,6 @@ updates:
     directory: "/src"
     schedule:
       interval: "daily"
-    versioning-strategy: increase
   - package-ecosystem: "npm"
     directory: "/src/pretix/static/npm_dir"
     schedule:

.github/workflows/docs.yml

@@ -17,19 +17,16 @@ on:
 permissions:
   contents: read  #  to fetch code (actions/checkout)
 
-env:
-  FORCE_COLOR: 1
-
 jobs:
   spelling:
     name: Spellcheck
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.9
+      - name: Set up Python 3.8
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: 3.8
       - uses: actions/cache@v1
         with:
           path: ~/.cache/pip

.github/workflows/strings.yml

@@ -15,19 +15,16 @@ on:
 permissions:
   contents: read  #  to fetch code (actions/checkout)
 
-env:
-  FORCE_COLOR: 1
-
 jobs:
   compile:
     runs-on: ubuntu-22.04
     name: Check gettext syntax
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.9
+      - name: Set up Python 3.8
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: 3.8
       - uses: actions/cache@v1
         with:
           path: ~/.cache/pip
@@ -50,10 +47,10 @@ jobs:
     name: Spellcheck
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.9
+      - name: Set up Python 3.8
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: 3.8
       - uses: actions/cache@v1
         with:
           path: ~/.cache/pip

.github/workflows/style.yml

@@ -15,19 +15,16 @@ on:
 permissions:
   contents: read  #  to fetch code (actions/checkout)
 
-env:
-  FORCE_COLOR: 1
-
 jobs:
   isort:
     name: isort
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.9
+      - name: Set up Python 3.8
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: 3.8
       - uses: actions/cache@v1
         with:
           path: ~/.cache/pip
@@ -45,10 +42,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.9
+      - name: Set up Python 3.8
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: 3.8
       - uses: actions/cache@v1
         with:
           path: ~/.cache/pip
@@ -66,10 +63,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.9
+      - name: Set up Python 3.8
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: 3.8
       - name: Install Dependencies
         run: pip3 install licenseheaders
       - name: Run licenseheaders

.github/workflows/tests.yml

@@ -15,9 +15,6 @@ on:
 permissions:
   contents: read  #  to fetch code (actions/checkout)
 
-env:
-  FORCE_COLOR: 1
-
 jobs:
   test:
     runs-on: ubuntu-22.04
@@ -63,7 +60,7 @@ jobs:
       - name: Install system dependencies
         run: sudo apt update && sudo apt install gettext mariadb-client
       - name: Install Python dependencies
-        run: pip3 install --ignore-requires-python -e ".[dev]" mysqlclient psycopg2-binary  # We ignore that flake8 needs newer python as we don't run flake8 during tests
+        run: pip3 install -e ".[dev]" mysqlclient psycopg2-binary
         working-directory: ./src
       - name: Run checks
         run: python manage.py check
@@ -81,6 +78,5 @@ jobs:
         uses: codecov/codecov-action@v1
         with:
           file: src/coverage.xml
-          token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
         if: matrix.database == 'postgres' && matrix.python-version == '3.10'

doc/admin/config.rst

@@ -141,7 +141,7 @@ Database settings
 Example::
 
     [database]
-    backend=postgresql
+    backend=mysql
     name=pretix
     user=pretix
     password=abcd
@@ -149,7 +149,7 @@ Example::
     port=3306
 
 ``backend``
-    One of ``mysql`` (deprecated), ``sqlite3`` and ``postgresql``.
+    One of ``mysql``, ``sqlite3``, ``oracle`` and ``postgresql``.
     Default: ``sqlite3``.
 
     If you use MySQL, be sure to create your database using
@@ -163,7 +163,7 @@ Example::
     Connection details for the database connection. Empty by default.
 
 ``galera``
-    (Deprecated) Indicates if the database backend is a MySQL/MariaDB Galera cluster and
+    Indicates if the database backend is a MySQL/MariaDB Galera cluster and
     turns on some optimizations/special case handlers. Default: ``False``
 
 .. _`config-replica`:
@@ -194,7 +194,7 @@ Example::
 
     [urls]
     media=/media/
-    static=/static/
+    static=/media/
 
 ``media``
     The URL to be used to serve user-uploaded content. You should not need to modify
@@ -399,9 +399,9 @@ The two ``transport_options`` entries can be omitted in most cases.
 If they are present they need to be a valid JSON dictionary.
 For possible entries in that dictionary see the `Celery documentation`_.
 
-To use redis with sentinels set the broker or backend to ``sentinel://sentinel_host_1:26379;sentinel_host_2:26379/0``
+To use redis with sentinels set the broker or backend to ``sentinel://sentinel_host_1:26379;sentinal_host_2:26379/0``
 and the respective transport_options to ``{"master_name":"mymaster"}``.
-If your redis instances behind the sentinel have a password use ``sentinel://:my_password@sentinel_host_1:26379;sentinel_host_2:26379/0``.
+If your redis instances behind the sentinel have a password use ``sentinel://:my_password@sentinel_host_1:26379;sentinal_host_2:26379/0``.
 If your redis sentinels themselves have a password set the transport_options to ``{"master_name":"mymaster","sentinel_kwargs":{"password":"my_password"}}``.
 
 Sentry

doc/admin/index.rst

@@ -14,5 +14,4 @@ This documentation is for everyone who wants to install pretix on a server.
    maintainance
    scaling
    errors
-   mysql2postgres
    indexes

doc/admin/installation/docker_smallscale.rst

@@ -14,7 +14,7 @@ This has some trade-offs in terms of performance and isolation but allows a rath
              get it right. If you're not feeling comfortable managing a Linux server, check out our hosting and service
              offers at `pretix.eu`_.
 
-We tested this guide on the Linux distribution **Debian 11.0** but it should work very similar on other
+We tested this guide on the Linux distribution **Debian 8.0** but it should work very similar on other
 modern distributions, especially on all systemd-based ones.
 
 Requirements
@@ -26,7 +26,7 @@ installation guides):
 * `Docker`_
 * A SMTP server to send out mails, e.g. `Postfix`_ on your machine or some third-party server you have credentials for
 * A HTTP reverse proxy, e.g. `nginx`_ or Apache to allow HTTPS connections
-* A `PostgreSQL`_ 9.6+ database server
+* A `PostgreSQL`_ 9.6+, `MySQL`_ 5.7+, or MariaDB 10.2.7+ database server
 * A `redis`_ server
 
 We also recommend that you use a firewall, although this is not a pretix-specific recommendation. If you're new to
@@ -58,6 +58,9 @@ directory writable to the user that runs pretix inside the docker container::
 Database
 --------
 
+.. warning:: **Please use PostgreSQL for all new installations**. If you need to go for MySQL, make sure you run
+             **MySQL 5.7 or newer** or **MariaDB 10.2.7 or newer**.
+
 Next, we need a database and a database user. We can create these with any kind of database managing tool or directly on
 our database's shell. Please make sure that UTF8 is used as encoding for the best compatibility. You can check this with
 the following command::
@@ -83,6 +86,13 @@ Restart PostgreSQL after you changed these files::
 
 If you have a firewall running, you should also make sure that port 5432 is reachable from the ``172.17.0.1/16`` subnet.
 
+For MySQL, you can either also use network-based connections or mount the ``/var/run/mysqld/mysqld.sock`` socket into the docker container.
+When using MySQL, make sure you set the character set of the database to ``utf8mb4``, e.g. like this::
+
+    mysql > CREATE DATABASE pretix DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
+
+You will also need to make sure that ``sql_mode`` in your ``my.cnf`` file does **not** include ``ONLY_FULL_GROUP_BY``.
+
 Redis
 -----
 
@@ -142,13 +152,15 @@ Fill the configuration file ``/etc/pretix/pretix.cfg`` with the following conten
     trust_x_forwarded_proto=on
 
     [database]
+    ; Replace postgresql with mysql for MySQL
     backend=postgresql
     name=pretix
     user=pretix
     ; Replace with the password you chose above
     password=*********
     ; In most docker setups, 172.17.0.1 is the address of the docker host. Adjust
-    ; this to wherever your database is running, e.g. the name of a linked container.
+    ; this to wherever your database is running, e.g. the name of a linked container
+    ; or of a mounted MySQL socket.
     host=172.17.0.1
 
     [mail]
@@ -200,6 +212,8 @@ named ``/etc/systemd/system/pretix.service`` with the following content::
     [Install]
     WantedBy=multi-user.target
 
+When using MySQL and socket mounting, you'll need the additional flag ``-v /var/run/mysqld:/var/run/mysqld`` in the command.
+
 You can now run the following commands
 to enable and start the service::
 
@@ -325,6 +339,7 @@ workers, e.g. ``docker run … taskworker -Q notifications --concurrency 32``.
 .. _nginx: https://botleg.com/stories/https-with-lets-encrypt-and-nginx/
 .. _Let's Encrypt: https://letsencrypt.org/
 .. _pretix.eu: https://pretix.eu/
+.. _MySQL: https://dev.mysql.com/doc/refman/5.7/en/linux-installation-apt-repo.html
 .. _PostgreSQL: https://www.digitalocean.com/community/tutorials/how-to-install-and-use-postgresql-on-ubuntu-20-04
 .. _redis: https://blog.programster.org/debian-8-install-redis-server/
 .. _ufw: https://en.wikipedia.org/wiki/Uncomplicated_Firewall

doc/admin/installation/manual_smallscale.rst

@@ -12,7 +12,7 @@ solution with many things readily set-up, look at :ref:`dockersmallscale`.
              get it right. If you're not feeling comfortable managing a Linux server, check out our hosting and service
              offers at `pretix.eu`_.
 
-We tested this guide on the Linux distribution **Debian 11.6** but it should work very similar on other
+We tested this guide on the Linux distribution **Debian 10.0** but it should work very similar on other
 modern distributions, especially on all systemd-based ones.
 
 Requirements
@@ -23,7 +23,7 @@ installation guides):
 
 * A SMTP server to send out mails, e.g. `Postfix`_ on your machine or some third-party server you have credentials for
 * A HTTP reverse proxy, e.g. `nginx`_ or Apache to allow HTTPS connections
-* A `PostgreSQL`_ 9.6+ database server
+* A `PostgreSQL`_ 9.6+, `MySQL`_ 5.7+, or MariaDB 10.2.7+ database server
 * A `redis`_ server
 * A `nodejs`_ installation
 
@@ -47,6 +47,9 @@ In this guide, all code lines prepended with a ``#`` symbol are commands that yo
 Database
 --------
 
+.. warning:: **Please use PostgreSQL for all new installations**. If you need to go for MySQL, make sure you run
+             **MySQL 5.7 or newer** or **MariaDB 10.2.7 or newer**.
+
 Having the database server installed, we still need a database and a database user. We can create these with any kind
 of database managing tool or directly on our database's shell. Please make sure that UTF8 is used as encoding for the
 best compatibility. You can check this with the following command::
@@ -58,6 +61,12 @@ For PostgreSQL database creation, we would do::
     # sudo -u postgres createuser pretix
     # sudo -u postgres createdb -O pretix pretix
 
+When using MySQL, make sure you set the character set of the database to ``utf8mb4``, e.g. like this::
+
+    mysql > CREATE DATABASE pretix DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
+
+You will also need to make sure that ``sql_mode`` in your ``my.cnf`` file does **not** include ``ONLY_FULL_GROUP_BY``.
+
 Package dependencies
 --------------------
 
@@ -65,7 +74,7 @@ To build and run pretix, you will need the following debian packages::
 
     # apt-get install git build-essential python-dev python3-venv python3 python3-pip \
                       python3-dev libxml2-dev libxslt1-dev libffi-dev zlib1g-dev libssl-dev \
-                      gettext libpq-dev libjpeg-dev libopenjp2-7-dev
+                      gettext libpq-dev libmariadb-dev libjpeg-dev libopenjp2-7-dev
 
 Config file
 -----------
@@ -88,12 +97,16 @@ Fill the configuration file ``/etc/pretix/pretix.cfg`` with the following conten
     trust_x_forwarded_proto=on
 
     [database]
+    ; For MySQL, replace with "mysql"
     backend=postgresql
     name=pretix
     user=pretix
-    ; For PostgreSQL on the same host, we don't need a password because we can use
-    ; peer authentication if our PostgreSQL user matches our unix user.
+    ; For MySQL, enter the user password. For PostgreSQL on the same host,
+    ; we don't need one because we can use peer authentification if our
+    ; PostgreSQL user matches our unix user.
     password=
+    ; For MySQL, use local socket, e.g. /var/run/mysqld/mysqld.sock
+    ; For a remote host, supply an IP address
     ; For local postgres authentication, you can leave it empty
     host=
 
@@ -127,6 +140,10 @@ We now install pretix, its direct dependencies and gunicorn::
 
     (venv)$ pip3 install pretix gunicorn
 
+If you're running MySQL, also install the client library::
+
+    (venv)$ pip3 install mysqlclient
+
 Note that you need Python 3.7 or newer. You can find out your Python version using ``python -V``.
 
 We also need to create a data directory::
@@ -301,32 +318,12 @@ example::
     (venv)$ python -m pretix rebuild
     # systemctl restart pretix-web pretix-worker
 
-System updates
---------------
-
-After system updates, such as updates to a new Ubuntu or Debian release, you might be using a new Python version.
-That's great, but requires some adjustments. First, adjust any old version paths in your nginx configuration file.
-Then, re-create your Python environment::
-
-    $ source /var/pretix/venv/bin/activate
-    (venv)$ pip3 freeze > /tmp/pip-backup.txt
-    $ rm -rf /var/pretix/venv
-    $ python3 -m venv /var/pretix/venv
-    $ source /var/pretix/venv/bin/activate
-    (venv)$ pip3 install -U pip wheel setuptools
-    (venv)$ pip3 install -r /tmp/pip-backup.txt
-
-Then, proceed like after any plugin installation::
-
-    (venv)$ python -m pretix migrate
-    (venv)$ python -m pretix rebuild
-    (venv)$ python -m pretix updatestyles
-    # systemctl restart pretix-web pretix-worker
 
 .. _Postfix: https://www.digitalocean.com/community/tutorials/how-to-install-and-configure-postfix-as-a-send-only-smtp-server-on-ubuntu-16-04
 .. _nginx: https://botleg.com/stories/https-with-lets-encrypt-and-nginx/
 .. _Let's Encrypt: https://letsencrypt.org/
 .. _pretix.eu: https://pretix.eu/
+.. _MySQL: https://dev.mysql.com/doc/refman/5.7/en/linux-installation-apt-repo.html
 .. _PostgreSQL: https://www.digitalocean.com/community/tutorials/how-to-install-and-use-postgresql-on-ubuntu-20-04
 .. _redis: https://blog.programster.org/debian-8-install-redis-server/
 .. _ufw: https://en.wikipedia.org/wiki/Uncomplicated_Firewall

doc/admin/maintainance.rst

@@ -17,11 +17,11 @@ Backups
 There are essentially two things which you should create backups of:
 
 Database
-    Your SQL database. This is critical and you should **absolutely always create automatic
-    backups of your database**. There are tons of tutorials on the internet on how to do this,
-    and the exact process depends on the choice of your database. For PostgreSQL, see the
-    ``pg_dump`` tool. You probably want to create a cronjob that does the backups for you on a
-    regular schedule.
+    Your SQL database (MySQL or PostgreSQL). This is critical and you should **absolutely
+    always create automatic backups of your database**. There are tons of tutorials on the
+    internet on how to do this, and the exact process depends on the choice of your database.
+    For MySQL, see ``mysqldump`` and for PostgreSQL, see the ``pg_dump`` tool. You probably
+    want to create a cronjob that does the backups for you on a regular schedule.
 
 Data directory
     The data directory of your pretix configuration might contain some things that you should

doc/admin/mysql2postgres.rst

@@ -1,148 +0,0 @@
-.. highlight:: none
-
-Migrating from MySQL/MariaDB to PostgreSQL
-==========================================
-
-Our recommended database for all production installations is PostgreSQL. Support for MySQL/MariaDB will be removed in
-pretix 5.0.
-
-In order to follow this guide, your pretix installation needs to be a version that fully supports MySQL/MariaDB. If you
-already upgraded to pretix 5.0, downgrade back to the last 4.x release using ``pip``.
-
-.. note:: We have tested this guide carefully, but we can't assume any liability for its correctness. The data loss
-          risk should be low as long as pretix is not running while you do the migration. If you are a pretix Enterprise
-          customer, feel free to reach out in advance if you want us to support you along the way.
-
-Update database schema
-----------------------
-
-Before you start, make sure your database schema is up to date::
-
-    # sudo -u pretix -s
-    $ source /var/pretix/venv/bin/activate
-    (venv)$ python -m pretix migrate
-
-Install PostgreSQL
-------------------
-
-Now, install and set up a PostgreSQL server. For a local installation on Debian or Ubuntu, use::
-
-    # apt install postgresql
-
-Having the database server installed, we still need a database and a database user. We can create these with any kind
-of database managing tool or directly on our database's shell. Please make sure that UTF8 is used as encoding for the
-best compatibility. You can check this with the following command::
-
-    # sudo -u postgres psql -c 'SHOW SERVER_ENCODING'
-
-Without Docker
-""""""""""""""
-
-For our standard manual installation, create the database and user like this::
-
-    # sudo -u postgres createuser pretix
-    # sudo -u postgres createdb -O pretix pretix
-
-With Docker
-"""""""""""
-
-For our standard docker installation, create the database and user like this::
-
-    # sudo -u postgres createuser -P pretix
-    # sudo -u postgres createdb -O pretix pretix
-
-Make sure that your database listens on the network. If PostgreSQL on the same same host as docker, but not inside a docker container, we recommend that you just listen on the Docker interface by changing the following line in ``/etc/postgresql/<version>/main/postgresql.conf``::
-
-    listen_addresses = 'localhost,172.17.0.1'
-
-You also need to add a new line to ``/etc/postgresql/<version>/main/pg_hba.conf`` to allow network connections to this user and database::
-
-    host    pretix          pretix          172.17.0.1/16           md5
-
-Restart PostgreSQL after you changed these files::
-
-    # systemctl restart postgresql
-
-If you have a firewall running, you should also make sure that port 5432 is reachable from the ``172.17.0.1/16`` subnet.
-
-Of course, instead of all this you can also run a PostgreSQL docker container and link it to the pretix container.
-
-Stop pretix
------------
-
-To prevent any more changes to your data, stop pretix from running::
-
-    # systemctl stop pretix-web pretix-worker
-
-Change configuration
---------------------
-
-Change the database configuration in your ``/etc/pretix/pretix.cfg`` file::
-
-    [database]
-    backend=postgresql
-    name=pretix
-    user=pretix
-    password=  ; only required for docker or remote database, can be kept empty for local auth
-    host=      ; set to 172.17.0.1 in docker setup, keep empty for local auth
-
-
-Create database schema
------------------------
-
-To create the schema in your new PostgreSQL database, use the following commands::
-
-    # sudo -u pretix -s
-    $ source /var/pretix/venv/bin/activate
-    (venv)$ python -m pretix migrate
-
-
-Migrate your data
------------------
-
-Install ``pgloader``::
-
-    # apt install pgloader
-
-Create a new file ``/tmp/pretix.load``, replacing the MySQL and PostgreSQL connection strings with the correct user names, passwords, and/or database names::
-
-    LOAD DATABASE
-        FROM mysql://pretix:password@localhost/pretix  -- replace with mysql://username:password@hostname/dbname
-        INTO postgresql:///pretix                      -- replace with dbname
-
-    WITH data only, include no drop, truncate, disable triggers,
-         create no indexes, drop indexes, reset sequences
-
-    ALTER SCHEMA 'pretix' RENAME TO 'public'           -- replace pretix with the name of the MySQL database
-
-    ALTER TABLE NAMES MATCHING ~/.*/
-        SET SCHEMA 'public'
-
-    SET timezone TO '+00:00'
-
-    SET PostgreSQL PARAMETERS
-         maintenance_work_mem to '128MB',
-         work_mem to '12MB';
-
-Then, run::
-
-    # sudo -u postgres pgloader /tmp/pretix.load
-
-The output should end with a table summarizing the results for every table. You can ignore warnings about type casts
-and missing constraints.
-
-Afterwards, delete the file again::
-
-    # rm -rf /tmp/pretix.load
-
-Start pretix
-------------
-
-Now, restart pretix. Maybe stop your MySQL server as a verification step that you are no longer using it::
-
-    # systemctl stop mariadb
-    # systemctl start pretix-web pretix-worker
-
-And you're done! After you've verified everything has been copied correctly, you can delete the old MySQL database.
-
-.. note:: Don't forget to update your backup process to back up your PostgreSQL database instead of your MySQL database now.

doc/admin/scaling.rst

@@ -42,7 +42,7 @@ A pretix installation usually consists of the following components which run per
 
 * ``pretix-worker`` is a Celery-based application that processes tasks that should be run asynchronously outside of the web application process.
 
-* A **PostgreSQL database** keeps all the important data and processes the actual transactions.
+* A **SQL database** keeps all the important data and processes the actual transactions. We recommend using PostgreSQL, but MySQL/MariaDB works as well.
 
 * A **web server** that terminates TLS and HTTP connections and forwards them to ``pretix-web``. In some cases, e.g. when serving static files, the web servers might return a response directly. We recommend using ``nginx``.
 
@@ -74,7 +74,7 @@ We recommend reading up on tuning your web server for high concurrency. For ngin
 processes and the number of connections each worker process accepts. Double-check that TLS session caching works, because TLS
 handshakes can get really expensive.
 
-During a traffic peak, your web server will be able to make use of more CPU resources, while memory usage will stay comparatively low,
+During a traffic peak, your web server will be able to make us of more CPU resources, while memory usage will stay comparatively low,
 so if you invest in more hardware here, invest in more and faster CPU cores.
 
 Make sure that pretix' static files (such as CSS and JavaScript assets) as well as user-uploaded media files (event logos, etc)

doc/api/fundamentals.rst

@@ -48,11 +48,10 @@ Possible permissions are:
 Compatibility
 -------------
 
-We try to avoid any breaking changes to our API to avoid hassle on your end. If possible, we'll
-build new features in a way that keeps all pre-existing API usage unchanged. In some cases,
-this might not be possible or only possible with restrictions. In these case, any
-backwards-incompatible changes will be prominently noted in the "Changes to the REST API"
-section of our release notes. If possible, we will announce them multiple releases in advance.
+We currently see pretix' API as a beta-stage feature. We therefore do not give any guarantees
+for compatibility between feature releases of pretix (such as 1.5 and 1.6). However, as always,
+we try not to break things when we don't need to. Any backwards-incompatible changes will be
+prominently noted in the release notes.
 
 We treat the following types of changes as *backwards-compatible* so we ask you to make sure
 that your clients can deal with them properly:
@@ -61,7 +60,6 @@ that your clients can deal with them properly:
 * Support of new HTTP methods for a given API endpoint
 * Support of new query parameters for a given API endpoint
 * New fields contained in API responses
-* New possible values of enumeration-like fields
 * Response body structure or message texts on failed requests (``4xx``, ``5xx`` response codes)
 
 We treat the following types of changes as *backwards-incompatible*:
@@ -192,9 +190,6 @@ Relative date         *either* String in ISO 8601  ``"2017-12-27"``,
 File                  URL in responses, ``file:``  ``"https://…"``, ``"file:…"``
                       specifiers in requests
                       (see below).
-Date range            *either* two dates separated ``2022-03-18/2022-03-23``, ``2022-03-18/``,
-                      by ``/`` *or* the name of a  ``/2022-03-23``, ``week_this``, ``week_next``,
-                      defined range.               ``month_this``
 ===================== ============================ ===================================
 
 Query parameters

doc/api/resources/carts.rst

@@ -43,6 +43,10 @@ seat                                  objects                    The assigned se
 └ seat_guid                           string                     Identifier of the seat within the seating plan
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 3.0
+
+   This ``seat`` attribute has been added.
+
 .. versionchanged:: 4.14
 
    This ``is_bundled`` attribute has been added and the cart creation endpoints have been updated.

doc/api/resources/checkinlists.rst

@@ -39,6 +39,23 @@ exit_all_at                           datetime                   Automatically c
 addon_match                           boolean                    If ``true``, tickets on this list can be redeemed by scanning their parent ticket if this still leads to an unambiguous match.
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 3.9
+
+    The ``subevent`` attribute may now be ``null`` inside event series. The ``allow_multiple_entries``,
+    ``allow_entry_after_exit``, and ``rules`` attributes have been added.
+
+.. versionchanged:: 3.11
+
+    The ``subevent_match`` and ``exclude`` query parameters have been added.
+
+.. versionchanged:: 3.12
+
+    The ``exit_all_at`` attribute has been added.
+
+.. versionchanged:: 3.17
+
+    The ``ends_after`` and ``expand`` query parameters have been added.
+
 .. versionchanged:: 4.12
 
     The ``addon_match`` attribute has been added.
@@ -98,8 +115,6 @@ Endpoints
    :query string ends_after: Exclude all check-in lists attached to a sub-event that is already in the past at the given time.
    :query string expand: Expand a field into a full object. Currently only ``subevent`` is supported. Can be passed multiple times.
    :query string exclude: Exclude a field from the output, e.g. ``checkin_count``. Can be used as a performance optimization. Can be passed multiple times.
-   :query string ordering: Manually set the ordering of results. Valid fields to be used are ``id``, ``name``, and ``subevent__date_from``,
-                           Default: ``subevent__date_from,name``
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
    :statuscode 200: no error

doc/api/resources/events.rst

@@ -52,9 +52,34 @@ sales_channels                        list                       A list of sales
 ===================================== ========================== =======================================================
 
 
+.. versionchanged:: 3.3
+
+   The attributes ``geo_lat`` and ``geo_lon`` have been added.
+
+.. versionchanged:: 3.4
+
+   The attribute ``timezone`` has been added.
+
+.. versionchanged:: 3.7
+
+   The attribute ``item_meta_properties`` has been added.
+
+.. versionchanged:: 3.12
+
+   The attribute ``valid_keys`` has been added.
+
+.. versionchanged:: 3.14
+
+    The attribute ``sales_channels`` has been added.
+
+
 Endpoints
 ---------
 
+.. versionchanged:: 3.3
+
+    The events resource can now be filtered by meta data attributes.
+
 .. versionchanged:: 4.0
 
     The ``clone_from`` parameter has been added to the event creation endpoint.
@@ -542,6 +567,10 @@ information about the properties.
 .. 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.
 
+.. versionchanged:: 3.6
+
+   Initial support for settings has been added to the API.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/settings/
 
    Get current values of event settings.

doc/api/resources/exporters.rst

@@ -6,6 +6,10 @@ Data exporters
 pretix and it's plugins include a number of data exporters that allow you to bulk download various data from pretix in
 different formats. This page shows you how to use these exporters through the API.
 
+.. versionchanged:: 3.13
+
+   This feature has been added to the API.
+
 .. warning::
 
    While we consider the methods listed on this page to be a stable API, the availability and specific input field

doc/api/resources/giftcards.rst

@@ -40,6 +40,10 @@ text                                  string                     Custom text of
 Endpoints
 ---------
 
+.. versionadded:: 3.14
+
+   The transaction list endpoint was added.
+
 .. http:get:: /api/v1/organizers/(organizer)/giftcards/
 
    Returns a list of all gift cards issued by a given organizer.
@@ -253,6 +257,10 @@ Endpoints
         "value": "15.37"
       }
 
+   .. versionchanged:: 3.5
+
+      This endpoint now returns status code ``409`` if the transaction would lead to a negative gift card value.
+
    :param organizer: The ``slug`` field of the organizer to modify
    :param id: The ``id`` field of the gift card to modify
    :query boolean include_accepted: Also show gift cards issued by other organizers that are accepted by this organizer.

doc/api/resources/invoices.rst

@@ -108,6 +108,16 @@ internal_reference                    string                     Customer's refe
 ===================================== ========================== =======================================================
 
 
+.. versionchanged:: 3.4
+
+   The attribute ``lines.number`` has been added.
+
+.. versionchanged:: 3.17
+
+   The attribute ``invoice_to_*``, ``invoice_from_*``, ``custom_field``, ``lines.item``, ``lines.variation``, ``lines.event_date_from``,
+   ``lines.event_date_to``, and ``lines.attendee_name`` have been added.
+   ``refers`` now returns an invoice number including the prefix.
+
 .. versionchanged:: 4.1
 
    The attributes ``fee_type`` and ``fee_internal_type`` have been added.

doc/api/resources/item_variations.rst

@@ -43,13 +43,8 @@ available_until                       datetime                   The last date t
 hide_without_voucher                  boolean                    If ``true``, this variation is only shown during the voucher
                                                                  redemption process, but not in the normal shop
                                                                  frontend.
-meta_data                             object                     Values set for event-specific meta data parameters.
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 4.16
-
-   The ``meta_data`` attribute has been added.
-
 Endpoints
 ---------
 
@@ -99,7 +94,6 @@ Endpoints
             "default_price": "223.00",
             "price": 223.0,
             "original_price": null,
-            "meta_data": {}
           },
           {
             "id": 3,
@@ -114,8 +108,7 @@ Endpoints
             "description": {},
             "position": 1,
             "default_price": null,
-            "price": 15.0,
-            "meta_data": {}
+            "price": 15.0
           }
         ]
       }
@@ -168,8 +161,7 @@ Endpoints
         "available_until": null,
         "hide_without_voucher": false,
         "description": null,
-        "position": 0,
-        "meta_data": {}
+        "position": 0
       }
 
    :param organizer: The ``slug`` field of the organizer to fetch
@@ -206,8 +198,7 @@ Endpoints
         "available_until": null,
         "hide_without_voucher": false,
         "description": null,
-        "position": 0,
-        "meta_data": {}
+        "position": 0
       }
 
    **Example response**:
@@ -234,8 +225,7 @@ Endpoints
         "available_until": null,
         "hide_without_voucher": false,
         "description": null,
-        "position": 0,
-        "meta_data": {}
+        "position": 0
       }
 
    :param organizer: The ``slug`` field of the organizer of the event/item to create a variation for
@@ -293,8 +283,7 @@ Endpoints
         "available_until": null,
         "hide_without_voucher": false,
         "description": null,
-        "position": 1,
-        "meta_data": {}
+        "position": 1
       }
 
    :param organizer: The ``slug`` field of the organizer to modify

doc/api/resources/items.rst

@@ -35,12 +35,6 @@ tax_rule                              integer                    The internal ID
 admission                             boolean                    ``true`` for items that grant admission to the event
                                                                  (such as primary tickets) and ``false`` for others
                                                                  (such as add-ons or merchandise).
-personalized                          boolean                    ``true`` for items that require personalization according
-                                                                 to event settings. Only affects system-level fields, not
-                                                                 custom questions. Currently only allowed for products with
-                                                                 ``admission`` set to ``true``. For backwards compatibility,
-                                                                 when creating new items and this field is not given, it defaults
-                                                                 to the same value as ``admission``.
 position                              integer                    An integer, used for sorting
 picture                               file                       A product picture to be displayed in the shop
                                                                  (can be ``null``).
@@ -129,7 +123,6 @@ variations                            list of objects            A list with one
 ├ hide_without_voucher                boolean                    If ``true``, this variation is only shown during the voucher
                                                                  redemption process, but not in the normal shop
                                                                  frontend.
-├ meta_data                           object                     Values set for event-specific meta data parameters.
 └ position                            integer                    An integer, used for sorting
 addons                                list of objects            Definition of add-ons that can be chosen for this item.
                                                                  Only writable during creation,
@@ -153,6 +146,14 @@ bundles                               list of objects            Definition of b
 meta_data                             object                     Values set for event-specific meta data parameters.
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 3.7
+
+   The attribute ``meta_data`` has been added.
+
+.. versionchanged:: 3.10
+
+   The attribute ``multi_allowed`` has been added to ``addons``.
+
 .. versionchanged:: 4.0
 
    The attributes ``require_membership``, ``require_membership_types``, ``grant_membership_type``, ``grant_membership_duration_like_event``,
@@ -162,10 +163,6 @@ meta_data                             object                     Values set for
 
    The attributes ``require_membership_hidden`` attribute has been added.
 
-.. versionchanged:: 4.16
-
-   The ``variations[x].meta_data`` attribute has been added. The ``personalized`` attribute has been added.
-
 Notes
 -----
 
@@ -219,7 +216,6 @@ Endpoints
             "tax_rate": "0.00",
             "tax_rule": 1,
             "admission": false,
-            "personalized": false,
             "issue_giftcard": false,
             "meta_data": {},
             "position": 0,
@@ -259,7 +255,6 @@ Endpoints
                  "available_until": null,
                  "hide_without_voucher": false,
                  "description": null,
-                 "meta_data": {},
                  "position": 0
               },
               {
@@ -275,7 +270,6 @@ Endpoints
                  "available_until": null,
                  "hide_without_voucher": false,
                  "description": null,
-                 "meta_data": {},
                  "position": 1
               }
             ],
@@ -336,7 +330,6 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
-        "personalized": false,
         "issue_giftcard": false,
         "meta_data": {},
         "position": 0,
@@ -376,7 +369,6 @@ Endpoints
              "available_from": null,
              "available_until": null,
              "hide_without_voucher": false,
-             "meta_data": {},
              "position": 0
           },
           {
@@ -392,7 +384,6 @@ Endpoints
              "available_until": null,
              "hide_without_voucher": false,
              "description": null,
-             "meta_data": {},
              "position": 1
           }
         ],
@@ -434,7 +425,6 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
-        "personalized": false,
         "issue_giftcard": false,
         "meta_data": {},
         "position": 0,
@@ -473,7 +463,6 @@ Endpoints
              "available_until": null,
              "hide_without_voucher": false,
              "description": null,
-             "meta_data": {},
              "position": 0
           },
           {
@@ -489,7 +478,6 @@ Endpoints
              "available_until": null,
              "hide_without_voucher": false,
              "description": null,
-             "meta_data": {},
              "position": 1
           }
         ],
@@ -519,7 +507,6 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
-        "personalized": false,
         "issue_giftcard": false,
         "meta_data": {},
         "position": 0,
@@ -559,7 +546,6 @@ Endpoints
              "available_until": null,
              "hide_without_voucher": false,
              "description": null,
-             "meta_data": {},
              "position": 0
           },
           {
@@ -575,7 +561,6 @@ Endpoints
              "available_until": null,
              "hide_without_voucher": false,
              "description": null,
-             "meta_data": {},
              "position": 1
           }
         ],
@@ -636,7 +621,6 @@ Endpoints
         "tax_rate": "0.00",
         "tax_rule": 1,
         "admission": false,
-        "personalized": false,
         "issue_giftcard": false,
         "meta_data": {},
         "position": 0,
@@ -676,7 +660,6 @@ Endpoints
              "available_until": null,
              "hide_without_voucher": false,
              "description": null,
-             "meta_data": {},
              "position": 0
           },
           {
@@ -692,7 +675,6 @@ Endpoints
              "available_until": null,
              "hide_without_voucher": false,
              "description": null,
-             "meta_data": {},
              "position": 1
           }
         ],

doc/api/resources/orders.rst

@@ -98,6 +98,30 @@ last_modified                         datetime                   Last modificati
 ===================================== ========================== =======================================================
 
 
+.. versionchanged:: 3.5
+
+   The ``order.fees.canceled`` attribute has been added.
+
+.. versionchanged:: 3.8
+
+   The ``reactivate`` operation has been added.
+
+.. versionchanged:: 3.10
+
+   The ``search`` query parameter has been added.
+
+.. versionchanged:: 3.11
+
+   The ``exclude`` and ``subevent_after`` query parameter has been added.
+
+.. versionchanged:: 3.13
+
+   The ``subevent_before`` query parameter has been added.
+
+.. versionchanged:: 3.14
+
+   The ``phone`` attribute has been added.
+
 .. versionchanged:: 4.0
 
    The ``customer`` attribute has been added.
@@ -118,10 +142,6 @@ last_modified                         datetime                   Last modificati
 
    The ``order.fees.id`` attribute has been added.
 
-.. versionchanged:: 4.15
-
-   The ``include`` query parameter has been added.
-
 
 .. _order-position-resource:
 
@@ -186,6 +206,27 @@ pdf_data                              object                     Data object req
                                                                  ``pdf_data=true`` query parameter to your request.
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 3.3
+
+  The ``url`` of a ticket ``download`` can now also return a ``text/uri-list`` instead of a file. See
+  :ref:`order-position-ticket-download` for details.
+
+.. versionchanged:: 3.5
+
+  The attribute ``canceled`` has been added.
+
+.. versionchanged:: 3.8
+
+  The attributes ``company``, ``street``, ``zipcode``, ``city``, ``country``, and ``state`` have been added.
+
+.. versionchanged:: 3.9
+
+  The ``checkin.type`` attribute has been added.
+
+.. versionchanged:: 3.16
+
+   Answers to file questions are now returned as an URL.
+
 .. _order-payment-resource:
 
 Order payment resource
@@ -246,6 +287,10 @@ details                               object                     Refund-specific
 List of all orders
 ------------------
 
+.. versionchanged:: 3.5
+
+   The ``include_canceled_positions`` and ``include_canceled_fees`` query parameters have been added.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orders/
 
    Returns a list of all orders within a given event.
@@ -413,7 +458,6 @@ List of all orders
    :query datetime subevent_after: Only return orders that contain a ticket for a subevent taking place after the given date. This is an exclusive after, and it considers the **end** of the subevent (or its start, if the end is not set).
    :query datetime subevent_before: Only return orders that contain a ticket for a subevent taking place after the given date. This is an exclusive before, and it considers the **start** of the subevent.
    :query string exclude: Exclude a field from the output, e.g. ``fees`` or ``positions.downloads``. Can be used as a performance optimization. Can be passed multiple times.
-   :query string include: Include only the given field in the output, e.g. ``fees`` or ``positions.downloads``. Can be used as a performance optimization. Can be passed multiple times. ``include`` is applied before ``exclude``, so ``exclude`` takes precedence.
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
    :resheader X-Page-Generated: The server time at the beginning of the operation. If you're using this API to fetch
@@ -425,6 +469,10 @@ List of all orders
 Fetching individual orders
 --------------------------
 
+.. versionchanged:: 3.5
+
+   The ``include_canceled_positions`` and ``include_canceled_fees`` query parameters have been added.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/
 
    Returns information on one order, identified by its order code.
@@ -999,6 +1047,10 @@ Creating orders
 Order state operations
 ----------------------
 
+.. versionchanged:: 3.12
+
+   The ``mark_paid`` operation now takes a ``send_email`` parameter.
+
 .. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/mark_paid/
 
    Marks a pending or expired order as successfully paid.
@@ -1400,6 +1452,10 @@ Sending e-mails
 List of all order positions
 ---------------------------
 
+.. versionchanged:: 3.5
+
+   The ``include_canceled_positions`` and ``include_canceled_fees`` query parameters have been added.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/
 
    Returns a list of all order positions within a given event.
@@ -1654,6 +1710,10 @@ Order position ticket download
 Manipulating individual positions
 ---------------------------------
 
+.. versionchanged:: 3.15
+
+   The ``PATCH`` method has been added for individual positions.
+
 .. versionchanged:: 4.8
 
    The ``PATCH`` method now supports changing items, variations, subevents, seats, prices, and tax rules.
@@ -1960,6 +2020,14 @@ otherwise, such as splitting an order or changing fees.
 Order payment endpoints
 -----------------------
 
+.. versionchanged:: 3.6
+
+   Payments can now be created through the API.
+
+.. versionchanged:: 3.12
+
+   The ``confirm`` operation now takes a ``send_email`` parameter.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/payments/
 
    Returns a list of all payments for an order.
@@ -2497,6 +2565,10 @@ Revoked ticket secrets
 
 With some non-default ticket secret generation methods, a list of revoked ticket secrets is required for proper validation.
 
+.. versionchanged:: 3.12
+
+   Added revocation lists.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/revokedsecrets/
 
    Returns a list of all revoked secrets within a given event.

doc/api/resources/organizers.rst

@@ -109,6 +109,10 @@ information about the properties.
 .. warning:: This API is intended for advanced users. Even though we take care to validate your input, you will be
              able to break your shops using this API by creating situations of conflicting settings. Please take care.
 
+.. versionchanged:: 3.14
+
+   Initial support for settings has been added to the API.
+
 .. http:get:: /api/v1/organizers/(organizer)/settings/
 
    Get current values of organizer settings.

doc/api/resources/questions.rst

@@ -76,9 +76,26 @@ dependency_value                      string                     An old version
                                                                  for one value. **Deprecated.**
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 3.5
+
+  The attribute ``help_text`` has been added.
+
+.. versionchanged:: 3.14
+
+  The attributes ``valid_*`` have been added.
+
+.. versionchanged:: 3.18
+
+  The attribute ``valid_file_portrait`` have been added.
+
 Endpoints
 ---------
 
+.. versionchanged:: 1.15
+
+   The questions endpoint has been extended by the filter queries ``ask_during_checkin``, ``requred``, and
+   ``identifier``.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/questions/
 
    Returns a list of all questions within a given event.

doc/api/resources/quotas.rst

@@ -36,6 +36,10 @@ available_number                      integer                    Number of avail
                                                                  slightly out of date. ``null`` means unlimited.
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 3.10
+
+   The attribute ``release_after_exit`` has been added.
+
 .. versionchanged:: 4.1
 
     The ``with_availability`` query parameter has been added.

doc/api/resources/subevents.rst

@@ -59,13 +59,29 @@ seat_category_mapping                 object                     An object mappi
 last_modified                         datetime                   Last modification of this object
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 4.15
+.. versionchanged:: 3.3
 
-    The ``search`` query parameter has been added to filter sub-events by their name or location in any language.
+   The attributes ``geo_lat`` and ``geo_lon`` have been added.
+
+.. versionchanged:: 3.10
+
+   The ``disabled`` attribute has been added to ``item_price_overrides`` and ``variation_price_overrides``.
+
+.. versionchanged:: 3.12
+
+   The ``last_modified`` attribute has been added.
+
+.. versionchanged:: 3.18
+
+   The ``available_from``/``available_until`` attributes have been added to ``item_price_overrides`` and ``variation_price_overrides``.
 
 Endpoints
 ---------
 
+.. versionchanged:: 3.3
+
+    The sub-events resource can now be filtered by meta data attributes.
+
 .. versionchanged:: 4.1
 
     The ``with_availability_for`` parameter has been added.
@@ -131,7 +147,6 @@ Endpoints
    :query is_future: If set to ``true`` (``false``), only events that happen currently or in the future are (not) returned.
    :query is_past: If set to ``true`` (``false``), only events that are over are (not) returned.
    :query ends_after: If set to a date and time, only events that happen during of after the given time are returned.
-   :query search: Only return events matching a given search query.
    :param organizer: The ``slug`` field of a valid organizer
    :param event: The ``slug`` field of the main event
    :query datetime modified_since: Only return objects that have changed since the given date. Be careful: This does not

doc/api/resources/vouchers.rst

@@ -50,6 +50,10 @@ show_hidden_items                     boolean                    Only if set to
 ===================================== ========================== =======================================================
 
 
+.. versionchanged:: 3.4
+
+   The attribute ``seat`` has been added.
+
 Endpoints
 ---------
 

doc/api/resources/waitinglist.rst

@@ -30,6 +30,12 @@ subevent                              integer                    ID of the date
 ===================================== ========================== =======================================================
 
 
+.. versionchanged:: 1.15
+
+   The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added as well as a method to send out
+   vouchers.
+
+
 Endpoints
 ---------
 

doc/development/api/exporter.rst

@@ -76,10 +76,6 @@ The exporter class
 
       This is an abstract attribute, you **must** override this!
 
-   .. autoattribute:: description
-
-   .. autoattribute:: category
-
    .. autoattribute:: export_form_fields
 
    .. automethod:: render

doc/development/api/payment.rst

@@ -138,10 +138,6 @@ The provider class
 
    .. autoattribute:: is_meta
 
-   .. autoattribute:: execute_payment_needs_user
-
-   .. autoattribute:: multi_use_supported
-
    .. autoattribute:: test_mode_message
 
    .. autoattribute:: requires_invoice_immediately

doc/development/implementation/permissions.rst

@@ -184,6 +184,11 @@ Most of these methods work identically on :class:`pretix.base.models.TeamAPIToke
 Staff sessions
 --------------
 
+.. versionchanged:: 1.14
+
+   In 1.14, the ``User.is_superuser`` attribute has been deprecated and statically set to return ``False``. Staff
+   sessions have been newly introduced.
+
 System administrators of a pretix instance are identified by the ``is_staff`` attribute on the user model. By default,
 the regular permission rules apply for users with ``is_staff = True``. The only difference is that such users can
 temporarily turn on "staff mode" via a button in the user interface that grants them **all permissions** as long as

doc/plugins/digital.rst

@@ -91,7 +91,6 @@ Field                                 Type                       Description
 ===================================== ========================== =======================================================
 id                                    integer                    Internal content ID
 title                                 multi-lingual string       The content title (required)
-internal_name                         string                     An optional name that is only used in the backend
 content_type                          string                     The type of content, valid values are ``webinar``, ``video``, ``livestream``, ``link``, ``file``
 url                                   string                     The location of the digital content
 file                                  file                       A downloadable file. Either ``url`` or ``file`` must be ``null``.

doc/plugins/ticketoutputpdf.rst

@@ -17,13 +17,9 @@ Field                                 Type                       Description
 id                                    integer                    Internal layout ID
 name                                  string                     Internal layout description
 default                               boolean                    ``true`` if this is the default layout
-layout                                list                       Dynamic layout specification. Each list element
-                                                                 corresponds to one dynamic element of the layout.
-                                                                 The current version of the schema in use can be found
-                                                                 `here`_.
-                                                                 Submitting invalid content can lead to application errors.
+layout                                object                     Layout specification for libpretixprint
 background                            URL                        Background PDF file
-item_assignments                      list of objects            Products this layout is assigned to (currently read-only)
+item_assignments                      list of objects            Products this layout is assigned to
 ├ sales_channel                       string                     Sales channel (defaults to ``web``).
 └ item                                integer                    Item ID
 ===================================== ========================== =======================================================
@@ -62,7 +58,7 @@ Endpoints
             "name": "Default layout",
             "default": true,
             "layout": {…},
-            "background": null,
+            "background": {},
             "item_assignments": []
           }
         ]
@@ -100,7 +96,7 @@ Endpoints
         "name": "Default layout",
         "default": true,
         "layout": {…},
-        "background": null,
+        "background": {},
         "item_assignments": []
       }
 
@@ -151,122 +147,3 @@ Endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer does not exist **or** you have no permission to view it.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/ticketlayouts/
-
-   Creates a new ticket layout
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/ticketlayouts/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "name": "Default layout",
-        "default": true,
-        "layout": […],
-        "background": null,
-        "item_assignments": []
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "name": "Default layout",
-        "default": true,
-        "layout": […],
-        "background": null,
-        "item_assignments": []
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event to create a layout for
-   :param event: The ``slug`` field of the event to create a layout for
-   :statuscode 201: no error
-   :statuscode 400: The layout 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)/ticketlayouts/(id)/
-
-   Update a layout. 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/ticketlayouts/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 94
-
-      {
-        "name": "Default layout"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "name": "Default layout",
-        "default": true,
-        "layout": […],
-        "background": null,
-        "item_assignments": []
-      }
-
-   :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 layout to modify
-   :statuscode 200: no error
-   :statuscode 400: The layout 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)/ticketlayouts/(id)/
-
-   Delete a layout.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/ticketlayouts/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 layout 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.
-
-
-.. _here: https://github.com/pretix/pretix/blob/master/src/pretix/static/schema/pdf-layout.schema.json

doc/spelling_wordlist.txt

@@ -97,7 +97,6 @@ overpayment
 param
 passphrase
 percental
-personalization
 pluggable
 positionid
 pre

doc/user/events/widget.rst

@@ -447,4 +447,8 @@ Hosted or pretix Enterprise are active, you can pass the following fields:
     </script>
 
 
+.. versionchanged:: 3.6
+
+   Dynamically opening the widget has been added in pretix 3.6.
+
 .. _Let's Encrypt: https://letsencrypt.org/

src/pretix/__init__.py

@@ -19,4 +19,4 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-__version__ = "4.16.0"
+__version__ = "4.15.0.dev0"

src/pretix/api/middleware.py

@@ -32,7 +32,6 @@ from rest_framework import status
 
 from pretix.api.models import ApiCall
 from pretix.base.models import Organizer
-from pretix.helpers import OF_SELF
 
 
 class IdempotencyMiddleware:
@@ -57,7 +56,7 @@ class IdempotencyMiddleware:
         idempotency_key = request.headers.get('X-Idempotency-Key', '')
 
         with transaction.atomic():
-            call, created = ApiCall.objects.select_for_update(of=OF_SELF).get_or_create(
+            call, created = ApiCall.objects.select_for_update().get_or_create(
                 auth_hash=auth_hash,
                 idempotency_key=idempotency_key,
                 defaults={

src/pretix/api/migrations/0009_auto_20221217_1847.py

@@ -1,77 +0,0 @@
-# Generated by Django 3.2.16 on 2022-12-17 18:47
-
-import uuid
-
-import django.db.models.deletion
-import oauth2_provider.generators
-import oauth2_provider.models
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0226_itemvariationmetavalue'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('pretixapi', '0008_webhookcallretry'),
-    ]
-    run_before = [
-        ('oauth2_provider', '0002_auto_20190406_1805'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='oauthapplication',
-            name='algorithm',
-            field=models.CharField(default='', max_length=5),
-        ),
-        migrations.AddField(
-            model_name='oauthgrant',
-            name='claims',
-            field=models.TextField(default=''),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='oauthgrant',
-            name='code_challenge',
-            field=models.CharField(default='', max_length=128),
-        ),
-        migrations.AddField(
-            model_name='oauthgrant',
-            name='code_challenge_method',
-            field=models.CharField(default='', max_length=10),
-        ),
-        migrations.AddField(
-            model_name='oauthgrant',
-            name='nonce',
-            field=models.CharField(default='', max_length=255),
-        ),
-        migrations.AlterField(
-            model_name='oauthapplication',
-            name='client_secret',
-            field=oauth2_provider.models.ClientSecretField(db_index=True, default=oauth2_provider.generators.generate_client_secret, max_length=255),
-        ),
-        migrations.CreateModel(
-            name='OAuthIDToken',
-            fields=[
-                ('id', models.BigAutoField(primary_key=True, serialize=False)),
-                ('jti', models.UUIDField(default=uuid.uuid4, unique=True)),
-                ('expires', models.DateTimeField()),
-                ('scope', models.TextField()),
-                ('created', models.DateTimeField(auto_now_add=True)),
-                ('updated', models.DateTimeField(auto_now=True)),
-                ('application', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.OAUTH2_PROVIDER_APPLICATION_MODEL)),
-                ('organizers', models.ManyToManyField(to='pretixbase.Organizer')),
-                ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='pretixapi_oauthidtoken', to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'abstract': False,
-            },
-        ),
-        migrations.AddField(
-            model_name='oauthaccesstoken',
-            name='id_token',
-            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='access_token', to='pretixapi.oauthidtoken'),
-        ),
-    ]

src/pretix/api/models.py

@@ -29,8 +29,8 @@ from oauth2_provider.generators import (
     generate_client_id, generate_client_secret,
 )
 from oauth2_provider.models import (
-    AbstractAccessToken, AbstractApplication, AbstractGrant, AbstractIDToken,
-    AbstractRefreshToken, ClientSecretField,
+    AbstractAccessToken, AbstractApplication, AbstractGrant,
+    AbstractRefreshToken,
 )
 from oauth2_provider.validators import URIValidator
 
@@ -46,7 +46,7 @@ class OAuthApplication(AbstractApplication):
         verbose_name=_("Client ID"),
         max_length=100, unique=True, default=generate_client_id, db_index=True
     )
-    client_secret = ClientSecretField(
+    client_secret = models.CharField(
         verbose_name=_("Client secret"),
         max_length=255, blank=False, default=generate_client_secret, db_index=True
     )
@@ -67,26 +67,12 @@ class OAuthGrant(AbstractGrant):
     redirect_uri = models.CharField(max_length=2500)  # Only 255 in AbstractGrant, which caused problems
 
 
-class OAuthIDToken(AbstractIDToken):
-    application = models.ForeignKey(
-        OAuthApplication, on_delete=models.CASCADE,
-    )
-    organizers = models.ManyToManyField('pretixbase.Organizer')
-
-
 class OAuthAccessToken(AbstractAccessToken):
     source_refresh_token = models.OneToOneField(
         # unique=True implied by the OneToOneField
         'OAuthRefreshToken', on_delete=models.SET_NULL, blank=True, null=True,
         related_name="refreshed_access_token"
     )
-    id_token = models.OneToOneField(
-        OAuthIDToken,
-        on_delete=models.CASCADE,
-        blank=True,
-        null=True,
-        related_name="access_token",
-    )
     application = models.ForeignKey(
         OAuthApplication, on_delete=models.CASCADE, blank=True, null=True,
     )

src/pretix/api/serializers/exporters.py

@@ -22,10 +22,8 @@
 from django import forms
 from django.http import QueryDict
 from rest_framework import serializers
-from rest_framework.exceptions import ValidationError
 
 from pretix.base.exporter import OrganizerLevelExportMixin
-from pretix.base.timeframes import DateFrameField, SerializerDateFrameField
 
 
 class FormFieldWrapperField(serializers.Field):
@@ -144,12 +142,6 @@ class JobRunSerializer(serializers.Serializer):
                     allow_null=not v.required,
                     validators=v.validators,
                 )
-            elif isinstance(v, DateFrameField):
-                self.fields[k] = SerializerDateFrameField(
-                    required=v.required,
-                    allow_null=not v.required,
-                    validators=v.validators,
-                )
             else:
                 self.fields[k] = FormFieldWrapperField(form_field=v, required=v.required, allow_null=not v.required)
 
@@ -159,40 +151,5 @@ class JobRunSerializer(serializers.Serializer):
         for k, v in self.fields.items():
             if isinstance(v, serializers.ManyRelatedField) and k not in data:
                 data[k] = []
-
-        for fk in self.fields.keys():
-            # Backwards compatibility for exports that used to take e.g. (date_from, date_to) or (event_date_from, event_date_to)
-            # and now only take date_range.
-            if fk.endswith("_range") and isinstance(self.fields[fk], SerializerDateFrameField) and fk not in data:
-                if fk.replace("_range", "_from") in data:
-                    d_from = data.pop(fk.replace("_range", "_from"))
-                    if d_from:
-                        d_from = serializers.DateField().to_internal_value(d_from)
-                else:
-                    d_from = None
-                if fk.replace("_range", "_to") in data:
-                    d_to = data.pop(fk.replace("_range", "_to"))
-                    if d_to:
-                        d_to = serializers.DateField().to_internal_value(d_to)
-                else:
-                    d_to = None
-                data[fk] = f'{d_from.isoformat() if d_from else ""}/{d_to.isoformat() if d_to else ""}'
-
         data = super().to_internal_value(data)
         return data
-
-    def is_valid(self, raise_exception=False):
-        super().is_valid(raise_exception=raise_exception)
-
-        fields_keys = set(self.fields.keys())
-        input_keys = set(self.initial_data.keys())
-
-        additional_fields = input_keys - fields_keys
-
-        if bool(additional_fields):
-            self._errors['fields'] = ['Additional fields not allowed: {}.'.format(list(additional_fields))]
-
-        if self._errors and raise_exception:
-            raise ValidationError(self.errors)
-
-        return not bool(self._errors)

src/pretix/api/serializers/item.py

@@ -47,14 +47,13 @@ from pretix.api.serializers.fields import UploadedFileField
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.base.models import (
     Item, ItemAddOn, ItemBundle, ItemCategory, ItemMetaValue, ItemVariation,
-    ItemVariationMetaValue, Question, QuestionOption, Quota,
+    Question, QuestionOption, Quota,
 )
 
 
 class InlineItemVariationSerializer(I18nAwareModelSerializer):
     price = serializers.DecimalField(read_only=True, decimal_places=2, max_digits=10,
                                      coerce_to_string=True)
-    meta_data = MetaDataField(required=False, source='*')
 
     class Meta:
         model = ItemVariation
@@ -62,23 +61,16 @@ class InlineItemVariationSerializer(I18nAwareModelSerializer):
                   'position', 'default_price', 'price', 'original_price', 'require_approval',
                   'require_membership', 'require_membership_types',
                   'require_membership_hidden', 'available_from', 'available_until',
-                  'sales_channels', 'hide_without_voucher', 'meta_data')
+                  'sales_channels', 'hide_without_voucher',)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['require_membership_types'].queryset = lazy(lambda: self.context['event'].organizer.membership_types.all(), QuerySet)
 
-    def validate_meta_data(self, value):
-        for key in value['meta_data'].keys():
-            if key not in self.parent.parent.item_meta_properties:
-                raise ValidationError(_('Item meta data property \'{name}\' does not exist.').format(name=key))
-        return value
-
 
 class ItemVariationSerializer(I18nAwareModelSerializer):
     price = serializers.DecimalField(read_only=True, decimal_places=2, max_digits=10,
                                      coerce_to_string=True)
-    meta_data = MetaDataField(required=False, source='*')
 
     class Meta:
         model = ItemVariation
@@ -86,67 +78,12 @@ class ItemVariationSerializer(I18nAwareModelSerializer):
                   'position', 'default_price', 'price', 'original_price', 'require_approval',
                   'require_membership', 'require_membership_types',
                   'require_membership_hidden', 'available_from', 'available_until',
-                  'sales_channels', 'hide_without_voucher', 'meta_data')
+                  'sales_channels', 'hide_without_voucher',)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['require_membership_types'].queryset = self.context['event'].organizer.membership_types.all()
 
-    @transaction.atomic
-    def create(self, validated_data):
-        meta_data = validated_data.pop('meta_data', None)
-        require_membership_types = validated_data.pop('require_membership_types', [])
-        variation = ItemVariation.objects.create(**validated_data)
-
-        if require_membership_types:
-            variation.require_membership_types.add(*require_membership_types)
-
-        # Meta data
-        if meta_data is not None:
-            for key, value in meta_data.items():
-                ItemVariationMetaValue.objects.create(
-                    property=self.item_meta_properties.get(key),
-                    value=value,
-                    variation=variation
-                )
-        return variation
-
-    @cached_property
-    def item_meta_properties(self):
-        return {
-            p.name: p for p in self.context['request'].event.item_meta_properties.all()
-        }
-
-    def validate_meta_data(self, value):
-        for key in value['meta_data'].keys():
-            if key not in self.item_meta_properties:
-                raise ValidationError(_('Item meta data property \'{name}\' does not exist.').format(name=key))
-        return value
-
-    def update(self, instance, validated_data):
-        meta_data = validated_data.pop('meta_data', None)
-        variation = super().update(instance, validated_data)
-
-        # Meta data
-        if meta_data is not None:
-            current = {mv.property: mv for mv in variation.meta_values.select_related('property')}
-            for key, value in meta_data.items():
-                prop = self.item_meta_properties.get(key)
-                if prop in current:
-                    current[prop].value = value
-                    current[prop].save()
-                else:
-                    variation.meta_values.create(
-                        property=self.item_meta_properties.get(key),
-                        value=value
-                    )
-
-            for prop, current_object in current.items():
-                if prop.name not in meta_data:
-                    current_object.delete()
-
-        return variation
-
 
 class InlineItemBundleSerializer(serializers.ModelSerializer):
     class Meta:
@@ -234,7 +171,7 @@ 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',
+                  'default_price', 'free_price', 'tax_rate', 'tax_rule', 'admission',
                   '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',
@@ -262,15 +199,6 @@ class ItemSerializer(I18nAwareModelSerializer):
         Item.clean_per_order(data.get('min_per_order'), data.get('max_per_order'))
         Item.clean_available(data.get('available_from'), data.get('available_until'))
 
-        if data.get('personalized') and not data.get('admission'):
-            raise ValidationError(_('Only admission products can currently be personalized.'))
-
-        if data.get('admission') and 'personalized' not in data and not self.instance:
-            # Backwards compatibility
-            data['personalized'] = True
-        elif 'admission' in data and not data['admission']:
-            data['personalized'] = False
-
         if data.get('issue_giftcard'):
             if data.get('tax_rule') and data.get('tax_rule').rate > 0:
                 raise ValidationError(
@@ -335,19 +263,9 @@ class ItemSerializer(I18nAwareModelSerializer):
 
         for variation_data in variations_data:
             require_membership_types = variation_data.pop('require_membership_types', [])
-            var_meta_data = variation_data.pop('meta_data', {})
             v = ItemVariation.objects.create(item=item, **variation_data)
             if require_membership_types:
                 v.require_membership_types.add(*require_membership_types)
-
-            if var_meta_data is not None:
-                for key, value in var_meta_data.items():
-                    ItemVariationMetaValue.objects.create(
-                        property=self.item_meta_properties.get(key),
-                        value=value,
-                        variation=v
-                    )
-
         for addon_data in addons_data:
             ItemAddOn.objects.create(base_item=item, **addon_data)
         for bundle_data in bundles_data:

src/pretix/api/serializers/order.py

@@ -29,7 +29,6 @@ import pycountry
 from django.conf import settings
 from django.core.files import File
 from django.db.models import F, Q
-from django.utils.encoding import force_str
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy
 from django_countries.fields import Country
@@ -62,25 +61,14 @@ from pretix.base.services.pricing import (
 )
 from pretix.base.settings import COUNTRIES_WITH_STATE_IN_ADDRESS
 from pretix.base.signals import register_ticket_outputs
-from pretix.helpers.countries import CachedCountries
 from pretix.multidomain.urlreverse import build_absolute_uri
 
 logger = logging.getLogger(__name__)
 
 
 class CompatibleCountryField(serializers.Field):
-    countries = CachedCountries()
-    default_error_messages = {
-        'invalid_choice': gettext_lazy('"{input}" is not a valid choice.')
-    }
-
     def to_internal_value(self, data):
-        country = self.countries.alpha2(data)
-        if data and not country:
-            country = self.countries.by_name(force_str(data))
-            if not country:
-                self.fail("invalid_choice", input=data)
-        return {self.field_name: Country(country)}
+        return {self.field_name: Country(data)}
 
     def to_representation(self, instance: InvoiceAddress):
         if instance.country:
@@ -118,10 +106,6 @@ class InvoiceAddressSerializer(I18nAwareModelSerializer):
             raise ValidationError(
                 {'name': ['Do not specify name if you specified name_parts.']}
             )
-
-        if data.get('name_parts') and not isinstance(data.get('name_parts'), dict):
-            raise ValidationError({'name_parts': ['Invalid data type']})
-
         if data.get('name_parts') and '_scheme' not in data.get('name_parts'):
             data['name_parts']['_scheme'] = self.context['request'].event.settings.name_scheme
 
@@ -375,19 +359,10 @@ class PdfDataSerializer(serializers.Field):
             for k, v in ev._cached_meta_data.items():
                 res['meta:' + k] = v
 
-            if instance.variation_id:
-                print(instance, instance.variation, instance.variation_id, instance.item)
-                if not hasattr(instance.variation, '_cached_meta_data'):
-                    instance.variation.item = instance.item  # saves some database lookups
-                    instance.variation._cached_meta_data = instance.variation.meta_data
-                print(instance.variation._cached_meta_data.items())
-                for k, v in instance.variation._cached_meta_data.items():
-                    res['itemmeta:' + k] = v
-            else:
-                if not hasattr(instance.item, '_cached_meta_data'):
-                    instance.item._cached_meta_data = instance.item.meta_data
-                for k, v in instance.item._cached_meta_data.items():
-                    res['itemmeta:' + k] = v
+            if not hasattr(instance.item, '_cached_meta_data'):
+                instance.item._cached_meta_data = instance.item.meta_data
+            for k, v in instance.item._cached_meta_data.items():
+                res['itemmeta:' + k] = v
 
             res['images'] = {}
 
@@ -635,32 +610,6 @@ class OrderSerializer(I18nAwareModelSerializer):
         if not self.context['pdf_data']:
             self.fields['positions'].child.fields.pop('pdf_data', None)
 
-        includes = set(self.context['include'])
-        if includes:
-            for fname, field in list(self.fields.items()):
-                if fname in includes:
-                    continue
-                elif hasattr(field, 'child'):  # Nested list serializers
-                    found_any = False
-                    for childfname, childfield in list(field.child.fields.items()):
-                        if f'{fname}.{childfname}' not in includes:
-                            field.child.fields.pop(childfname)
-                        else:
-                            found_any = True
-                    if not found_any:
-                        self.fields.pop(fname)
-                elif isinstance(field, serializers.Serializer):  # Nested serializers
-                    found_any = False
-                    for childfname, childfield in list(field.fields.items()):
-                        if f'{fname}.{childfname}' not in includes:
-                            field.fields.pop(childfname)
-                        else:
-                            found_any = True
-                    if not found_any:
-                        self.fields.pop(fname)
-                else:
-                    self.fields.pop(fname)
-
         for exclude_field in self.context['exclude']:
             p = exclude_field.split('.')
             if p[0] in self.fields:
@@ -845,10 +794,6 @@ class OrderPositionCreateSerializer(I18nAwareModelSerializer):
             raise ValidationError(
                 {'attendee_name': ['Do not specify attendee_name if you specified attendee_name_parts.']}
             )
-
-        if data.get('attendee_name_parts') and not isinstance(data.get('attendee_name_parts'), dict):
-            raise ValidationError({'attendee_name_parts': ['Invalid data type']})
-
         if data.get('attendee_name_parts') and '_scheme' not in data.get('attendee_name_parts'):
             data['attendee_name_parts']['_scheme'] = self.context['request'].event.settings.name_scheme
 

src/pretix/api/serializers/orderchange.py

@@ -158,14 +158,12 @@ class OrderPositionInfoPatchSerializer(serializers.ModelSerializer):
                 a.question_id: a for a in instance.answers.all()
             }
             for answ_data in answers_data:
-                if not answ_data.get('answer'):
-                    continue
                 options = answ_data.pop('options', [])
                 if answ_data['question'].pk in qs_seen:
                     raise ValidationError(f'Question {answ_data["question"]} was sent twice.')
                 if answ_data['question'].pk in answercache:
                     a = answercache[answ_data['question'].pk]
-                    if isinstance(answ_data.get('answer'), File):
+                    if isinstance(answ_data['answer'], File):
                         a.file.save(answ_data['answer'].name, answ_data['answer'], save=False)
                         a.answer = 'file://' + a.file.name
                     elif a.answer.startswith('file://') and answ_data['answer'] == "file:keep":
@@ -175,7 +173,7 @@ class OrderPositionInfoPatchSerializer(serializers.ModelSerializer):
                             setattr(a, attr, value)
                     a.save()
                 else:
-                    if isinstance(answ_data.get('answer'), File):
+                    if isinstance(answ_data['answer'], File):
                         an = answ_data.pop('answer')
                         a = instance.answers.create(**answ_data, answer='')
                         a.file.save(os.path.basename(an.name), an, save=False)

src/pretix/api/serializers/organizer.py

@@ -79,13 +79,6 @@ class CustomerSerializer(I18nAwareModelSerializer):
             validated_data['external_identifier'] = instance.external_identifier
         return super().update(instance, validated_data)
 
-    def validate(self, data):
-        if data.get('name_parts') and not isinstance(data.get('name_parts'), dict):
-            raise ValidationError({'name_parts': ['Invalid data type']})
-        if data.get('name_parts') and '_scheme' not in data.get('name_parts'):
-            data['name_parts']['_scheme'] = self.context['request'].organizer.settings.name_scheme
-        return data
-
 
 class CustomerCreateSerializer(CustomerSerializer):
     send_email = serializers.BooleanField(default=False, required=False, allow_null=True)

src/pretix/api/urls.py

@@ -35,8 +35,7 @@
 import importlib
 
 from django.apps import apps
-from django.conf.urls import re_path
-from django.urls import include
+from django.conf.urls import include, re_path
 from rest_framework import routers
 
 from pretix.api.views import cart

src/pretix/api/views/checkin.py

@@ -93,10 +93,8 @@ with scopes_disabled():
 class CheckinListViewSet(viewsets.ModelViewSet):
     serializer_class = CheckinListSerializer
     queryset = CheckinList.objects.none()
-    filter_backends = (DjangoFilterBackend, RichOrderingFilter)
+    filter_backends = (DjangoFilterBackend,)
     filterset_class = CheckinListFilter
-    ordering = ('subevent__date_from', 'name', 'id')
-    ordering_fields = ('subevent__date_from', 'id', 'name',)
 
     def _get_permission_name(self, request):
         if request.path.endswith('/failed_checkins/'):
@@ -684,7 +682,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = CheckinListOrderPositionSerializer
     queryset = OrderPosition.all.none()
     filter_backends = (ExtendedBackend, RichOrderingFilter)
-    ordering = (F('attendee_name_cached').asc(nulls_last=True), 'pk')
+    ordering = (F('attendee_name_cached').asc(nulls_last=True), 'positionid')
     ordering_fields = (
         'order__code', 'order__datetime', 'positionid', 'attendee_name',
         'last_checked_in', 'order__email',

src/pretix/api/views/event.py

@@ -332,7 +332,6 @@ with scopes_disabled():
         ends_after = django_filters.rest_framework.IsoDateTimeFilter(method='ends_after_qs')
         modified_since = django_filters.IsoDateTimeFilter(field_name='last_modified', lookup_expr='gte')
         sales_channel = django_filters.rest_framework.CharFilter(method='sales_channel_qs')
-        search = django_filters.rest_framework.CharFilter(method='search_qs')
 
         class Meta:
             model = SubEvent
@@ -368,12 +367,6 @@ with scopes_disabled():
         def sales_channel_qs(self, queryset, name, value):
             return queryset.filter(event__sales_channels__contains=value)
 
-        def search_qs(self, queryset, name, value):
-            return queryset.filter(
-                Q(name__icontains=i18ncomp(value))
-                | Q(location__icontains=i18ncomp(value))
-            )
-
 
 class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
     serializer_class = SubEventSerializer

src/pretix/api/views/item.py

@@ -84,9 +84,7 @@ class ItemViewSet(ConditionalListView, viewsets.ModelViewSet):
 
     def get_queryset(self):
         return self.request.event.items.select_related('tax_rule').prefetch_related(
-            'variations', 'addons', 'bundles', 'meta_values', 'meta_values__property',
-            'variations__meta_values', 'variations__meta_values__property',
-            'require_membership_types', 'variations__require_membership_types',
+            'variations', 'addons', 'bundles', 'meta_values'
         ).all()
 
     def perform_create(self, serializer):
@@ -149,11 +147,7 @@ class ItemVariationViewSet(viewsets.ModelViewSet):
         return get_object_or_404(Item, pk=self.kwargs['item'], event=self.request.event)
 
     def get_queryset(self):
-        return self.item.variations.all().prefetch_related(
-            'meta_values',
-            'meta_values__property',
-            'require_membership_types'
-        )
+        return self.item.variations.all()
 
     def get_serializer_context(self):
         ctx = super().get_serializer_context()

src/pretix/api/views/order.py

@@ -65,10 +65,9 @@ from pretix.api.views import RichOrderingFilter
 from pretix.base.i18n import language
 from pretix.base.models import (
     CachedCombinedTicket, CachedTicket, Checkin, Device, EventMetaValue,
-    Invoice, InvoiceAddress, ItemMetaValue, ItemVariation,
-    ItemVariationMetaValue, Order, OrderFee, OrderPayment, OrderPosition,
-    OrderRefund, Quota, SubEvent, SubEventMetaValue, TaxRule, TeamAPIToken,
-    generate_secret,
+    Invoice, InvoiceAddress, ItemMetaValue, Order, OrderFee, OrderPayment,
+    OrderPosition, OrderRefund, Quota, SubEvent, SubEventMetaValue, TaxRule,
+    TeamAPIToken, generate_secret,
 )
 from pretix.base.models.orders import QuestionAnswer, RevokedTicketSecret
 from pretix.base.payment import PaymentException
@@ -192,7 +191,6 @@ class OrderViewSet(viewsets.ModelViewSet):
         ctx['event'] = self.request.event
         ctx['pdf_data'] = self.request.query_params.get('pdf_data', 'false') == 'true'
         ctx['exclude'] = self.request.query_params.getlist('exclude')
-        ctx['include'] = self.request.query_params.getlist('include')
         return ctx
 
     def get_queryset(self):
@@ -233,9 +231,7 @@ class OrderViewSet(viewsets.ModelViewSet):
                     Prefetch('item', queryset=self.request.event.items.prefetch_related(
                         Prefetch('meta_values', ItemMetaValue.objects.select_related('property'), to_attr='meta_values_cached')
                     )),
-                    Prefetch('variation', queryset=ItemVariation.objects.prefetch_related(
-                        Prefetch('meta_values', ItemVariationMetaValue.objects.select_related('property'), to_attr='meta_values_cached')
-                    )),
+                    'variation',
                     'answers', 'answers__options', 'answers__question',
                     'item__category',
                     'addon_to__answers', 'addon_to__answers__options', 'addon_to__answers__question',
@@ -703,8 +699,8 @@ class OrderViewSet(viewsets.ModelViewSet):
                     subject_attendees_template = request.event.settings.mail_subject_order_placed_attendee
 
                 _order_placed_email(
-                    request.event, order, email_template, subject_template,
-                    log_entry, invoice, [payment] if payment else [], is_free=free_flow
+                    request.event, order, payment.payment_provider if payment else None, email_template, subject_template,
+                    log_entry, invoice, payment, is_free=free_flow
                 )
                 if email_attendees:
                     for p in order.positions.all():
@@ -1002,11 +998,7 @@ class OrderPositionViewSet(viewsets.ModelViewSet):
                                 Prefetch('meta_values', ItemMetaValue.objects.select_related('property'),
                                          to_attr='meta_values_cached')
                             )),
-                            Prefetch('variation', queryset=self.request.event.items.prefetch_related(
-                                Prefetch('meta_values', ItemVariationMetaValue.objects.select_related('property'),
-                                         to_attr='meta_values_cached')
-                            )),
-                            'answers', 'answers__options', 'answers__question',
+                            'variation', 'answers', 'answers__options', 'answers__question',
                             'item__category',
                             Prefetch('subevent', queryset=self.request.event.subevents.prefetch_related(
                                 Prefetch('meta_values', to_attr='meta_values_cached',

src/pretix/api/views/organizer.py

@@ -51,7 +51,6 @@ from pretix.base.models import (
     User,
 )
 from pretix.base.settings import SETTINGS_AFFECTING_CSS
-from pretix.helpers import OF_SELF
 from pretix.helpers.dicts import merge_dicts
 from pretix.presale.style import regenerate_organizer_css
 
@@ -179,7 +178,7 @@ class GiftCardViewSet(viewsets.ModelViewSet):
     def perform_update(self, serializer):
         if 'include_accepted' in self.request.GET:
             raise PermissionDenied("Accepted gift cards cannot be updated, use transact instead.")
-        GiftCard.objects.select_for_update(of=OF_SELF).get(pk=self.get_object().pk)
+        GiftCard.objects.select_for_update().get(pk=self.get_object().pk)
         old_value = serializer.instance.value
         value = serializer.validated_data.pop('value')
         inst = serializer.save(secret=serializer.instance.secret, currency=serializer.instance.currency,
@@ -197,7 +196,7 @@ class GiftCardViewSet(viewsets.ModelViewSet):
     @action(detail=True, methods=["POST"])
     @transaction.atomic()
     def transact(self, request, **kwargs):
-        gc = GiftCard.objects.select_for_update(of=OF_SELF).get(pk=self.get_object().pk)
+        gc = GiftCard.objects.select_for_update().get(pk=self.get_object().pk)
         value = serializers.DecimalField(max_digits=10, decimal_places=2).to_internal_value(
             request.data.get('value')
         )

src/pretix/api/views/upload.py

@@ -21,7 +21,6 @@
 #
 import datetime
 
-from django.core.exceptions import ValidationError as DjangoValidationError
 from django.utils.timezone import now
 from oauth2_provider.contrib.rest_framework import OAuth2Authentication
 from rest_framework.authentication import SessionAuthentication
@@ -34,9 +33,6 @@ from pretix.api.auth.device import DeviceTokenAuthentication
 from pretix.api.auth.permission import AnyAuthenticatedClientPermission
 from pretix.api.auth.token import TeamTokenAuthentication
 from pretix.base.models import CachedFile
-from pretix.helpers.images import (
-    IMAGE_TYPES, validate_uploaded_file_for_valid_image,
-)
 
 ALLOWED_TYPES = {
     'image/gif': {'.gif'},
@@ -65,13 +61,6 @@ class UploadView(APIView):
                 name=file_obj.name,
                 type=content_type
             ))
-
-        if content_type in IMAGE_TYPES:
-            try:
-                validate_uploaded_file_for_valid_image(file_obj)
-            except DjangoValidationError as e:
-                raise ValidationError(e.message)
-
         cf = CachedFile.objects.create(
             expires=now() + datetime.timedelta(days=1),
             date=now(),

src/pretix/api/webhooks.py

@@ -42,7 +42,6 @@ from pretix.base.models import LogEntry
 from pretix.base.services.tasks import ProfiledTask, TransactionAwareTask
 from pretix.base.signals import periodic_task
 from pretix.celery_app import app
-from pretix.helpers import OF_SELF
 
 logger = logging.getLogger(__name__)
 _ALL_EVENTS = None
@@ -503,8 +502,7 @@ def manually_retry_all_calls(webhook_id: int):
         webhook = WebHook.objects.get(id=webhook_id)
     with scope(organizer=webhook.organizer), transaction.atomic():
         for whcr in webhook.retries.select_for_update(
-            skip_locked=connection.features.has_select_for_update_skip_locked,
-            of=OF_SELF
+            skip_locked=connection.features.has_select_for_update_skip_locked
         ):
             send_webhook.apply_async(
                 args=(whcr.logentry_id, whcr.action_type, whcr.webhook_id, whcr.retry_count),
@@ -517,8 +515,7 @@ def manually_retry_all_calls(webhook_id: int):
 def schedule_webhook_retries_on_celery(sender, **kwargs):
     with transaction.atomic():
         for whcr in WebHookCallRetry.objects.select_for_update(
-            skip_locked=connection.features.has_select_for_update_skip_locked,
-            of=OF_SELF
+            skip_locked=connection.features.has_select_for_update_skip_locked
         ).filter(retry_not_before__lt=now()):
             send_webhook.apply_async(
                 args=(whcr.logentry_id, whcr.action_type, whcr.webhook_id, whcr.retry_count),

src/pretix/base/addressvalidation.py

@@ -1,225 +0,0 @@
-#
-# 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 collections import defaultdict
-
-from django.core.exceptions import ValidationError
-from django.utils.translation import gettext_lazy as _
-from localflavor.ar.forms import ARPostalCodeField
-from localflavor.at.forms import ATZipCodeField
-from localflavor.au.forms import AUPostCodeField
-from localflavor.be.forms import BEPostalCodeField
-from localflavor.br.forms import BRZipCodeField
-from localflavor.ca.forms import CAPostalCodeField
-from localflavor.ch.forms import CHZipCodeField
-from localflavor.cn.forms import CNPostCodeField
-from localflavor.cu.forms import CUPostalCodeField
-from localflavor.cz.forms import CZPostalCodeField
-from localflavor.de.forms import DEZipCodeField
-from localflavor.dk.forms import DKPostalCodeField
-from localflavor.ee.forms import EEZipCodeField
-from localflavor.es.forms import ESPostalCodeField
-from localflavor.fi.forms import FIZipCodeField
-from localflavor.fr.forms import FRZipCodeField
-from localflavor.gb.forms import GBPostcodeField
-from localflavor.gr.forms import GRPostalCodeField
-from localflavor.hr.forms import HRPostalCodeField
-from localflavor.ie.forms import EircodeField
-from localflavor.il.forms import ILPostalCodeField
-from localflavor.in_.forms import INZipCodeField
-from localflavor.ir.forms import IRPostalCodeField
-from localflavor.is_.is_postalcodes import IS_POSTALCODES
-from localflavor.it.forms import ITZipCodeField
-from localflavor.jp.forms import JPPostalCodeField
-from localflavor.lt.forms import LTPostalCodeField
-from localflavor.lv.forms import LVPostalCodeField
-from localflavor.ma.forms import MAPostalCodeField
-from localflavor.mt.forms import MTPostalCodeField
-from localflavor.mx.forms import MXZipCodeField
-from localflavor.nl.forms import NLZipCodeField
-from localflavor.no.forms import NOZipCodeField
-from localflavor.nz.forms import NZPostCodeField
-from localflavor.pk.forms import PKPostCodeField
-from localflavor.pl.forms import PLPostalCodeField
-from localflavor.pt.forms import PTZipCodeField
-from localflavor.ro.forms import ROPostalCodeField
-from localflavor.ru.forms import RUPostalCodeField
-from localflavor.se.forms import SEPostalCodeField
-from localflavor.sg.forms import SGPostCodeField
-from localflavor.si.si_postalcodes import SI_POSTALCODES
-from localflavor.sk.forms import SKPostalCodeField
-from localflavor.tr.forms import TRPostalCodeField
-from localflavor.ua.forms import UAPostalCodeField
-from localflavor.us.forms import USZipCodeField
-from localflavor.za.forms import ZAPostCodeField
-
-from pretix.base.settings import COUNTRIES_WITH_STATE_IN_ADDRESS
-
-_validator_classes = defaultdict(list)
-
-COUNTRIES_WITH_STREET_ZIPCODE_AND_CITY_REQUIRED = {
-    # We don't presume this for countries we don't have knowledge about, there are countries in the
-    # world e.g. without zipcodes
-    'AR', 'AT', 'AU', 'BE', 'BR', 'CA', 'CH', 'CN', 'CU', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR',
-    'GB', 'GR', 'HR', 'IE', 'IL', 'IN', 'IR', 'IS', 'IT', 'JP', 'LT', 'LV', 'MA', 'MT', 'MX', 'NL',
-    'NO', 'NZ', 'PK', 'PL', 'PT', 'RO', 'RU', 'SE', 'SG', 'SI', 'SK', 'TR', 'UA', 'US', 'ZA',
-}
-
-
-def validate_address(address: dict, all_optional=False):
-    """
-    :param address: A dictionary with at least the entries ``street``, ``zipcode``, ``city``, ``country``,
-                    ``state``
-    :return: The dictionary, possibly with changes
-    """
-    if not address.get('street') and not address.get('zipcode') and not address.get('city'):
-        # Consider the actual address part to be empty, no further validation necessary, if the
-        # address should be required, it's the callers job to validate that at least one of these
-        # fields is filled
-        return address
-
-    if not address.get('country'):
-        raise ValidationError({'country': [_('This field is required.')]})
-
-    if str(address['country']) in COUNTRIES_WITH_STATE_IN_ADDRESS and not address.get('state') and not all_optional:
-        raise ValidationError({'state': [_('This field is required.')]})
-
-    if str(address['country']) in COUNTRIES_WITH_STREET_ZIPCODE_AND_CITY_REQUIRED and not all_optional:
-        for f in ('street', 'zipcode', 'city'):
-            if not address.get(f):
-                raise ValidationError({f: [_('This field is required.')]})
-
-    for klass in _validator_classes[str(address['country'])]:
-        validator = klass()
-        try:
-            if address.get('zipcode'):
-                address['zipcode'] = validator.validate_zipcode(address['zipcode'])
-        except ValidationError as e:
-            raise ValidationError({'zipcode': list(e)})
-
-    return address
-
-
-def register_validator_for(country):
-    def inner(klass):
-        _validator_classes[country].append(klass)
-        return klass
-
-    return inner
-
-
-class BaseValidator:
-    required_fields = []
-
-    def validate_zipcode(self, value):
-        return value
-
-
-"""
-Currently, mostly have validators that are auto-generated from django-localflavor
-but custom ones can be added like this:
-
-@register_validator_for('DE')
-class DEValidator(BaseValidator):
-    def validate_zipcode(value):
-        return value
-
-In the future, we can also add additional methods to validate that e.g. a city
-is plausible for a given zip code.
-"""
-
-_zip_code_fields = {
-    'AR': ARPostalCodeField,
-    'AT': ATZipCodeField,
-    'AU': AUPostCodeField,
-    'BE': BEPostalCodeField,
-    'BR': BRZipCodeField,
-    'CA': CAPostalCodeField,
-    'CH': CHZipCodeField,
-    'CN': CNPostCodeField,
-    'CU': CUPostalCodeField,
-    'CZ': CZPostalCodeField,
-    'DE': DEZipCodeField,
-    'DK': DKPostalCodeField,
-    'EE': EEZipCodeField,
-    'ES': ESPostalCodeField,
-    'FI': FIZipCodeField,
-    'FR': FRZipCodeField,
-    'GB': GBPostcodeField,
-    'GR': GRPostalCodeField,
-    'HR': HRPostalCodeField,
-    'IE': EircodeField,
-    'IL': ILPostalCodeField,
-    'IN': INZipCodeField,
-    'IR': IRPostalCodeField,
-    'IT': ITZipCodeField,
-    'JP': JPPostalCodeField,
-    'LT': LTPostalCodeField,
-    'LV': LVPostalCodeField,
-    'MA': MAPostalCodeField,
-    'MT': MTPostalCodeField,
-    'MX': MXZipCodeField,
-    'NL': NLZipCodeField,
-    'NO': NOZipCodeField,
-    'NZ': NZPostCodeField,
-    'PK': PKPostCodeField,
-    'PL': PLPostalCodeField,
-    'PT': PTZipCodeField,
-    'RO': ROPostalCodeField,
-    'RU': RUPostalCodeField,
-    'SE': SEPostalCodeField,
-    'SG': SGPostCodeField,
-    'SK': SKPostalCodeField,
-    'TR': TRPostalCodeField,
-    'UA': UAPostalCodeField,
-    'US': USZipCodeField,
-    'ZA': ZAPostCodeField,
-}
-
-
-def _generate_class_from_zipcode_field(field_class):
-    class _GeneratedValidator(BaseValidator):
-        def validate_zipcode(self, value):
-            return field_class().clean(value)
-    return _GeneratedValidator
-
-
-for cc, field_class in _zip_code_fields.items():
-    register_validator_for(cc)(_generate_class_from_zipcode_field(field_class))
-
-
-@register_validator_for('IS')
-class ISValidator(BaseValidator):
-    def validate_zipcode(self, value):
-        if value not in [entry[0] for entry in IS_POSTALCODES]:
-            raise ValidationError(_('Enter a postal code in the format XXX.'), code='invalid')
-        return value
-
-
-@register_validator_for('SI')
-class SIValidator(BaseValidator):
-    def validate_zipcode(self, value):
-        try:
-            if int(value) not in [entry[0] for entry in SI_POSTALCODES]:
-                raise ValidationError(_('Enter a postal code in the format XXXX.'), code='invalid')
-        except ValueError:
-            raise ValidationError(_('Enter a postal code in the format XXXX.'), code='invalid')
-        return value

src/pretix/base/email.py

@@ -320,18 +320,13 @@ def get_email_context(**kwargs):
     return ctx
 
 
-def _placeholder_payments(order, payments):
-    d = []
-    for payment in payments:
-        if 'payment' in inspect.signature(payment.payment_provider.order_pending_mail_render).parameters:
-            d.append(str(payment.payment_provider.order_pending_mail_render(order, payment)))
-        else:
-            d.append(str(payment.payment_provider.order_pending_mail_render(order)))
-    d = [line for line in d if line.strip()]
-    if d:
-        return '\n\n'.join(d)
+def _placeholder_payment(order, payment):
+    if not payment:
+        return None
+    if 'payment' in inspect.signature(payment.payment_provider.order_pending_mail_render).parameters:
+        return str(payment.payment_provider.order_pending_mail_render(order, payment))
     else:
-        return ''
+        return str(payment.payment_provider.order_pending_mail_render(order))
 
 
 def get_best_name(position_or_address, parts=False):
@@ -381,14 +376,6 @@ def base_placeholders(sender, **kwargs):
         SimpleFunctionalMailTextPlaceholder(
             'currency', ['event'], lambda event: event.currency, lambda event: event.currency
         ),
-        SimpleFunctionalMailTextPlaceholder(
-            'order_email', ['order'], lambda order: order.email, 'john@example.org'
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'invoice_number', ['invoice'],
-            lambda invoice: invoice.full_invoice_no,
-            f'{sender.settings.invoice_numbers_prefix or (sender.slug.upper() + "-")}00000'
-        ),
         SimpleFunctionalMailTextPlaceholder(
             'refund_amount', ['event_or_subevent', 'refund_amount'],
             lambda event_or_subevent, refund_amount: LazyCurrencyNumber(refund_amount, event_or_subevent.currency),
@@ -520,20 +507,20 @@ def base_placeholders(sender, **kwargs):
             lambda event: (event if not event.has_subevents or not event.subevents.exists() else event.subevents.first()).get_date_from_display()
         ),
         SimpleFunctionalMailTextPlaceholder(
-            'url_remove', ['waiting_list_voucher', 'event'],
-            lambda waiting_list_voucher, event: build_absolute_uri(
+            'url_remove', ['waiting_list_entry', 'event'],
+            lambda waiting_list_entry, event: build_absolute_uri(
                 event, 'presale:event.waitinglist.remove'
-            ) + '?voucher=' + waiting_list_voucher.code,
+            ) + '?voucher=' + waiting_list_entry.voucher.code,
             lambda event: build_absolute_uri(
                 event,
                 'presale:event.waitinglist.remove',
             ) + '?voucher=68CYU2H6ZTP3WLK5',
         ),
         SimpleFunctionalMailTextPlaceholder(
-            'url', ['waiting_list_voucher', 'event'],
-            lambda waiting_list_voucher, event: build_absolute_uri(
+            'url', ['waiting_list_entry', 'event'],
+            lambda waiting_list_entry, event: build_absolute_uri(
                 event, 'presale:event.redeem'
-            ) + '?voucher=' + waiting_list_voucher.code,
+            ) + '?voucher=' + waiting_list_entry.voucher.code,
             lambda event: build_absolute_uri(
                 event,
                 'presale:event.redeem',
@@ -588,7 +575,7 @@ def base_placeholders(sender, **kwargs):
             _('Sample Admission Ticket')
         ),
         SimpleFunctionalMailTextPlaceholder(
-            'code', ['waiting_list_voucher'], lambda waiting_list_voucher: waiting_list_voucher.code,
+            'code', ['waiting_list_entry'], lambda waiting_list_entry: waiting_list_entry.voucher.code,
             '68CYU2H6ZTP3WLK5'
         ),
         SimpleFunctionalMailTextPlaceholder(
@@ -630,7 +617,7 @@ def base_placeholders(sender, **kwargs):
             _('An individual text with a reason can be inserted here.'),
         ),
         SimpleFunctionalMailTextPlaceholder(
-            'payment_info', ['order', 'payments'], _placeholder_payments,
+            'payment_info', ['order', 'payment'], _placeholder_payment,
             _('The amount has been charged to your card.'),
         ),
         SimpleFunctionalMailTextPlaceholder(

src/pretix/base/exporter.py

@@ -36,7 +36,7 @@ import io
 import tempfile
 from collections import OrderedDict, namedtuple
 from decimal import Decimal
-from typing import Optional, Tuple
+from typing import Tuple
 
 import pytz
 from defusedcsv import csv
@@ -84,27 +84,6 @@ class BaseExporter:
         """
         raise NotImplementedError()  # NOQA
 
-    @property
-    def description(self) -> str:
-        """
-        A description for this exporter.
-        """
-        return ""
-
-    @property
-    def category(self) -> Optional[str]:
-        """
-        A category name for this exporter, or ``None``.
-        """
-        return None
-
-    @property
-    def featured(self) -> bool:
-        """
-        If ``True``, this exporter will be highlighted.
-        """
-        return False
-
     @property
     def identifier(self) -> str:
         """

src/pretix/base/exporters/answers.py

@@ -39,7 +39,7 @@ from zipfile import ZipFile
 
 from django import forms
 from django.dispatch import receiver
-from django.utils.translation import gettext_lazy as _, pgettext_lazy
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.models import QuestionAnswer
 
@@ -49,10 +49,7 @@ from ..signals import register_data_exporters
 
 class AnswerFilesExporter(BaseExporter):
     identifier = 'answerfiles'
-    verbose_name = _('Question answer file uploads')
-    category = pgettext_lazy('export_category', 'Order data')
-    description = _('Download a ZIP file including all files that have been uploaded by your customers while creating '
-                    'an order.')
+    verbose_name = _('Answers to file upload questions')
 
     @property
     def export_form_fields(self):

src/pretix/base/exporters/customers.py

@@ -36,7 +36,7 @@ from collections import OrderedDict
 
 from django.dispatch import receiver
 from django.utils.timezone import get_current_timezone
-from django.utils.translation import gettext as _, gettext_lazy, pgettext_lazy
+from django.utils.translation import gettext as _, gettext_lazy
 
 from pretix.base.settings import PERSON_NAME_SCHEMES
 
@@ -48,8 +48,6 @@ class CustomerListExporter(OrganizerLevelExportMixin, ListExporter):
     identifier = 'customerlist'
     verbose_name = gettext_lazy('Customer accounts')
     organizer_required_permission = 'can_manage_customers'
-    category = pgettext_lazy('export_category', 'Customer accounts')
-    description = gettext_lazy('Download a spreadsheet of all currently registered customer accounts.')
 
     @property
     def additional_form_fields(self):

src/pretix/base/exporters/dekodi.py

@@ -23,24 +23,22 @@ import json
 from collections import OrderedDict
 from decimal import Decimal
 
+import dateutil
+from django import forms
 from django.core.serializers.json import DjangoJSONEncoder
 from django.dispatch import receiver
-from django.utils.timezone import now
-from django.utils.translation import gettext, gettext_lazy, pgettext_lazy
+from django.utils.translation import gettext, gettext_lazy
 
 from pretix.base.i18n import language
 from pretix.base.models import Invoice, OrderPayment
 
 from ..exporter import BaseExporter
 from ..signals import register_data_exporters
-from ..timeframes import DateFrameField, resolve_timeframe_to_dates_inclusive
 
 
 class DekodiNREIExporter(BaseExporter):
     identifier = 'dekodi_nrei'
     verbose_name = 'dekodi NREI (JSON)'
-    category = pgettext_lazy('export_category', 'Invoices')
-    description = gettext_lazy("Download invoices in a format that can be used by the dekodi NREI conversion software.")
 
     # Specification: http://manuals.dekodi.de/nexuspub/schnittstellenbuch/
 
@@ -115,7 +113,7 @@ class DekodiNREIExporter(BaseExporter):
                         'PTNo14': p.info_data.get('reference') or '',
                         'PTNo15': p.full_id or '',
                     })
-            elif p.provider and p.provider.startswith('stripe'):
+            elif p.provider.startswith('stripe'):
                 src = p.info_data.get("source", p.info_data)
                 payments.append({
                     'PTID': '81',
@@ -194,12 +192,17 @@ class DekodiNREIExporter(BaseExporter):
     def render(self, form_data):
         qs = self.event.invoices.select_related('order').prefetch_related('lines', 'lines__subevent')
 
-        if form_data.get('date_range'):
-            d_start, d_end = resolve_timeframe_to_dates_inclusive(now(), form_data['date_range'], self.timezone)
-            if d_start:
-                qs = qs.filter(date__gte=d_start)
-            if d_end:
-                qs = qs.filter(date__lte=d_end)
+        if form_data.get('date_from'):
+            date_value = form_data.get('date_from')
+            if isinstance(date_value, str):
+                date_value = dateutil.parser.parse(date_value).date()
+            qs = qs.filter(date__gte=date_value)
+
+        if form_data.get('date_to'):
+            date_value = form_data.get('date_to')
+            if isinstance(date_value, str):
+                date_value = dateutil.parser.parse(date_value).date()
+            qs = qs.filter(date__lte=date_value)
 
         jo = {
             'Format': 'NREI',
@@ -215,14 +218,22 @@ class DekodiNREIExporter(BaseExporter):
     def export_form_fields(self):
         return OrderedDict(
             [
-                ('date_range',
-                 DateFrameField(
-                     label=gettext_lazy('Date range'),
-                     include_future_frames=False,
+                ('date_from',
+                 forms.DateField(
+                     label=gettext_lazy('Start date'),
+                     widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
                      required=False,
-                     help_text=gettext_lazy('Only include invoices issued in this time frame. Note that the invoice date does '
+                     help_text=gettext_lazy('Only include invoices issued on or after this date. Note that the invoice date does '
                                             'not always correspond to the order or payment date.')
                  )),
+                ('date_to',
+                 forms.DateField(
+                     label=gettext_lazy('End date'),
+                     widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
+                     required=False,
+                     help_text=gettext_lazy('Only include invoices issued on or before this date. Note that the invoice date '
+                                            'does not always correspond to the order or payment date.')
+                 )),
             ]
         )
 

src/pretix/base/exporters/events.py

@@ -35,7 +35,7 @@
 from django.dispatch import receiver
 from django.utils.formats import date_format
 from django.utils.functional import cached_property
-from django.utils.translation import gettext_lazy as _, pgettext_lazy
+from django.utils.translation import gettext_lazy as _
 
 from ...control.forms.filter import get_all_payment_providers
 from ..exporter import ListExporter
@@ -45,8 +45,6 @@ from ..signals import register_multievent_data_exporters
 class EventDataExporter(ListExporter):
     identifier = 'eventdata'
     verbose_name = _('Event data')
-    category = pgettext_lazy('export_category', 'Event data')
-    description = _('Download a spreadsheet with information on all events in this organizer account.')
 
     @cached_property
     def providers(self):

src/pretix/base/exporters/invoices.py

@@ -38,15 +38,13 @@ from collections import OrderedDict
 from decimal import Decimal
 from zipfile import ZipFile
 
+import dateutil.parser
 from django import forms
 from django.db.models import CharField, Exists, F, OuterRef, Q, Subquery, Sum
 from django.dispatch import receiver
 from django.utils.formats import date_format
 from django.utils.functional import cached_property
-from django.utils.timezone import now
-from django.utils.translation import (
-    gettext, gettext_lazy as _, pgettext, pgettext_lazy,
-)
+from django.utils.translation import gettext, gettext_lazy as _, pgettext
 
 from pretix.base.models import Invoice, InvoiceLine, OrderPayment
 
@@ -59,24 +57,30 @@ from ..services.invoices import invoice_pdf_task
 from ..signals import (
     register_data_exporters, register_multievent_data_exporters,
 )
-from ..timeframes import DateFrameField, resolve_timeframe_to_dates_inclusive
 
 
 class InvoiceExporterMixin:
-    category = pgettext_lazy('export_category', 'Invoices')
 
     @property
     def invoice_exporter_form_fields(self):
         return OrderedDict(
             [
-                ('date_range',
-                 DateFrameField(
-                     label=_('Date range'),
-                     include_future_frames=False,
+                ('date_from',
+                 forms.DateField(
+                     label=_('Start date'),
+                     widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
                      required=False,
-                     help_text=_('Only include invoices issued in this time frame. Note that the invoice date does '
+                     help_text=_('Only include invoices issued on or after this date. Note that the invoice date does '
                                  'not always correspond to the order or payment date.')
                  )),
+                ('date_to',
+                 forms.DateField(
+                     label=_('End date'),
+                     widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
+                     required=False,
+                     help_text=_('Only include invoices issued on or before this date. Note that the invoice date '
+                                 'does not always correspond to the order or payment date.')
+                 )),
                 ('payment_provider',
                  forms.ChoiceField(
                      label=_('Payment provider'),
@@ -108,12 +112,16 @@ class InvoiceExporterMixin:
                 )
             )
             qs = qs.filter(has_payment_with_provider=1)
-        if form_data.get('date_range'):
-            d_start, d_end = resolve_timeframe_to_dates_inclusive(now(), form_data['date_range'], self.timezone)
-            if d_start:
-                qs = qs.filter(date__gte=d_start)
-            if d_end:
-                qs = qs.filter(date__lte=d_end)
+        if form_data.get('date_from'):
+            date_value = form_data.get('date_from')
+            if isinstance(date_value, str):
+                date_value = dateutil.parser.parse(date_value).date()
+            qs = qs.filter(date__gte=date_value)
+        if form_data.get('date_to'):
+            date_value = form_data.get('date_to')
+            if isinstance(date_value, str):
+                date_value = dateutil.parser.parse(date_value).date()
+            qs = qs.filter(date__lte=date_value)
 
         return qs
 
@@ -121,7 +129,6 @@ class InvoiceExporterMixin:
 class InvoiceExporter(InvoiceExporterMixin, BaseExporter):
     identifier = 'invoices'
     verbose_name = _('All invoices')
-    description = _('Download all invoices created by the system as a ZIP file of PDF files.')
 
     def render(self, form_data: dict, output_file=None):
         qs = self.invoices_queryset(form_data).filter(shredded=False)
@@ -173,10 +180,6 @@ class InvoiceExporter(InvoiceExporterMixin, BaseExporter):
 class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
     identifier = 'invoicedata'
     verbose_name = _('Invoice data')
-    description = _('Download a spreadsheet with the data of all invoices created by the system. The spreadsheet '
-                    'includes two sheets, one with a line for every invoice, and one with a line for every position of '
-                    'every invoice.')
-    featured = True
 
     @property
     def additional_form_fields(self):

src/pretix/base/exporters/items.py

@@ -22,14 +22,14 @@
 from django.db.models import Prefetch
 from django.dispatch import receiver
 from django.utils.formats import date_format
-from django.utils.translation import gettext_lazy as _, pgettext_lazy
+from django.utils.translation import gettext_lazy as _
 from openpyxl.styles import Alignment
 from openpyxl.utils import get_column_letter
 
 from ...helpers.safe_openpyxl import SafeCell
 from ..channels import get_all_sales_channels
 from ..exporter import ListExporter
-from ..models import ItemMetaValue, ItemVariation, ItemVariationMetaValue
+from ..models import ItemMetaValue
 from ..signals import register_data_exporters
 
 
@@ -48,8 +48,6 @@ def _min(a1, a2):
 class ItemDataExporter(ListExporter):
     identifier = 'itemdata'
     verbose_name = _('Product data')
-    category = pgettext_lazy('export_category', 'Product data')
-    description = _('Download a spreadsheet with details about all products and variations.')
 
     def iterate_list(self, form_data):
         locales = self.event.settings.locales
@@ -75,7 +73,6 @@ class ItemDataExporter(ListExporter):
             _("Free price input"),
             _("Sales tax"),
             _("Is an admission ticket"),
-            _("Personalized ticket"),
             _("Generate tickets"),
             _("Waiting list"),
             _("Available from"),
@@ -109,27 +106,18 @@ class ItemDataExporter(ListExporter):
         yield row
 
         for i in self.event.items.prefetch_related(
+            'variations',
             Prefetch(
                 'meta_values',
                 ItemMetaValue.objects.select_related('property'),
                 to_attr='meta_values_cached'
-            ),
-            Prefetch(
-                'variations',
-                queryset=ItemVariation.objects.prefetch_related(
-                    Prefetch(
-                        'meta_values',
-                        ItemVariationMetaValue.objects.select_related('property'),
-                        to_attr='meta_values_cached'
-                    ),
-                ),
-            ),
+            )
         ).select_related('category', 'tax_rule'):
+            m = i.meta_data
             vars = list(i.variations.all())
 
             if vars:
                 for v in vars:
-                    m = v.meta_data
                     row = [
                         i.pk,
                         v.pk,
@@ -147,7 +135,6 @@ class ItemDataExporter(ListExporter):
                         _("Yes") if i.free_price else "",
                         str(i.tax_rule) if i.tax_rule else "",
                         _("Yes") if i.admission else "",
-                        _("Yes") if i.personalized else "",
                         _("Yes") if i.generate_tickets else (_("Default") if i.generate_tickets is None else ""),
                         _("Yes") if i.allow_waitinglist else "",
                         date_format(_max(i.available_from, v.available_from).astimezone(self.timezone),
@@ -173,7 +160,6 @@ class ItemDataExporter(ListExporter):
                     yield row
 
             else:
-                m = i.meta_data
                 row = [
                     i.pk,
                     "",
@@ -191,7 +177,6 @@ class ItemDataExporter(ListExporter):
                     _("Yes") if i.free_price else "",
                     str(i.tax_rule) if i.tax_rule else "",
                     _("Yes") if i.admission else "",
-                    _("Yes") if i.personalized else "",
                     _("Yes") if i.generate_tickets else (_("Default") if i.generate_tickets is None else ""),
                     _("Yes") if i.allow_waitinglist else "",
                     date_format(i.available_from.astimezone(self.timezone),

src/pretix/base/exporters/json.py

@@ -36,22 +36,15 @@ import json
 from decimal import Decimal
 
 from django.core.serializers.json import DjangoJSONEncoder
-from django.db.models import Prefetch
 from django.dispatch import receiver
-from django.utils.functional import lazy
-from django.utils.translation import gettext, gettext_lazy, pgettext_lazy
 
 from ..exporter import BaseExporter
-from ..models import ItemMetaValue, ItemVariation, ItemVariationMetaValue
 from ..signals import register_data_exporters
 
 
 class JSONExporter(BaseExporter):
     identifier = 'json'
-    verbose_name = lazy(lambda *args: gettext('Order data') + ' (JSON)', str)()
-    category = pgettext_lazy('export_category', 'Order data')
-    description = gettext_lazy('Download a structured JSON representation of all orders. This might be useful for the '
-                               'import in third-party systems.')
+    verbose_name = 'Order data (JSON)'
 
     def render(self, form_data):
         jo = {
@@ -83,7 +76,6 @@ class JSONExporter(BaseExporter):
                         'tax_rate': item.tax_rule.rate if item.tax_rule else Decimal('0.00'),
                         'tax_name': str(item.tax_rule.name) if item.tax_rule else None,
                         'admission': item.admission,
-                        'personalized': item.personalized,
                         'active': item.active,
                         'sales_channels': item.sales_channels,
                         'description': str(item.description),
@@ -114,26 +106,9 @@ class JSONExporter(BaseExporter):
                                 'available_from': variation.available_from,
                                 'available_until': variation.available_until,
                                 'hide_without_voucher': variation.hide_without_voucher,
-                                'meta_data': variation.meta_data,
                             } for variation in item.variations.all()
                         ]
-                    } for item in self.event.items.select_related('tax_rule').prefetch_related(
-                        Prefetch(
-                            'meta_values',
-                            ItemMetaValue.objects.select_related('property'),
-                            to_attr='meta_values_cached'
-                        ),
-                        Prefetch(
-                            'variations',
-                            queryset=ItemVariation.objects.prefetch_related(
-                                Prefetch(
-                                    'meta_values',
-                                    ItemVariationMetaValue.objects.select_related('property'),
-                                    to_attr='meta_values_cached'
-                                ),
-                            ),
-                        ),
-                    )
+                    } for item in self.event.items.select_related('tax_rule').prefetch_related('variations')
                 ],
                 'questions': [
                     {

src/pretix/base/exporters/mail.py

@@ -36,7 +36,7 @@ from collections import OrderedDict
 
 from django import forms
 from django.dispatch import receiver
-from django.utils.translation import gettext_lazy as _, pgettext_lazy
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.models import OrderPosition
 
@@ -50,8 +50,6 @@ from ..signals import (
 class MailExporter(BaseExporter):
     identifier = 'mailaddrs'
     verbose_name = _('Email addresses (text file)')
-    category = pgettext_lazy('export_category', 'Order data')
-    description = _("Download a text file with all email addresses collected either from buyers or from ticket holders.")
 
     def render(self, form_data: dict):
         qs = Order.objects.filter(event__in=self.events, status__in=form_data['status']).prefetch_related('event')

src/pretix/base/exporters/orderlist.py

@@ -33,8 +33,10 @@
 # License for the specific language governing permissions and limitations under the License.
 
 from collections import OrderedDict
+from datetime import date, datetime, time
 from decimal import Decimal
 
+import dateutil
 import pytz
 from django import forms
 from django.db.models import (
@@ -44,10 +46,8 @@ from django.db.models import (
 from django.db.models.functions import Coalesce
 from django.dispatch import receiver
 from django.utils.functional import cached_property
-from django.utils.timezone import get_current_timezone, now
-from django.utils.translation import (
-    gettext as _, gettext_lazy, pgettext, pgettext_lazy,
-)
+from django.utils.timezone import get_current_timezone, make_aware, now
+from django.utils.translation import gettext as _, gettext_lazy, pgettext
 
 from pretix.base.models import (
     GiftCard, GiftCardTransaction, Invoice, InvoiceAddress, Order,
@@ -63,24 +63,14 @@ from ...helpers.iter import chunked_iterable
 from ..exporter import (
     ListExporter, MultiSheetListExporter, OrganizerLevelExportMixin,
 )
-from ..forms.widgets import SplitDateTimePickerWidget
 from ..signals import (
     register_data_exporters, register_multievent_data_exporters,
 )
-from ..timeframes import (
-    DateFrameField,
-    resolve_timeframe_to_datetime_start_inclusive_end_exclusive,
-)
 
 
 class OrderListExporter(MultiSheetListExporter):
     identifier = 'orderlist'
     verbose_name = gettext_lazy('Order data')
-    category = pgettext_lazy('export_category', 'Order data')
-    description = gettext_lazy('Download a spreadsheet of all orders. The spreadsheet will include three sheets, one '
-                               'with a line for every order, one with a line for every order position, and one with '
-                               'a line for every additional fee charged in an order.')
-    featured = True
 
     @cached_property
     def providers(self):
@@ -115,25 +105,41 @@ class OrderListExporter(MultiSheetListExporter):
                  initial=False,
                  required=False
              )),
-            ('date_range',
-             DateFrameField(
-                 label=_('Date range'),
-                 include_future_frames=False,
+            ('date_from',
+             forms.DateField(
+                 label=_('Start date'),
+                 widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
                  required=False,
-                 help_text=_('Only include orders created within this date range.')
+                 help_text=_('Only include orders created on or after this date.')
              )),
-            ('event_date_range',
-             DateFrameField(
-                 label=_('Event date'),
-                 include_future_frames=True,
+            ('date_to',
+             forms.DateField(
+                 label=_('End date'),
+                 widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
                  required=False,
-                 help_text=_('Only include orders including at least one ticket for a date in this range. '
+                 help_text=_('Only include orders created on or before this date.')
+             )),
+            ('event_date_from',
+             forms.DateField(
+                 label=_('Start event date'),
+                 widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
+                 required=False,
+                 help_text=_('Only include orders including at least one ticket for a date on or after this date. '
+                             'Will also include other dates in case of mixed orders!')
+             )),
+            ('event_date_to',
+             forms.DateField(
+                 label=_('End event date'),
+                 widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
+                 required=False,
+                 help_text=_('Only include orders including at least one ticket for a date on or before this date. '
                              'Will also include other dates in case of mixed orders!')
              )),
         ]
         d = OrderedDict(d)
         if not self.is_multievent and not self.event.has_subevents:
-            del d['event_date_range']
+            del d['event_date_from']
+            del d['event_date_to']
         return d
 
     def _get_all_payment_methods(self, qs):
@@ -176,27 +182,45 @@ class OrderListExporter(MultiSheetListExporter):
         annotations = {}
         filters = {}
 
-        if form_data.get('date_range'):
-            dt_start, dt_end = resolve_timeframe_to_datetime_start_inclusive_end_exclusive(now(), form_data['date_range'], self.timezone)
-            if dt_start:
-                filters[f'{rel}datetime__gte'] = dt_start
-            if dt_end:
-                filters[f'{rel}datetime__lt'] = dt_end
+        if form_data.get('date_from'):
+            date_value = form_data.get('date_from')
+            if not isinstance(date_value, date):
+                date_value = dateutil.parser.parse(date_value).date()
+            datetime_value = make_aware(datetime.combine(date_value, time(0, 0, 0)), self.timezone)
 
-        if form_data.get('event_date_range'):
-            dt_start, dt_end = resolve_timeframe_to_datetime_start_inclusive_end_exclusive(now(), form_data['event_date_range'], self.timezone)
-            if dt_start:
-                annotations['event_date_max'] = Case(
-                    When(**{f'{rel}event__has_subevents': True}, then=Max(f'{rel}all_positions__subevent__date_from')),
-                    default=F(f'{rel}event__date_from'),
-                )
-                filters['event_date_max__gte'] = dt_start
-            if dt_end:
-                annotations['event_date_min'] = Case(
-                    When(**{f'{rel}event__has_subevents': True}, then=Min(f'{rel}all_positions__subevent__date_from')),
-                    default=F(f'{rel}event__date_from'),
-                )
-                filters['event_date_min__lt'] = dt_end
+            filters[f'{rel}datetime__gte'] = datetime_value
+
+        if form_data.get('date_to'):
+            date_value = form_data.get('date_to')
+            if not isinstance(date_value, date):
+                date_value = dateutil.parser.parse(date_value).date()
+            datetime_value = make_aware(datetime.combine(date_value, time(23, 59, 59, 999999)), self.timezone)
+
+            filters[f'{rel}datetime__lte'] = datetime_value
+
+        if form_data.get('event_date_from'):
+            date_value = form_data.get('event_date_from')
+            if not isinstance(date_value, date):
+                date_value = dateutil.parser.parse(date_value).date()
+            datetime_value = make_aware(datetime.combine(date_value, time(0, 0, 0)), self.timezone)
+
+            annotations['event_date_max'] = Case(
+                When(**{f'{rel}event__has_subevents': True}, then=Max(f'{rel}all_positions__subevent__date_from')),
+                default=F(f'{rel}event__date_from'),
+            )
+            filters['event_date_max__gte'] = datetime_value
+
+        if form_data.get('event_date_to'):
+            date_value = form_data.get('event_date_to')
+            if not isinstance(date_value, date):
+                date_value = dateutil.parser.parse(date_value).date()
+            datetime_value = make_aware(datetime.combine(date_value, time(23, 59, 59, 999999)), self.timezone)
+
+            annotations['event_date_min'] = Case(
+                When(**{f'{rel}event__has_subevents': True}, then=Min(f'{rel}all_positions__subevent__date_from')),
+                default=F(f'{rel}event__date_from'),
+            )
+            filters['event_date_min__lte'] = datetime_value
 
         if filters:
             return qs.annotate(**annotations).filter(**filters)
@@ -279,8 +303,6 @@ class OrderListExporter(MultiSheetListExporter):
             for id, vn in payment_methods:
                 headers.append(_('Paid by {method}').format(method=vn))
 
-        # get meta_data labels from first cached event
-        headers += next(iter(self.event_object_cache.values())).meta_data.keys()
         yield headers
 
         full_fee_sum_cache = {
@@ -394,7 +416,6 @@ class OrderListExporter(MultiSheetListExporter):
                         payment_sum_cache.get((order.id, id), Decimal('0.00')) -
                         refund_sum_cache.get((order.id, id), Decimal('0.00'))
                     )
-            row += self.event_object_cache[order.event_id].meta_data.values()
             yield row
 
     def iterate_fees(self, form_data: dict):
@@ -444,9 +465,6 @@ class OrderListExporter(MultiSheetListExporter):
 
         headers.append(_('External customer ID'))
         headers.append(_('Payment providers'))
-
-        # get meta_data labels from first cached event
-        headers += next(iter(self.event_object_cache.values())).meta_data.keys()
         yield headers
 
         yield self.ProgressSetTotal(total=qs.count())
@@ -494,7 +512,6 @@ class OrderListExporter(MultiSheetListExporter):
                 str(self.providers.get(p, p)) for p in sorted(set((op.payment_providers or '').split(',')))
                 if p and p != 'free'
             ]))
-            row += self.event_object_cache[order.event_id].meta_data.values()
             yield row
 
     def iterate_positions(self, form_data: dict):
@@ -516,7 +533,6 @@ class OrderListExporter(MultiSheetListExporter):
             'order', 'order__invoice_address', 'order__customer', 'item', 'variation',
             'voucher', 'tax_rule'
         ).prefetch_related(
-            'subevent', 'subevent__meta_values',
             'answers', 'answers__question', 'answers__options'
         )
         if form_data['paid_only']:
@@ -608,10 +624,6 @@ class OrderListExporter(MultiSheetListExporter):
             _('Payment providers'),
         ]
 
-        # get meta_data labels from first cached event
-        meta_data_labels = next(iter(self.event_object_cache.values())).meta_data.keys()
-        if has_subevents:
-            headers += meta_data_labels
         yield headers
 
         all_ids = list(base_qs.order_by('order__datetime', 'positionid').values_list('pk', flat=True))
@@ -735,12 +747,6 @@ class OrderListExporter(MultiSheetListExporter):
                     str(self.providers.get(p, p)) for p in sorted(set((op.payment_providers or '').split(',')))
                     if p and p != 'free'
                 ]))
-
-                if has_subevents:
-                    if op.subevent:
-                        row += op.subevent.meta_data.values()
-                    else:
-                        row += [''] * len(meta_data_labels)
                 yield row
 
     def get_filename(self):
@@ -752,10 +758,7 @@ class OrderListExporter(MultiSheetListExporter):
 
 class PaymentListExporter(ListExporter):
     identifier = 'paymentlist'
-    verbose_name = gettext_lazy('Payments and refunds')
-    category = pgettext_lazy('export_category', 'Order data')
-    description = gettext_lazy('Download a spreadsheet of all payments or refunds of every order.')
-    featured = True
+    verbose_name = gettext_lazy('Order payments and refunds')
 
     @property
     def additional_form_fields(self):
@@ -834,8 +837,6 @@ class PaymentListExporter(ListExporter):
 class QuotaListExporter(ListExporter):
     identifier = 'quotalist'
     verbose_name = gettext_lazy('Quota availabilities')
-    category = pgettext_lazy('export_category', 'Product data')
-    description = gettext_lazy('Download a spreadsheet of all quotas including their current availability.')
 
     def iterate_list(self, form_data):
         has_subevents = self.event.has_subevents
@@ -889,17 +890,21 @@ class GiftcardTransactionListExporter(OrganizerLevelExportMixin, ListExporter):
     identifier = 'giftcardtransactionlist'
     verbose_name = gettext_lazy('Gift card transactions')
     organizer_required_permission = 'can_manage_gift_cards'
-    category = pgettext_lazy('export_category', 'Gift cards')
-    description = gettext_lazy('Download a spreadsheet of all gift card transactions.')
 
     @property
     def additional_form_fields(self):
         d = [
-            ('date_range',
-             DateFrameField(
-                 label=_('Date range'),
-                 include_future_frames=False,
-                 required=False
+            ('date_from',
+             forms.DateField(
+                 label=_('Start date'),
+                 widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
+                 required=False,
+             )),
+            ('date_to',
+             forms.DateField(
+                 label=_('End date'),
+                 widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
+                 required=False,
              )),
         ]
         d = OrderedDict(d)
@@ -910,12 +915,22 @@ class GiftcardTransactionListExporter(OrganizerLevelExportMixin, ListExporter):
             card__issuer=self.organizer,
         ).order_by('datetime').select_related('card', 'order', 'order__event')
 
-        if form_data.get('date_range'):
-            dt_start, dt_end = resolve_timeframe_to_datetime_start_inclusive_end_exclusive(now(), form_data['date_range'], self.timezone)
-            if dt_start:
-                qs = qs.filter(datetime__gte=dt_start)
-            if dt_end:
-                qs = qs.filter(datetime__lt=dt_end)
+        if form_data.get('date_from'):
+            date_value = form_data.get('date_from')
+            if isinstance(date_value, str):
+                date_value = dateutil.parser.parse(date_value).date()
+            qs = qs.filter(
+                datetime__gte=make_aware(datetime.combine(date_value, time(0, 0, 0)), self.timezone)
+            )
+
+        if form_data.get('date_to'):
+            date_value = form_data.get('date_to')
+            if isinstance(date_value, str):
+                date_value = dateutil.parser.parse(date_value).date()
+
+            qs = qs.filter(
+                datetime__lte=make_aware(datetime.combine(date_value, time(23, 59, 59, 999999)), self.timezone)
+            )
 
         headers = [
             _('Gift card code'),
@@ -945,8 +960,6 @@ class GiftcardTransactionListExporter(OrganizerLevelExportMixin, ListExporter):
 class GiftcardRedemptionListExporter(ListExporter):
     identifier = 'giftcardredemptionlist'
     verbose_name = gettext_lazy('Gift card redemptions')
-    category = pgettext_lazy('export_category', 'Order data')
-    description = gettext_lazy('Download a spreadsheet of all payments or refunds that involve gift cards.')
 
     def iterate_list(self, form_data):
         payments = OrderPayment.objects.filter(
@@ -992,18 +1005,14 @@ class GiftcardListExporter(OrganizerLevelExportMixin, ListExporter):
     identifier = 'giftcardlist'
     verbose_name = gettext_lazy('Gift cards')
     organizer_required_permission = 'can_manage_gift_cards'
-    category = pgettext_lazy('export_category', 'Gift cards')
-    description = gettext_lazy('Download a spreadsheet of all gift cards including their current value.')
 
     @property
     def additional_form_fields(self):
         return OrderedDict(
             [
-                ('date', forms.SplitDateTimeField(
+                ('date', forms.DateTimeField(
                     label=_('Show value at'),
-                    required=False,
-                    widget=SplitDateTimePickerWidget(),
-                    help_text=_('Defaults to the time of report.')
+                    initial=now(),
                 )),
                 ('testmode', forms.ChoiceField(
                     label=_('Test mode'),
@@ -1031,13 +1040,12 @@ class GiftcardListExporter(OrganizerLevelExportMixin, ListExporter):
         )
 
     def iterate_list(self, form_data):
-        d = form_data.get('date') or now()
         s = GiftCardTransaction.objects.filter(
             card=OuterRef('pk'),
-            datetime__lte=d
+            datetime__lte=form_data['date']
         ).order_by().values('card').annotate(s=Sum('value')).values('s')
         qs = self.organizer.issued_gift_cards.filter(
-            issuance__lte=d
+            issuance__lte=form_data['date']
         ).annotate(
             cached_value=Coalesce(Subquery(s), Decimal('0.00')),
         ).order_by('issuance').prefetch_related(
@@ -1052,11 +1060,11 @@ class GiftcardListExporter(OrganizerLevelExportMixin, ListExporter):
         if form_data.get('state') == 'empty':
             qs = qs.filter(cached_value=0)
         elif form_data.get('state') == 'valid_value':
-            qs = qs.exclude(cached_value=0).filter(Q(expires__isnull=True) | Q(expires__gte=d))
+            qs = qs.exclude(cached_value=0).filter(Q(expires__isnull=True) | Q(expires__gte=form_data['date']))
         elif form_data.get('state') == 'expired_value':
-            qs = qs.exclude(cached_value=0).filter(expires__lt=d)
+            qs = qs.exclude(cached_value=0).filter(expires__lt=form_data['date'])
         elif form_data.get('state') == 'expired':
-            qs = qs.filter(expires__lt=d)
+            qs = qs.filter(expires__lt=form_data['date'])
 
         headers = [
             _('Gift card code'),

src/pretix/base/exporters/waitinglist.py

@@ -39,8 +39,6 @@ from ..signals import (
 class WaitingListExporter(ListExporter):
     identifier = 'waitinglist'
     verbose_name = _('Waiting list')
-    category = pgettext_lazy('export_category', 'Waiting list')
-    description = _('Download a spread sheet with all your waiting list data.')
 
     # map selected status to label and queryset-filter
     status_filters = [

src/pretix/base/forms/questions.py

@@ -135,10 +135,6 @@ class NamePartsWidget(forms.MultiWidget):
             data.append(value.get(fname, ""))
         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:
-            scheme = PERSON_NAME_SCHEMES[value['_scheme']]
-            data[-1] = scheme['concatenation'](value).strip()
-
         return data
 
     def render(self, name: str, value, attrs=None, renderer=None) -> str:
@@ -531,7 +527,7 @@ class PortraitImageField(SizeValidationMixin, ExtValidationMixin, forms.FileFiel
                     code='aspect_ratio_not_3_by_4',
                 )
         except Exception as exc:
-            logger.exception('Could not parse image')
+            logger.exception('foo')
             # Pillow doesn't recognize it as an image.
             if isinstance(exc, ValidationError):
                 raise
@@ -575,7 +571,7 @@ class BaseQuestionsForm(forms.Form):
 
         add_fields = {}
 
-        if item.ask_attendee_data and event.settings.attendee_names_asked:
+        if item.admission and event.settings.attendee_names_asked:
             add_fields['attendee_name_parts'] = NamePartsFormField(
                 max_length=255,
                 required=event.settings.attendee_names_required and not self.all_optional,
@@ -584,7 +580,7 @@ class BaseQuestionsForm(forms.Form):
                 label=_('Attendee name'),
                 initial=(cartpos.attendee_name_parts if cartpos else orderpos.attendee_name_parts),
             )
-        if item.ask_attendee_data and event.settings.attendee_emails_asked:
+        if item.admission and event.settings.attendee_emails_asked:
             add_fields['attendee_email'] = forms.EmailField(
                 required=event.settings.attendee_emails_required and not self.all_optional,
                 label=_('Attendee email'),
@@ -595,7 +591,7 @@ class BaseQuestionsForm(forms.Form):
                     }
                 )
             )
-        if item.ask_attendee_data and event.settings.attendee_company_asked:
+        if item.admission and event.settings.attendee_company_asked:
             add_fields['company'] = forms.CharField(
                 required=event.settings.attendee_company_required and not self.all_optional,
                 label=_('Company'),
@@ -603,7 +599,7 @@ class BaseQuestionsForm(forms.Form):
                 initial=(cartpos.company if cartpos else orderpos.company),
             )
 
-        if item.ask_attendee_data and event.settings.attendee_addresses_asked:
+        if item.admission and event.settings.attendee_addresses_asked:
             add_fields['street'] = forms.CharField(
                 required=event.settings.attendee_addresses_required and not self.all_optional,
                 label=_('Address'),
@@ -919,7 +915,6 @@ class BaseQuestionsForm(forms.Form):
 
 class BaseInvoiceAddressForm(forms.ModelForm):
     vat_warning = False
-    address_validation = False
 
     class Meta:
         model = InvoiceAddress
@@ -1055,9 +1050,6 @@ class BaseInvoiceAddressForm(forms.ModelForm):
                 v.widget.attrs['autocomplete'] = 'section-invoice billing ' + v.widget.attrs.get('autocomplete', '')
 
     def clean(self):
-        from pretix.base.addressvalidation import \
-            validate_address  # local import to prevent impact on startup time
-
         data = self.cleaned_data
         if not data.get('is_business'):
             data['company'] = ''
@@ -1073,8 +1065,9 @@ class BaseInvoiceAddressForm(forms.ModelForm):
         if 'vat_id' in self.changed_data or not data.get('vat_id'):
             self.instance.vat_id_validated = False
 
-        if self.address_validation:
-            self.cleaned_data = data = validate_address(data, self.all_optional)
+        if data.get('city') and data.get('country') and str(data['country']) in COUNTRIES_WITH_STATE_IN_ADDRESS:
+            if not data.get('state'):
+                self.add_error('state', _('This field is required.'))
 
         self.instance.name_parts = data.get('name_parts')
 

src/pretix/base/invoice.py

@@ -242,12 +242,6 @@ class BaseReportlabInvoiceRenderer(BaseInvoiceRenderer):
         buffer.seek(0)
         return 'invoice.pdf', 'application/pdf', buffer.read()
 
-    def _clean_text(self, text, tags=None):
-        return bleach.clean(
-            text,
-            tags=tags or []
-        ).strip().replace('<br>', '<br />').replace('\n', '<br />\n')
-
 
 class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
     identifier = 'classic'
@@ -272,7 +266,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
     invoice_to_top = 52 * mm
 
     def _draw_invoice_to(self, canvas):
-        p = Paragraph(self._clean_text(self.invoice.address_invoice_to),
+        p = Paragraph(bleach.clean(self.invoice.address_invoice_to, tags=[]).strip().replace('\n', '<br />\n'),
                       style=self.stylesheet['Normal'])
         p.wrapOn(canvas, self.invoice_to_width, self.invoice_to_height)
         p_size = p.wrap(self.invoice_to_width, self.invoice_to_height)
@@ -285,7 +279,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
 
     def _draw_invoice_from(self, canvas):
         p = Paragraph(
-            self._clean_text(self.invoice.full_invoice_from),
+            bleach.clean(self.invoice.full_invoice_from, tags=[]).strip().replace('\n', '<br />\n'),
             style=self.stylesheet['InvoiceFrom']
         )
         p.wrapOn(canvas, self.invoice_from_width, self.invoice_from_height)
@@ -480,8 +474,8 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
         if self.invoice.custom_field:
             story.append(Paragraph(
                 '{}: {}'.format(
-                    self._clean_text(str(self.invoice.event.settings.invoice_address_custom_field)),
-                    self._clean_text(self.invoice.custom_field),
+                    bleach.clean(str(self.invoice.event.settings.invoice_address_custom_field), tags=[]).strip().replace('\n', '<br />\n'),
+                    bleach.clean(self.invoice.custom_field, tags=[]).strip().replace('\n', '<br />\n'),
                 ),
                 self.stylesheet['Normal']
             ))
@@ -489,7 +483,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
         if self.invoice.internal_reference:
             story.append(Paragraph(
                 pgettext('invoice', 'Customer reference: {reference}').format(
-                    reference=self._clean_text(self.invoice.internal_reference),
+                    reference=bleach.clean(self.invoice.internal_reference, tags=[]).strip().replace('\n', '<br />\n'),
                 ),
                 self.stylesheet['Normal']
             ))
@@ -497,20 +491,20 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
         if self.invoice.invoice_to_vat_id:
             story.append(Paragraph(
                 pgettext('invoice', 'Customer VAT ID') + ': ' +
-                self._clean_text(self.invoice.invoice_to_vat_id),
+                bleach.clean(self.invoice.invoice_to_vat_id, tags=[]).replace("\n", "<br />\n"),
                 self.stylesheet['Normal']
             ))
 
         if self.invoice.invoice_to_beneficiary:
             story.append(Paragraph(
                 pgettext('invoice', 'Beneficiary') + ':<br />' +
-                self._clean_text(self.invoice.invoice_to_beneficiary),
+                bleach.clean(self.invoice.invoice_to_beneficiary, tags=[]).replace("\n", "<br />\n"),
                 self.stylesheet['Normal']
             ))
 
         if self.invoice.introductory_text:
             story.append(Paragraph(
-                self._clean_text(self.invoice.introductory_text, tags=['br']),
+                self.invoice.introductory_text,
                 self.stylesheet['Normal']
             ))
             story.append(Spacer(1, 10 * mm))
@@ -577,7 +571,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
                     description = description + "\n" + single_price_line
                 tdata.append((
                     Paragraph(
-                        self._clean_text(description, tags=['br']),
+                        bleach.clean(description, tags=['br']).strip().replace('<br>', '<br/>').replace('\n', '<br />\n'),
                         self.stylesheet['Normal']
                     ),
                     str(len(lines)),
@@ -593,7 +587,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
                     description = description + "\n" + single_price_line
                 tdata.append((
                     Paragraph(
-                        self._clean_text(description, tags=['br']),
+                        bleach.clean(description, tags=['br']).strip().replace('<br>', '<br/>').replace('\n', '<br />\n'),
                         self.stylesheet['Normal']
                     ),
                     str(len(lines)),
@@ -663,7 +657,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
 
         if self.invoice.additional_text:
             story.append(Paragraph(
-                self._clean_text(self.invoice.additional_text, tags=['br']),
+                self.invoice.additional_text,
                 self.stylesheet['Normal']
             ))
             story.append(Spacer(1, 5 * mm))
@@ -800,7 +794,7 @@ class Modern1Renderer(ClassicInvoiceRenderer):
         if not self.invoice.invoice_from:
             return
         c = [
-            self._clean_text(l)
+            bleach.clean(l, tags=[]).strip().replace('\n', '<br />\n')
             for l in self.invoice.address_invoice_from.strip().split('\n')
         ]
         p = Paragraph(' · '.join(c), style=self.stylesheet['Sender'])

src/pretix/base/middleware.py

@@ -30,6 +30,7 @@ from django.urls import get_script_prefix
 from django.utils import timezone, translation
 from django.utils.cache import patch_vary_headers
 from django.utils.deprecation import MiddlewareMixin
+from django.utils.translation import LANGUAGE_SESSION_KEY
 from django.utils.translation.trans_real import (
     check_for_language, get_supported_language_variant, language_code_re,
     parse_accept_lang_header,
@@ -127,7 +128,12 @@ def get_language_from_user_settings(request: HttpRequest) -> str:
             return lang_code
 
 
-def get_language_from_cookie(request: HttpRequest) -> str:
+def get_language_from_session_or_cookie(request: HttpRequest) -> str:
+    if hasattr(request, 'session'):
+        lang_code = request.session.get(LANGUAGE_SESSION_KEY)
+        if lang_code in _supported and lang_code is not None and check_for_language(lang_code):
+            return lang_code
+
     lang_code = request.COOKIES.get(settings.LANGUAGE_COOKIE_NAME)
     try:
         return get_supported_language_variant(lang_code)
@@ -181,14 +187,14 @@ def get_language_from_request(request: HttpRequest) -> str:
         return (
             get_language_from_user_settings(request)
             or get_language_from_customer_settings(request)
-            or get_language_from_cookie(request)
+            or get_language_from_session_or_cookie(request)
             or get_language_from_browser(request)
             or get_language_from_event(request)
             or get_default_language()
         )
     else:
         return (
-            get_language_from_cookie(request)
+            get_language_from_session_or_cookie(request)
             or get_language_from_customer_settings(request)
             or get_language_from_user_settings(request)
             or get_language_from_browser(request)
@@ -218,11 +224,6 @@ def _merge_csp(a, b):
         if k not in a:
             a[k] = b[k]
 
-    for k, v in a.items():
-        if "'unsafe-inline'" in v:
-            # If we need unsafe-inline, drop any hashes or nonce as they will be ignored otherwise
-            a[k] = [i for i in v if not i.startswith("'nonce-") and not i.startswith("'sha-")]
-
 
 class SecurityMiddleware(MiddlewareMixin):
     CSP_EXEMPT = (
@@ -300,7 +301,7 @@ class SecurityMiddleware(MiddlewareMixin):
             resp['Content-Security-Policy'] = _render_csp(h).format(static=staticdomain, dynamic=dynamicdomain,
                                                                     media=mediadomain)
             for k, v in h.items():
-                h[k] = sorted(set(' '.join(v).format(static=staticdomain, dynamic=dynamicdomain, media=mediadomain).split(' ')))
+                h[k] = ' '.join(v).format(static=staticdomain, dynamic=dynamicdomain, media=mediadomain).split(' ')
             resp['Content-Security-Policy'] = _render_csp(h)
         elif 'Content-Security-Policy' in resp:
             del resp['Content-Security-Policy']

src/pretix/base/migrations/0225_orderpayment_process_initiated.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.16 on 2022-11-17 15:27
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0224_eventmetaproperty_filter_allowed'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='orderpayment',
-            name='process_initiated',
-            field=models.BooleanField(null=True),
-        ),
-    ]

src/pretix/base/migrations/0226_itemvariationmetavalue.py

@@ -1,29 +0,0 @@
-# Generated by Django 3.2.16 on 2022-12-09 10:06
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-import pretix.base.models.base
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0225_orderpayment_process_initiated'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ItemVariationMetaValue',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
-                ('value', models.TextField()),
-                ('property', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='variation_values', to='pretixbase.itemmetaproperty')),
-                ('variation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='meta_values', to='pretixbase.itemvariation')),
-            ],
-            options={
-                'unique_together': {('variation', 'property')},
-            },
-            bases=(models.Model, pretix.base.models.base.LoggingMixin),
-        ),
-    ]

src/pretix/base/migrations/0227_item_personalized.py

@@ -1,27 +0,0 @@
-# Generated by Django 3.2.16 on 2022-12-21 08:59
-
-from django.db import migrations, models
-
-
-def item_set_personalized(apps, schema_editor):
-    # We cannot really know if a position was bundled or an add-on, but we can at least guess
-    Item = apps.get_model("pretixbase", "Item")
-    Item.objects.filter(admission=True).update(personalized=True)
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('pretixbase', '0226_itemvariationmetavalue'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='item',
-            name='personalized',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.RunPython(
-            item_set_personalized,
-            migrations.RunPython.noop,
-        ),
-    ]

src/pretix/base/migrations/0228_scheduledeventexport_scheduledorganizerexport.py

@@ -1,68 +0,0 @@
-# Generated by Django 3.2.16 on 2023-01-18 11:57
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-import pretix.base.models.base
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0227_item_personalized'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ScheduledOrganizerExport',
-            fields=[
-                ('id', models.BigAutoField(primary_key=True, serialize=False)),
-                ('export_identifier', models.CharField(max_length=190)),
-                ('export_form_data', models.JSONField(default=dict)),
-                ('locale', models.CharField(max_length=250)),
-                ('mail_additional_recipients', models.TextField()),
-                ('mail_additional_recipients_cc', models.TextField()),
-                ('mail_additional_recipients_bcc', models.TextField()),
-                ('mail_subject', models.CharField(max_length=250)),
-                ('mail_template', models.TextField()),
-                ('schedule_rrule', models.TextField(null=True)),
-                ('schedule_rrule_time', models.TimeField()),
-                ('schedule_next_run', models.DateTimeField(blank=True, null=True)),
-                ('error_counter', models.IntegerField(default=0)),
-                ('error_last_message', models.TextField(null=True)),
-                ('timezone', models.CharField(default='UTC', max_length=100)),
-                ('organizer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='scheduled_exports', to='pretixbase.organizer')),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'abstract': False,
-            },
-            bases=(models.Model, pretix.base.models.base.LoggingMixin),
-        ),
-        migrations.CreateModel(
-            name='ScheduledEventExport',
-            fields=[
-                ('id', models.BigAutoField(primary_key=True, serialize=False)),
-                ('export_identifier', models.CharField(max_length=190)),
-                ('export_form_data', models.JSONField(default=dict)),
-                ('locale', models.CharField(max_length=250)),
-                ('mail_additional_recipients', models.TextField()),
-                ('mail_additional_recipients_cc', models.TextField()),
-                ('mail_additional_recipients_bcc', models.TextField()),
-                ('mail_subject', models.CharField(max_length=250)),
-                ('mail_template', models.TextField()),
-                ('schedule_rrule', models.TextField(null=True)),
-                ('schedule_rrule_time', models.TimeField()),
-                ('schedule_next_run', models.DateTimeField(blank=True, null=True)),
-                ('error_counter', models.IntegerField(default=0)),
-                ('error_last_message', models.TextField(null=True)),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='scheduled_exports', to='pretixbase.event')),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'abstract': False,
-            },
-            bases=(models.Model, pretix.base.models.base.LoggingMixin),
-        ),
-    ]

src/pretix/base/models/__init__.py

@@ -30,13 +30,12 @@ from .event import (
     Event, Event_SettingsStore, EventLock, EventMetaProperty, EventMetaValue,
     SubEvent, SubEventMetaValue, generate_invite_token,
 )
-from .exports import ScheduledEventExport, ScheduledOrganizerExport
 from .giftcards import GiftCard, GiftCardAcceptance, GiftCardTransaction
 from .invoices import Invoice, InvoiceLine, invoice_filename
 from .items import (
     Item, ItemAddOn, ItemBundle, ItemCategory, ItemMetaProperty, ItemMetaValue,
-    ItemVariation, ItemVariationMetaValue, Question, QuestionOption, Quota,
-    SubEventItem, SubEventItemVariation, itempicture_upload_to,
+    ItemVariation, Question, QuestionOption, Quota, SubEventItem,
+    SubEventItemVariation, itempicture_upload_to,
 )
 from .log import LogEntry
 from .memberships import Membership, MembershipType

src/pretix/base/models/checkin.py

@@ -36,17 +36,13 @@ from datetime import timedelta
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.db.models import (
-    Count, Exists, F, Max, OuterRef, Q, Subquery, Value, Window,
-)
-from django.db.models.expressions import RawSQL
+from django.db.models import Exists, F, Max, OuterRef, Q, Subquery
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager, scopes_disabled
 
 from pretix.base.models import LoggedModel
 from pretix.base.models.fields import MultiStringField
-from pretix.helpers import PostgresWindowFrame
 
 
 class CheckinList(LoggedModel):
@@ -99,109 +95,52 @@ class CheckinList(LoggedModel):
     class Meta:
         ordering = ('subevent__date_from', 'name')
 
-    def positions_query(self, ignore_status=False):
+    @property
+    def positions(self):
         from . import Order, OrderPosition
 
-        qs = OrderPosition.all.filter(
+        qs = OrderPosition.objects.filter(
             order__event=self.event,
+            order__status__in=[Order.STATUS_PAID, Order.STATUS_PENDING] if self.include_pending else [
+                Order.STATUS_PAID],
         )
-        if not ignore_status:
-            qs = qs.filter(
-                canceled=False,
-                order__status__in=[Order.STATUS_PAID, Order.STATUS_PENDING] if self.include_pending else [Order.STATUS_PAID],
-            )
-
         if self.subevent_id:
             qs = qs.filter(subevent_id=self.subevent_id)
         if not self.all_products:
             qs = qs.filter(item__in=self.limit_products.values_list('id', flat=True))
         return qs
 
-    @property
-    def positions(self):
-        return self.positions_query(ignore_status=False)
-
-    @scopes_disabled()
-    def positions_inside_query(self, ignore_status=False, at_time=None):
-        if at_time is None:
-            c_q = []
-        else:
-            c_q = [Q(datetime__lt=at_time)]
-
-        if "postgresql" not in settings.DATABASES["default"]["ENGINE"]:
-            # Use a simple approach that works on all databases
-            qs = self.positions_query(ignore_status=ignore_status).annotate(
-                last_entry=Subquery(
-                    Checkin.objects.filter(
-                        *c_q,
-                        position_id=OuterRef('pk'),
-                        list_id=self.pk,
-                        type=Checkin.TYPE_ENTRY,
-                    ).order_by().values('position_id').annotate(
-                        m=Max('datetime')
-                    ).values('m')
-                ),
-                last_exit=Subquery(
-                    Checkin.objects.filter(
-                        *c_q,
-                        position_id=OuterRef('pk'),
-                        list_id=self.pk,
-                        type=Checkin.TYPE_EXIT,
-                    ).order_by().values('position_id').annotate(
-                        m=Max('datetime')
-                    ).values('m')
-                ),
-            ).filter(
-                Q(last_entry__isnull=False)
-                & Q(
-                    Q(last_exit__isnull=True) | Q(last_exit__lt=F('last_entry'))
-                )
-            )
-            return qs
-
-        # Use the PostgreSQL-specific query using Window functions, which is a lot faster.
-        # On a real-world example with ~100k tickets, of which ~17k are checked in, we observed
-        # a speed-up from 29s (old) to a few hundred milliseconds (new)!
-        # Why is this so much faster? The regular query get's PostgreSQL all busy with filtering
-        # the tickets both by their belonging the event and checkin status at the same time, while
-        # this query just iterates over all successful checkins on the list, and -- by the power
-        # of window functions -- asks "is this an entry that is followed by no exit?". Then we
-        # dedupliate by position and count it up.
-        cl = self
-        base_q, base_params = (
-            Checkin.all.filter(*c_q, successful=True, list=cl)
-            .annotate(
-                cnt_exists_after=Window(
-                    expression=Count("position_id", filter=Q(type=Value("exit"))),
-                    partition_by=[F("position_id"), F("list_id")],
-                    order_by=F("datetime").asc(),
-                    frame=PostgresWindowFrame(
-                        "ROWS", start="1 following", end="unbounded following"
-                    ),
-                )
-            )
-            .values("position_id", "type", "datetime", "cnt_exists_after")
-            .query.sql_with_params()
-        )
-        return self.positions_query(ignore_status=ignore_status).filter(
-            pk__in=RawSQL(
-                f"""
-                SELECT "position_id"
-                FROM ({str(base_q)}) s
-                WHERE "type" = %s AND "cnt_exists_after" = 0
-                GROUP BY "position_id"
-                """,
-                [*base_params, Checkin.TYPE_ENTRY]
-            )
-        )
-
     @property
     def positions_inside(self):
-        return self.positions_inside_query(None)
+        return self.positions.annotate(
+            last_entry=Subquery(
+                Checkin.objects.filter(
+                    position_id=OuterRef('pk'),
+                    list_id=self.pk,
+                    type=Checkin.TYPE_ENTRY,
+                ).order_by().values('position_id').annotate(
+                    m=Max('datetime')
+                ).values('m')
+            ),
+            last_exit=Subquery(
+                Checkin.objects.filter(
+                    position_id=OuterRef('pk'),
+                    list_id=self.pk,
+                    type=Checkin.TYPE_EXIT,
+                ).order_by().values('position_id').annotate(
+                    m=Max('datetime')
+                ).values('m')
+            ),
+        ).filter(
+            Q(last_entry__isnull=False)
+            & Q(
+                Q(last_exit__isnull=True) | Q(last_exit__lt=F('last_entry'))
+            )
+        )
 
     @property
     def inside_count(self):
-        return self.positions_inside_query(None).count()
+        return self.positions_inside.count()
 
     @property
     @scopes_disabled()

src/pretix/base/models/discount.py

@@ -28,7 +28,6 @@ from typing import Dict, Optional, Tuple
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
 from django.db import models
-from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager
 
@@ -199,14 +198,6 @@ class Discount(LoggedModel):
             'subevent_mode': self.subevent_mode,
         })
 
-    def is_available_by_time(self, now_dt=None) -> bool:
-        now_dt = now_dt or now()
-        if self.available_from and self.available_from > now_dt:
-            return False
-        if self.available_until and self.available_until < now_dt:
-            return False
-        return True
-
     def _apply_min_value(self, positions, idx_group, result):
         if self.condition_min_value and sum(positions[idx][2] for idx in idx_group) < self.condition_min_value:
             return

src/pretix/base/models/event.py

@@ -374,7 +374,7 @@ class EventMixin:
                 if q.active_items:
                     items_reserved.update(q.active_items.split(","))
                 if q.active_variations:
-                    vars_reserved.update(q.active_variations.split(","))
+                    vars_available.update(q.active_variations.split(","))
             elif res[0] < Quota.AVAILABILITY_RESERVED:
                 if q.active_items:
                     items_gone.update(q.active_items.split(","))
@@ -632,7 +632,6 @@ class Event(EventMixin, LoggedModel):
             return super().presale_has_ended
 
     def delete_all_orders(self, really=False):
-        from .checkin import Checkin
         from .orders import (
             OrderFee, OrderPayment, OrderPosition, OrderRefund, Transaction,
         )
@@ -646,7 +645,6 @@ class Event(EventMixin, LoggedModel):
         OrderFee.objects.filter(order__event=self).delete()
         OrderRefund.objects.filter(order__event=self).delete()
         OrderPayment.objects.filter(order__event=self).delete()
-        Checkin.objects.filter(list__event=self).delete()
         self.orders.all().delete()
 
     def save(self, *args, **kwargs):
@@ -730,7 +728,7 @@ class Event(EventMixin, LoggedModel):
         from ..signals import event_copy_data
         from . import (
             Discount, Item, ItemAddOn, ItemBundle, ItemCategory, ItemMetaValue,
-            ItemVariationMetaValue, Question, Quota,
+            Question, Quota,
         )
 
         #  Note: avoid self.set_active_plugins(), it causes trouble e.g. for the badges plugin.
@@ -806,18 +804,12 @@ class Event(EventMixin, LoggedModel):
                 v.item = i
                 v.save(force_insert=True)
 
-        for imv in ItemMetaValue.objects.filter(item__event=other):
+        for imv in ItemMetaValue.objects.filter(item__event=other).prefetch_related('item', 'property'):
             imv.pk = None
-            imv.property = item_meta_properties_map[imv.property_id]
+            imv.property = item_meta_properties_map[imv.property.pk]
             imv.item = item_map[imv.item.pk]
             imv.save(force_insert=True)
 
-        for imv in ItemVariationMetaValue.objects.filter(variation__item__event=other):
-            imv.pk = None
-            imv.property = item_meta_properties_map[imv.property_id]
-            imv.variation = variation_map[imv.variation_id]
-            imv.save(force_insert=True)
-
         for ia in ItemAddOn.objects.filter(base_item__event=other).prefetch_related('base_item', 'addon_category'):
             ia.pk = None
             ia.base_item = item_map[ia.base_item.pk]

src/pretix/base/models/exports.py

@@ -1,139 +0,0 @@
-#
-# 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 datetime import datetime, timedelta
-
-import pytz
-from dateutil.rrule import rrulestr
-from django.conf import settings
-from django.core.serializers.json import DjangoJSONEncoder
-from django.db import models
-from django.utils.timezone import make_aware, now
-from django.utils.translation import gettext_lazy as _
-
-from pretix.base.models import LoggedModel
-from pretix.base.validators import RRuleValidator, multimail_validate
-
-
-class AbstractScheduledExport(LoggedModel):
-    id = models.BigAutoField(primary_key=True)
-
-    export_identifier = models.CharField(
-        max_length=190,
-        verbose_name=_("Export"),
-    )
-    export_form_data = models.JSONField(
-        default=dict,
-        encoder=DjangoJSONEncoder,
-    )
-
-    owner = models.ForeignKey(
-        "pretixbase.User",
-        on_delete=models.PROTECT,
-    )
-    locale = models.CharField(
-        verbose_name=_('Language'),
-        max_length=250
-    )
-
-    mail_additional_recipients = models.TextField(
-        verbose_name=_('Additional recipients'),
-        null=False, blank=True, validators=[multimail_validate],
-        help_text=_("You can specify multiple recipients separated by commas.")
-    )
-    mail_additional_recipients_cc = models.TextField(
-        verbose_name=_('Additional recipients (Cc)'),
-        null=False, blank=True, validators=[multimail_validate],
-        help_text=_("You can specify multiple recipients separated by commas.")
-    )
-    mail_additional_recipients_bcc = models.TextField(
-        verbose_name=_('Additional recipients (Bcc)'),
-        null=False, blank=True, validators=[multimail_validate],
-        help_text=_("You can specify multiple recipients separated by commas.")
-    )
-    mail_subject = models.CharField(
-        verbose_name=_('Subject'),
-        max_length=250
-    )
-    mail_template = models.TextField(
-        verbose_name=_('Message'),
-    )
-
-    schedule_rrule = models.TextField(
-        null=True, blank=True, validators=[RRuleValidator()]
-    )
-    schedule_rrule_time = models.TimeField(
-        verbose_name=_("Requested start time"),
-        help_text=_("The actual start time might be delayed depending on system load."),
-    )
-    schedule_next_run = models.DateTimeField(null=True, blank=True)
-
-    error_counter = models.IntegerField(default=0)
-    error_last_message = models.TextField(null=True, blank=True)
-
-    class Meta:
-        abstract = True
-
-    def __str__(self):
-        return self.mail_subject
-
-    def compute_next_run(self):
-        tz = self.tz
-        r = rrulestr(self.schedule_rrule)
-
-        base_dt = now().astimezone(tz).replace(tzinfo=None)
-        if now().astimezone(tz).time() < self.schedule_rrule_time:
-            base_dt -= timedelta(days=1)
-
-        new_d = r.after(base_dt, inc=False)
-        if not new_d:
-            self.schedule_next_run = None
-            return
-
-        try:
-            self.schedule_next_run = make_aware(datetime.combine(new_d.date(), self.schedule_rrule_time), tz)
-        except pytz.exceptions.AmbiguousTimeError:
-            self.schedule_next_run = make_aware(datetime.combine(new_d.date(), self.schedule_rrule_time), tz, is_dst=False)
-        except pytz.exceptions.NonExistentTimeError:
-            self.schedule_next_run = make_aware(datetime.combine(new_d.date(), self.schedule_rrule_time) + timedelta(hours=1), tz)
-
-
-class ScheduledEventExport(AbstractScheduledExport):
-    event = models.ForeignKey(
-        "pretixbase.Event", on_delete=models.CASCADE, related_name="scheduled_exports"
-    )
-
-    @property
-    def tz(self):
-        return self.event.timezone
-
-
-class ScheduledOrganizerExport(AbstractScheduledExport):
-    organizer = models.ForeignKey(
-        "pretixbase.Organizer", on_delete=models.CASCADE, related_name="scheduled_exports"
-    )
-    timezone = models.CharField(max_length=100,
-                                default=settings.TIME_ZONE,
-                                verbose_name=_('Timezone'))
-
-    @property
-    def tz(self):
-        return pytz.timezone(self.timezone)

src/pretix/base/models/items.py

@@ -62,7 +62,6 @@ from pretix.base.models.base import LoggedModel
 from pretix.base.models.fields import MultiStringField
 from pretix.base.models.tax import TaxedPrice
 
-from ...helpers.images import ImageSizeValidator
 from .event import Event, SubEvent
 
 
@@ -311,8 +310,6 @@ class Item(LoggedModel):
     :type tax_rate: decimal.Decimal
     :param admission: ``True``, if this item allows persons to enter the event (as opposed to e.g. merchandise)
     :type admission: bool
-    :param personalized: ``True``, if attendee information should be collected for this ticket
-    :type personalized: bool
     :param picture: A product picture to be shown next to the product description
     :type picture: File
     :param available_from: The date this product goes on sale
@@ -399,14 +396,8 @@ class Item(LoggedModel):
     admission = models.BooleanField(
         verbose_name=_("Is an admission ticket"),
         help_text=_(
-            'Whether or not buying this product allows a person to enter your event'
-        ),
-        default=False
-    )
-    personalized = models.BooleanField(
-        verbose_name=_("Is a personalized ticket"),
-        help_text=_(
-            'Whether or not buying this product allows to enter attendee information'
+            'Whether or not buying this product allows a person to enter '
+            'your event'
         ),
         default=False
     )
@@ -430,8 +421,7 @@ class Item(LoggedModel):
     picture = models.ImageField(
         verbose_name=_("Product picture"),
         null=True, blank=True, max_length=255,
-        upload_to=itempicture_upload_to,
-        validators=[ImageSizeValidator()]
+        upload_to=itempicture_upload_to
     )
     available_from = models.DateTimeField(
         verbose_name=_("Available from"),
@@ -588,10 +578,6 @@ class Item(LoggedModel):
             return self.event.settings.show_quota_left
         return self.show_quota_left
 
-    @property
-    def ask_attendee_data(self):
-        return self.admission and self.personalized
-
     def tax(self, price=None, base_price_is='auto', currency=None, invoice_address=None, override_tax_rate=None, include_bundled=False):
         price = price if price is not None else self.default_price
 
@@ -1022,16 +1008,6 @@ class ItemVariation(models.Model):
             return False
         return True
 
-    @property
-    def meta_data(self):
-        data = self.item.meta_data
-        if hasattr(self, 'meta_values_cached'):
-            data.update({v.property.name: v.value for v in self.meta_values_cached})
-        else:
-            data.update({v.property.name: v.value for v in self.meta_values.select_related('property').all()})
-
-        return OrderedDict((k, v) for k, v in sorted(data.items(), key=lambda k: k[0]))
-
 
 class ItemAddOn(models.Model):
     """
@@ -1408,10 +1384,8 @@ class Question(LoggedModel):
         if self.type == Question.TYPE_CHOICE:
             if isinstance(answer, QuestionOption):
                 return answer
-            if not isinstance(answer, (int, str)):
-                raise ValidationError(_('Invalid input type.'))
             q = Q(identifier=answer)
-            if isinstance(answer, int) or (isinstance(answer, str) and answer.isdigit()):
+            if isinstance(answer, int) or answer.isdigit():
                 q |= Q(pk=answer)
             o = self.options.filter(q).first()
             if not o:
@@ -1811,21 +1785,8 @@ class ItemMetaValue(LoggedModel):
     class Meta:
         unique_together = ('item', 'property')
 
+    def delete(self, *args, **kwargs):
+        super().delete(*args, **kwargs)
 
-class ItemVariationMetaValue(LoggedModel):
-    """
-    A meta-data value assigned to an item variation, overriding the value on the item.
-
-    :param variation: The variation this metadata is valid for
-    :type variation: ItemVariation
-    :param property: The property this value belongs to
-    :type property: ItemMetaProperty
-    :param value: The actual value
-    :type value: str
-    """
-    variation = models.ForeignKey('ItemVariation', on_delete=models.CASCADE, related_name='meta_values')
-    property = models.ForeignKey('ItemMetaProperty', on_delete=models.CASCADE, related_name='variation_values')
-    value = models.TextField()
-
-    class Meta:
-        unique_together = ('variation', 'property')
+    def save(self, *args, **kwargs):
+        super().save(*args, **kwargs)

src/pretix/base/models/orders.py

@@ -79,9 +79,7 @@ from pretix.base.services.locking import LOCK_TIMEOUT, NoLockManager
 from pretix.base.settings import PERSON_NAME_SCHEMES
 from pretix.base.signals import order_gracefully_delete
 
-from ...helpers import OF_SELF
 from ...helpers.countries import CachedCountries, FastCountryField
-from ...helpers.format import format_map
 from ._transactions import (
     _fail, _transactions_mark_order_clean, _transactions_mark_order_dirty,
 )
@@ -809,7 +807,7 @@ class Order(LockModel, LoggedModel):
             return True
         ask_names = self.event.settings.get('attendee_names_asked', as_type=bool)
         for cp in positions:
-            if (cp.item.ask_attendee_data and ask_names) or cp.item.questions.all():
+            if (cp.item.admission and ask_names) or cp.item.questions.all():
                 return True
 
         return False  # nothing there to modify
@@ -998,7 +996,7 @@ class Order(LockModel, LoggedModel):
                          position and the attendee email will be used if available.
         """
         from pretix.base.services.mail import (
-            SendMailException, mail, render_mail,
+            SendMailException, TolerantDict, mail, render_mail,
         )
 
         if not self.email and not (position and position.attendee_email):
@@ -1014,7 +1012,7 @@ class Order(LockModel, LoggedModel):
 
             try:
                 email_content = render_mail(template, context)
-                subject = format_map(subject, context)
+                subject = str(subject).format_map(TolerantDict(context))
                 mail(
                     recipient, subject, template, context,
                     self.event, self.locale, self, headers=headers, sender=sender,
@@ -1511,9 +1509,6 @@ class OrderPayment(models.Model):
     :type info: str
     :param fee: The ``OrderFee`` object used to track the fee for this order.
     :type fee: pretix.base.models.OrderFee
-    :param process_initiated: Only for internal use inside pretix.presale to check which payments have started
-                              the execution process.
-    :type process_initiated: bool
     """
     PAYMENT_STATE_CREATED = 'created'
     PAYMENT_STATE_PENDING = 'pending'
@@ -1564,9 +1559,6 @@ class OrderPayment(models.Model):
         null=True, blank=True, related_name='payments', on_delete=models.SET_NULL
     )
     migrated = models.BooleanField(default=False)
-    process_initiated = models.BooleanField(
-        null=True  # null = created before this field was introduced
-    )
 
     objects = ScopedManager(organizer='order__event__organizer')
 
@@ -1629,7 +1621,7 @@ class OrderPayment(models.Model):
         been marked as paid.
         """
         with transaction.atomic():
-            locked_instance = OrderPayment.objects.select_for_update(of=OF_SELF).get(pk=self.pk)
+            locked_instance = OrderPayment.objects.select_for_update().get(pk=self.pk)
             if locked_instance.state not in (OrderPayment.PAYMENT_STATE_CREATED, OrderPayment.PAYMENT_STATE_PENDING):
                 # Race condition detected, this payment is already confirmed
                 logger.info('Failed payment {} but ignored due to likely race condition.'.format(
@@ -1653,7 +1645,7 @@ class OrderPayment(models.Model):
         }, user=user, auth=auth)
 
     def confirm(self, count_waitinglist=True, send_mail=True, force=False, user=None, auth=None, mail_text='',
-                ignore_date=False, lock=True, payment_date=None, generate_invoice=True):
+                ignore_date=False, lock=True, payment_date=None):
         """
         Marks the payment as complete. If possible, this also marks the order as paid if no further
         payment is required
@@ -1674,7 +1666,7 @@ class OrderPayment(models.Model):
         :raises Quota.QuotaExceededException: if the quota is exceeded and ``force`` is ``False``
         """
         with transaction.atomic():
-            locked_instance = OrderPayment.objects.select_for_update(of=OF_SELF).get(pk=self.pk)
+            locked_instance = OrderPayment.objects.select_for_update().get(pk=self.pk)
             if locked_instance.state == self.PAYMENT_STATE_CONFIRMED:
                 # Race condition detected, this payment is already confirmed
                 logger.info('Confirmed payment {} but ignored due to likely race condition.'.format(
@@ -1716,11 +1708,10 @@ class OrderPayment(models.Model):
             ))
             return
 
-        self._mark_order_paid(count_waitinglist, send_mail, force, user, auth, mail_text, ignore_date, lock, payment_sum - refund_sum,
-                              generate_invoice)
+        self._mark_order_paid(count_waitinglist, send_mail, force, user, auth, mail_text, ignore_date, lock, payment_sum - refund_sum)
 
     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):
+                         ignore_date=False, lock=True, payment_refund_sum=0):
         from pretix.base.services.invoices import (
             generate_invoice, invoice_qualified,
         )
@@ -1737,7 +1728,7 @@ class OrderPayment(models.Model):
                                   ignore_date=ignore_date)
 
         invoice = None
-        if invoice_qualified(self.order) and allow_generate_invoice:
+        if invoice_qualified(self.order):
             invoices = self.order.invoices.filter(is_cancellation=False).count()
             cancellations = self.order.invoices.filter(is_cancellation=True).count()
             gen_invoice = (
@@ -2416,7 +2407,7 @@ class OrderPosition(AbstractPosition):
         :param attach_ical: Attach relevant ICS files
         """
         from pretix.base.services.mail import (
-            SendMailException, mail, render_mail,
+            SendMailException, TolerantDict, mail, render_mail,
         )
 
         if not self.attendee_email:
@@ -2429,7 +2420,7 @@ class OrderPosition(AbstractPosition):
             recipient = self.attendee_email
             try:
                 email_content = render_mail(template, context)
-                subject = format_map(subject, context)
+                subject = str(subject).format_map(TolerantDict(context))
                 mail(
                     recipient, subject, template, context,
                     self.event, self.order.locale, order=self.order, headers=headers, sender=sender,
@@ -2689,7 +2680,7 @@ class CartPosition(AbstractPosition):
         category_key = (self.item.category.position, self.item.category.id) if self.item.category_id is not None else (0, 0)
         item_key = self.item.position, self.item_id
         variation_key = (self.variation.position, self.variation.id) if self.variation_id is not None else (0, 0)
-        line_key = (self.price, (self.voucher_id or 0), (self.seat.sorting_rank if self.seat_id else 0), self.pk)
+        line_key = (self.price, (self.voucher_id or 0), (self.seat.sorting_rank if self.seat_id else None), self.pk)
         sort_key = subevent_key + category_key + item_key + variation_key + line_key
 
         if self.addon_to_id:

src/pretix/base/models/tax.py

@@ -23,7 +23,6 @@ import json
 from decimal import Decimal
 
 from django.core.exceptions import ValidationError
-from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.utils.formats import localize
 from django.utils.translation import gettext_lazy as _, pgettext
@@ -150,15 +149,7 @@ class TaxRule(LoggedModel):
     rate = models.DecimalField(
         max_digits=10,
         decimal_places=2,
-        validators=[
-            MaxValueValidator(
-                limit_value=Decimal("100.00"),
-            ),
-            MinValueValidator(
-                limit_value=Decimal("0.00"),
-            ),
-        ],
-        verbose_name=_("Tax rate"),
+        verbose_name=_("Tax rate")
     )
     price_includes_tax = models.BooleanField(
         verbose_name=_("The configured product prices include the tax amount"),

src/pretix/base/models/waitinglist.py

@@ -20,7 +20,6 @@
 # <https://www.gnu.org/licenses/>.
 #
 from datetime import timedelta
-from typing import Any, Dict, Union
 
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import models, transaction
@@ -28,16 +27,14 @@ from django.db.models import F, Q, Sum
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager
-from i18nfield.strings import LazyI18nString
 from phonenumber_field.modelfields import PhoneNumberField
 
 from pretix.base.email import get_email_context
 from pretix.base.i18n import language
-from pretix.base.models import User, Voucher
-from pretix.base.services.mail import SendMailException, mail, render_mail
+from pretix.base.models import Voucher
+from pretix.base.services.mail import mail
 from pretix.base.settings import PERSON_NAME_SCHEMES
 
-from ...helpers.format import format_map
 from .base import LoggedModel
 from .event import Event, SubEvent
 from .items import Item, ItemVariation
@@ -216,74 +213,15 @@ class WaitingListEntry(LoggedModel):
             self.voucher = v
             self.save()
 
-        self.send_mail(
-            self.event.settings.mail_subject_waiting_list,
-            self.event.settings.mail_text_waiting_list,
-            get_email_context(
-                event=self.event,
-                waiting_list_entry=self,
-                waiting_list_voucher=v,
-                event_or_subevent=self.subevent or self.event,
-            ),
-            user=user,
-            auth=auth,
-        )
-
-    def send_mail(self, subject: Union[str, LazyI18nString], template: Union[str, LazyI18nString],
-                  context: Dict[str, Any]=None, log_entry_type: str='pretix.waitinglist.email.sent',
-                  user: User=None, headers: dict=None, sender: str=None, auth=None, auto_email=True,
-                  attach_other_files: list=None, attach_cached_files: list=None):
-        """
-        Sends an email to the entry's contact address.
-
-        * Call ``pretix.base.services.mail.mail`` with useful values for the ``event``, ``locale``, and ``recipient``
-          parameters.
-
-        * Create a ``LogEntry`` with the email contents.
-
-        :param subject: Subject of the email
-        :param template: LazyI18nString or template filename, see ``pretix.base.services.mail.mail`` for more details
-        :param context: Dictionary to use for rendering the template
-        :param log_entry_type: Key to be used for the log entry
-        :param user: Administrative user who triggered this mail to be sent
-        :param headers: Dictionary with additional mail headers
-        :param sender: Custom email sender.
-        """
-        if not self.email:
-            return
-
-        for k, v in self.event.meta_data.items():
-            context['meta_' + k] = v
-
         with language(self.locale, self.event.settings.region):
-            recipient = self.email
-
-            try:
-                email_content = render_mail(template, context)
-                subject = format_map(subject, context)
-                mail(
-                    recipient, subject, template, context,
-                    self.event,
-                    self.locale,
-                    headers=headers,
-                    sender=sender,
-                    auto_email=auto_email,
-                    attach_other_files=attach_other_files,
-                    attach_cached_files=attach_cached_files,
-                )
-            except SendMailException:
-                raise
-            else:
-                self.log_action(
-                    log_entry_type,
-                    user=user,
-                    auth=auth,
-                    data={
-                        'subject': subject,
-                        'message': email_content,
-                        'recipient': recipient,
-                    }
-                )
+            mail(
+                self.email,
+                self.event.settings.mail_subject_waiting_list,
+                self.event.settings.mail_text_waiting_list,
+                get_email_context(event=self.event, waiting_list_entry=self),
+                self.event,
+                locale=self.locale
+            )
 
     @staticmethod
     def clean_itemvar(event, item, variation):

src/pretix/base/payment.py

@@ -63,15 +63,14 @@ from pretix.base.models import (
     OrderRefund, Quota,
 )
 from pretix.base.reldate import RelativeDateField, RelativeDateWrapper
+from pretix.base.services.cart import get_fees
 from pretix.base.settings import SettingsSandbox
 from pretix.base.signals import register_payment_providers
 from pretix.base.templatetags.money import money_filter
 from pretix.base.templatetags.rich_text import rich_text
-from pretix.helpers import OF_SELF
 from pretix.helpers.countries import CachedCountries
-from pretix.helpers.format import format_map
 from pretix.helpers.money import DecimalTextInput
-from pretix.multidomain.urlreverse import build_absolute_uri
+from pretix.multidomain.urlreverse import build_absolute_uri, eventreverse
 from pretix.presale.views import get_cart, get_cart_total
 from pretix.presale.views.cart import cart_session, get_or_create_cart_id
 
@@ -139,50 +138,6 @@ class BasePaymentProvider:
         """
         return self.settings.get('_enabled', as_type=bool)
 
-    @property
-    def multi_use_supported(self) -> bool:
-        """
-        Returns whether or whether not this payment provider supports being used multiple times in the same
-        checkout, or in addition to a different payment provider. This is usually only useful for payment providers
-        that represent gift cards, i.e. payment methods with an upper limit per payment instrument that can usually
-        be combined with other instruments.
-
-        If you set this property to ``True``, the behavior of how pretix interacts with your payment provider changes
-        and you will need to respect the following rules:
-
-        - ``payment_form_render`` must not depend on session state, it must always allow a user to add a new payment.
-           Editing a payment is not possible, but pretix will give users an option to delete it.
-
-        - Returning ``True`` from ``checkout_prepare`` is no longer enough. Instead, you must *also* call
-          ``pretix.base.services.cart.add_payment_to_cart(request, provider, min_value, max_value, info_data)``
-          to add the payment to the session. You are still allowed to do a redirect from ``checkout_prepare`` and then
-          call this function upon return.
-
-        - Unlike in the general case, when ``checkout_prepare`` is called, the ``cart['total']`` parameter will _not yet_
-          include payment fees charged by your provider as we don't yet know the amount of the charge, so you need to
-          take care of that yourself when setting your maximum amount.
-
-        - ``payment_is_valid_session`` will not be called during checkout, don't rely on it. If you called
-          ``add_payment_to_cart``, we'll trust the payment is okay and your next chance to change that will be
-          ``execute_payment``.
-
-        The changed behavior currently only affects the behavior during initial checkout (i.e. ``checkout_prepare``),
-        for ``payment_prepare`` the regular behavior applies and you are expected to just modify the amount of the
-        ``OrderPayment`` object if you need to.
-        """
-        return False
-
-    @property
-    def execute_payment_needs_user(self) -> bool:
-        """
-        Set this to ``True`` if your ``execute_payment`` function needs to be triggered by a user request, i.e. either
-        needs the ``request`` object or might require a browser redirect. If this is ``False``, you will not receive
-        a ``request`` and may not redirect since execute_payment might be called server-side. You should ensure that
-        your ``execute_payment`` method has a limited execution time (i.e. by using ``timeout`` for all external calls)
-        and handles all error cases appropriately.
-        """
-        return True
-
     @property
     def test_mode_message(self) -> str:
         """
@@ -326,6 +281,16 @@ class BasePaymentProvider:
                  help_text=_('Users will not be able to choose this payment provider after the given date.'),
                  required=False,
              )),
+            ('_invoice_text',
+             I18nFormField(
+                 label=_('Text on invoices'),
+                 help_text=_('Will be printed just below the payment figures and above the closing text on invoices. '
+                             'This will only be used if the invoice is generated before the order is paid. If the '
+                             'invoice is generated later, it will show a text stating that it has already been paid.'),
+                 required=False,
+                 widget=I18nTextarea,
+                 widget_kwargs={'attrs': {'rows': '2'}}
+             )),
             ('_total_min',
              forms.DecimalField(
                  label=_('Minimum order total'),
@@ -373,16 +338,6 @@ class BasePaymentProvider:
                              'above!').format(docs_url='https://docs.pretix.eu/en/latest/user/payments/fees.html'),
                  required=False
              )),
-            ('_invoice_text',
-             I18nFormField(
-                 label=_('Text on invoices'),
-                 help_text=_('Will be printed just below the payment figures and above the closing text on invoices. '
-                             'This will only be used if the invoice is generated before the order is paid. If the '
-                             'invoice is generated later, it will show a text stating that it has already been paid.'),
-                 required=False,
-                 widget=I18nTextarea,
-                 widget_kwargs={'attrs': {'rows': '2'}}
-             )),
             ('_restricted_countries',
              forms.MultipleChoiceField(
                  label=_('Restrict to countries'),
@@ -619,7 +574,7 @@ class BasePaymentProvider:
         ctx = {'request': request, 'form': form}
         return template.render(ctx)
 
-    def checkout_confirm_render(self, request, order: Order=None, info_data: dict=None) -> str:
+    def checkout_confirm_render(self, request, order: Order=None) -> str:
         """
         If the user has successfully filled in their payment data, they will be redirected
         to a confirmation page which lists all details of their order for a final review.
@@ -629,9 +584,7 @@ class BasePaymentProvider:
         In most cases, this should include a short summary of the user's input and
         a short explanation on how the payment process will continue.
 
-        :param request: The current HTTP request.
         :param order: Only set when this is a change to a new payment method for an existing order.
-        :param info_data: The ``info_data`` dictionary you set during ``add_payment_to_cart`` (only filled if ``multi_use_supported`` is set)
         """
         raise NotImplementedError()  # NOQA
 
@@ -665,10 +618,6 @@ class BasePaymentProvider:
         .. IMPORTANT:: If this is called, the user has not yet confirmed their order.
            You may NOT do anything which actually moves money.
 
-        Note: The behavior of this method changes significantly when you set
-              ``multi_use_supported``. Please refer to the ``multi_use_supported`` documentation
-              for more information.
-
         :param cart: This dictionary contains at least the following keys:
 
             positions:
@@ -708,9 +657,9 @@ class BasePaymentProvider:
         You will be passed an :py:class:`pretix.base.models.OrderPayment` object that contains
         the amount of money that should be paid.
 
-        If you need any special behavior, you can return a string containing the URL the user will be redirected to.
-        If you are done with your process you should return the user to the order's detail page. Redirection is not
-        allowed if you set ``execute_payment_needs_user`` to ``True``.
+        If you need any special behavior, you can return a string
+        containing the URL the user will be redirected to. If you are done with your process
+        you should return the user to the order's detail page.
 
         If the payment is completed, you should call ``payment.confirm()``. Please note that this might
         raise a ``Quota.QuotaExceededException`` if (and only if) the payment term of this order is over and
@@ -722,7 +671,7 @@ class BasePaymentProvider:
 
         On errors, you should raise a ``PaymentException``.
 
-        :param request: A HTTP request, except if ``execute_payment_needs_user`` is ``False``
+        :param order: The order object
         :param payment: An ``OrderPayment`` instance
         """
         return None
@@ -956,7 +905,6 @@ class FreeOrderProvider(BasePaymentProvider):
     is_implicit = True
     is_enabled = True
     identifier = "free"
-    execute_payment_needs_user = False
 
     def checkout_confirm_render(self, request: HttpRequest) -> str:
         return _("No payment is required as this order only includes products which are free of charge.")
@@ -1043,7 +991,6 @@ class BoxOfficeProvider(BasePaymentProvider):
 class ManualPayment(BasePaymentProvider):
     identifier = 'manual'
     verbose_name = _('Manual payment')
-    execute_payment_needs_user = False
 
     @property
     def test_mode_message(self):
@@ -1124,12 +1071,12 @@ class ManualPayment(BasePaymentProvider):
         }
 
     def order_pending_mail_render(self, order, payment) -> str:
-        msg = format_map(self.settings.get('email_instructions', as_type=LazyI18nString), self.format_map(order, payment))
+        msg = str(self.settings.get('email_instructions', as_type=LazyI18nString)).format_map(self.format_map(order, payment))
         return msg
 
     def payment_pending_render(self, request, payment) -> str:
         return rich_text(
-            format_map(self.settings.get('pending_description', as_type=LazyI18nString), self.format_map(payment.order, payment))
+            str(self.settings.get('pending_description', as_type=LazyI18nString)).format_map(self.format_map(payment.order, payment))
         )
 
 
@@ -1184,42 +1131,18 @@ class OffsettingProvider(BasePaymentProvider):
 
 class GiftCardPayment(BasePaymentProvider):
     identifier = "giftcard"
-    priority = 10
-    multi_use_supported = True
-    execute_payment_needs_user = False
     verbose_name = _("Gift card")
-
-    @property
-    def public_name(self) -> str:
-        return str(self.settings.get("public_name", as_type=LazyI18nString)) or _(
-            "Gift card"
-        )
+    priority = 10
 
     @property
     def settings_form_fields(self):
-        fields = [
-            (
-                "public_name",
-                I18nFormField(
-                    label=_("Payment method name"), widget=I18nTextInput, required=False
-                ),
-            ),
-            (
-                "public_description",
-                I18nFormField(
-                    label=_("Payment method description"), widget=I18nTextarea, required=False
-                ),
-            ),
-        ]
-
-        f = OrderedDict(fields + list(super().settings_form_fields.items()))
+        f = super().settings_form_fields
         del f['_fee_abs']
         del f['_fee_percent']
         del f['_fee_reverse_calc']
         del f['_total_min']
         del f['_total_max']
         del f['_invoice_text']
-        f.move_to_end("_enabled", last=False)
         return f
 
     @property
@@ -1233,14 +1156,10 @@ class GiftCardPayment(BasePaymentProvider):
         return super().order_change_allowed(order) and self.event.organizer.has_gift_cards
 
     def payment_form_render(self, request: HttpRequest, total: Decimal) -> str:
-        return get_template('pretixcontrol/giftcards/checkout.html').render({
-            'request': request,
-        })
+        return get_template('pretixcontrol/giftcards/checkout.html').render({})
 
-    def checkout_confirm_render(self, request, order=None, info_data=None) -> str:
-        return get_template('pretixcontrol/giftcards/checkout_confirm.html').render({
-            'info_data': info_data,
-        })
+    def checkout_confirm_render(self, request) -> str:
+        return get_template('pretixcontrol/giftcards/checkout_confirm.html').render({})
 
     def refund_control_render(self, request, refund) -> str:
         from .models import GiftCard
@@ -1294,8 +1213,6 @@ class GiftCardPayment(BasePaymentProvider):
         return True
 
     def checkout_prepare(self, request: HttpRequest, cart: Dict[str, Any]) -> Union[bool, str, None]:
-        from pretix.base.services.cart import add_payment_to_cart
-
         for p in get_cart(request):
             if p.item.issue_giftcard:
                 messages.error(request, _("You cannot pay with gift cards when buying a gift card."))
@@ -1304,7 +1221,7 @@ class GiftCardPayment(BasePaymentProvider):
         cs = cart_session(request)
         try:
             gc = self.event.organizer.accepted_gift_cards.get(
-                secret=request.POST.get("giftcard").strip()
+                secret=request.POST.get("giftcard")
             )
             if gc.currency != self.event.currency:
                 messages.error(request, _("This gift card does not support this currency."))
@@ -1321,22 +1238,34 @@ class GiftCardPayment(BasePaymentProvider):
             if gc.value <= Decimal("0.00"):
                 messages.error(request, _("All credit on this gift card has been used."))
                 return
+            if 'gift_cards' not in cs:
+                cs['gift_cards'] = []
+            elif gc.pk in cs['gift_cards']:
+                messages.error(request, _("This gift card is already used for your payment."))
+                return
+            cs['gift_cards'] = cs['gift_cards'] + [gc.pk]
 
-            for p in cs.get('payments', []):
-                if p['provider'] == self.identifier and p['info_data']['gift_card'] == gc.pk:
-                    messages.error(request, _("This gift card is already used for your payment."))
-                    return
-
-            add_payment_to_cart(
-                request,
-                self,
-                max_value=gc.value,
-                info_data={
-                    'gift_card': gc.pk,
-                    'gift_card_secret': gc.secret,
-                }
+            total = sum(p.total for p in cart['positions'])
+            # Recompute fees. Some plugins, e.g. pretix-servicefees, change their fee schedule if a gift card is
+            # applied.
+            fees = get_fees(
+                self.event, request, total, cart['invoice_address'], cs.get('payment'),
+                cart['raw']
             )
-            return True
+            total += sum([f.value for f in fees])
+            remainder = total
+            if remainder > Decimal('0.00'):
+                del cs['payment']
+                messages.success(request, _("Your gift card has been applied, but {} still need to be paid. Please select a payment method.").format(
+                    money_filter(remainder, self.event.currency)
+                ))
+            else:
+                messages.success(request, _("Your gift card has been applied."))
+
+            kwargs = {'step': 'payment'}
+            if request.resolver_match and 'cart_namespace' in request.resolver_match.kwargs:
+                kwargs['cart_namespace'] = request.resolver_match.kwargs['cart_namespace']
+            return eventreverse(self.event, 'presale:event.checkout', kwargs=kwargs)
         except GiftCard.DoesNotExist:
             if self.event.vouchers.filter(code__iexact=request.POST.get("giftcard")).exists():
                 messages.warning(request, _("You entered a voucher instead of a gift card. Vouchers can only be entered on the first page of the shop below "
@@ -1354,7 +1283,7 @@ class GiftCardPayment(BasePaymentProvider):
 
         try:
             gc = self.event.organizer.accepted_gift_cards.get(
-                secret=request.POST.get("giftcard").strip()
+                secret=request.POST.get("giftcard")
             )
             if gc.currency != self.event.currency:
                 messages.error(request, _("This gift card does not support this currency."))
@@ -1373,7 +1302,6 @@ class GiftCardPayment(BasePaymentProvider):
                 return
             payment.info_data = {
                 'gift_card': gc.pk,
-                'gift_card_secret': gc.secret,
                 'retry': True
             }
             payment.amount = min(payment.amount, gc.value)
@@ -1381,7 +1309,7 @@ class GiftCardPayment(BasePaymentProvider):
 
             return True
         except GiftCard.DoesNotExist:
-            if self.event.vouchers.filter(code__iexact=request.POST.get("giftcard").strip()).exists():
+            if self.event.vouchers.filter(code__iexact=request.POST.get("giftcard")).exists():
                 messages.warning(request, _("You entered a voucher instead of a gift card. Vouchers can only be entered on the first page of the shop below "
                                             "the product selection."))
             else:
@@ -1389,46 +1317,37 @@ class GiftCardPayment(BasePaymentProvider):
         except GiftCard.MultipleObjectsReturned:
             messages.error(request, _("This gift card can not be redeemed since its code is not unique. Please contact the organizer of this event."))
 
-    def execute_payment(self, request: HttpRequest, payment: OrderPayment, is_early_special_case=False) -> str:
-        for p in payment.order.positions.all():
+    def execute_payment(self, request: HttpRequest, payment: OrderPayment) -> str:
+        # This method will only be called when retrying payments, e.g. after a payment_prepare call. It is not called
+        # during the order creation phase because this payment provider is a special case.
+        for p in payment.order.positions.all():  # noqa - just a safeguard
             if p.item.issue_giftcard:
                 raise PaymentException(_("You cannot pay with gift cards when buying a gift card."))
 
         gcpk = payment.info_data.get('gift_card')
-        if not gcpk:
+        if not gcpk or not payment.info_data.get('retry'):
             raise PaymentException("Invalid state, should never occur.")
-        try:
-            with transaction.atomic():
-                try:
-                    gc = GiftCard.objects.select_for_update(of=OF_SELF).get(pk=gcpk)
-                except GiftCard.DoesNotExist:
-                    raise PaymentException(_("This gift card does not support this currency."))
-                if gc.currency != self.event.currency:  # noqa - just a safeguard
-                    raise PaymentException(_("This gift card does not support this currency."))
-                if not gc.accepted_by(self.event.organizer):
-                    raise PaymentException(_("This gift card is not accepted by this event organizer."))
-                if payment.amount > gc.value:
-                    raise PaymentException(_("This gift card was used in the meantime. Please try again."))
-                if gc.testmode and not payment.order.testmode:
-                    raise PaymentException(_("This gift card can only be used in test mode."))
-                if not gc.testmode and payment.order.testmode:
-                    raise PaymentException(_("Only test gift cards can be used in test mode."))
-                if gc.expires and gc.expires < now():
-                    raise PaymentException(_("This gift card is no longer valid."))
-
-                trans = gc.transactions.create(
-                    value=-1 * payment.amount,
-                    order=payment.order,
-                    payment=payment
-                )
-                payment.info_data = {
-                    'gift_card': gc.pk,
-                    'transaction_id': trans.pk,
-                }
-                payment.confirm(send_mail=not is_early_special_case, generate_invoice=not is_early_special_case)
-        except PaymentException as e:
-            payment.fail(info={'error': str(e)})
-            raise e
+        with transaction.atomic():
+            gc = GiftCard.objects.select_for_update().get(pk=gcpk)
+            if gc.currency != self.event.currency:  # noqa - just a safeguard
+                raise PaymentException(_("This gift card does not support this currency."))
+            if not gc.accepted_by(self.event.organizer):  # noqa - just a safeguard
+                raise PaymentException(_("This gift card is not accepted by this event organizer."))
+            if payment.amount > gc.value:  # noqa - just a safeguard
+                raise PaymentException(_("This gift card was used in the meantime. Please try again."))
+            if gc.expires and gc.expires < now():  # noqa - just a safeguard
+                messages.error(request, _("This gift card is no longer valid."))
+                return
+            trans = gc.transactions.create(
+                value=-1 * payment.amount,
+                order=payment.order,
+                payment=payment
+            )
+            payment.info_data = {
+                'gift_card': gc.pk,
+                'transaction_id': trans.pk,
+            }
+            payment.confirm()
 
     def payment_is_valid_session(self, request: HttpRequest) -> bool:
         return True

src/pretix/base/pdf.py

@@ -35,7 +35,6 @@
 import copy
 import hashlib
 import itertools
-import json
 import logging
 import os
 import re
@@ -47,15 +46,12 @@ from collections import OrderedDict
 from functools import partial
 from io import BytesIO
 
-import jsonschema
 from arabic_reshaper import ArabicReshaper
 from bidi.algorithm import get_display
 from django.conf import settings
 from django.contrib.staticfiles import finders
-from django.core.exceptions import ValidationError
 from django.db.models import Max, Min
 from django.dispatch import receiver
-from django.utils.deconstruct import deconstructible
 from django.utils.formats import date_format
 from django.utils.functional import SimpleLazyObject
 from django.utils.html import conditional_escape
@@ -744,14 +740,12 @@ class Renderer:
 
         if o['content'] == 'other' or o['content'] == 'other_i18n':
             if o['content'] == 'other_i18n':
-                text = str(LazyI18nString(o.get('text_i18n', {})))
+                text = str(LazyI18nString(o['text_i18n']))
             else:
-                text = o.get('text', '')
+                text = o['text']
 
             def replace(x):
                 if x.group(1).startswith('itemmeta:'):
-                    if op.variation_id:
-                        return op.variation.meta_data.get(x.group(1)[9:]) or ''
                     return op.item.meta_data.get(x.group(1)[9:]) or ''
                 elif x.group(1).startswith('meta:'):
                     return ev.meta_data.get(x.group(1)[5:]) or ''
@@ -772,8 +766,6 @@ class Renderer:
             return re.sub(r'\{([a-zA-Z0-9:_]+)\}', replace, text)
 
         elif o['content'].startswith('itemmeta:'):
-            if op.variation_id:
-                return op.variation.meta_data.get(o['content'][9:]) or ''
             return op.item.meta_data.get(o['content'][9:]) or ''
 
         elif o['content'].startswith('meta:'):
@@ -979,22 +971,3 @@ class Renderer:
             output.write(outbuffer)
             outbuffer.seek(0)
             return outbuffer
-
-
-@deconstructible
-class PdfLayoutValidator:
-    def __call__(self, value):
-        if not isinstance(value, dict):
-            try:
-                val = json.loads(value)
-            except ValueError:
-                raise ValidationError(_('Your layout file is not a valid JSON file.'))
-        else:
-            val = value
-        with open(finders.find('schema/pdf-layout.schema.json'), 'r') as f:
-            schema = json.loads(f.read())
-        try:
-            jsonschema.validate(val, schema)
-        except jsonschema.ValidationError as e:
-            e = str(e).replace('%', '%%')
-            raise ValidationError(_('Your layout file is not a valid layout. Error message: {}').format(e))

src/pretix/base/plugins.py

@@ -65,14 +65,7 @@ def get_all_plugins(event=None) -> List[type]:
     )
 
 
-class PluginConfigMeta(type):
-    def __getattribute__(cls, item):
-        if item == "default" and cls is PluginConfig:
-            return False
-        return super().__getattribute__(item)
-
-
-class PluginConfig(AppConfig, metaclass=PluginConfigMeta):
+class PluginConfig(AppConfig):
     IGNORE = False
 
     def __init__(self, *args, **kwargs):

src/pretix/base/reldate.py

@@ -59,10 +59,10 @@ class RelativeDateWrapper:
     def date(self, event) -> datetime.date:
         from .models import SubEvent
 
-        if isinstance(self.data, datetime.datetime):
-            return self.data.date()
-        elif isinstance(self.data, datetime.date):
+        if isinstance(self.data, datetime.date):
             return self.data
+        elif isinstance(self.data, datetime.datetime):
+            return self.data.date()
         else:
             if self.data.minutes_before is not None:
                 raise ValueError('A minute-based relative datetime can not be used as a date')

src/pretix/base/services/cancelevent.py

@@ -35,14 +35,12 @@ from pretix.base.models import (
     SubEvent, User, WaitingListEntry,
 )
 from pretix.base.services.locking import LockTimeoutException
-from pretix.base.services.mail import SendMailException, mail
+from pretix.base.services.mail import SendMailException, TolerantDict, mail
 from pretix.base.services.orders import (
     OrderChangeManager, OrderError, _cancel_order, _try_auto_refund,
 )
 from pretix.base.services.tasks import ProfiledEventTask
 from pretix.celery_app import app
-from pretix.helpers import OF_SELF
-from pretix.helpers.format import format_map
 
 logger = logging.getLogger(__name__)
 
@@ -53,7 +51,7 @@ def _send_wle_mail(wle: WaitingListEntry, subject: LazyI18nString, message: Lazy
         try:
             mail(
                 wle.email,
-                format_map(subject, email_context),
+                str(subject).format_map(TolerantDict(email_context)),
                 message,
                 email_context,
                 wle.event,
@@ -73,7 +71,7 @@ def _send_mail(order: Order, subject: LazyI18nString, message: LazyI18nString, s
 
         email_context = get_email_context(event_or_subevent=subevent or order.event, refund_amount=refund_amount,
                                           order=order, position_or_address=ia, event=order.event)
-        real_subject = format_map(subject, email_context)
+        real_subject = str(subject).format_map(TolerantDict(email_context))
         try:
             order.send_mail(
                 real_subject, message, email_context,
@@ -88,7 +86,7 @@ def _send_mail(order: Order, subject: LazyI18nString, message: LazyI18nString, s
                 continue
 
             if p.addon_to_id is None and p.attendee_email and p.attendee_email != order.email:
-                real_subject = format_map(subject, email_context)
+                real_subject = str(subject).format_map(TolerantDict(email_context))
                 email_context = get_email_context(event_or_subevent=p.subevent or order.event,
                                                   event=order.event,
                                                   refund_amount=refund_amount,
@@ -240,7 +238,7 @@ def cancel_event(self, event: Event, subevent: int, auto_refund: bool,
 
     for o in orders_to_change.values_list('id', flat=True).iterator():
         with transaction.atomic():
-            o = event.orders.select_for_update(of=OF_SELF).get(pk=o)
+            o = event.orders.select_for_update().get(pk=o)
             total = Decimal('0.00')
             fee = Decimal('0.00')
             positions = []

src/pretix/base/services/cart.py

@@ -31,7 +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 uuid
+
 from collections import Counter, defaultdict, namedtuple
 from datetime import datetime, time, timedelta
 from decimal import Decimal
@@ -140,7 +140,7 @@ error_messages = {
     'addon_min_count': _('You need to select at least %(min)s add-ons from the category %(cat)s for the '
                          'product %(base)s.'),
     'addon_no_multi': _('You can select every add-ons from the category %(cat)s for the product %(base)s at most once.'),
-    'addon_only': _('One of the products you selected can only be bought as an add-on to another product.'),
+    'addon_only': _('One of the products you selected can only be bought as an add-on to another project.'),
     'bundled_only': _('One of the products you selected can only be bought part of a bundle.'),
     'seat_required': _('You need to select a specific seat.'),
     'seat_invalid': _('Please select a valid seat.'),
@@ -1265,71 +1265,44 @@ class CartManager:
                 raise CartError(err)
 
 
-def add_payment_to_cart(request, provider, min_value: Decimal=None, max_value: Decimal=None, info_data: dict=None):
-    """
-    :param request: The current HTTP request context.
-    :param provider: The instance of your payment provider.
-    :param min_value: The minimum value this payment instrument supports, or ``None`` for unlimited.
-    :param max_value: The maximum value this payment instrument supports, or ``None`` for unlimited. Highly discouraged
-                      to use for payment providers which charge a payment fee, as this can be very user-unfriendly if
-                      users need a second payment method just for the payment fee of the first method.
-    :param info_data: A dictionary of information that will be passed through to the ``OrderPayment.info_data`` attribute.
-    :return:
-    """
+def get_fees(event, request, total, invoice_address, provider, positions):
     from pretix.presale.views.cart import cart_session
 
-    cs = cart_session(request)
-    cs.setdefault('payments', [])
-
-    cs['payments'].append({
-        'id': str(uuid.uuid4()),
-        'provider': provider.identifier,
-        'multi_use_supported': provider.multi_use_supported,
-        'min_value': str(min_value) if min_value is not None else None,
-        'max_value': str(max_value) if max_value is not None else None,
-        'info_data': info_data or {},
-    })
-
-
-def get_fees(event, request, total, invoice_address, payments, positions):
-    if payments and not isinstance(payments, list):
-        raise TypeError("payments must now be a list")
-
     fees = []
     for recv, resp in fee_calculation_for_cart.send(sender=event, request=request, invoice_address=invoice_address,
-                                                    total=total, positions=positions, payment_requests=payments):
+                                                    total=total, positions=positions):
         if resp:
             fees += resp
 
     total = total + sum(f.value for f in fees)
 
-    if total != 0 and payments:
-        total_remaining = total
-        for p in payments:
-            # This algorithm of treating min/max values and fees needs to stay in sync between the following
-            # places in the code base:
-            # - pretix.base.services.cart.get_fees
-            # - pretix.base.services.orders._get_fees
-            # - pretix.presale.views.CartMixin.current_selected_payments
-            if p.get('min_value') and total_remaining < Decimal(p['min_value']):
+    cs = cart_session(request)
+    if cs.get('gift_cards'):
+        gcs = cs['gift_cards']
+        gc_qs = event.organizer.accepted_gift_cards.filter(pk__in=cs.get('gift_cards'), currency=event.currency)
+        for gc in gc_qs:
+            if gc.testmode != event.testmode:
+                gcs.remove(gc.pk)
                 continue
+            fval = Decimal(gc.value)  # TODO: don't require an extra query
+            fval = min(fval, total)
+            if fval > 0:
+                total -= fval
+                fees.append(OrderFee(
+                    fee_type=OrderFee.FEE_TYPE_GIFTCARD,
+                    internal_type='giftcard',
+                    description=gc.secret,
+                    value=-1 * fval,
+                    tax_rate=Decimal('0.00'),
+                    tax_value=Decimal('0.00'),
+                    tax_rule=TaxRule.zero()
+                ))
+        cs['gift_cards'] = gcs
 
-            to_pay = total_remaining
-            if p.get('max_value') and to_pay > Decimal(p['max_value']):
-                to_pay = min(to_pay, Decimal(p['max_value']))
-
-            pprov = event.get_payment_providers(cached=True).get(p['provider'])
-            if not pprov:
-                continue
-
-            payment_fee = pprov.calculate_fee(to_pay)
-            total_remaining += payment_fee
-            to_pay += payment_fee
-
-            if p.get('max_value') and to_pay > Decimal(p['max_value']):
-                to_pay = min(to_pay, Decimal(p['max_value']))
-
-            total_remaining -= to_pay
+    if provider and total != 0:
+        provider = event.get_payment_providers().get(provider)
+        if provider:
+            payment_fee = provider.calculate_fee(total)
 
             if payment_fee:
                 payment_fee_tax_rule = event.settings.tax_rate_default or TaxRule.zero()

src/pretix/base/services/checkin.py

@@ -56,7 +56,6 @@ from pretix.base.models import (
     Checkin, CheckinList, Device, Order, OrderPosition, QuestionOption,
 )
 from pretix.base.signals import checkin_created, order_placed, periodic_task
-from pretix.helpers import OF_SELF
 from pretix.helpers.jsonlogic import Logic
 from pretix.helpers.jsonlogic_boolalg import convert_to_dnf
 from pretix.helpers.jsonlogic_query import (
@@ -290,11 +289,6 @@ def _logic_explain(rules, ev, rule_data):
         p for i, p in enumerate(paths) if path_weights[i] == min_weight
     ]
 
-    # Step 7: All things equal, prefer shorter explanations
-    paths_with_min_weight.sort(
-        key=lambda p: len([v for v in p if not _var_values[v]])
-    )
-
     # Finally, return the text for one of them
     return ', '.join(var_texts[v] for v in paths_with_min_weight[0] if not _var_values[v])
 
@@ -735,11 +729,8 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
         _save_answers(op, answers, given_answers)
 
     with transaction.atomic():
-        # Lock order positions, if it is an entry. We don't need it for exits, as a race condition wouldn't be problematic
-        opqs = OrderPosition.all
-        if type != Checkin.TYPE_EXIT:
-            opqs = opqs.select_for_update(of=OF_SELF)
-        op = opqs.get(pk=op.pk)
+        # Lock order positions
+        op = OrderPosition.all.select_for_update().get(pk=op.pk)
 
         if not clist.all_products and op.item_id not in [i.pk for i in clist.limit_products.all()]:
             raise CheckInError(
@@ -851,7 +842,10 @@ def process_exit_all(sender, **kwargs):
         exit_all_at__isnull=False
     ).select_related('event', 'event__organizer')
     for cl in qs:
-        positions = cl.positions_inside_query(ignore_status=True, at_time=cl.exit_all_at)
+        positions = cl.positions_inside.filter(
+            Q(last_exit__isnull=True) | Q(last_exit__lte=cl.exit_all_at),
+            last_entry__lte=cl.exit_all_at,
+        )
         for p in positions:
             with scope(organizer=cl.event.organizer):
                 ci = Checkin.objects.create(

src/pretix/base/services/export.py

@@ -19,50 +19,31 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-import logging
-from datetime import timedelta
-from typing import Any, Dict, Union
+from typing import Any, Dict
 
-from celery.exceptions import MaxRetriesExceededError
 from django.conf import settings
 from django.core.files.base import ContentFile
-from django.db import connection, transaction
-from django.dispatch import receiver
-from django.utils.timezone import now, override
+from django.utils.timezone import override
 from django.utils.translation import gettext
-from django_scopes import scopes_disabled
-from i18nfield.strings import LazyI18nString
 
-from pretix.base.email import get_email_context
 from pretix.base.exporter import OrganizerLevelExportMixin
 from pretix.base.i18n import LazyLocaleException, language
 from pretix.base.models import (
-    CachedFile, Device, Event, Organizer, ScheduledEventExport, TeamAPIToken,
-    User, cachedfile_name,
+    CachedFile, Device, Event, Organizer, TeamAPIToken, User, cachedfile_name,
 )
-from pretix.base.models.exports import ScheduledOrganizerExport
-from pretix.base.services.mail import mail
 from pretix.base.services.tasks import (
-    EventTask, OrganizerTask, ProfiledEventTask, ProfiledOrganizerUserTask,
+    ProfiledEventTask, ProfiledOrganizerUserTask,
 )
 from pretix.base.signals import (
-    periodic_task, register_data_exporters, register_multievent_data_exporters,
+    register_data_exporters, register_multievent_data_exporters,
 )
 from pretix.celery_app import app
-from pretix.helpers import OF_SELF
-from pretix.helpers.urls import build_absolute_uri
-
-logger = logging.getLogger(__name__)
 
 
 class ExportError(LazyLocaleException):
     pass
 
 
-class ExportEmptyError(ExportError):
-    pass
-
-
 @app.task(base=ProfiledEventTask, throws=(ExportError,), bind=True)
 def export(self, event: Event, fileid: str, provider: str, form_data: Dict[str, Any]) -> None:
     def set_progress(val):
@@ -75,7 +56,7 @@ def export(self, event: Event, fileid: str, provider: str, form_data: Dict[str,
     file = CachedFile.objects.get(id=fileid)
     with language(event.settings.locale, event.settings.region), override(event.settings.timezone):
         responses = register_data_exporters.send(event)
-        for recv, response in responses:
+        for receiver, response in responses:
             if not response:
                 continue
             ex = response(event, event.organizer, set_progress)
@@ -125,16 +106,16 @@ def multiexport(self, organizer: Organizer, user: User, device: int, token: int,
             timezone = organizer.settings.timezone or settings.TIME_ZONE
             region = organizer.settings.region
     with language(locale, region), override(timezone):
-        if form_data.get('events') is not None and not form_data.get('all_events'):
+        if form_data.get('events') is not None:
             if isinstance(form_data['events'][0], str):
                 events = allowed_events.filter(slug__in=form_data.get('events'), organizer=organizer)
             else:
-                events = allowed_events.filter(pk__in=form_data.get('events'), organizer=organizer)
+                events = allowed_events.filter(pk__in=form_data.get('events'))
         else:
-            events = allowed_events.filter(organizer=organizer)
+            events = allowed_events
         responses = register_multievent_data_exporters.send(organizer)
 
-        for recv, response in responses:
+        for receiver, response in responses:
             if not response:
                 continue
             ex = response(events, organizer, set_progress)
@@ -157,210 +138,3 @@ def multiexport(self, organizer: Organizer, user: User, device: int, token: int,
                 f = ContentFile(data)
                 file.file.save(cachedfile_name(file, file.filename), f)
     return file.pk
-
-
-def _run_scheduled_export(schedule, context: Union[Event, Organizer], exporter, config_url, retry_func, has_permission):
-    with language(schedule.locale, context.settings.region), override(schedule.tz):
-        file = CachedFile(web_download=False)
-        file.date = now()
-        file.expires = now() + timedelta(hours=24)
-        file.save()
-
-        def _handle_error(msg, soft=False):
-            context.log_action(
-                'pretix.event.export.schedule.failed',
-                data={
-                    'id': schedule.id,
-                    'export_identifier': schedule.export_identifier,
-                    'export_form_data': schedule.export_form_data,
-                    'reason': msg,
-                    'soft': soft,
-                }
-            )
-            if schedule.owner.is_active:
-                mail(
-                    email=schedule.owner.email,
-                    subject=gettext('Export failed'),
-                    template='pretixbase/email/export_failed.txt',
-                    context={
-                        'configuration_url': config_url,
-                        'reason': msg,
-                        'soft': soft,
-                    },
-                    event=context if isinstance(context, Event) else None,
-                    organizer=context.organizer if isinstance(context, Event) else context,
-                    locale=schedule.locale,
-                )
-            if not soft:
-                schedule.error_counter += 1
-                schedule.error_last_message = msg
-                schedule.save(update_fields=['error_counter', 'error_last_message'])
-
-        if not has_permission:
-            _handle_error(gettext('Permission denied.'))
-            return
-
-        try:
-            if not exporter:
-                raise ExportError("Export type not found.")
-            d = exporter.render(schedule.export_form_data)
-            if d is None:
-                raise ExportEmptyError(
-                    gettext('Your export did not contain any data.')
-                )
-            file.filename, file.type, data = d
-            filesize = len(data)
-            if filesize > 20 * 1024 * 1024:  # 20 MB
-                raise ExportError(
-                    gettext('Your exported data exceeded the size limit for scheduled exports.')
-                )
-            f = ContentFile(data)
-            file.file.save(cachedfile_name(file, file.filename), f)
-        except ExportEmptyError as e:
-            _handle_error(str(e), soft=True)
-        except ExportError as e:
-            _handle_error(str(e), soft=False)
-        except Exception:
-            logger.exception("Scheduled export failed.")
-            try:
-                retry_func()
-            except MaxRetriesExceededError:
-                _handle_error('Internal Error')
-        else:
-            schedule.error_counter = 0
-            schedule.save(update_fields=['error_counter'])
-            to = [r for r in schedule.mail_additional_recipients.split(",") if r]
-            cc = [r for r in schedule.mail_additional_recipients_cc.split(",") if r]
-            bcc = [r for r in schedule.mail_additional_recipients_bcc.split(",") if r]
-            if to:
-                # If there is an explicit To, the owner is Cc. Otherwise, the owner is To. Yes, this is
-                # purely cosmetical and has policital reasons.
-                cc.append(schedule.owner.email)
-            else:
-                to.append(schedule.owner.email)
-
-            mail(
-                email=to,
-                cc=cc,
-                bcc=bcc,
-                subject=schedule.mail_subject,
-                template=LazyI18nString(schedule.mail_template),
-                context=get_email_context(event=context) if isinstance(context, Event) else {},
-                event=context if isinstance(context, Event) else None,
-                organizer=context.organizer if isinstance(context, Event) else context,
-                locale=schedule.locale,
-                attach_cached_files=[file],
-            )
-            context.log_action(
-                'pretix.event.export.schedule.executed',
-                data={
-                    'id': schedule.id,
-                    'export_identifier': schedule.export_identifier,
-                    'export_form_data': schedule.export_form_data,
-                    'result_file_size': filesize,
-                    'result_file_name': file.file.name,
-                }
-            )
-
-
-@app.task(base=OrganizerTask, bind=True, max_retries=5, default_retry_delay=120)
-def scheduled_organizer_export(self, organizer: Organizer, schedule: int) -> None:
-    schedule = organizer.scheduled_exports.get(pk=schedule)
-
-    allowed_events = schedule.owner.get_events_with_permission('can_view_orders')
-    if schedule.export_form_data.get('events') is not None and not schedule.export_form_data.get('all_events'):
-        if isinstance(schedule.export_form_data['events'][0], str):
-            events = allowed_events.filter(slug__in=schedule.export_form_data.get('events'), organizer=organizer)
-        else:
-            events = allowed_events.filter(pk__in=schedule.export_form_data.get('events'), organizer=organizer)
-    else:
-        events = allowed_events.filter(organizer=organizer)
-
-    responses = register_multievent_data_exporters.send(organizer)
-    exporter = None
-    for recv, response in responses:
-        if not response:
-            continue
-        ex = response(events, organizer)
-        if ex.identifier == schedule.export_identifier:
-            exporter = ex
-            break
-
-    has_permission = schedule.owner.is_active
-    if isinstance(exporter, OrganizerLevelExportMixin):
-        if not schedule.owner.has_organizer_permission(organizer, exporter.organizer_required_permission):
-            has_permission = False
-
-    _run_scheduled_export(
-        schedule,
-        organizer,
-        exporter,
-        build_absolute_uri(
-            'control:organizer.export',
-            kwargs={
-                'organizer': organizer.slug,
-            }
-        ) + f'?identifier={schedule.export_identifier}&scheduled={schedule.pk}',
-        self.retry,
-        has_permission,
-    )
-
-
-@app.task(base=EventTask, bind=True, max_retries=5, default_retry_delay=120)
-def scheduled_event_export(self, event: Event, schedule: int) -> None:
-    schedule = event.scheduled_exports.get(pk=schedule)
-
-    responses = register_data_exporters.send(event)
-    exporter = None
-    for recv, response in responses:
-        if not response:
-            continue
-        ex = response(event, event.organizer)
-        if ex.identifier == schedule.export_identifier:
-            exporter = ex
-            break
-
-    has_permission = schedule.owner.is_active and schedule.owner.has_event_permission(event.organizer, event, 'can_view_orders')
-
-    _run_scheduled_export(
-        schedule,
-        event,
-        exporter,
-        build_absolute_uri(
-            'control:event.orders.export',
-            kwargs={
-                'event': event.slug,
-                'organizer': event.organizer.slug,
-            }
-        ) + f'?identifier={schedule.export_identifier}&scheduled={schedule.pk}',
-        self.retry,
-        has_permission,
-    )
-
-
-@receiver(signal=periodic_task)
-@scopes_disabled()
-@transaction.atomic
-def run_scheduled_exports(sender, **kwargs):
-    qs = ScheduledEventExport.objects.filter(
-        schedule_next_run__lt=now(),
-        error_counter__lt=5,
-    ).select_for_update(skip_locked=connection.features.has_select_for_update_skip_locked, of=OF_SELF).select_related('event')
-    for s in qs:
-        scheduled_event_export.apply_async(kwargs={
-            'event': s.event_id,
-            'schedule': s.pk,
-        })
-        s.compute_next_run()
-        s.save(update_fields=['schedule_next_run'])
-    qs = ScheduledOrganizerExport.objects.filter(
-        schedule_next_run__lt=now(),
-        error_counter__lt=5,
-    ).select_for_update(skip_locked=connection.features.has_select_for_update_skip_locked, of=OF_SELF).select_related('organizer')
-    for s in qs:
-        scheduled_organizer_export.apply_async(kwargs={
-            'organizer': s.organizer_id,
-            'schedule': s.pk,
-        })
-        s.compute_next_run()
-        s.save(update_fields=['schedule_next_run'])

src/pretix/base/services/invoices.py

@@ -63,7 +63,7 @@ from pretix.base.services.tasks import TransactionAwareTask
 from pretix.base.settings import GlobalSettingsObject
 from pretix.base.signals import invoice_line_text, periodic_task
 from pretix.celery_app import app
-from pretix.helpers.database import OF_SELF, rolledback_transaction
+from pretix.helpers.database import rolledback_transaction
 from pretix.helpers.models import modelcopy
 
 logger = logging.getLogger(__name__)
@@ -452,7 +452,7 @@ def build_preview_invoice_pdf(event):
 
         if event.tax_rules.exists():
             for i, tr in enumerate(event.tax_rules.all()):
-                for j in range(5):
+                for j in range(150):
                     tax = tr.tax(Decimal('100.00'), base_price_is='gross')
                     InvoiceLine.objects.create(
                         invoice=invoice, description=_("Sample product {}").format(i + 1),
@@ -460,7 +460,7 @@ def build_preview_invoice_pdf(event):
                         tax_rate=tax.rate
                     )
         else:
-            for i in range(5):
+            for i in range(150):
                 InvoiceLine.objects.create(
                     invoice=invoice, description=_("Sample product A"),
                     gross_value=100, tax_value=0, tax_rate=0
@@ -500,7 +500,7 @@ def send_invoices_to_organizer(sender, **kwargs):
         with transaction.atomic():
             qs = Invoice.objects.filter(
                 sent_to_organizer__isnull=True
-            ).prefetch_related('event').select_for_update(of=OF_SELF, skip_locked=connection.features.has_select_for_update_skip_locked)
+            ).prefetch_related('event').select_for_update(skip_locked=connection.features.has_select_for_update_skip_locked)
             for i in qs[:batch_size]:
                 if i.event.settings.invoice_email_organizer:
                     with language(i.event.settings.locale):

src/pretix/base/services/mail.py

@@ -76,7 +76,6 @@ from pretix.base.services.tasks import TransactionAwareTask
 from pretix.base.services.tickets import get_tickets_for_order
 from pretix.base.signals import email_filter, global_email_filter
 from pretix.celery_app import app
-from pretix.helpers.format import format_map
 from pretix.helpers.hierarkey import clean_filename
 from pretix.multidomain.urlreverse import build_absolute_uri
 from pretix.presale.ical import get_private_icals
@@ -99,8 +98,7 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
          context: Dict[str, Any] = None, event: Event = None, locale: str = None, order: Order = None,
          position: OrderPosition = None, *, headers: dict = None, sender: str = None, organizer: Organizer = None,
          customer: Customer = None, invoices: Sequence = None, attach_tickets=False, auto_email=True, user=None,
-         attach_ical=False, attach_cached_files: Sequence = None, attach_other_files: list=None,
-         plain_text_only=False, no_order_links=False, cc: Sequence[str]=None, bcc: Sequence[str]=None):
+         attach_ical=False, attach_cached_files: Sequence = None, attach_other_files: list=None):
     """
     Sends out an email to a user. The mail will be sent synchronously or asynchronously depending on the installation.
 
@@ -111,7 +109,7 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
 
     :param template: The filename of a template to be used. It will be rendered with the locale given in the locale
         argument and the context given in the next argument. Alternatively, you can pass a LazyI18nString and
-        ``context`` will be used as the argument to a ``pretix.helpers.format.format_map(template, context)`` call on the template.
+        ``context`` will be used as the argument to a  Python ``.format_map()`` call on the template.
 
     :param context: The context for rendering the template (see ``template`` parameter)
 
@@ -150,21 +148,12 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
 
     :param attach_other_files: A list of file paths on our storage to attach.
 
-    :param plain_text_only: If set to ``True``, rendering a HTML version will be skipped.
-
-    :param no_order_links: If set to ``True``, no link to the order confirmation page will be auto-appended. Currently
-                           only allowed to use together with ``plain_text_only`` since HTML renderers add their own
-                           links.
-
     :raises MailOrderException: on obvious, immediate failures. Not raising an exception does not necessarily mean
         that the email has been sent, just that it has been queued by the email backend.
     """
     if email == INVALID_ADDRESS:
         return
 
-    if no_order_links and not plain_text_only:
-        raise ValueError('If you set no_order_links, you also need to set plain_text_only.')
-
     headers = headers or {}
     if auto_email:
         headers['X-Auto-Response-Suppress'] = 'OOF, NRN, AutoReply, RN'
@@ -211,7 +200,7 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
         subject = raw_subject = str(subject).replace('\n', ' ').replace('\r', '')[:900]
         signature = ""
 
-        bcc = list(bcc or [])
+        bcc = []
 
         settings_holder = event or organizer
 
@@ -253,7 +242,7 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
             if order and order.testmode:
                 subject = "[TESTMODE] " + subject
 
-            if order and position and not no_order_links:
+            if order and position:
                 body_plain += _(
                     "You are receiving this email because someone placed an order for {event} for you."
                 ).format(event=event.name)
@@ -269,7 +258,7 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
                         }
                     )
                 )
-            elif order and not no_order_links:
+            elif order:
                 body_plain += _(
                     "You are receiving this email because you placed an order for {event}."
                 ).format(event=event.name)
@@ -289,9 +278,7 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
 
         with override(timezone):
             try:
-                if plain_text_only:
-                    body_html = None
-                elif 'position' in inspect.signature(renderer.render).parameters:
+                if 'position' in inspect.signature(renderer.render).parameters:
                     body_html = renderer.render(content_plain, signature, raw_subject, order, position)
                 else:
                     # Backwards compatibility
@@ -305,7 +292,6 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
 
         send_task = mail_send_task.si(
             to=[email] if isinstance(email, str) else list(email),
-            cc=cc,
             bcc=bcc,
             subject=subject,
             body=body_plain,
@@ -358,11 +344,11 @@ class CustomEmail(EmailMultiAlternatives):
 
 @app.task(base=TransactionAwareTask, bind=True, acks_late=True)
 def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: str, sender: str,
-                   event: int = None, position: int = None, headers: dict = None, cc: List[str] = None, bcc: List[str] = None,
+                   event: int = None, position: int = None, headers: dict = None, bcc: List[str] = None,
                    invoices: List[int] = None, order: int = None, attach_tickets=False, user=None,
                    organizer=None, customer=None, attach_ical=False, attach_cached_files: List[int] = None,
                    attach_other_files: List[str] = None) -> bool:
-    email = CustomEmail(subject, body, sender, to=to, cc=cc, bcc=bcc, headers=headers)
+    email = CustomEmail(subject, body, sender, to=to, bcc=bcc, headers=headers)
     if html is not None:
         html_message = SafeMIMEMultipart(_subtype='related', encoding=settings.DEFAULT_CHARSET)
         html_with_cid, cid_images = replace_images_with_cid_paths(html)
@@ -622,7 +608,7 @@ def render_mail(template, context):
     if isinstance(template, LazyI18nString):
         body = str(template)
         if context:
-            body = format_map(body, context)
+            body = body.format_map(TolerantDict(context))
     else:
         tpl = get_template(template)
         body = tpl.render(context)

src/pretix/base/services/memberships.py

@@ -32,7 +32,6 @@ from pretix.base.models import (
     AbstractPosition, Customer, Event, Item, Membership, Order, OrderPosition,
     SubEvent,
 )
-from pretix.helpers import OF_SELF
 
 
 def membership_validity(item: Item, subevent: Optional[SubEvent], event: Event):
@@ -119,7 +118,7 @@ def validate_memberships_in_order(customer: Customer, positions: List[AbstractPo
     base_qs = Membership.objects.with_usages(ignored_order=ignored_order)
 
     if lock:
-        base_qs = base_qs.select_for_update(of=OF_SELF)
+        base_qs = base_qs.select_for_update()
 
     membership_cache = base_qs\
         .select_related('membership_type')\

src/pretix/base/services/orders.py

@@ -74,7 +74,7 @@ from pretix.base.models.orders import (
 )
 from pretix.base.models.organizer import TeamAPIToken
 from pretix.base.models.tax import TAXED_ZERO, TaxedPrice, TaxRule
-from pretix.base.payment import GiftCardPayment, PaymentException
+from pretix.base.payment import BasePaymentProvider, PaymentException
 from pretix.base.reldate import RelativeDateWrapper
 from pretix.base.secrets import assign_ticket_secret
 from pretix.base.services import tickets
@@ -97,7 +97,6 @@ from pretix.base.signals import (
     order_placed, order_split, periodic_task, validate_order,
 )
 from pretix.celery_app import app
-from pretix.helpers import OF_SELF
 from pretix.helpers.models import modelcopy
 from pretix.helpers.periodic import minimum_interval
 
@@ -185,7 +184,7 @@ def reactivate_order(order: Order, force: bool=False, user: User=None, auth=None
                         Voucher.objects.filter(pk=position.voucher.pk).update(redeemed=Greatest(0, F('redeemed') + 1))
 
                     for gc in position.issued_gift_cards.all():
-                        gc = GiftCard.objects.select_for_update(of=OF_SELF).get(pk=gc.pk)
+                        gc = GiftCard.objects.select_for_update().get(pk=gc.pk)
                         gc.transactions.create(value=position.price, order=order)
                         break
 
@@ -398,7 +397,7 @@ def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device
     # If new actions are added to this function, make sure to add the reverse operation to reactivate_order()
     with transaction.atomic():
         if isinstance(order, int):
-            order = Order.objects.select_for_update(of=OF_SELF).get(pk=order)
+            order = Order.objects.select_for_update().get(pk=order)
         if isinstance(user, int):
             user = User.objects.get(pk=user)
         if isinstance(api_token, int):
@@ -420,7 +419,7 @@ def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device
 
         for position in order.positions.all():
             for gc in position.issued_gift_cards.all():
-                gc = GiftCard.objects.select_for_update(of=OF_SELF).get(pk=gc.pk)
+                gc = GiftCard.objects.select_for_update().get(pk=gc.pk)
                 if gc.value < position.price:
                     raise OrderError(
                         _('This order can not be canceled since the gift card {card} purchased in '
@@ -794,75 +793,68 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
         raise OrderError(err, errargs)
 
 
-def _get_fees(positions: List[CartPosition], payment_requests: List[dict], address: InvoiceAddress,
-              meta_info: dict, event: Event, require_approval=False):
+def _get_fees(positions: List[CartPosition], payment_provider: BasePaymentProvider, address: InvoiceAddress,
+              meta_info: dict, event: Event, gift_cards: List[GiftCard]):
     fees = []
     total = sum([c.price for c in positions])
 
-    gift_cards = []  # for backwards compatibility
-    for p in payment_requests:
-        if p['provider'] == 'giftcard':
-            gift_cards.append(GiftCard.objects.get(pk=p['info_data']['gift_card']))
-
-    for recv, resp in order_fee_calculation.send(sender=event, invoice_address=address, total=total, payment_requests=payment_requests,
+    for recv, resp in order_fee_calculation.send(sender=event, invoice_address=address, total=total,
                                                  meta_info=meta_info, positions=positions, gift_cards=gift_cards):
         if resp:
             fees += resp
     total += sum(f.value for f in fees)
 
-    total_remaining = total
-    for p in payment_requests:
-        # This algorithm of treating min/max values and fees needs to stay in sync between the following
-        # places in the code base:
-        # - pretix.base.services.cart.get_fees
-        # - pretix.base.services.orders._get_fees
-        # - pretix.presale.views.CartMixin.current_selected_payments
-        if p.get('min_value') and total_remaining < Decimal(p['min_value']):
-            p['payment_amount'] = Decimal('0.00')
-            continue
+    gift_card_values = {}
+    for gc in gift_cards:
+        fval = Decimal(gc.value)  # TODO: don't require an extra query
+        fval = min(fval, total)
+        if fval > 0:
+            total -= fval
+            gift_card_values[gc] = fval
 
-        to_pay = total_remaining
-        if p.get('max_value') and to_pay > Decimal(p['max_value']):
-            to_pay = min(to_pay, Decimal(p['max_value']))
+    if payment_provider:
+        payment_fee = payment_provider.calculate_fee(total)
+    else:
+        payment_fee = 0
+    pf = None
+    if payment_fee:
+        pf = OrderFee(fee_type=OrderFee.FEE_TYPE_PAYMENT, value=payment_fee,
+                      internal_type=payment_provider.identifier)
+        fees.append(pf)
 
-        payment_fee = p['pprov'].calculate_fee(to_pay)
-        total_remaining += payment_fee
-        to_pay += payment_fee
-
-        if p.get('max_value') and to_pay > Decimal(p['max_value']):
-            to_pay = min(to_pay, Decimal(p['max_value']))
-
-        total_remaining -= to_pay
-
-        p['payment_amount'] = to_pay
-        if payment_fee:
-            pf = OrderFee(fee_type=OrderFee.FEE_TYPE_PAYMENT, value=payment_fee,
-                          internal_type=p['pprov'].identifier)
-            fees.append(pf)
-            p['fee'] = pf
-
-    if total_remaining != Decimal('0.00') and not require_approval:
-        raise OrderError(_("The selected payment methods do not cover the total balance."))
-
-    return fees
+    return fees, pf, gift_card_values
 
 
 def _create_order(event: Event, email: str, positions: List[CartPosition], now_dt: datetime,
-                  payment_requests: List[dict], locale: str=None, address: InvoiceAddress=None,
-                  meta_info: dict=None, sales_channel: str='web', shown_total=None,
+                  payment_provider: BasePaymentProvider, locale: str=None, address: InvoiceAddress=None,
+                  meta_info: dict=None, sales_channel: str='web', gift_cards: list=None, shown_total=None,
                   customer=None):
-    payments = []
+    p = None
     sales_channel = get_all_sales_channels()[sales_channel]
 
     with transaction.atomic():
+        checked_gift_cards = []
+        if gift_cards:
+            gc_qs = GiftCard.objects.select_for_update().filter(pk__in=gift_cards)
+            for gc in gc_qs:
+                if gc.currency != event.currency:
+                    raise OrderError(_("This gift card does not support this currency."))
+                if gc.testmode and not event.testmode:
+                    raise OrderError(_("This gift card can only be used in test mode."))
+                if not gc.testmode and event.testmode:
+                    raise OrderError(_("Only test gift cards can be used in test mode."))
+                if not gc.accepted_by(event.organizer):
+                    raise OrderError(_("This gift card is not accepted by this event organizer."))
+                checked_gift_cards.append(gc)
+        if checked_gift_cards and any(c.item.issue_giftcard for c in positions):
+            raise OrderError(_("You cannot pay with gift cards when buying a gift card."))
 
         try:
             validate_memberships_in_order(customer, positions, event, lock=True, testmode=event.testmode)
         except ValidationError as e:
             raise OrderError(e.message)
 
-        require_approval = any(p.requires_approval(invoice_address=address) for p in positions)
-        fees = _get_fees(positions, payment_requests, address, meta_info, event, require_approval=require_approval)
+        fees, pf, gift_card_values = _get_fees(positions, payment_provider, address, meta_info, event, checked_gift_cards)
         total = pending_sum = sum([c.price for c in positions]) + sum([c.value for c in fees])
 
         order = Order(
@@ -875,7 +867,7 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
             total=total,
             testmode=True if sales_channel.testmode_supported and event.testmode else False,
             meta_info=json.dumps(meta_info or {}),
-            require_approval=require_approval,
+            require_approval=any(p.requires_approval(invoice_address=address) for p in positions),
             sales_channel=sales_channel.identifier,
             customer=customer,
         )
@@ -899,11 +891,28 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
                 fee.tax_rule = None  # TODO: deprecate
             fee.save()
 
+        for gc, val in gift_card_values.items():
+            p = order.payments.create(
+                state=OrderPayment.PAYMENT_STATE_CONFIRMED,
+                provider='giftcard',
+                amount=val,
+                fee=pf
+            )
+            trans = gc.transactions.create(
+                value=-1 * val,
+                order=order,
+                payment=p
+            )
+            p.info_data = {
+                'gift_card': gc.pk,
+                'transaction_id': trans.pk,
+            }
+            p.save()
+            pending_sum -= val
+
         # Safety check: Is the amount we're now going to charge the same amount the user has been shown when they
         # pressed "Confirm purchase"? If not, we should better warn the user and show the confirmation page again.
-        # We used to have a *known* case where this happened is if a gift card is used in two concurrent sessions,
-        # but this is now a payment error instead. So currently this code branch is usually only triggered by bugs
-        # in other places (e.g. tax calculation).
+        # The only *known* case where this happens is if a gift card is used in two concurrent sessions.
         if shown_total is not None:
             if Decimal(shown_total) != pending_sum:
                 raise OrderError(
@@ -912,17 +921,13 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
                       'check the prices below and try again.')
                 )
 
-        if payment_requests and not order.require_approval:
-            for p in payment_requests:
-                if not p.get('multi_use_supported') or p['payment_amount'] > Decimal('0.00'):
-                    payments.append(order.payments.create(
-                        state=OrderPayment.PAYMENT_STATE_CREATED,
-                        provider=p['provider'],
-                        amount=p['payment_amount'],
-                        fee=p.get('fee'),
-                        info=json.dumps(p['info_data']),
-                        process_initiated=False,
-                    ))
+        if payment_provider and not order.require_approval:
+            p = order.payments.create(
+                state=OrderPayment.PAYMENT_STATE_CREATED,
+                provider=payment_provider.identifier,
+                amount=pending_sum,
+                fee=pf
+            )
 
         orderpositions = OrderPosition.transform_cart_positions(positions, order)
         order.create_transactions(positions=orderpositions, fees=fees, is_new=True)
@@ -934,12 +939,12 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
                 order.log_action('pretix.event.order.consent', data={'msg': msg})
 
     order_placed.send(event, order=order)
-    return order, payments
+    return order, p
 
 
-def _order_placed_email(event: Event, order: Order, email_template, subject_template,
-                        log_entry: str, invoice, payments: List[OrderPayment], is_free=False):
-    email_context = get_email_context(event=event, order=order, payments=payments)
+def _order_placed_email(event: Event, order: Order, pprov: BasePaymentProvider, email_template, subject_template,
+                        log_entry: str, invoice, payment: OrderPayment, is_free=False):
+    email_context = get_email_context(event=event, order=order, payment=payment if pprov else None)
     try:
         order.send_mail(
             subject_template, email_template, email_context,
@@ -974,13 +979,15 @@ def _order_placed_email_attendee(event: Event, order: Order, position: OrderPosi
         logger.exception('Order received email could not be sent to attendee')
 
 
-def _perform_order(event: Event, payment_requests: List[dict], position_ids: List[str],
+def _perform_order(event: Event, payment_provider: str, position_ids: List[str],
                    email: str, locale: str, address: int, meta_info: dict=None, sales_channel: str='web',
-                   shown_total=None, customer=None):
-    for p in payment_requests:
-        p['pprov'] = event.get_payment_providers(cached=True)[p['provider']]
-        if not p['pprov']:
+                   gift_cards: list=None, shown_total=None, customer=None):
+    if payment_provider:
+        pprov = event.get_payment_providers().get(payment_provider)
+        if not pprov:
             raise OrderError(error_messages['internal'])
+    else:
+        pprov = None
 
     if customer:
         customer = event.organizer.customers.get(pk=customer)
@@ -1010,17 +1017,8 @@ def _perform_order(event: Event, payment_requests: List[dict], position_ids: Lis
         id__in=position_ids, event=event
     )
 
-    validate_order.send(
-        event,
-        payment_provider=payment_requests[0]['provider'] if payment_requests else None,  # only for backwards compatibility
-        payments=payment_requests,
-        email=email,
-        positions=positions,
-        locale=locale,
-        invoice_address=addr,
-        meta_info=meta_info,
-        customer=customer,
-    )
+    validate_order.send(event, payment_provider=pprov, email=email, positions=positions, locale=locale,
+                        invoice_address=addr, meta_info=meta_info, customer=customer)
 
     lockfn = NoLockManager
     locked = False
@@ -1030,9 +1028,6 @@ def _perform_order(event: Event, payment_requests: List[dict], position_ids: Lis
         locked = True
         lockfn = event.lock
 
-    warnings = []
-    any_payment_failed = False
-
     with lockfn() as now_dt:
         positions = list(
             positions.select_related('item', 'variation', 'subevent', 'seat', 'addon_to').prefetch_related('addons')
@@ -1043,57 +1038,21 @@ def _perform_order(event: Event, payment_requests: List[dict], position_ids: Lis
         if len(position_ids) != len(positions):
             raise OrderError(error_messages['internal'])
         _check_positions(event, now_dt, positions, address=addr, sales_channel=sales_channel, customer=customer)
-        order, payment_objs = _create_order(event, email, positions, now_dt, payment_requests,
-                                            locale=locale, address=addr, meta_info=meta_info, sales_channel=sales_channel,
-                                            shown_total=shown_total, customer=customer)
-        try:
-            for p in payment_objs:
-                if p.provider == 'free':
-                    p.confirm(send_mail=False, lock=not locked, generate_invoice=False)
-        except Quota.QuotaExceededException:
-            pass
+        order, payment = _create_order(event, email, positions, now_dt, pprov,
+                                       locale=locale, address=addr, meta_info=meta_info, sales_channel=sales_channel,
+                                       gift_cards=gift_cards, shown_total=shown_total, customer=customer)
 
-    # We give special treatment to GiftCardPayment here because our invoice renderer expects gift cards to already be
-    # processed, and because we historically treat gift card orders like free orders with regards to email texts.
-    # It would be great to give external gift card plugins the same special treatment, but it feels to risky for now, as
-    # (a) there would be no email at all if the plugin fails in a weird way and (b) we'd be able to run into
-    # contradictions when a plugin set both execute_payment_needs_user=False as well as requires_invoice_immediately=True
-    for p in payment_objs:
-        if isinstance(p.payment_provider, GiftCardPayment):
+        free_order_flow = payment and payment_provider == 'free' and order.pending_sum == Decimal('0.00') and not order.require_approval
+        if free_order_flow:
             try:
-                p.process_initiated = True
-                p.save(update_fields=['process_initiated'])
-                p.payment_provider.execute_payment(None, p, is_early_special_case=True)
-            except PaymentException as e:
-                warnings.append(str(e))
-                any_payment_failed = True
-            except Exception:
-                logger.exception('Error during payment attempt')
-            else:
-                order.refresh_from_db()
-
-    pending_sum = order.pending_sum
-    free_order_flow = (
-        payment_objs and
-        (
-            any(p['provider'] == 'free' for p in payment_requests) or
-            all(p['provider'] == 'giftcard' for p in payment_requests)
-        ) and
-        pending_sum == Decimal('0.00') and
-        not order.require_approval
-    )
+                payment.confirm(send_mail=False, lock=not locked)
+            except Quota.QuotaExceededException:
+                pass
 
     invoice = order.invoices.last()  # Might be generated by plugin already
     if not invoice and invoice_qualified(order):
-        invoice_required = (
-            event.settings.get('invoice_generate') == 'True' or (
-                event.settings.get('invoice_generate') == 'paid' and (
-                    any(p['pprov'].requires_invoice_immediately for p in payment_requests) or
-                    pending_sum <= Decimal('0.00')
-                )
-            )
-        )
-        if invoice_required:
+        if event.settings.get('invoice_generate') == 'True' or (
+                event.settings.get('invoice_generate') == 'paid' and payment.payment_provider.requires_invoice_immediately):
             invoice = generate_invoice(
                 order,
                 trigger_pdf=not event.settings.invoice_email_attachment or not order.email
@@ -1125,7 +1084,7 @@ def _perform_order(event: Event, payment_requests: List[dict], position_ids: Lis
             subject_attendees_template = event.settings.mail_subject_order_placed_attendee
 
         if sales_channel in event.settings.mail_sales_channel_placed_paid:
-            _order_placed_email(event, order, email_template, subject_template, log_entry, invoice, payment_objs,
+            _order_placed_email(event, order, pprov, email_template, subject_template, log_entry, invoice, payment,
                                 is_free=free_order_flow)
             if email_attendees:
                 for p in order.positions.all():
@@ -1133,32 +1092,7 @@ def _perform_order(event: Event, payment_requests: List[dict], position_ids: Lis
                         _order_placed_email_attendee(event, order, p, email_attendees_template, subject_attendees_template, log_entry,
                                                      is_free=free_order_flow)
 
-    if not any_payment_failed:
-        for p in payment_objs:
-            if not p.payment_provider.execute_payment_needs_user and not p.process_initiated:
-                try:
-                    p.process_initiated = True
-                    p.save(update_fields=['process_initiated'])
-                    resp = p.payment_provider.execute_payment(None, p)
-                    if isinstance(resp, str):
-                        logger.warning('Payment provider returned URL from execute_payment even though execute_payment_needs_user is not set')
-                except PaymentException as e:
-                    warnings.append(str(e))
-                    any_payment_failed = True
-                except Exception:
-                    logger.exception('Error during payment attempt')
-
-    if any_payment_failed:
-        # Cancel all other payments because their amount might be wrong now.
-        for p in payment_objs:
-            if p.state == OrderPayment.PAYMENT_STATE_CREATED:
-                p.state = OrderPayment.PAYMENT_STATE_CANCELED
-                p.save(update_fields=['state'])
-
-    return {
-        'order_id': order.id,
-        'warnings': warnings,
-    }
+    return order.id
 
 
 @receiver(signal=periodic_task)
@@ -1206,7 +1140,7 @@ def send_expiry_warnings(sender, **kwargs):
 
         if days and (o.expires - today).days <= days:
             with transaction.atomic():
-                o = Order.objects.select_related('event').select_for_update(of=OF_SELF).get(pk=o.pk)
+                o = Order.objects.select_related('event').select_for_update().get(pk=o.pk)
                 if o.status != Order.STATUS_PENDING or o.expiry_reminder_sent:
                     # Race condition
                     continue
@@ -1265,7 +1199,7 @@ def send_download_reminders(sender, **kwargs):
             continue
 
         with transaction.atomic():
-            o = Order.objects.select_for_update(of=OF_SELF).get(pk=o.pk)
+            o = Order.objects.select_for_update().get(pk=o.pk)
             if o.download_reminder_sent:
                 # Race condition
                 continue
@@ -2060,7 +1994,7 @@ class OrderChangeManager:
                 op.fee.save(update_fields=['canceled'])
             elif isinstance(op, self.CancelOperation):
                 for gc in op.position.issued_gift_cards.all():
-                    gc = GiftCard.objects.select_for_update(of=OF_SELF).get(pk=gc.pk)
+                    gc = GiftCard.objects.select_for_update().get(pk=gc.pk)
                     if gc.value < op.position.price:
                         raise OrderError(_(
                             'A position can not be canceled since the gift card {card} purchased in this order has '
@@ -2076,7 +2010,7 @@ class OrderChangeManager:
 
                 for opa in op.position.addons.all():
                     for gc in opa.issued_gift_cards.all():
-                        gc = GiftCard.objects.select_for_update(of=OF_SELF).get(pk=gc.pk)
+                        gc = GiftCard.objects.select_for_update().get(pk=gc.pk)
                         if gc.value < opa.position.price:
                             raise OrderError(_(
                                 'A position can not be canceled since the gift card {card} purchased in this order has '
@@ -2460,14 +2394,14 @@ class OrderChangeManager:
 
 
 @app.task(base=ProfiledEventTask, bind=True, max_retries=5, default_retry_delay=1, throws=(OrderError,))
-def perform_order(self, event: Event, payments: List[dict], positions: List[str],
+def perform_order(self, event: Event, payment_provider: str, positions: List[str],
                   email: str=None, locale: str=None, address: int=None, meta_info: dict=None,
-                  sales_channel: str='web', shown_total=None, customer=None):
+                  sales_channel: str='web', gift_cards: list=None, shown_total=None, customer=None):
     with language(locale):
         try:
             try:
-                return _perform_order(event, payments, positions, email, locale, address, meta_info,
-                                      sales_channel, shown_total, customer)
+                return _perform_order(event, payment_provider, positions, email, locale, address, meta_info,
+                                      sales_channel, gift_cards, shown_total, customer)
             except LockTimeoutException:
                 self.retry()
         except (MaxRetriesExceededError, LockTimeoutException):
@@ -2649,9 +2583,9 @@ def change_payment_provider(order: Order, payment_provider, amount=None, new_pay
 
     open_payment = None
     if new_payment:
-        lp = order.payments.select_for_update(of=OF_SELF).exclude(pk=new_payment.pk).last()
+        lp = order.payments.select_for_update().exclude(pk=new_payment.pk).last()
     else:
-        lp = order.payments.select_for_update(of=OF_SELF).last()
+        lp = order.payments.select_for_update().last()
 
     if lp and lp.state in (OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED):
         open_payment = lp

src/pretix/base/services/tasks.py

@@ -109,31 +109,6 @@ class EventTask(app.Task):
         return ret
 
 
-class OrganizerTask(app.Task):
-    def __call__(self, *args, **kwargs):
-        if 'organizer_id' in kwargs:
-            organizer_id = kwargs.get('organizer_id')
-            with scopes_disabled():
-                organizer = Organizer.objects.get(pk=organizer_id)
-            del kwargs['organizer_id']
-            kwargs['organizer'] = organizer
-        elif 'organizer' in kwargs:
-            organizer_id = kwargs.get('organizer')
-            with scopes_disabled():
-                organizer = Organizer.objects.get(pk=organizer_id)
-            kwargs['organizer'] = organizer
-        else:
-            args = list(args)
-            organizer_id = args[0]
-            with scopes_disabled():
-                organizer = Organizer.objects.get(pk=organizer_id)
-            args[0] = organizer
-
-        with scope(organizer=organizer):
-            ret = super().__call__(*args, **kwargs)
-        return ret
-
-
 class OrganizerUserTask(app.Task):
     def __call__(self, *args, **kwargs):
         organizer_id = kwargs['organizer']

src/pretix/base/settings.py

@@ -206,7 +206,7 @@ DEFAULTS = {
         'serializer_class': serializers.BooleanField,
         'form_kwargs': dict(
             label=_("Ask for attendee names"),
-            help_text=_("Ask for a name for all personalized tickets."),
+            help_text=_("Ask for a name for all tickets which include admission to the event."),
         )
     },
     'attendee_names_required': {
@@ -229,10 +229,10 @@ DEFAULTS = {
             label=_("Ask for email addresses per ticket"),
             help_text=_("Normally, pretix asks for one email address per order and the order confirmation will be sent "
                         "only to that email address. If you enable this option, the system will additionally ask for "
-                        "individual email addresses for every personalized ticket. This might be useful if you want to "
+                        "individual email addresses for every admission ticket. This might be useful if you want to "
                         "obtain individual addresses for every attendee even in case of group orders. However, "
                         "pretix will send the order confirmation by default only to the one primary email address, not to "
-                        "the per-attendee addresses. You can however enable this in the email settings."),
+                        "the per-attendee addresses. You can however enable this in the E-mail settings."),
         )
     },
     'attendee_emails_required': {
@@ -242,7 +242,7 @@ DEFAULTS = {
         'serializer_class': serializers.BooleanField,
         'form_kwargs': dict(
             label=_("Require email addresses per ticket"),
-            help_text=_("Require customers to fill in individual email addresses for all personalized tickets. See the "
+            help_text=_("Require customers to fill in individual e-mail addresses for all admission tickets. See the "
                         "above option for more details. One email address for the order confirmation will always be "
                         "required regardless of this setting."),
             widget=forms.CheckboxInput(attrs={'data-checkbox-dependency': '#id_settings-attendee_emails_asked'}),
@@ -743,18 +743,6 @@ DEFAULTS = {
         'default': 'True',
         'type': bool
     },
-    'payment_giftcard_public_name': {
-        'default': LazyI18nString.from_gettext(gettext_noop('Gift card')),
-        'type': LazyI18nString
-    },
-    'payment_giftcard_public_description': {
-        'default': LazyI18nString.from_gettext(gettext_noop(
-            'If you have a gift card, please enter the gift card code here. If the gift card does not have '
-            'enough credit to pay for the full order, you will be shown this page again and you can either '
-            'redeem another gift card or select a different payment method for the difference.'
-        )),
-        'type': LazyI18nString
-    },
     'payment_resellers__restrict_to_sales_channels': {
         'default': ['resellers'],
         'type': list
@@ -2574,7 +2562,7 @@ Your {organizer} team"""))
             label=_("Attendee data explanation"),
             widget=I18nTextarea,
             widget_kwargs={'attrs': {'rows': '2'}},
-            help_text=_("This text will be shown above the questions asked for every personalized product. You can use it e.g. to explain "
+            help_text=_("This text will be shown above the questions asked for every admission product. You can use it e.g. to explain "
                         "why you need information from them.")
         )
     },

src/pretix/base/shredder.py

@@ -218,10 +218,8 @@ class EmailAddressShredder(BaseDataShredder):
                 o.meta_info = json.dumps(d)
             o.save(update_fields=['meta_info', 'email', 'customer'])
 
-        for le in self.event.logentry_set.filter(
-            Q(action_type__contains="order.email") | Q(action_type__contains="position.email"),
-        ):
-            shred_log_fields(le, banlist=['recipient', 'message', 'subject', 'full_mail'])
+        for le in self.event.logentry_set.filter(action_type__contains="order.email"):
+            shred_log_fields(le, banlist=['recipient', 'message', 'subject'])
 
         for le in self.event.logentry_set.filter(action_type="pretix.event.order.contact.changed"):
             shred_log_fields(le, banlist=['old_email', 'new_email'])

src/pretix/base/signals.py

@@ -307,7 +307,7 @@ The ``sender`` keyword argument will contain an organizer.
 validate_order = EventPluginSignal(
 )
 """
-Arguments: ``payments``, ``positions``, ``email``, ``locale``, ``invoice_address``,
+Arguments: ``payment_provider``, ``positions``, ``email``, ``locale``, ``invoice_address``,
 ``meta_info``, ``customer``
 
 This signal is sent out when the user tries to confirm the order, before we actually create
@@ -316,9 +316,6 @@ but you can raise an OrderError with an appropriate exception message if you lik
 the order. We strongly discourage making changes to the order here.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
-
-**DEPRECTATION:** Stop listening to the ``payment_provider`` attribute, it will be removed
-in the future, as the ``payments`` attribute gives more information.
 """
 
 validate_cart = EventPluginSignal()
@@ -567,7 +564,7 @@ an OrderedDict of (setting name, form field).
 
 order_fee_calculation = EventPluginSignal()
 """
-Arguments: ``positions``, ``invoice_address``, ``meta_info``, ``total``, ``gift_cards``, ``payment_requests``
+Arguments: ``positions``, ``invoice_address``, ``meta_info``, ``total``, ``gift_cards``
 
 This signals allows you to add fees to an order while it is being created. You are expected to
 return a list of ``OrderFee`` objects that are not yet saved to the database
@@ -577,10 +574,8 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 argument will contain the cart positions and ``invoice_address`` the invoice address (useful for
 tax calculation). The argument ``meta_info`` contains the order's meta dictionary. The ``total``
 keyword argument will contain the total cart sum without any fees. You should not rely on this
-``total`` value for fee calculations as other fees might interfere. The ``gift_cards`` argument
-lists the gift cards in use.
-
-**DEPRECTATION:** Stop listening to the ``gift_cards`` attribute, it will be removed in the future.
+``total`` value for fee calculations as other fees might interfere. The ``gift_cards`` argument lists
+the gift cards in use.
 """
 
 order_fee_type_name = EventPluginSignal()

src/pretix/base/templates/pretixbase/email/export_failed.txt

@@ -1,12 +0,0 @@
-{% load i18n %}
-{% trans "Your export failed." %}
-
-{% trans "Reason:" %} {{ reason }}
-
-{% if not soft %}
-{% trans "If your export fails five times in a row, it will no longer be sent." %}
-{% endif %}
-
-{% trans "Configuration link:" %}
-
-{{ configuration_url }}

src/pretix/base/templates/pretixbase/forms/widgets/dateframe.html

@@ -1,18 +0,0 @@
-{% load i18n %}
-{% with widget.subwidgets.0 as widget %}
-{% include widget.template_name %}
-{% endwith %}
-<div class="row" data-display-dependency-value="custom" data-display-dependency="#{{ widget.subwidgets.0.attrs.id }}">
-    <br>
-    <div class="col-sm-6">
-        {% with widget.subwidgets.1 as widget %}
-        {% include widget.template_name %}
-        {% endwith %}
-    </div>
-    <div class="col-sm-6">
-        {% with widget.subwidgets.2 as widget %}
-        {% include widget.template_name %}
-        {% endwith %}
-    </div>
-</div>
-{% spaceless %}{% for widget in widget.subwidgets %}{% endfor %}{% endspaceless %}

src/pretix/base/timeframes.py

@@ -1,433 +0,0 @@
-#
-# 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/>.
-#
-import calendar
-from datetime import date, datetime, time, timedelta
-from itertools import groupby
-from typing import Optional, Tuple
-
-import pytz
-from django import forms
-from django.core.exceptions import ValidationError
-from django.utils.formats import date_format
-from django.utils.timezone import make_aware, now
-from django.utils.translation import gettext_lazy, pgettext_lazy
-from rest_framework import serializers
-
-from pretix.helpers.daterange import daterange
-
-
-def _quarter_start(ref_d):
-    return ref_d.replace(day=1, month=1 + (ref_d.month - 1) // 3 * 3)
-
-
-def _week_start(ref_d):
-    return ref_d - timedelta(ref_d.weekday())
-
-
-REPORTING_DATE_TIMEFRAMES = (
-    # (identifier, label, start_inclusive, end_inclusive, includes_future, optgroup, describe)
-    (
-        'days_today',
-        pgettext_lazy('reporting_timeframe', 'Today'),
-        lambda ref_d: ref_d,
-        lambda ref_d, start_d: start_d,
-        False,
-        pgettext_lazy('reporting_timeframe', 'by day'),
-        daterange
-    ),
-    (
-        'days_yesterday',
-        pgettext_lazy('reporting_timeframe', 'Yesterday'),
-        lambda ref_d: ref_d - timedelta(days=1),
-        lambda ref_d, start_d: start_d,
-        False,
-        pgettext_lazy('reporting_timeframe', 'by day'),
-        daterange
-    ),
-    (
-        'days_last7',
-        pgettext_lazy('reporting_timeframe', 'Last 7 days'),
-        lambda ref_d: ref_d - timedelta(days=6),
-        lambda ref_d, start_d: start_d + timedelta(days=6),
-        False,
-        pgettext_lazy('reporting_timeframe', 'by day'),
-        daterange
-    ),
-    (
-        'days_last14',
-        pgettext_lazy('reporting_timeframe', 'Last 14 days'),
-        lambda ref_d: ref_d - timedelta(days=13),
-        lambda ref_d, start_d: start_d + timedelta(days=13),
-        False,
-        pgettext_lazy('reporting_timeframe', 'by day'),
-        daterange
-    ),
-    (
-        'days_tomorrow',
-        pgettext_lazy('reporting_timeframe', 'Tomorrow'),
-        lambda ref_d: ref_d + timedelta(days=1),
-        lambda ref_d, start_d: start_d,
-        True,
-        pgettext_lazy('reporting_timeframe', 'by day'),
-        daterange
-    ),
-    (
-        'days_next7',
-        pgettext_lazy('reporting_timeframe', 'Next 7 days'),
-        lambda ref_d: ref_d + timedelta(days=1),
-        lambda ref_d, start_d: start_d + timedelta(days=6),
-        True,
-        pgettext_lazy('reporting_timeframe', 'by day'),
-        daterange
-    ),
-    (
-        'days_next14',
-        pgettext_lazy('reporting_timeframe', 'Next 14 days'),
-        lambda ref_d: ref_d + timedelta(days=1),
-        lambda ref_d, start_d: start_d + timedelta(days=13),
-        True,
-        pgettext_lazy('reporting_timeframe', 'by day'),
-        daterange
-    ),
-    (
-        'week_this',
-        pgettext_lazy('reporting_timeframe', 'Current week'),
-        lambda ref_d: _week_start(ref_d),
-        lambda ref_d, start_d: start_d + timedelta(days=6),
-        True,
-        pgettext_lazy('reporting_timeframe', 'by week'),
-        lambda start_d, end_d: date_format(start_d, 'WEEK_FORMAT') + ' - ' + daterange(start_d, end_d),
-    ),
-    (
-        'week_to_date',
-        pgettext_lazy('reporting_timeframe', 'Current week to date'),
-        lambda ref_d: _week_start(ref_d),
-        lambda ref_d, start_d: ref_d,
-        False,
-        pgettext_lazy('reporting_timeframe', 'by week'),
-        lambda start_d, end_d: date_format(start_d, 'WEEK_FORMAT') + ' - ' + daterange(start_d, end_d),
-    ),
-    (
-        'week_previous',
-        pgettext_lazy('reporting_timeframe', 'Previous week'),
-        lambda ref_d: _week_start(ref_d) - timedelta(days=7),
-        lambda ref_d, start_d: start_d + timedelta(days=6),
-        False,
-        pgettext_lazy('reporting_timeframe', 'by week'),
-        lambda start_d, end_d: date_format(start_d, 'WEEK_FORMAT') + ' - ' + daterange(start_d, end_d),
-    ),
-    (
-        'week_next',
-        pgettext_lazy('reporting_timeframe', 'Next week'),
-        lambda ref_d: _week_start(ref_d + timedelta(days=7)),
-        lambda ref_d, start_d: start_d + timedelta(days=6),
-        True,
-        pgettext_lazy('reporting_timeframe', 'by week'),
-        lambda start_d, end_d: date_format(start_d, 'WEEK_FORMAT') + ' - ' + daterange(start_d, end_d),
-    ),
-    (
-        'month_this',
-        pgettext_lazy('reporting_timeframe', 'Current month'),
-        lambda ref_d: ref_d.replace(day=1),
-        lambda ref_d, start_d: start_d.replace(day=calendar.monthrange(start_d.year, start_d.month)[1]),
-        True,
-        pgettext_lazy('reporting_timeframe', 'by month'),
-        lambda start_d, end_d: date_format(start_d, 'YEAR_MONTH_FORMAT'),
-    ),
-    (
-        'month_to_date',
-        pgettext_lazy('reporting_timeframe', 'Current month to date'),
-        lambda ref_d: ref_d.replace(day=1),
-        lambda ref_d, start_d: ref_d,
-        False,
-        pgettext_lazy('reporting_timeframe', 'by month'),
-        lambda start_d, end_d: date_format(start_d, 'YEAR_MONTH_FORMAT'),
-    ),
-    (
-        'month_previous',
-        pgettext_lazy('reporting_timeframe', 'Previous month'),
-        lambda ref_d: (ref_d.replace(day=1) - timedelta(days=1)).replace(day=1),
-        lambda ref_d, start_d: start_d.replace(day=calendar.monthrange(start_d.year, start_d.month)[1]),
-        False,
-        pgettext_lazy('reporting_timeframe', 'by month'),
-        lambda start_d, end_d: date_format(start_d, 'YEAR_MONTH_FORMAT'),
-    ),
-    (
-        'month_next',
-        pgettext_lazy('reporting_timeframe', 'Next month'),
-        lambda ref_d: ref_d.replace(day=calendar.monthrange(ref_d.year, ref_d.month)[1]) + timedelta(days=1),
-        lambda ref_d, start_d: start_d.replace(day=calendar.monthrange(start_d.year, start_d.month)[1]),
-        True,
-        pgettext_lazy('reporting_timeframe', 'by month'),
-        lambda start_d, end_d: date_format(start_d, 'YEAR_MONTH_FORMAT'),
-    ),
-    (
-        'quarter_this',
-        pgettext_lazy('reporting_timeframe', 'Current quarter'),
-        lambda ref_d: _quarter_start(ref_d),
-        lambda ref_d, start_d: start_d.replace(day=calendar.monthrange(start_d.year, start_d.month + 2)[1], month=start_d.month + 2),
-        True,
-        pgettext_lazy('reporting_timeframe', 'by quarter'),
-        lambda start_d, end_d: f"Q{(start_d.month - 1) // 3 + 1}/{start_d.year}",
-    ),
-    (
-        'quarter_to_date',
-        pgettext_lazy('reporting_timeframe', 'Current quarter to date'),
-        lambda ref_d: _quarter_start(ref_d),
-        lambda ref_d, start_d: ref_d,
-        False,
-        pgettext_lazy('reporting_timeframe', 'by quarter'),
-        lambda start_d, end_d: f"Q{(start_d.month - 1) // 3 + 1}/{start_d.year}",
-    ),
-    (
-        'quarter_previous',
-        pgettext_lazy('reporting_timeframe', 'Previous quarter'),
-        lambda ref_d: _quarter_start(_quarter_start(ref_d) - timedelta(days=1)),
-        lambda ref_d, start_d: start_d.replace(day=calendar.monthrange(start_d.year, start_d.month + 2)[1], month=start_d.month + 2),
-        False,
-        pgettext_lazy('reporting_timeframe', 'by quarter'),
-        lambda start_d, end_d: f"Q{(start_d.month - 1) // 3 + 1}/{start_d.year}",
-    ),
-    (
-        'quarter_next',
-        pgettext_lazy('reporting_timeframe', 'Next quarter'),
-        lambda ref_d: ref_d.replace(
-            day=calendar.monthrange(ref_d.year, _quarter_start(ref_d).month + 2)[1], month=_quarter_start(ref_d).month + 2
-        ) + timedelta(days=1),
-        lambda ref_d, start_d: start_d.replace(day=calendar.monthrange(start_d.year, start_d.month + 2)[1], month=start_d.month + 2),
-        True,
-        pgettext_lazy('reporting_timeframe', 'by quarter'),
-        lambda start_d, end_d: f"Q{(start_d.month - 1) // 3 + 1}/{start_d.year}",
-    ),
-    (
-        'year_this',
-        pgettext_lazy('reporting_timeframe', 'Current year'),
-        lambda ref_d: ref_d.replace(day=1, month=1),
-        lambda ref_d, start_d: start_d.replace(day=31, month=12),
-        True,
-        pgettext_lazy('reporting_timeframe', 'by year'),
-        lambda start_d, end_d: str(start_d.year),
-    ),
-    (
-        'year_to_date',
-        pgettext_lazy('reporting_timeframe', 'Current year to date'),
-        lambda ref_d: ref_d.replace(day=1, month=1),
-        lambda ref_d, start_d: ref_d,
-        False,
-        pgettext_lazy('reporting_timeframe', 'by year'),
-        lambda start_d, end_d: str(start_d.year),
-    ),
-    (
-        'year_previous',
-        pgettext_lazy('reporting_timeframe', 'Previous year'),
-        lambda ref_d: (ref_d.replace(day=1, month=1) - timedelta(days=1)).replace(day=1, month=1),
-        lambda ref_d, start_d: start_d.replace(day=31, month=12),
-        False,
-        pgettext_lazy('reporting_timeframe', 'by year'),
-        lambda start_d, end_d: str(start_d.year),
-    ),
-    (
-        'year_next',
-        pgettext_lazy('reporting_timeframe', 'Next year'),
-        lambda ref_d: ref_d.replace(day=1, month=1, year=ref_d.year + 1),
-        lambda ref_d, start_d: start_d.replace(day=31, month=12),
-        True,
-        pgettext_lazy('reporting_timeframe', 'by year'),
-        lambda start_d, end_d: str(start_d.year),
-    ),
-    (
-        'future',
-        pgettext_lazy('reporting_timeframe', 'All future (excluding today)'),
-        lambda ref_d: ref_d + timedelta(days=1),
-        lambda ref_d, start_d: None,
-        True,
-        pgettext_lazy('reporting_timeframe', 'Other'),
-        lambda start_d, end_d: date_format(start_d, "SHORT_DATE_FORMAT") + ' – ',
-    ),
-    (
-        'past',
-        pgettext_lazy('reporting_timeframe', 'All past (including today)'),
-        lambda ref_d: None,
-        lambda ref_d, start_d: ref_d,
-        True,  # technically false, but only makes sense to have in a selection that also allows the future, otherwise redundant
-        pgettext_lazy('reporting_timeframe', 'Other'),
-        lambda start_d, end_d: ' – ' + date_format(end_d, "SHORT_DATE_FORMAT"),
-    ),
-)
-
-
-class DateFrameWidget(forms.MultiWidget):
-    template_name = 'pretixbase/forms/widgets/dateframe.html'
-
-    def __init__(self, *args, **kwargs):
-        self.timeframe_choices = kwargs.pop('timeframe_choices')
-        widgets = (
-            forms.Select(choices=self.timeframe_choices),
-            forms.DateInput(attrs={'class': 'datepickerfield', 'placeholder': pgettext_lazy('timeframe', 'Start')}),
-            forms.DateInput(attrs={'class': 'datepickerfield', 'placeholder': pgettext_lazy('timeframe', 'End')}),
-        )
-        super().__init__(widgets=widgets, *args, **kwargs)
-
-    def decompress(self, value):
-        if not value:
-            return ['unset', None, None]
-        if '/' in value:
-            return [
-                'custom',
-                date.fromisoformat(value.split('/', 1)[0]),
-                date.fromisoformat(value.split('/', 1)[-1]),
-            ]
-        return [value, None, None]
-
-    def get_context(self, name, value, attrs):
-        ctx = super().get_context(name, value, attrs)
-        ctx['required'] = self.timeframe_choices[0][0] == 'unset'
-        return ctx
-
-
-def _describe_timeframe(label, start, end, future, describe):
-    d_start = start(now())
-    d_end = end(now(), d_start)
-    details = describe(d_start, d_end)
-    return f'{label} ({details})'
-
-
-class DateFrameField(forms.MultiValueField):
-    default_error_messages = {
-        **forms.MultiValueField.default_error_messages,
-        'inconsistent': gettext_lazy('The end date must be after the start date.'),
-    }
-
-    def __init__(self, *args, **kwargs):
-        include_future_frames = kwargs.pop('include_future_frames')
-
-        top_choices = [('custom', gettext_lazy('Custom timeframe'))]
-        if not kwargs.get('required', True):
-            top_choices.insert(0, ('unset', pgettext_lazy('reporting_timeframe', 'All time')))
-
-        _choices = []
-        for grouper, group in groupby(REPORTING_DATE_TIMEFRAMES, key=lambda i: i[5]):
-            options = [
-                (identifier, _describe_timeframe(label, start, end, future, describe))
-                for identifier, label, start, end, future, group, describe in group
-                if include_future_frames or not future
-            ]
-            if options:
-                _choices.append((grouper, options))
-
-        timeframe_choices = [
-            ('', top_choices)
-        ] + _choices
-
-        fields = (
-            forms.ChoiceField(
-                choices=timeframe_choices,
-                required=True
-            ),
-            forms.DateField(
-                required=False
-            ),
-            forms.DateField(
-                required=False
-            ),
-        )
-        if 'widget' not in kwargs:
-            kwargs['widget'] = DateFrameWidget(timeframe_choices=timeframe_choices)
-        kwargs.pop('max_length', 0)
-        kwargs.pop('empty_value', 0)
-        super().__init__(
-            fields=fields, require_all_fields=False, *args, **kwargs
-        )
-
-    def compress(self, data_list):
-        if not data_list:
-            return None
-        if data_list[0] == 'unset':
-            return None
-        elif data_list[0] == 'custom':
-            return f'{data_list[1].isoformat() if data_list[1] else ""}/{data_list[2].isoformat() if data_list[2] else ""}'
-        else:
-            return data_list[0]
-
-    def has_changed(self, initial, data):
-        if initial is None:
-            initial = self.widget.decompress(initial)
-        return super().has_changed(initial, data)
-
-    def clean(self, value):
-        if not value:
-            return None
-        if value[0] == 'custom':
-            if not value[1] and not value[2]:
-                raise ValidationError(self.error_messages['incomplete'])
-            if value[1] and value[2] and self.fields[2].to_python(value[2]) < self.fields[1].to_python(value[1]):
-                raise ValidationError(self.error_messages['inconsistent'])
-        return super().clean(value)
-
-
-class SerializerDateFrameField(serializers.CharField):
-
-    def to_internal_value(self, data):
-        if data is None:
-            return None
-        try:
-            resolve_timeframe_to_dates_inclusive(now(), data, pytz.UTC)
-        except:
-            raise ValidationError("Invalid date frame")
-
-    def to_representation(self, value):
-        if value is None:
-            return None
-        return value
-
-
-def resolve_timeframe_to_dates_inclusive(ref_dt, frame, timezone) -> Tuple[Optional[date], Optional[date]]:
-    """
-    Given a serialized timeframe, evaluate it relative to `ref_dt` and return a tuple of dates
-    where the first element ist the first possible date value within the timeframe and the second
-    element is the last possible date value in the timeframe.
-    Both returned values may be ``None`` for an unlimited interval.
-    """
-    if isinstance(ref_dt, datetime):
-        ref_dt = ref_dt.astimezone(timezone).date()
-    if "/" in frame:
-        start, end = frame.split("/", 1)
-        return date.fromisoformat(start) if start else None, date.fromisoformat(end) if end else None
-    for idf, label, start, end, includes_future, *args in REPORTING_DATE_TIMEFRAMES:
-        if frame == idf:
-            d_start = start(ref_dt)
-            d_end = end(ref_dt, d_start)
-            return d_start, d_end
-    raise ValueError(f"Invalid timeframe '{frame}'")
-
-
-def resolve_timeframe_to_datetime_start_inclusive_end_exclusive(ref_dt, frame, timezone) -> Tuple[Optional[date], Optional[date]]:
-    """
-    Given a serialized timeframe, evaluate it relative to `ref_dt` and return a tuple of datetimes
-    where the first element ist the first possible datetime within the timeframe and the second
-    element is the first possible datetime value *not* in the timeframe.
-    Both returned values may be ``None`` for an unlimited interval.
-    """
-    d_start, d_end = resolve_timeframe_to_dates_inclusive(ref_dt, frame, timezone)
-    dt_start = make_aware(datetime.combine(d_start, time(0, 0, 0)), timezone) if d_start else None
-    dt_end = make_aware(datetime.combine(d_end + timedelta(days=1), time(0, 0, 0)), timezone) if d_end else None
-    return dt_start, dt_end