Dockerfile: Fix pretix version not known to pip

.github/dependabot.yml

@@ -1,15 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "pip"
-    directory: "/src"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "npm"
-    directory: "/src/pretix/static/npm_dir"
-    schedule:
-      interval: "monthly"

.github/workflows/tests.yml

@@ -18,17 +18,17 @@ jobs:
     name: Tests
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9"]
+        python-version: [3.6, 3.7, 3.8]
         database: [sqlite, postgres, mysql]
         exclude:
           - database: mysql
-            python-version: "3.8"
+            python-version: 3.7
+          - database: sqlite
+            python-version: 3.7
           - database: mysql
-            python-version: "3.9"
+            python-version: 3.6
           - database: sqlite
-            python-version: "3.7"
-          - database: sqlite
-            python-version: "3.8"
+            python-version: 3.6
     steps:
       - uses: actions/checkout@v2
       - uses: getong/mariadb-action@v1.1
@@ -55,7 +55,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system dependencies
-        run: sudo apt update && sudo apt install gettext mariadb-client
+        run: sudo apt update && sudo apt install gettext mysql-client
       - name: Install Python dependencies
         run: pip3 install -e ".[dev]" mysqlclient psycopg2-binary
         working-directory: ./src

Dockerfile

@@ -1,9 +1,9 @@
-FROM python:3.9-bullseye
+FROM python:3.8
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
             build-essential \
-            libmariadb-dev \
+            default-libmysqlclient-dev \
             gettext \
             git \
             libffi-dev \
@@ -15,7 +15,8 @@ RUN apt-get update && \
             libxslt1-dev \
             locales \
             nginx \
-            python3-virtualenv \
+            python-dev \
+            python-virtualenv \
             python3-dev \
             sudo \
             supervisor \
@@ -56,7 +57,6 @@ COPY deployment/docker/supervisord /etc/supervisord
 COPY deployment/docker/supervisord.all.conf /etc/supervisord.all.conf
 COPY deployment/docker/supervisord.web.conf /etc/supervisord.web.conf
 COPY deployment/docker/nginx.conf /etc/nginx/nginx.conf
-COPY deployment/docker/nginx-max-body-size.conf /etc/nginx/conf.d/nginx-max-body-size.conf
 COPY deployment/docker/production_settings.py /pretix/src/production_settings.py
 COPY src /pretix/src
 

deployment/docker/nginx-max-body-size.conf

@@ -1 +0,0 @@
-client_max_body_size 100M;

deployment/docker/nginx.conf

@@ -16,6 +16,7 @@ http {
 	charset utf-8;
 	tcp_nopush on;
 	tcp_nodelay on;
+	client_max_body_size 100M;
 
 	log_format private '[$time_local] $host "$request" $status $body_bytes_sent';
 
@@ -65,18 +66,9 @@ http {
             access_log off;
             expires 365d;
             add_header Cache-Control "public";
-            add_header Access-Control-Allow-Origin "*";
-            gzip on;
         }
         location / {
-            # Very important:
-            #   proxy_pass http://unix:/tmp/pretix.sock:;
-            # is not the same as
-            #   proxy_pass http://unix:/tmp/pretix.sock:/;
-            # In the latter case, nginx will apply its URL parsing, in the former it doesn't.
-            # There are situations in which pretix' API will deal with "file names" containing %2F%2F, which
-            # nginx will normalize to %2F, which can break ticket validation.
-            proxy_pass http://unix:/tmp/pretix.sock:;
+            proxy_pass http://unix:/tmp/pretix.sock:/;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         	proxy_set_header Host $http_host;
         }

doc/admin/config.rst

@@ -220,30 +220,12 @@ Example::
 ``user``, ``password``
     The SMTP user data to use for the connection. Empty by default.
 
-``tls``, ``ssl``
-    Use STARTTLS or SSL for the SMTP connection. Off by default.
-
 ``from``
     The email address to set as ``From`` header in outgoing emails by the system.
     Default: ``pretix@localhost``
 
-``from_notifications``
-    The email address to set as ``From`` header in admin notification emails by the system.
-    Defaults to the value of ``from``.
-
-``from_organizers``
-    The email address to set as ``From`` header in outgoing emails by the system sent on behalf of organizers.
-    Defaults to the value of ``from``.
-
-``custom_sender_verification_required``
-    If this is on (the default), organizers need to verify email addresses they want to use as senders in their event.
-
-``custom_sender_spf_string``
-    If this is set to a valid SPF string, pretix will show a warning if organizers use a sender address from a domain
-    that does not include this value.
-
-``custom_smtp_allow_private_networks``
-    If this is off (the default), custom SMTP servers cannot be private network addresses.
+``tls``, ``ssl``
+    Use STARTTLS or SSL for the SMTP connection. Off by default.
 
 ``admins``
     Comma-separated list of email addresses that should receive a report about every error code 500 thrown by pretix.
@@ -300,7 +282,7 @@ You can use an existing memcached server as pretix's caching backend::
 ``location``
     The location of memcached, either a host:port combination or a socket file.
 
-If no memcached is configured, pretix will use redis for caching. If neither is configured, pretix will not use any caching.
+If no memcached is configured, pretix will use Django's built-in local-memory caching method.
 
 .. note:: If you use memcached and you deploy pretix across multiple servers, you should use *one*
           shared memcached instance, not multiple ones, because cache invalidations would not be
@@ -452,21 +434,3 @@ pretix can make use of some external tools if they are installed. Currently, the
 
 .. _Python documentation: https://docs.python.org/3/library/configparser.html?highlight=configparser#supported-ini-file-structure
 .. _Celery documentation: http://docs.celeryproject.org/en/latest/userguide/configuration.html
-
-Maximum upload file sizes
--------------------------
-
-You can configure the maximum file size for uploading various files::
-
-    [pretix_file_upload]
-    ; Max upload size for images in MiB, defaults to 10 MiB
-    max_size_image = 12
-    ; Max upload size for favicons in MiB, defaults to 1 MiB
-    max_size_favicon = 2
-    ; Max upload size for email attachments of manually sent emails in MiB, defaults to 10 MiB
-    max_size_email_attachment = 15
-    ; Max upload size for email attachments of automatically sent emails in MiB, defaults to 1 MiB
-    max_size_email_auto_attachment = 2
-    ; Max upload size for other files in MiB, defaults to 10 MiB
-    ; This includes all file upload type order questions
-    max_size_other = 100

doc/admin/errors.rst

@@ -1,40 +0,0 @@
-.. _`admin-errors`:
-
-Dealing with errors
-===================
-
-If you encounter an error in pretix, please follow the following steps to debug it:
-
-* If the error message is shown on a **white page** and the last line of the error includes "nginx", the error is not with pretix
-  directly but with your nginx webserver. This might mean that pretix is not running, but it could also be something else.
-  Please first check your nginx error log. The default location is ``/var/log/nginx/error.log``.
-
-  * If it turns out pretix is not running, check the output of ``docker logs pretix`` for a docker installation and
-    ``journalctl -u pretix-web.service`` for a manual installation.
-
-* If the error message is an "**Internal Server Error**" in purple pretix design, please check pretix' log file which by default is at
-  ``/var/pretix-data/logs/pretix.log`` if you installed with docker and ``/var/pretix/data/logs/pretix.log`` otherwise. If you don't
-  know how to interpret it, open a discussion on GitHub with the relevant parts of the log file.
-
-  * If the error message includes ``/usr/bin/env: ‘node’: No such file or directory``, you forgot to install ``node.js``
-
-  * If the error message includes ``OfflineGenerationError``, you might have forgot to run the ``rebuild`` step after a pretix update
-    or plugin installation.
-
-  * If the error message mentions your database server or redis server, make sure these are running and accessible.
-
-* If pretix loads fine but certain actions (creating carts, orders, or exports, downloading tickets, sending emails) **take forever**,
-  ``pretix-worker`` is not running. Check the output of ``docker logs pretix`` for a docker installation and
-  ``journalctl -u pretix-worker.service`` for a manual installation.
-
-* If the page loads but all **styles are missing**, you probably forgot to update your nginx configuration file after an upgrade of your
-  operating system's python version.
-
-
-If you are unable to debug the issue any further, please open a **discussion** on GitHub in our `Q&A Forum`_. Do **not** open an issue
-right away, since most things turn out not to be a bug in pretix but a mistake in your server configuration. Make sure to include
-relevant log excerpts in your question.
-
-If you're a pretix Enterprise customer, you can also reach out to support@pretix.eu with your issue right away.
-
-.. _Q&A Forum: https://github.com/pretix/pretix/discussions/categories/q-a

doc/admin/index.rst

@@ -9,9 +9,7 @@ This documentation is for everyone who wants to install pretix on a server.
    :maxdepth: 2
 
    installation/index
-   updates
    config
    maintainance
    scaling
-   errors
    indexes

doc/admin/indexes.rst

@@ -50,7 +50,7 @@ Here is the currently recommended set of commands::
     CREATE INDEX CONCURRENTLY pretix_addidx_orderpos_name
         ON pretixbase_orderposition
         USING gin (upper("attendee_name_cached") gin_trgm_ops);
-    CREATE INDEX CONCURRENTLY pretix_addidx_orderpos_secret
+    CREATE INDEX CONCURRENTLY pretix_addidx_orderpos_scret
         ON pretixbase_orderposition
         USING gin (upper("secret") gin_trgm_ops);
     CREATE INDEX CONCURRENTLY pretix_addidx_orderpos_email

doc/admin/installation/docker_smallscale.rst

@@ -36,9 +36,8 @@ Linux and firewalls, we recommend that you start with `ufw`_.
           SSL certificates can be obtained for free these days. We also *do not* provide support for HTTP-only
           installations except for evaluation purposes.
 
-.. warning:: By default, using `ufw` in conjunction will not have any effect. Please make sure to either bind the exposed
-             ports of your docker container explicitly to 127.0.0.1 or configure docker to respect any set up firewall
-             rules.
+.. warning:: We recommend **PostgreSQL**. If you go for MySQL, make sure you run **MySQL 5.7 or newer** or
+             **MariaDB 10.2.7 or newer**.
 
 On this guide
 -------------
@@ -58,9 +57,6 @@ 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::
@@ -91,8 +87,6 @@ When using MySQL, make sure you set the character set of the database to ``utf8m
 
     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
 -----
 
@@ -108,18 +102,6 @@ Now restart redis-server::
 
     # systemctl restart redis-server
 
-In this setup, systemd will delete ``/var/run/redis`` on every redis restart, which will cause issues with pretix. To
-prevent this, you can execute::
-
-   # systemctl edit redis-server
-
-And insert the following::
-
-    [Service]
-    # Keep the directory around so that pretix.service in docker does not need to be
-    # restarted when redis is restarted.
-    RuntimeDirectoryPreserve=yes
-
 .. warning:: Setting the socket permissions to 777 is a possible security problem. If you have untrusted users on your
              system or have high security requirements, please don't do this and let redis listen to a TCP socket
              instead. We recommend the socket approach because the TCP socket in combination with docker's networking
@@ -201,7 +183,7 @@ named ``/etc/systemd/system/pretix.service`` with the following content::
     TimeoutStartSec=0
     ExecStartPre=-/usr/bin/docker kill %n
     ExecStartPre=-/usr/bin/docker rm %n
-    ExecStart=/usr/bin/docker run --name %n -p 127.0.0.1:8345:80 \
+    ExecStart=/usr/bin/docker run --name %n -p 8345:80 \
         -v /var/pretix-data:/data \
         -v /etc/pretix:/etc/pretix \
         -v /var/run/redis:/var/run/redis \
@@ -251,7 +233,7 @@ The following snippet is an example on how to configure a nginx proxy for pretix
         ssl_certificate_key /path/to/key.pem;
 
         location / {
-            proxy_pass http://localhost:8345;
+            proxy_pass http://localhost:8345/;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto https;
             proxy_set_header Host $http_host;
@@ -270,8 +252,6 @@ create an event and start selling tickets!
 
 You should probably read :ref:`maintainance` next.
 
-.. _`docker_updates`:
-
 Updates
 -------
 
@@ -287,8 +267,6 @@ Restarting the service can take a few seconds, especially if the update requires
 Replace ``stable`` above with a specific version number like ``1.0`` or with ``latest`` for the development
 version, if you want to.
 
-Make sure to also read :ref:`update_notes` and the release notes of the version you are updating to.
-
 .. _`docker_plugininstall`:
 
 Install a plugin

doc/admin/installation/manual_smallscale.rst

@@ -25,7 +25,7 @@ installation guides):
 * A HTTP reverse proxy, e.g. `nginx`_ or Apache to allow HTTPS connections
 * A `PostgreSQL`_ 9.6+, `MySQL`_ 5.7+, or MariaDB 10.2.7+ database server
 * A `redis`_ server
-* A `nodejs`_ installation
+* A `nodejs_` installation
 
 We also recommend that you use a firewall, although this is not a pretix-specific recommendation. If you're new to
 Linux and firewalls, we recommend that you start with `ufw`_.
@@ -34,6 +34,9 @@ Linux and firewalls, we recommend that you start with `ufw`_.
           SSL certificates can be obtained for free these days. We also *do not* provide support for HTTP-only
           installations except for evaluation purposes.
 
+.. warning:: We recommend **PostgreSQL**. If you go for MySQL, make sure you run **MySQL 5.7 or newer** or
+             **MariaDB 10.2.7 or newer**.
+
 Unix user
 ---------
 
@@ -47,9 +50,6 @@ 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::
@@ -65,8 +65,6 @@ When using MySQL, make sure you set the character set of the database to ``utf8m
 
     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
 --------------------
 
@@ -74,7 +72,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 libmariadb-dev libjpeg-dev libopenjp2-7-dev
+                      gettext libpq-dev libmariadbclient-dev libjpeg-dev libopenjp2-7-dev
 
 Config file
 -----------
@@ -144,7 +142,7 @@ 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``.
+Note that you need Python 3.6 or newer. You can find out your Python version using ``python -V``.
 
 We also need to create a data directory::
 
@@ -239,7 +237,7 @@ The following snippet is an example on how to configure a nginx proxy for pretix
         add_header X-Content-Type-Options nosniff;
 
         location / {
-            proxy_pass http://localhost:8345;
+            proxy_pass http://localhost:8345/;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto https;
             proxy_set_header Host $http_host;
@@ -261,14 +259,14 @@ The following snippet is an example on how to configure a nginx proxy for pretix
         }
 
         location /static/ {
-            alias /var/pretix/venv/lib/python3.10/site-packages/pretix/static.dist/;
+            alias /var/pretix/venv/lib/python3.7/site-packages/pretix/static.dist/;
             access_log off;
             expires 365d;
             add_header Cache-Control "public";
         }
     }
 
-.. note:: Remember to replace the ``python3.10`` in the ``/static/`` path in the config
+.. note:: Remember to replace the ``python3.7`` in the ``/static/`` path in the config 
           above with your python version.
 
 We recommend reading about setting `strong encryption settings`_ for your web server.
@@ -282,14 +280,13 @@ create an event and start selling tickets!
 
 You should probably read :ref:`maintainance` next.
 
-.. _`manual_updates`:
-
 Updates
 -------
 
 .. warning:: While we try hard not to break things, **please perform a backup before every upgrade**.
 
-To upgrade to a new pretix release, pull the latest code changes and run the following commands::
+To upgrade to a new pretix release, pull the latest code changes and run the following commands (again, replace
+``postgres`` with ``mysql`` if necessary)::
 
     $ source /var/pretix/venv/bin/activate
     (venv)$ pip3 install -U --upgrade-strategy eager pretix gunicorn
@@ -298,7 +295,6 @@ To upgrade to a new pretix release, pull the latest code changes and run the fol
     (venv)$ python -m pretix updatestyles
     # systemctl restart pretix-web pretix-worker
 
-Make sure to also read :ref:`update_notes` and the release notes of the version you are updating to.
 
 .. _`manual_plugininstall`:
 

doc/admin/maintainance.rst

@@ -9,8 +9,6 @@ If you host your own pretix instance, you also need to care about the availabili
 of your service and the safety of your data yourself. This page gives you some
 information that you might need to do so properly.
 
-.. _`backups`:
-
 Backups
 -------
 

doc/admin/updates.rst

@@ -1,51 +0,0 @@
-.. _`update_notes`:
-
-Update notes
-============
-
-pretix receives regular feature and bugfix updates and we highly encourage you to always update to
-the latest version for maximum quality and security. Updates are announces on our `blog`_. There are
-usually 10 feature updates in a year, so you can expect a new release almost every month.
-
-Pure bugfix releases are only issued in case of very critical bugs or security vulnerabilities. In these
-case, we'll publish bugfix releases for the last three stable release branches.
-
-Compatibility to plugins and in very rare cases API clients may break. For in-depth details on the
-API changes of every version, please refer to the release notes published on our blog.
-
-Upgrade steps
--------------
-
-For the actual upgrade, you can usually just follow the steps from the installation guide for :ref:`manual installations <manual_updates>`
-or :ref:`docker installations <docker_updates>` respectively.
-Generally, it is always strongly recommended to perform a :ref:`backup <backups>` first.
-It is possible to skip versions during updates, although we recommend not skipping over major version numbers
-(i.e. if you want to go from 2.4 to 4.4, first upgrade to 3.0, then upgrade to 4.0, then to 4.4).
-
-In addition to these standard update steps, the following list issues steps that should be taken when you upgrade
-to specific versions for pretix. If you're skipping versions, please read the instructions for every version in
-between as well.
-
-Upgrade to 3.17.0 or newer
-""""""""""""""""""""""""""
-
-pretix 3.17 introduces a dependency on ``nodejs``, so you should install it on your system::
-
-    # apt install nodejs npm
-
-Upgrade to 4.4.0 or newer
-"""""""""""""""""""""""""
-
-pretix 4.4 introduces a new data structure to store historical financial data. If you already have existing
-data in your database, you will need to back-fill this data or you might get incorrect reports! This is not
-done automatically as part of the usual update steps since it can take a while on large databases and you might
-want to do it in parallel while the system is already running again. Please execute the following command::
-
-    (venv)$ python -m pretix create_order_transactions
-
-Or, with a docker installation::
-
-    $ docker exec -it pretix.service pretix create_order_transactions
-
-
-.. _blog: https://pretix.eu/about/en/blog/

doc/api/fundamentals.rst

@@ -87,8 +87,7 @@ respectively, or ``null`` if there is no such page. You can use those URLs to re
 respective page.
 
 The field ``results`` contains a list of objects representing the first results. For most
-objects, every page contains 50 results. You can specify a lower pagination size using the
-``page_size`` query parameter, but no more than 50.
+objects, every page contains 50 results.
 
 Conditional fetching
 --------------------

doc/api/guides/custom_checkout.rst

@@ -97,8 +97,7 @@ For example, if you want users to be redirected to ``https://example.org/order/r
 either enter ``https://example.org`` or ``https://example.org/order/``.
 
 The user will be redirected back to your page instead of pretix' order confirmation page after the payment,
-**regardless of whether it was successful or not**. We will append an ``error=…`` query parameter with an error
-message, but you should not rely on that and instead make sure you use our API to check if the payment actually
+**regardless of whether it was successful or not**. Make sure you use our API to check if the payment actually
 worked! Your final URL could look like this::
 
     https://test.pretix.eu/democon/3vjrh/order/NSLEZ/ujbrnsjzbq4dzhck/pay/123/?return_url=https%3A%2F%2Fexample.org%2Forder%2Freturn%3Ftx_id%3D1234

doc/api/resources/carts.rst

@@ -243,99 +243,6 @@ Cart position endpoints
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this
          order.
 
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/cartpositions/bulk_create/
-
-   Creates multiple new cart position. This operation is deliberately not atomic, so each cart position can succeed
-   or fail individually, so the response code of the response is not the only thing to look at!
-
-   .. warning:: This endpoint is considered **experimental**. It might change at any time without prior notice.
-
-   .. warning:: The same limitations as with the regular creation endpoint apply.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/cartpositions/bulk_create/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      [
-        {
-          "item": 1,
-          "variation": null,
-          "price": "23.00",
-          "attendee_name_parts": {
-            "given_name": "Peter",
-            "family_name": "Miller"
-          },
-          "attendee_email": null,
-          "answers": [
-            {
-              "question": 1,
-              "answer": "23",
-              "options": []
-            }
-          ],
-          "subevent": null
-        },
-        {
-          "item": 1,
-          "variation": null,
-          "price": "23.00",
-          "attendee_name_parts": {
-            "given_name": "Maria",
-            "family_name": "Miller"
-          },
-          "attendee_email": null,
-          "answers": [
-            {
-              "question": 1,
-              "answer": "23",
-              "options": []
-            }
-          ],
-          "subevent": null
-        }
-      ]
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "results": [
-          {
-            "success": true,
-            "errors": null,
-            "data": {
-              "id": 1,
-              ...
-            },
-          },
-          {
-            "success": "false",
-            "errors": {
-              "non_field_errors": ["There is not enough quota available on quota \"Tickets\" to perform the operation."]
-            },
-            "data": null
-          }
-        ]
-      }
-
-   :param organizer: The ``slug`` field of the organizer of the event to create positions for
-   :param event: The ``slug`` field of the event to create positions for
-   :statuscode 200: See response for success
-   :statuscode 400: Your input could not be parsed
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this
-         order.
-
 .. http:delete:: /api/v1/organizers/(organizer)/events/(event)/cartpositions/(id)/
 
    Deletes a cart position, identified by its internal ID.

doc/api/resources/checkinlists.rst

@@ -604,8 +604,6 @@ Order position endpoints
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
    :statuscode 404: The requested order position or check-in list does not exist.
 
-.. _`rest-checkin-redeem`:
-
 .. http:post:: /api/v1/organizers/(organizer)/events/(event)/checkinlists/(list)/positions/(id)/redeem/
 
    Tries to redeem an order position, identified by its internal ID, i.e. checks the attendee in. This endpoint
@@ -620,9 +618,8 @@ Order position endpoints
    :<json boolean canceled_supported: When this parameter is set to ``true``, the response code ``canceled`` may be
                                       returned. Otherwise, canceled orders will return ``unpaid``.
    :<json datetime datetime: Specifies the datetime of the check-in. If not supplied, the current time will be used.
-   :<json boolean force: Specifies that the check-in should succeed regardless of revoked barcode, previous check-ins or required
-                         questions that have not been filled. This is usually used to upload offline scans that already happened,
-                         because there's no point in validating them since they happened whether they are valid or not. Defaults to ``false``.
+   :<json boolean force: Specifies that the check-in should succeed regardless of previous check-ins or required
+                         questions that have not been filled. Defaults to ``false``.
    :<json string type: Send ``"exit"`` for an exit and ``"entry"`` (default) for an entry.
    :<json boolean ignore_unpaid: Specifies that the check-in should succeed even if the order is in pending state.
                                  Defaults to ``false`` and only works when ``include_pending`` is set on the check-in

doc/api/resources/index.rst

@@ -31,6 +31,5 @@ Resources and endpoints
    webhooks
    seatingplans
    exporters
-   sendmail_rules
    billing_invoices
    billing_var

doc/api/resources/invoices.rst

@@ -58,12 +58,6 @@ lines                                 list of objects            The actual invo
                                                                  created before this field was introduced as well as for
                                                                  all lines not created by a product (e.g. a shipping or
                                                                  cancellation fee).
-├ subevent                            integer                    Event series date ID used to create this line. Note that everything
-                                                                 about the subevent might have changed since the creation
-                                                                 of the invoice. Can be ``null`` for all invoice lines
-                                                                 created before this field was introduced as well as for
-                                                                 all lines not created by a product (e.g. a shipping or
-                                                                 cancellation fee) as well as for all events that are not a series.
 ├ fee_type                            string                     Fee type, e.g. ``shipping``, ``service``, ``payment``,
                                                                  ``cancellation``, ``giftcard``, or ``other. Can be ``null`` for
                                                                  all invoice lines
@@ -84,12 +78,6 @@ lines                                 list of objects            The actual invo
                                                                  an event series not created by a product (e.g. shipping or
                                                                  cancellation fees) as well as whenever the respective (sub)event
                                                                  has no end date set.
-├ event_location                      string                     Location of the (sub)event this line was created for as it
-                                                                 was set during invoice creation. Can be ``null`` for all invoice
-                                                                 lines created before this was introduced as well as for lines in
-                                                                 an event series not created by a product (e.g. shipping or
-                                                                 cancellation fees) as well as whenever the respective (sub)event
-                                                                 has no location set.
 ├ attendee_name                       string                     Attendee name at time of invoice creation. Can be ``null`` if no
                                                                  name was set or if names are configured to not be added to invoices.
 ├ gross_value                         money (string)             Price including taxes
@@ -122,14 +110,6 @@ internal_reference                    string                     Customer's refe
 
    The attributes ``fee_type`` and ``fee_internal_type`` have been added.
 
-.. versionchanged:: 4.1
-
-   The attribute ``lines.event_location`` has been added.
-
-.. versionchanged:: 4.6
-
-   The attribute ``lines.subevent`` has been added.
-
 
 Endpoints
 ---------
@@ -195,12 +175,10 @@ Endpoints
                 "description": "Budget Ticket",
                 "item": 1234,
                 "variation": 245,
-                "subevent": null,
                 "fee_type": null,
                 "fee_internal_type": null,
                 "event_date_from": "2017-12-27T10:00:00Z",
                 "event_date_to": null,
-                "event_location": "Heidelberg",
                 "attendee_name": null,
                 "gross_value": "23.00",
                 "tax_value": "0.00",
@@ -285,12 +263,10 @@ Endpoints
             "description": "Budget Ticket",
             "item": 1234,
             "variation": 245,
-            "subevent": null,
             "fee_type": null,
             "fee_internal_type": null,
             "event_date_from": "2017-12-27T10:00:00Z",
             "event_date_to": null,
-            "event_location": "Heidelberg",
             "attendee_name": null,
             "gross_value": "23.00",
             "tax_value": "0.00",

doc/api/resources/item_variations.rst

@@ -24,25 +24,8 @@ active                                boolean                    If ``false``, t
 description                           multi-lingual string       A public description of the variation. May contain
                                                                  Markdown syntax or can be ``null``.
 position                              integer                    An integer, used for sorting
-require_approval                      boolean                    If ``true``, orders with this variation will need to be
-                                                                 approved by the event organizer before they can be
-                                                                 paid.
 require_membership                    boolean                    If ``true``, booking this variation requires an active membership.
-require_membership_hidden             boolean                    If ``true`` and ``require_membership`` is set, this variation will
-                                                                 be hidden from users without a valid membership.
 require_membership_types              list of integers           Internal IDs of membership types valid if ``require_membership`` is ``true``
-sales_channels                        list of strings            Sales channels this variation is available on, such as
-                                                                 ``"web"`` or ``"resellers"``. Defaults to all existing sales channels.
-                                                                 The item-level list takes precedence, i.e. a sales
-                                                                 channel needs to be on both lists for the item to be
-                                                                 available.
-available_from                        datetime                   The first date time at which this variation can be bought
-                                                                 (or ``null``).
-available_until                       datetime                   The last date time at which this variation can be bought
-                                                                 (or ``null``).
-hide_without_voucher                  boolean                    If ``true``, this variation is only shown during the voucher
-                                                                 redemption process, but not in the normal shop
-                                                                 frontend.
 ===================================== ========================== =======================================================
 
 Endpoints
@@ -79,14 +62,8 @@ Endpoints
               "en": "S"
             },
             "active": true,
-            "require_approval": false,
             "require_membership": false,
-            "require_membership_hidden": false,
             "require_membership_types": [],
-            "sales_channels": ["web"],
-            "available_from": null,
-            "available_until": null,
-            "hide_without_voucher": false,
             "description": {
               "en": "Test2"
             },
@@ -101,9 +78,7 @@ Endpoints
               "en": "L"
             },
             "active": true,
-            "require_approval": false,
             "require_membership": false,
-            "require_membership_hidden": false,
             "require_membership_types": [],
             "description": {},
             "position": 1,
@@ -152,14 +127,8 @@ Endpoints
         "price": "10.00",
         "original_price": null,
         "active": true,
-        "require_approval": false,
         "require_membership": false,
-        "require_membership_hidden": false,
         "require_membership_types": [],
-        "sales_channels": ["web"],
-        "available_from": null,
-        "available_until": null,
-        "hide_without_voucher": false,
         "description": null,
         "position": 0
       }
@@ -189,14 +158,8 @@ Endpoints
         "value": {"en": "Student"},
         "default_price": "10.00",
         "active": true,
-        "require_approval": false,
         "require_membership": false,
-        "require_membership_hidden": false,
         "require_membership_types": [],
-        "sales_channels": ["web"],
-        "available_from": null,
-        "available_until": null,
-        "hide_without_voucher": false,
         "description": null,
         "position": 0
       }
@@ -216,14 +179,8 @@ Endpoints
         "price": "10.00",
         "original_price": null,
         "active": true,
-        "require_approval": false,
         "require_membership": false,
-        "require_membership_hidden": false,
         "require_membership_types": [],
-        "sales_channels": ["web"],
-        "available_from": null,
-        "available_until": null,
-        "hide_without_voucher": false,
         "description": null,
         "position": 0
       }
@@ -274,14 +231,8 @@ Endpoints
         "price": "10.00",
         "original_price": null,
         "active": false,
-        "require_approval": false,
         "require_membership": false,
-        "require_membership_hidden": false,
         "require_membership_types": [],
-        "sales_channels": ["web"],
-        "available_from": null,
-        "available_until": null,
-        "hide_without_voucher": false,
         "description": null,
         "position": 1
       }

doc/api/resources/items.rst

@@ -70,8 +70,6 @@ require_approval                      boolean                    If ``true``, or
                                                                  paid.
 require_bundling                      boolean                    If ``true``, this item is only available as part of bundles.
 require_membership                    boolean                    If ``true``, booking this item requires an active membership.
-require_membership_hidden             boolean                    If ``true`` and ``require_membership`` is set, this product will
-                                                                 be hidden from users without a valid membership.
 require_membership_types              list of integers           Internal IDs of membership types valid if ``require_membership`` is ``true``
 grant_membership_type                 integer                    If set to the internal ID of a membership type, purchasing this item will
                                                                  create a membership of the given type.
@@ -107,22 +105,8 @@ variations                            list of objects            A list with one
 ├ active                              boolean                    If ``false``, this variation will not be sold or shown.
 ├ description                         multi-lingual string       A public description of the variation. May contain
 ├ require_membership                  boolean                    If ``true``, booking this variation requires an active membership.
-├ require_membership_hidden           boolean                    If ``true`` and ``require_membership`` is set, this variation will
-                                                                 be hidden from users without a valid membership.
 ├ require_membership_types            list of integers           Internal IDs of membership types valid if ``require_membership`` is ``true``
                                                                  Markdown syntax or can be ``null``.
-├ sales_channels                      list of strings            Sales channels this variation is available on, such as
-                                                                 ``"web"`` or ``"resellers"``. Defaults to all existing sales channels.
-                                                                 The item-level list takes precedence, i.e. a sales
-                                                                 channel needs to be on both lists for the item to be
-                                                                 available.
-├ available_from                      datetime                   The first date time at which this variation can be bought
-                                                                 (or ``null``).
-├ available_until                     datetime                   The last date time at which this variation can be bought
-                                                                 (or ``null``).
-├ hide_without_voucher                boolean                    If ``true``, this variation is only shown during the voucher
-                                                                 redemption process, but not in the normal shop
-                                                                 frontend.
 └ 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,
@@ -159,10 +143,6 @@ meta_data                             object                     Values set for
    The attributes ``require_membership``, ``require_membership_types``, ``grant_membership_type``, ``grant_membership_duration_like_event``,
     ``grant_membership_duration_days`` and ``grant_membership_duration_months`` have been added.
 
-.. versionchanged:: 4.4
-
-   The attributes ``require_membership_hidden`` attribute has been added.
-
 Notes
 -----
 
@@ -250,10 +230,6 @@ Endpoints
                  "active": true,
                  "require_membership": false,
                  "require_membership_types": [],
-                 "sales_channels": ["web"],
-                 "available_from": null,
-                 "available_until": null,
-                 "hide_without_voucher": false,
                  "description": null,
                  "position": 0
               },
@@ -265,10 +241,6 @@ Endpoints
                  "active": true,
                  "require_membership": false,
                  "require_membership_types": [],
-                 "sales_channels": ["web"],
-                 "available_from": null,
-                 "available_until": null,
-                 "hide_without_voucher": false,
                  "description": null,
                  "position": 1
               }
@@ -365,10 +337,6 @@ Endpoints
              "require_membership": false,
              "require_membership_types": [],
              "description": null,
-             "sales_channels": ["web"],
-             "available_from": null,
-             "available_until": null,
-             "hide_without_voucher": false,
              "position": 0
           },
           {
@@ -379,10 +347,6 @@ Endpoints
              "active": true,
              "require_membership": false,
              "require_membership_types": [],
-             "sales_channels": ["web"],
-             "available_from": null,
-             "available_until": null,
-             "hide_without_voucher": false,
              "description": null,
              "position": 1
           }
@@ -458,10 +422,6 @@ Endpoints
              "active": true,
              "require_membership": false,
              "require_membership_types": [],
-             "sales_channels": ["web"],
-             "available_from": null,
-             "available_until": null,
-             "hide_without_voucher": false,
              "description": null,
              "position": 0
           },
@@ -473,10 +433,6 @@ Endpoints
              "active": true,
              "require_membership": false,
              "require_membership_types": [],
-             "sales_channels": ["web"],
-             "available_from": null,
-             "available_until": null,
-             "hide_without_voucher": false,
              "description": null,
              "position": 1
           }
@@ -541,10 +497,6 @@ Endpoints
              "active": true,
              "require_membership": false,
              "require_membership_types": [],
-             "sales_channels": ["web"],
-             "available_from": null,
-             "available_until": null,
-             "hide_without_voucher": false,
              "description": null,
              "position": 0
           },
@@ -556,10 +508,6 @@ Endpoints
              "active": true,
              "require_membership": false,
              "require_membership_types": [],
-             "sales_channels": ["web"],
-             "available_from": null,
-             "available_until": null,
-             "hide_without_voucher": false,
              "description": null,
              "position": 1
           }
@@ -655,10 +603,6 @@ Endpoints
              "active": true,
              "require_membership": false,
              "require_membership_types": [],
-             "sales_channels": ["web"],
-             "available_from": null,
-             "available_until": null,
-             "hide_without_voucher": false,
              "description": null,
              "position": 0
           },
@@ -670,10 +614,6 @@ Endpoints
              "active": true,
              "require_membership": false,
              "require_membership_types": [],
-             "sales_channels": ["web"],
-             "available_from": null,
-             "available_until": null,
-             "hide_without_voucher": false,
              "description": null,
              "position": 1
           }

doc/api/resources/orders.rst

@@ -128,14 +128,6 @@ last_modified                         datetime                   Last modificati
 
    The ``custom_followup_at`` attribute has been added.
 
-.. versionchanged:: 4.4
-
-   The ``item`` and ``variation`` query parameters have been added.
-
-.. versionchanged:: 4.6
-
-   The ``subevent`` query parameters has been added.
-
 
 .. _order-position-resource:
 
@@ -423,8 +415,6 @@ List of all orders
    :query string code: Only return orders that match the given order code
    :query string status: Only return orders in the given order status (see above)
    :query string search: Only return orders matching a given search query
-   :query integer item: Only return orders with a position that contains this item ID. *Warning:* Result will also include orders if they contain mixed items, and it will even return orders where the item is only contained in a canceled position.
-   :query integer variation: Only return orders with a position that contains this variation ID. *Warning:* Result will also include orders if they contain mixed items and variations, and it will even return orders where the variation is only contained in a canceled position.
    :query boolean testmode: Only return orders with ``testmode`` set to ``true`` or ``false``
    :query boolean require_approval: If set to ``true`` or ``false``, only categories with this value for the field
                                     ``require_approval`` will be returned.
@@ -437,7 +427,6 @@ List of all orders
        recommend using this in combination with ``testmode=false``, since test mode orders can vanish at any time and
        you will not notice it using this method.
    :query datetime created_since: Only return orders that have been created since the given date.
-   :query integer subevent: Only return orders with a position that contains this subevent ID. *Warning:* Result will also include orders if they contain mixed subevents, and it will even return orders where the subevent is only contained in a canceled position.
    :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.
@@ -839,7 +828,6 @@ Creating orders
    * ``comment`` (optional)
    * ``custom_followup_at`` (optional)
    * ``checkin_attention`` (optional)
-   * ``require_approval`` (optional)
    * ``invoice_address`` (optional)
 
       * ``company``
@@ -899,9 +887,8 @@ Creating orders
 
    * ``force`` (optional). If set to ``true``, quotas will be ignored.
    * ``send_email`` (optional). If set to ``true``, the same emails will be sent as for a regular order, regardless of
-     whether these emails are enabled for certain sales channels. If set to ``null``, behavior will be controlled by pretix'
-     settings based on the sales channels (added in pretix 4.7). Defaults to ``false``.
-     Used to be ``send_mail`` before pretix 3.14.
+     whether these emails are enabled for certain sales channels. Defaults to
+     ``false``. Used to be ``send_mail`` before pretix 3.14.
 
    If you want to use add-on products, you need to set the ``positionid`` fields of all positions manually
    to incrementing integers starting with ``1``. Then, you can reference one of these

doc/api/resources/sendmail_rules.rst

@@ -1,281 +0,0 @@
-Automated email rules
-=====================
-
-Resource description
---------------------
-
-Automated email rules that specify emails that the system will send automatically at a specific point in time, e.g.
-the day of the event.
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the rule
-enabled                               boolean                    If ``false``, the rule is ignored
-subject                               multi-lingual string       The subject of the email
-template                              multi-lingual string       The body of the email
-all_products                          boolean                    If ``true``, the email is sent to buyers of all products
-limit_products                        list of integers           List of product IDs, if ``all_products`` is not set
-include_pending                       boolean                    If ``true``, the email is sent to pending orders. If ``false``,
-                                                                 only paid orders are considered.
-date_is_absolute                      boolean                    If ``true``, the email is set at a specific point in time.
-send_date                             datetime                   If ``date_is_absolute`` is set: Date and time to send the email.
-send_offset_days                      integer                    If ``date_is_absolute`` is not set, this is the number of days
-                                                                 before/after the email is sent.
-send_offset_time                      time                       If ``date_is_absolute`` is not set, this is the time of day the
-                                                                 email is sent on the day specified by ``send_offset_days``.
-offset_to_event_end                   boolean                    If ``true``, ``send_offset_days`` is relative to the event end
-                                                                 date. Otherwise it is relative to the event start date.
-offset_is_after                       boolean                    If ``true``, ``send_offset_days`` is the number of days **after**
-                                                                 the event start or end date. Otherwise it is the number of days
-                                                                 **before**.
-send_to                               string                     Can be ``"orders"`` if the email should be sent to customers
-                                                                 (one email per order),
-                                                                 ``"attendees"`` if the email should be sent to every attendee,
-                                                                 or ``"both"``.
-                                                                 date. Otherwise it is relative to the event start date.
-===================================== ========================== =======================================================
-
-
-Endpoints
----------
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/sendmail_rules/
-
-   Returns a list of all rules configured for an event.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/sendmail_rules/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "count": 1,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id": 1,
-            "enabled": true,
-            "subject": {"en": "See you tomorrow!"},
-            "template": {"en": "Don't forget your tickets, download them at {url}"},
-            "all_products": true,
-            "limit_products": [],
-            "include_pending": false,
-            "send_date": null,
-            "send_offset_days": 1,
-            "send_offset_time": "18:00",
-            "date_is_absolute": false,
-            "offset_to_event_end": false,
-            "offset_is_after": false,
-            "send_to": "orders"
-          }
-        ]
-      }
-
-   :query page: The page number in case of a multi-page result set, default is 1
-   :param organizer: The ``slug`` field of a valid organizer
-   :param event: The ``slug`` field of the event to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to view it.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/sendmail_rules/(id)/
-
-   Returns information on one rule, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/sendmail_rules/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "enabled": true,
-        "subject": {"en": "See you tomorrow!"},
-        "template": {"en": "Don't forget your tickets, download them at {url}"},
-        "all_products": true,
-        "limit_products": [],
-        "include_pending": false,
-        "send_date": null,
-        "send_offset_days": 1,
-        "send_offset_time": "18:00",
-        "date_is_absolute": false,
-        "offset_to_event_end": false,
-        "offset_is_after": false,
-        "send_to": "orders"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param id: The ``id`` field of the rule to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/rule does not exist **or** you have no permission to view it.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/sendmail_rules/
-
-   Create a new rule.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/sendmail_rules/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 166
-
-      {
-        "enabled": true,
-        "subject": {"en": "See you tomorrow!"},
-        "template": {"en": "Don't forget your tickets, download them at {url}"},
-        "all_products": true,
-        "limit_products": [],
-        "include_pending": false,
-        "send_date": null,
-        "send_offset_days": 1,
-        "send_offset_time": "18:00",
-        "date_is_absolute": false,
-        "offset_to_event_end": false,
-        "offset_is_after": false,
-        "send_to": "orders"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "enabled": true,
-        "subject": {"en": "See you tomorrow!"},
-        "template": {"en": "Don't forget your tickets, download them at {url}"},
-        "all_products": true,
-        "limit_products": [],
-        "include_pending": false,
-        "send_date": null,
-        "send_offset_days": 1,
-        "send_offset_time": "18:00",
-        "date_is_absolute": false,
-        "offset_to_event_end": false,
-        "offset_is_after": false,
-        "send_to": "orders"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to create a rule for
-   :param event: The ``slug`` field of the event to create a rule for
-   :statuscode 201: no error
-   :statuscode 400: The rule 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 rules.
-
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/sendmail_rules/(id)/
-
-   Update a rule. 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/sendmail_rules/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 34
-
-      {
-        "enabled": false,
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: text/javascript
-
-      {
-        "id": 1,
-        "enabled": false,
-        "subject": {"en": "See you tomorrow!"},
-        "template": {"en": "Don't forget your tickets, download them at {url}"},
-        "all_products": true,
-        "limit_products": [],
-        "include_pending": false,
-        "send_date": null,
-        "send_offset_days": 1,
-        "send_offset_time": "18:00",
-        "date_is_absolute": false,
-        "offset_to_event_end": false,
-        "offset_is_after": false,
-        "send_to": "orders"
-      }
-
-   :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 rule to modify
-   :statuscode 200: no error
-   :statuscode 400: The rule could not be modified due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/rule does not exist **or** you have no permission to change it.
-
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/sendmail_rules/(id)/
-
-   Delete a rule.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/sendmail_rules/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 rule to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/rule does not exist **or** you have no permission to change it **or** this rule cannot be deleted since it is currently in use.

doc/api/resources/taxrules.rst

@@ -16,22 +16,15 @@ Field                                 Type                       Description
 ===================================== ========================== =======================================================
 id                                    integer                    Internal ID of the tax rule
 name                                  multi-lingual string       The tax rules' name
-internal_name                         string                     An optional name that is only used in the backend
 rate                                  decimal (string)           Tax rate in percent
 price_includes_tax                    boolean                    If ``true`` (default), tax is assumed to be included in
                                                                  the specified product price
 eu_reverse_charge                     boolean                    If ``true``, EU reverse charge rules are applied
 home_country                          string                     Merchant country (required for reverse charge), can be
                                                                  ``null`` or empty string
-keep_gross_if_rate_changes            boolean                    If ``true``, changes of the tax rate based on custom
-                                                                 rules keep the gross price constant (default is ``false``)
 ===================================== ========================== =======================================================
 
 
-.. versionchanged:: 4.6
-
-    The ``internal_name`` and ``keep_gross_if_rate_changes`` attributes have been added.
-
 Endpoints
 ---------
 
@@ -63,11 +56,9 @@ Endpoints
           {
             "id": 1,
             "name": {"en": "VAT"},
-            "internal_name": "VAT",
             "rate": "19.00",
             "price_includes_tax": true,
             "eu_reverse_charge": false,
-            "keep_gross_if_rate_changes": false,
             "home_country": "DE"
           }
         ]
@@ -103,11 +94,9 @@ Endpoints
       {
         "id": 1,
         "name": {"en": "VAT"},
-        "internal_name": "VAT",
         "rate": "19.00",
         "price_includes_tax": true,
         "eu_reverse_charge": false,
-        "keep_gross_if_rate_changes": false,
         "home_country": "DE"
       }
 
@@ -151,11 +140,9 @@ Endpoints
       {
         "id": 1,
         "name": {"en": "VAT"},
-        "internal_name": "VAT",
         "rate": "19.00",
         "price_includes_tax": true,
         "eu_reverse_charge": false,
-        "keep_gross_if_rate_changes": false,
         "home_country": "DE"
       }
 
@@ -198,11 +185,9 @@ Endpoints
       {
         "id": 1,
         "name": {"en": "VAT"},
-        "internal_name": "VAT",
         "rate": "20.00",
         "price_includes_tax": true,
         "eu_reverse_charge": false,
-        "keep_gross_if_rate_changes": false,
         "home_country": "DE"
       }
 

doc/development/algorithms/checkin.rst

@@ -1,28 +0,0 @@
-.. spelling: libpretixsync
-
-Check-in algorithms
-===================
-
-When a ticket is scanned at the entrance or exit of an event, we follow a series of steps to determine whether
-the check-in is allowed or not. To understand some of the terms in the following diagrams, you should also check
-out the documentation of the :ref:`ticket redemption API endpoint <rest-checkin-redeem>`.
-
-Server-side
------------
-
-The following diagram shows the series of checks executed on the server when a ticket is redeemed through the API.
-Some simplifications have been made, for example the deduplication mechanism based on the ``nonce`` parameter
-to prevent re-uploads of the same scan is not shown.
-
-.. image:: /images/checkin_online.png
-
-Client-side
------------
-
-The process of verifying tickets offline is a little different. There are two different approaches,
-depending on whether we have information about all tickets in the local database. The following diagram shows
-the algorithm as currently implemented in recent versions of `libpretixsync`_.
-
-.. image:: /images/checkin_offline.png
-
-.. _libpretixsync: https://github.com/pretix/libpretixsync

doc/development/algorithms/index.rst

@@ -1,13 +0,0 @@
-Algorithms
-==========
-
-The business logic inside pretix is full of complex algorithms making decisions based on all the hundreds of settings
-and input parameters available. Some of them are documented here as graphs, either because fully understanding them is very important
-when working on features close to them, or because they also need to be re-implemented by client-side components like our
-ticket scanning apps and we want to ensure the implementations are as similar as possible to avoid confusion.
-
-.. toctree::
-   :maxdepth: 2
-
-   checkin
-   layouts

doc/development/algorithms/layouts.rst

@@ -1,15 +0,0 @@
-.. spelling: pretixPOS
-
-Ticket layout
-=============
-
-When a ticket is exported to PDF, the system needs to decide which of multiple PDF layouts to use. The
-following diagram shows the steps of the decision, showing both the implementation in pretix itself as
-well as the implementation in `pretixPOS`_.
-
-The process can be influenced by plugins, which is demonstrated with the example of the shipping plugin.
-
-.. image:: /images/ticket_layouts.png
-
-
-.. _pretixPOS: https://pretix.eu/about/en/pos

doc/development/api/auth.rst

@@ -20,31 +20,20 @@ Basically, three pre-defined flows are supported:
 * Authentication mechanisms that rely on **redirection**, e.g. to an OAuth provider. These can be implemented by
   supplying a ``authentication_url`` method and implementing a custom return view.
 
-For security reasons, authentication backends are *not* automatically discovered through a signal. Instead, they must
-explicitly be set through the ``auth_backends`` directive in the ``pretix.cfg`` :ref:`configuration file <config>`.
+Authentication backends are *not* collected through a signal. Instead, they must explicitly be set through the
+``auth_backends`` directive in the ``pretix.cfg`` :ref:`configuration file <config>`.
 
-In each of these methods (``form_authenticate``, ``request_authenticate``, or your custom view) you are supposed to
-use ``User.objects.get_or_create_for_backend`` to get a :py:class:`pretix.base.models.User` object from the database
-or create a new one.
+In each of these methods (``form_authenticate``, ``request_authenticate`` or your custom view) you are supposed to
+either get an existing :py:class:`pretix.base.models.User` object from the database or create a new one. There are a
+few rules you need to follow:
 
-There are a few rules you need to follow:
+* You **MUST** only return users with the ``auth_backend`` attribute set to the ``identifier`` value of your backend.
 
-* You **MUST** have some kind of identifier for a user that is globally unique and **SHOULD** never change, even if the
-  user's name or email address changes. This could e.g. be the ID of the user in an external database. The identifier
-  must not be longer than 190 characters. If you worry your backend might generated longer identifiers, consider
-  using a hash function to trim them to a constant length.
-
-* You **SHOULD** not allow users created by other authentication backends to log in through your code, and you **MUST**
-  only create, modify or return users with ``auth_backend`` set to your backend.
+* You **MUST** create new users with the ``auth_backend`` attribute set to the ``identifier`` value of your backend.
 
 * Every user object **MUST** have an email address. Email addresses are globally unique. If the email address is
   already registered to a user who signs in through a different backend, you **SHOULD** refuse the login.
 
-``User.objects.get_or_create_for_backend`` will follow these rules for you automatically. It works like this:
-
-.. autoclass:: pretix.base.models.auth.UserManager
-   :members: get_or_create_for_backend
-
 The backend interface
 ---------------------
 
@@ -70,7 +59,6 @@ The backend interface
 
    .. automethod:: authentication_url
 
-
 Logging users in
 ----------------
 
@@ -80,45 +68,3 @@ recommend that you use the following utility method to correctly set session val
 authentication (if activated):
 
 .. autofunction:: pretix.control.views.auth.process_login
-
-A custom view that is called after a redirect from an external identity provider could look like this::
-
-   from django.contrib import messages
-   from django.shortcuts import redirect
-   from django.urls import reverse
-
-   from pretix.base.models import User
-   from pretix.base.models.auth import EmailAddressTakenError
-   from pretix.control.views.auth import process_login
-
-
-   def return_view(request):
-       # Verify validity of login with the external provider's API
-       api_response = my_verify_login_function(
-           code=request.GET.get('code')
-       )
-
-       try:
-           u = User.objects.get_or_create_for_backend(
-               'my_backend_name',
-               api_response['userid'],
-               api_response['email'],
-               set_always={
-                   'fullname': '{} {}'.format(
-                       api_response.get('given_name', ''),
-                       api_response.get('family_name', ''),
-                   ),
-               },
-               set_on_creation={
-                   'locale': api_response.get('locale').lower()[:2],
-                   'timezone': api_response.get('zoneinfo', 'UTC'),
-               }
-           )
-       except EmailAddressTakenError:
-           messages.error(
-               request, _('We cannot create your user account as a user account in this system '
-                          'already exists with the same email address.')
-           )
-           return redirect(reverse('control:auth.login'))
-       else:
-           return process_login(request, u, keep_logged_in=False)

doc/development/api/cookieconsent.rst

@@ -1,119 +0,0 @@
-.. highlight:: python
-   :linenothreshold: 5
-
-.. _`cookieconsent`:
-
-Handling cookie consent
-=======================
-
-pretix includes an optional feature to handle cookie consent explicitly to comply with EU regulations.
-If your plugin sets non-essential cookies or includes a third-party service that does so, you should
-integrate with this feature.
-
-Server-side integration
------------------------
-
-First, you need to declare that you are using non-essential cookies by responding to the following
-signal:
-
-.. automodule:: pretix.presale.signals
-   :members: register_cookie_providers
-
-You are expected to return a list of ``CookieProvider`` objects instantiated from the following class:
-
-.. class:: pretix.presale.cookies.CookieProvider
-
-   .. py:attribute:: CookieProvider.identifier
-
-      A short and unique identifier used to distinguish this cookie provider form others (required).
-
-   .. py:attribute:: CookieProvider.provider_name
-
-      A human-readable name of the entity of feature responsible for setting the cookie (required).
-
-   .. py:attribute:: CookieProvider.usage_classes
-
-      A list of enum values from the ``pretix.presale.cookies.UsageClass`` enumeration class, such as
-      ``UsageClass.ANALYTICS``, ``UsageClass.MARKETING``, or ``UsageClass.SOCIAL`` (required).
-
-   .. py:attribute:: CookieProvider.privacy_url
-
-      A link to a privacy policy (optional).
-
-Here is an example of such a receiver:
-
-.. code-block:: python
-
-   @receiver(register_cookie_providers)
-   def recv_cookie_providers(sender, request, **kwargs):
-       return [
-           CookieProvider(
-               identifier='google_analytics',
-               provider_name='Google Analytics',
-               usage_classes=[UsageClass.ANALYTICS],
-           )
-       ]
-
-JavaScript-side integration
----------------------------
-
-The server-side integration only causes the cookie provider to show up in the cookie dialog. You still
-need to care about actually enforcing the consent state.
-
-You can access the consent state through the ``window.pretix.cookie_consent`` variable. Whenever the
-value changes, a ``pretix:cookie-consent:change`` event is fired on the ``document`` object.
-
-The variable will generally have one of the following states:
-
-.. rst-class:: rest-resource-table
-
-================================================================ =====================================================
-State                                                            Interpretation
-================================================================ =====================================================
-``pretix === undefined || pretix.cookie_consent === undefined``  Your JavaScript has loaded before the cookie consent
-                                                                 script. Wait for the event to be fired, then try again,
-                                                                 do not yet set a cookie.
-``pretix.cookie_consent === null``                               The cookie consent mechanism has not been enabled. This
-                                                                 usually means that you can set cookies however you like.
-``pretix.cookie_consent[identifier] === undefined``              The cookie consent mechanism is loaded, but has no data
-                                                                 on your cookie yet, wait for the event to be fired, do not
-                                                                 yet set a cookie.
-``pretix.cookie_consent[identifier] === true``                   The user has consented to your cookie.
-``pretix.cookie_consent[identifier] === false``                  The user has actively rejected your cookie.
-================================================================ =====================================================
-
-If you are integrating e.g. a tracking provider with native cookie consent support such
-as Facebook's Pixel, you can integrate it like this:
-
-.. code-block:: javascript
-
-     var consent = (window.pretix || {}).cookie_consent;
-     if (consent !== null && !(consent || {}).facebook) {
-         fbq('consent', 'revoke');
-     }
-     fbq('init', ...);
-     document.addEventListener('pretix:cookie-consent:change', function (e) {
-         fbq('consent', (e.detail || {}).facebook ? 'grant' : 'revoke');
-     })
-
-If you have a JavaScript function that you only want to load if consent for a specific ``identifier``
-is given, you can wrap it like this:
-
-.. code-block:: javascript
-
-     var consent_identifier = "youridentifier";
-     var consent = (window.pretix || {}).cookie_consent;
-     if (consent === null || (consent || {})[consent_identifier] === true) {
-         // Cookie consent tool is either disabled or consent is given
-         addScriptElement(src);
-         return;
-     }
-
-     // Either cookie consent tool has not loaded yet or consent is not given
-     document.addEventListener('pretix:cookie-consent:change', function onChange(e) {
-         var consent = e.detail || {};
-         if (consent === null || consent[consent_identifier] === true) {
-             addScriptElement(src);
-             document.removeEventListener('pretix:cookie-consent:change', onChange);
-         }
-     })

doc/development/api/index.rst

@@ -17,7 +17,6 @@ Contents:
    shredder
    import
    customview
-   cookieconsent
    auth
    general
    quality

doc/development/api/payment.rst

@@ -62,8 +62,6 @@ The provider class
 
    .. autoattribute:: public_name
 
-   .. autoattribute:: confirm_button_name
-
    .. autoattribute:: is_enabled
 
    .. autoattribute:: priority

doc/development/api/plugins.rst

@@ -92,7 +92,6 @@ those will be displayed but not block the plugin execution.
 
 The ``AppConfig`` class may implement a method ``is_available(event)`` that checks if a plugin
 is available for a specific event. If not, it will not be shown in the plugin list of that event.
-You should not define ``is_available`` and ``restricted`` on the same plugin.
 
 Plugin registration
 -------------------

doc/development/contribution/style.rst

@@ -1,11 +1,6 @@
-.. spelling:: Rebase rebasing
-
 Coding style and quality
 ========================
 
-Code
-----
-
 * Basically, we want all python code to follow the `PEP 8`_ standard. There are a few exceptions where
   we see things differently or just aren't that strict. The ``setup.cfg`` file in the project's source
   folder contains definitions that allow `flake8`_ to check for violations automatically. See :ref:`checksandtests`
@@ -25,62 +20,8 @@ Code
   test suite are in the style of Python's unit test module. If you extend those files, you might continue in this style,
   but please use ``pytest`` style for any new test files.
 
-Commits and Pull Requests
--------------------------
-
-
-
-Most commits should start as pull requests, therefore this applies to the titles of pull requests as well since
-the pull request title will become the commit message on merge. We prefer merging with GitHub's "Squash and merge"
-feature if the PR contains multiple commits that do not carry value to keep. If there is value in keeping the
-individual commits, we use "Rebase and merge" instead. Merge commits should be avoided.
-
-* The commit message should start with a single subject line and can optionally be followed by a commit message body.
-
-  * The subject line should be the shortest possible representation of what the commit changes. Someone who reviewed
-    the commit should able to immediately remember the commit in a couple of weeks based on the subject line and tell
-    it apart from other commits.
-
-  * If there's additional useful information that we should keep, such as reasoning behind the commit, you can
-    add a longer body, separated from the first line by a blank line.
-
-  * The body should explain **what** you changed and more importantly **why** you changed it. There's no need to iterate
-    **how** you changed something.
-
-* The subject line should be capitalized ("Add new feature" instead of "add new feature") and should not end with a period
-  ("Add new feature" instead of "Add new feature.")
-
-* The subject line should be written in imperative mood, as if you were giving a command what the computer should do if the
-  commit is applied. This is how generated commit messages by git itself are already written ("Merge branch …", "Revert …")
-  and makes for short and consistent messages.
-
-  * Good: "Fix typo in template"
-  * Good: "Add Chinese translation"
-  * Good: "Remove deprecated method"
-  * Good: "Bump version to 4.4.0"
-  * Bad: "Fixed bug with …"
-  * Bad: "Fixes bug with …"
-  * Bad: "Fixing bug …"
-
-* If all changes in your commit are in context of a single feature or e.g. a bundled plugin, it makes sense to prefix the
-  subject line with the name of that feature. Examples:
-
-  * "API: Add support for PATCH on customers"
-  * "Docs: Add chapter on alpaca feeding"
-  * "Stripe: Fix duplicate payments"
-  * "Order change form: Fix incorrect validation"
-
-* If your commit references a GitHub issue that is fully resolved by your commit, start your subject line with the issue
-  ID in the form of "Fix #1234 -- Crash in order list". In this case, you can omit the verb "Fix" at the beginning of the
-  second part of the message to avoid repetition of the word "fix". If your commit only partially resolves the issue, use
-  "Refs #1234 -- Crash in order list" instead.
-
-* Applies to pretix employees only: If your commit references a sentry issue, please put it in parentheses at the end
-  of the subject line or inside the body ("Fix crash in order list (PRETIXEU-ABC)"). If your commit references a support
-  ticket, please put it in parentheses at the end of the subject line with a "Z#" prefix ("Fix crash in order list (Z#12345)").
-
-* If your PR was open for a while and might cause conflicts on merge, please prefer rebasing it (``git rebase -i master``)
-  over merging ``master`` into your branch unless it is prohibitively complicated.
+* Please keep the first line of your commit messages short. When referencing an issue, please phrase it like
+  ``Fix #123 -- Problems with order creation`` or ``Refs #123 -- Fix this part of that bug``.
 
 
 .. _PEP 8: https://legacy.python.org/dev/peps/pep-0008/

doc/development/implementation/models.rst

@@ -92,9 +92,6 @@ Carts and Orders
 .. autoclass:: pretix.base.models.OrderRefund
    :members:
 
-.. autoclass:: pretix.base.models.Transaction
-   :members:
-
 .. autoclass:: pretix.base.models.CartPosition
    :members:
 

doc/development/index.rst

@@ -8,7 +8,6 @@ Developer documentation
    setup
    contribution/index
    implementation/index
-   algorithms/index
+   translation/index
    api/index
    structure
-   translation/index

doc/development/setup.rst

@@ -26,7 +26,7 @@ Your should install the following on your system:
 * ``libssl`` (Debian package: ``libssl-dev``)
 * ``libxml2`` (Debian package ``libxml2-dev``)
 * ``libxslt`` (Debian package ``libxslt1-dev``)
-* ``libenchant-2-2`` (Debian package ``libenchant-2-2``)
+* ``libenchant1c2a`` (Debian package ``libenchant1c2a``)
 * ``msgfmt`` (Debian package ``gettext``)
 * ``git``
 
@@ -51,12 +51,7 @@ the dependencies might fail::
 
 Working with the code
 ---------------------
-If you do not have a recent installation of ``nodejs``, install it now::
-
-    curl -sL https://deb.nodesource.com/setup_17.x | sudo -E bash -
-    sudo apt install nodejs
-
-To make sure it is on your path variable, close and reopen your terminal. Now, install the Python-level dependencies of pretix::
+The first thing you need are all the main application's dependencies::
 
     cd src/
     pip3 install -e ".[dev]"

doc/images/checkin_offline.puml

@@ -1,146 +0,0 @@
-@startuml
-
-
-partition "data-based check" {
-    "Check based on local database" --> "Is the order in status PAID or PENDING\nand is the position not canceled?"
-    --> if "" then
-        -right->[no] "Return error CANCELED"
-    else
-        -down->[yes] "Is the product part of the check-in list?"
-        --> if "" then
-            -right->[no] "Return error PRODUCT"
-        else
-            -down->[yes] "Is the subevent part of the check-in list?"
-            --> if "" then
-                -right->[no] "Return error INVALID"
-                note bottom: TODO\ninconsistent\nwith online\ncheck
-            else
-                -down->[yes] "Is the order in status PAID?"
-                --> if "" then
-                    -right->[no] "Does the check-in list include pending orders?"
-                    --> if "" then
-                        -right->[no] "Return error UNPAID "
-                    else
-                        -down->[yes] "Is ignore_unpaid set?\n(Has the operator confirmed\nthe checkin?)"
-                        --> if "" then
-                            -right->[no] "Return error UNPAID "
-                        else
-                            -down->[yes] "Is this an entry or exit?"
-                        endif
-                    endif
-                else
-                    -down->[yes] "Is this an entry or exit?"
-                endif
-            endif
-        endif
-    endif
-
-    "Is this an entry or exit?" --> if "" then
-        -right->[entry] Evaluate custom logic (rules)
-        --> if "" then
-            -right->[error] "Return error RULES"
-        else
-            -down->[ok] "Are all required questions answered?"
-            --> if "" then
-                -right->[no] "Return error INCOMPLETE"
-            else
-                -down->[yes] "Does the check-in list allow multi-entry?"
-            endif
-        endif
-    else
-        -->[exit] "Return OK "
-    endif
-
-    "Does the check-in list allow multi-entry?" --> if "" then
-        -right->[yes] "Return OK"
-    else
-        -down->[no] "Is this the first checkin\nfor this ticket on this list?"
-        --> if "" then
-            -right->[yes] "Return OK"
-        else
-            -down->[no] "Are all previous checkins\nfor this ticket on this list exits?"
-            --> if "" then
-                -right->[yes] "Return OK"
-            else
-                -down->[no] "Does the check-in list\n allow entry after exit\nand is the last checkin\nan exit?"
-                --> if "" then
-                    -right->[yes] "Return OK"
-                else
-                    -down->[no] "Return error ALREADY_REDEEMED"
-                endif
-            endif
-        endif
-    endif
-}
-
-partition "dataless check" {
-    "Check based on secret content" --> "Does the secret decode with\nany supported scheme\nand has a valid signature?"
-
-    --> if "" then
-        -down->[yes] "Is the ticket secret on the revocation list?"
-        --> if "" then
-            -right->[yes] "Return error REVOKED"
-        else
-            -down->[no] "Is the product part of the check-in list? "
-            --> if "" then
-                -right->[no] "Return error PRODUCT "
-            else
-                -down->[yes] "Is the subevent part of the check-in list? "
-                --> if "" then
-                    -right->[no] "Return error INVALID  "
-                    note bottom: TODO\ninconsistent\nwith online\ncheck
-                else
-                  --> "Is this an entry or exit? "
-                endif
-            endif
-        endif
-    else
-        -right>[no] "Return error INVALID "
-    endif
-
-    "Is this an entry or exit? " --> if "" then
-        -right->[entry] "Evaluate custom logic (rules) "
-        --> if "" then
-            -right->[error] "Return error RULES "
-        else
-            -down->[ok] "Are all required questions answered? "
-            --> if "" then
-                -right->[no] "Return error INCOMPLETE "
-            else
-                -down->[yes] "Does the check-in list allow multi-entry? "
-            endif
-        endif
-    else
-        -->[exit] " Return OK "
-    endif
-
-    "Does the check-in list allow multi-entry? " --> if "" then
-        -right->[yes] "  Return OK  "
-    else
-        -down->[no] "Are any locally queued checkins for\nthis ticket of this list known?"
-        --> if "" then
-            -right->[no] "  Return OK  "
-        else
-            -down->[yes] "Are all locally queued checkins\nfor this ticket on this list exits? "
-            --> if "" then
-                -right->[yes] "  Return OK  "
-            else
-                -down->[no] "Does the check-in list\n allow entry after exit\nand is the last locally\nqueued checkin\nan exit? "
-                --> if "" then
-                    -right->[yes] "  Return OK  "
-                else
-                    -down->[no] "Return error ALREADY_REDEEMED "
-                endif
-            endif
-        endif
-    endif
-}
-
-(*) --> "Check if order position with\nscanned ticket secret exists"
---> if "" then
-    -down->[yes] "Check based on local database"
-else
-    -->[no] "Check based on secret content"
-endif
-
-@enduml

doc/images/checkin_online.puml

@@ -1,92 +0,0 @@
-@startuml
-
-(*) --> "Check if order position with\nscanned ticket secret exists"
---> if "" then
-    -down->[yes] ===CHECK===
-else
-    -->[no] "Check if secret exists\nin revocation list"
-    --> if "" then
-        --> "Is this a forced upload?"
-        --> if "" then
-            -->[yes] ===CHECK===
-        else
-            -right->[no] "Return error REVOKED"
-        endif
-    else
-        -right->[no] "Return error INVALID"
-    endif
-
-endif
-
-
-===CHECK=== -down-> "Is the order in status PAID or PENDING\nand is the position not canceled?"
---> if "" then
-    -right->[no] "Return error CANCELED"
-else
-    -down->[yes] "Is the product part of the check-in list?"
-    --> if "" then
-        -right->[no] "Return error PRODUCT"
-    else
-        -down->[yes] "Is the subevent part of the check-in list?"
-        --> if "" then
-            -right->[no] "Return error PRODUCT "
-        else
-            -down->[yes] "Is the order in status PAID\nor is this a forced upload?"
-            --> if "" then
-                -right->[no] "Does the check-in list include pending orders?"
-                --> if "" then
-                    -right->[no] "Return error UNPAID "
-                else
-                    -down->[yes] "Is ignore_unpaid set?\n(Has the operator confirmed\nthe checkin?)"
-                    --> if "" then
-                        -right->[no] "Return error UNPAID "
-                    else
-                        -down->[yes] "Is this an entry or exit?\nIs the upload forced?"
-                    endif
-                endif
-            else
-                -down->[yes] "Is this an entry or exit?\nIs the upload forced?"
-            endif
-        endif
-    endif
-endif
-
-"Is this an entry or exit?\nIs the upload forced?" --> if "" then
-    -right->[entry && not force] Evaluate custom logic (rules)
-    --> if "" then
-        -right->[error] "Return error RULES"
-    else
-        -down->[ok] "Are all required questions answered?"
-        --> if "" then
-            -right->[no && questions_supported] "Return error INCOMPLETE"
-        else
-            -down->[yes || not questions_supported] "Does the check-in list allow multi-entry?"
-        endif
-    endif
-else
-    -->[exit || force=true] "Return OK "
-endif
-
-"Does the check-in list allow multi-entry?" --> if "" then
-    -right->[yes] "Return OK"
-else
-    -down->[no] "Is this the first checkin\nfor this ticket on this list?"
-    --> if "" then
-        -right->[yes] "Return OK"
-    else
-        -down->[no] "Are all previous checkins\nfor this ticket on this list exits?"
-        --> if "" then
-            -right->[yes] "Return OK"
-        else
-            -down->[no] "Does the check-in list\n allow entry after exit\nand is the last checkin\nan exit?"
-            --> if "" then
-                -right->[yes] "Return OK"
-            else
-                -down->[no] "Return error ALREADY_REDEEMED"
-            endif
-        endif
-    endif
-endif
-
-
-@enduml

doc/images/ticket_layouts.puml

@@ -1,52 +0,0 @@
-@startuml
-
-(*) --> "Which implementation?"
---> if "" then
-    -down->[pretixPOS] "Check for TicketLayoutItem with\nsales_channel=pretixpos [libpretixsync]"
-    --> if "" then
-        --> (*)
-    else
-        -->[not found] "Check for TicketLayoutItem with\nsales_channel=web [libpretixsync]"
-        --> if "" then
-            --> (*)
-        else
-            -->[not found] "Use event default [libpretixsync]"
-            --> (*)
-        endif
-    endif
-
-else
-    -right->[pretix] "Check for TicketLayoutItem with\nsales_channel=order.sales_channel"
-    --> if "" then
-        -right-> "Run override_layout plugin signal on result"
-    else
-        -down->[not found] "Check for TicketLayoutItem with\nsales_channel=web"
-        --> if "" then
-            --> "Run override_layout plugin signal on result"
-        else
-            -->[not found] "Use event default"
-            --> "Run override_layout plugin signal on result"
-        endif
-    endif
-endif
-
-
-"Run override_layout plugin signal on result" -> (*)
-
-
-partition pretix_shipping {
-  "Run override_layout plugin signal on result" --> "Check for ShippingLayoutItem with\nmethod=order.shipping_method"
---> if "" then
-    --> (*)
-else
-    -down->[not found] "Check for ShippingMethod.layout"
-    --> if "" then
-        --> (*)
-    else
-        -down->[not found] "Keep original layout"
-        --> (*)
-    endif
-endif
-}
-
-@enduml

doc/plugins/certificates.rst

@@ -1,64 +0,0 @@
-Certificates of attendance
-==========================
-
-The certificates plugin provides a HTTP API that allows you to download the certificate for a specific attendee.
-
-
-Certificate download
---------------------
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/(id)/certificate/
-
-   Downloads the certificate for one order position, identified by its internal ID. Download is a two-step
-   process. You will always get a :http:statuscode:`303` response with a ``Location`` header to a different
-   URL. In the background, our server starts preparing the PDF file.
-
-   If you then do a ``GET`` to the URL you were given, you will either receive a :http:statuscode:`409` response
-   indicating to retry after a few seconds, or a :http:statuscode:`200` response with the PDF file.
-
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/orderpositions/23442/download/certificate/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 303 See Other
-      Location: /api/v1/organizers/democon/events/3vjrh/orderpositions/426/certificate/?result=1f550651-ae7b-4911-a76c-2be8f348aaa5
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/orderpositions/23442/download/certificate/?result=1f550651-ae7b-4911-a76c-2be8f348aaa5 HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/pdf
-
-      ...
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param id: The ``id`` field of the order position to fetch
-   :statuscode 200: File ready for download
-   :statuscode 303: Processing started
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource
-                    **or** downloads are not available for this order position at this time. The response content will
-                    contain more details.
-   :statuscode 404: The requested order position or download provider does not exist.
-   :statuscode 409: The file is not yet ready and will now be prepared. Retry the request after waiting for a few
-                    seconds.

doc/plugins/digital.rst

@@ -61,7 +61,7 @@ Variable                            Description
 ``attendee_city``                   City of the ticket holder's address (or empty)
 ``attendee_country``                Country code of the ticket holder's address (or empty)
 ``attendee_state``                  State of the ticket holder's address (or empty)
-``answers[XYZ]``                    Answer to the custom question with identifier ``XYZ``
+``answer[XYZ]``                     Answer to the custom question with identifier ``XYZ``
 ``invoice_name``                    Full name of the invoice address (or empty)
 ``invoice_name_*``                  Name parts of the invoice address, depending on configuration, e.g. ``invoice_name_given_name`` or ``invoice_name_family_name``
 ``invoice_company``                 Company of the invoice address (or empty)

doc/plugins/imported_secrets.rst

@@ -1,301 +0,0 @@
-Secrets Import
-==============
-
-Usually, pretix generates ticket secrets (i.e. the QR code used for scanning) itself. You can read more about this
-process at :ref:`secret_generators`.
-
-With the "Secrets Import" plugin, you can upload your own list of secrets to be used instead. This is useful for
-integrating with third-party check-in systems.
-
-
-API Resource description
--------------------------
-
-The secrets import plugin provides a HTTP API that allows you to create new secrets.
-
-The imported secret resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the secret
-secret                                string                     Actual string content of the secret (QR code content)
-used                                  boolean                    Whether the secret was already used for a ticket. If ``true``,
-                                                                 the secret can no longer be deleted. Secrets are never used
-                                                                 twice, even if an order is canceled or deleted.
-item                                  integer                    Internal ID of a product, or ``null``. If set, the secret
-                                                                 will only be used for tickets of this product.
-variation                             integer                    Internal ID of a product variation, or ``null``. If set, the secret
-                                                                 will only be used for tickets of this product variation.
-subevent                              integer                    Internal ID of an event series date, or ``null``. If set, the secret
-                                                                 will only be used for tickets of this event series date.
-===================================== ========================== =======================================================
-
-API Endpoints
--------------
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/imported_secrets/
-
-   Returns a list of all secrets imported for an event.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/imported_secrets/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "count": 1,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id": 1,
-            "secret": "foobar",
-            "used": false,
-            "item": null,
-            "variation": null,
-            "subevent": null
-          }
-        ]
-      }
-
-   :query page: The page number in case of a multi-page result set, default is 1
-   :param organizer: The ``slug`` field of a valid organizer
-   :param event: The ``slug`` field of the event to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer or event does not exist **or** you have no permission to view it.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/imported_secrets/(id)/
-
-   Returns information on one secret, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/imported_secrets/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "secret": "foobar",
-        "used": false,
-        "item": null,
-        "variation": null,
-        "subevent": null
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param id: The ``id`` field of the secret to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/secret does not exist **or** you have no permission to view it.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/imported_secrets/
-
-   Create a new secret.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/imported_secrets/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 166
-
-      {
-        "secret": "foobar",
-        "used": false,
-        "item": null,
-        "variation": null,
-        "subevent": null
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "secret": "foobar",
-        "used": false,
-        "item": null,
-        "variation": null,
-        "subevent": null
-      }
-
-   :param organizer: The ``slug`` field of the organizer to a create new secret for
-   :param event: The ``slug`` field of the event to create a new secret for
-   :statuscode 201: no error
-   :statuscode 400: The secret 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 secrets.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/imported_secrets/bulk_create/
-
-   Create new secrets in bulk (up to 500 per request). The request either succeeds or fails entirely.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/imported_secrets/bulk_create/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 166
-
-      [
-        {
-          "secret": "foobar",
-          "used": false,
-          "item": null,
-          "variation": null,
-          "subevent": null
-        },
-        {
-          "secret": "baz",
-          "used": false,
-          "item": null,
-          "variation": null,
-          "subevent": null
-        }
-      ]
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      [
-        {
-          "id": 1,
-          "secret": "foobar",
-          "used": false,
-          "item": null,
-          "variation": null,
-          "subevent": null
-        },
-        {
-          "id": 2,
-          "secret": "baz",
-          "used": false,
-          "item": null,
-          "variation": null,
-          "subevent": null
-        }
-      ]
-
-   :param organizer: The ``slug`` field of the organizer to create new secrets for
-   :param event: The ``slug`` field of the event to create new secrets for
-   :statuscode 201: no error
-   :statuscode 400: The secrets 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 secrets.
-
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/imported_secrets/(id)/
-
-   Update a secret. 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/imported_secrets/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 34
-
-      {
-        "item": 2
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: text/javascript
-
-      {
-        "id": 1,
-        "secret": "foobar",
-        "used": false,
-        "item": 2,
-        "variation": null,
-        "subevent": null
-      }
-
-   :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 secret to modify
-   :statuscode 200: no error
-   :statuscode 400: The secret could not be modified due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/secret does not exist **or** you have no permission to change it.
-
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/imported_secrets/(id)/
-
-   Delete a secret. You can only delete secrets that have not yet been used.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/imported_secrets/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 secret to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/secret does not exist **or** you have no permission to change it **or** the secret has already been used
-

doc/plugins/index.rst

@@ -15,8 +15,5 @@ If you want to **create** a plugin, please go to the
    ticketoutputpdf
    badges
    campaigns
-   certificates
    digital
-   imported_secrets
    webinar
-   presale-saml

doc/plugins/presale-saml.rst

@@ -1,405 +0,0 @@
-.. highlight:: ini
-.. spelling::
-
-   IdP
-   skIDentity
-   ePA
-   NPA
-
-Presale SAML Authentication
-===========================
-
-The Presale SAML Authentication plugin is an advanced plugin, which most event
-organizers will not need to use. However, for the select few  who do require
-strong customer authentication that cannot be covered by the built-in customer
-account functionality, this plugin allows pretix to connect to a SAML IdP and
-perform authentication and retrieval of user information.
-
-Usage of the plugin is governed by two separate sets of settings: The plugin
-installation, the Service Provider (SP) configuration and the event
-configuration.
-
-Plugin installation and initial configuration
----------------------------------------------
-
-.. note:: If you are a customer of our hosted `pretix.eu`_ offering, you can
-          skip this section.
-
-The plugin is installed as any other plugin in the pretix ecosystem. As a
-pretix system administrator, please follow the instructions in the the
-:ref:`Administrator documentation <admindocs>`.
-
-Once installed, you will need to assess, if you want (or need) your pretix
-instance to be a single SP for all organizers and events or if every event
-organizer has to provide their own SP.
-
-Take the example of a university which runs pretix under an pretix Enterprise
-agreement. Since they only provide ticketing services to themselves (every
-organizer is still just a different department of the same university), a
-single SP should be enough.
-
-On the other hand, a reseller such as `pretix.eu`_ who services a multitude
-of clients would not work that way. Here, every organizer is a separate
-legal entity and as such will also need to provide their own SP configuration:
-Company A will expect their SP to reflect their company - and not a generalized
-"pretix SP".
-
-Once you have decided on the mode of operation, the :ref:`Configuration file
-<config>` needs to be extended to reflect your choice.
-
-Example::
-
-    [presale-saml]
-    level=global
-
-``level``
-    ``global`` to use only a single, system-wide SP, ``organizer`` for multiple
-    SPs, configured on the organizer-level. Defaults to ``organizer``.
-
-Service Provider configuration
-------------------------------
-
-Global Level
-^^^^^^^^^^^^
-
-.. note:: If you are a customer of our hosted `pretix.eu`_ offering, you can
-          skip this section and follow the instructions on the upcoming
-          Organizer Level settings.
-
-As a user with administrative privileges, please activate them by clicking the
-`Admin Mode` button in the top right hand corner.
-
-You should now see a new menu-item titled `SAML` appear.
-
-Organizer Level
-^^^^^^^^^^^^^^^
-
-Navigate to the organizer settings in the pretix backend. In the navigation
-bar, you will find a menu-item titled `SAML` if your user has the `Can
-change organizer settings` permission.
-
-
-.. note:: If you are a customer of our hosted `pretix.eu`_ offering, the menu
-          will only appear once one of our friendly customer service agents
-          has enabled the Presale SAML Authentication plugin for at least one
-          of your events. Feel free to get in touch with us!
-
-Setting up the SP
-^^^^^^^^^^^^^^^^^
-
-No matter where your SP configuration lives, you will be greeted by a very
-long list of fields of which almost all of them will need to be filled. Please
-don't be discouraged - most of the settings don't need to be decided by yourself
-and/or are already preset with a sensible default setting.
-
-If you are not sure what setting you should choose for any of the fields, you
-should reach out to your IdP operator as they can tell you exactly what the IdP
-expects and - more importantly - supports.
-
-``IdP Metadata URL``
-    Please provide the URL where your IdP outputs its metadata. For most IdPs,
-    this URL is static and the same for all SPs. If you are a member of the
-    DFN-AAI, you can find the meta-data for the `Test-, Basic- and
-    Advanced-Federation`_ on their website. Please do talk with your local
-    IdP operator though, as you might not even need to go through the DFN-AAI
-    and might just use your institutions local IdP which will also host their
-    metadata on a different URL.
-
-    The URL needs to be publicly accessible, as saving the settings form will
-    fail if the IdP metadata cannot be retrieved. pretix will also automatically
-    refresh the IdP metadata on a regular basis.
-
-``SP Entity Id``
-    By default, we recommend that you use the system-proposed metadata-URL as
-    the Entity Id of your SP. However, if so desired or required by your IdP,
-    you can also set any other, arbitrary URL as the SP Entity Id.
-
-``SP Name / SP Decription``
-    Most IdP will display the name and description of your SP to the users
-    during authentication. The description field can be used to explain to the
-    users how their data is being used.
-
-``SP X.509 Certificate / SP X.509 Private Key``
-    Your SP needs a certificate and a private key for said certificate. Please
-    coordinate with your IdP, if you are supposed to generate these yourself or
-    if they are provided to you.
-
-``SP X.509 New Certificate``
-    As certificates have an expiry date, they need to be renewed on a regular
-    basis. In order to facilitate the rollover from the expiring to the new
-    certificate, you can provide the new certificate already before the expiration
-    of the existing one. That way, the system will automatically use the correct
-    one. Once the old certificate has expired and is not used anymore at all,
-    you can move the new certificate into the slot of the normal certificate and
-    keep the new slot empty for your next renewal process.
-
-``Requested Attributes``
-    An IdP can hold a variety of attributes of an authenticating user. While
-    your IdP will dictate which of the available attributes your SP can consume
-    in theory, you will still need to define exactly which attributes the SP
-    should request.
-
-    The notation is a JSON list of objects with 5 attributes each:
-
-      * ``attributeValue``: Can be defaulted to ``[]``.
-      * ``friendlyName``: String used in the upcoming event-level settings to
-        retrieve the attributes data.
-      * ``isRequired``: Boolean indicating whether the IdP must enforce the
-        transmission of this attribute. In most cases, ``true`` is the best
-        choice.
-      * ``name``: String of the internal, technical name of the requested
-        attribute. Often starting with ``urn:mace:dir:attribute-def:``,
-        ``urn:oid:`` or ``http://``/``https://``.
-      * ``nameFormat``: String describing the type of ``name`` that has been
-        set in the previous section. Often starting with
-        ``urn:mace:shibboleth:1.0:`` or ``urn:oasis:names:tc:SAML:2.0:``.
-
-    Your IdP can provide you with a list of available attributes. See below
-    for a sample configuration in an academic context.
-
-    Note, that you can have multiple attributes with the same ``friendlyName``
-    but different ``name``s. This is often used in systems, where the same
-    information (for example a persons name) is saved in different fields -
-    for example because one institution is returning SAML 1.0 and other
-    institutions are returning SAML 2.0 style attributes. Typically, this only
-    occurs in mix environments like the DFN-AAI with a large number of
-    participants. If you are only using your own institutions IdP and not
-    authenticating anyone outside of your realm, this should not be a common
-    sight.
-
-``Encrypt/Sign/Require ...``
-    Does what is says on the box - please inquire with your IdP for the
-    necessary settings. Most settings can be turned on as they increase security,
-    however some IdPs might stumble over some of them.
-
-``Signature / Digest Algorithm``
-    Please chose appropriate algorithms, that both pretix/your SP and the IdP
-    can communicate with. A common source of issues when connecting to a
-    Shibboleth-based IdP is the Digest Algorithm: pretix does not support
-    ``http://www.w3.org/2009/xmlenc11#rsa-oaep`` and authentication will fail
-    if the IdP enforces this.
-
-``Technical/Support Contacts``
-    Those contacts are encoded into the SPs public meta data and might be
-    displayed to users having trouble authenticating. It is recommended to
-    provide a dedicated point of contact for technical issues, as those will
-    be the ones to change the configuration for the SP.
-
-Event / Authentication configuration
-------------------------------------
-
-Basic settings
-^^^^^^^^^^^^^^
-
-Once the plugin has been enabled for a pretix event using the Plugins-menu from
-the event's settings, a new *SAML* menu item will show up.
-
-On this page, the actual authentication can be configured.
-
-``Checkout Explanation``
-    Since most users probably won't be familiar with why they have to authenticate
-    to buy a ticket, you can provide them a small blurb here. Markdown is supported.
-
-``Attribute RegEx``
-    By default, any successful authentication with the IdP will allow the user to
-    proceed with their purchase. Should the allowed audience needed to be restricted
-    further, a set of regular Expressions can be used to do this.
-
-    An Attribute RegEx of ``{}`` will allow any authenticated user to pass.
-
-    A RegEx of ``{ "affiliation": "^(employee@pretix.eu|staff@pretix.eu)$" }`` will
-    only allow user to pass which have the ``affiliation`` attribute and whose
-    attribute either matches ``employee@pretix.eu`` or ``staff@pretix.eu``.
-
-    Please make sure that the attribute you are querying is also requested from the
-    IdP in the first place - for a quick check you can have a look at the top of
-    the page where all currently configured attributes are listed.
-
-``RegEx Fail Explanation``
-    Only used in conjunction with the above Attribute RegEx. Should the user not
-    pass the restrictions imposed by the regular expression, the user is shown
-    this error-message.
-
-    If you are - for example in an university context - restricting access to
-    students only, you might want to explain here that Employees are not allowed
-    to book tickets.
-
-``Ticket Secret SAML Attribute``
-    In very specific instances, it might be desirable that the ticket-secret is
-    not the randomly one generated by pretix but rather based on one of the
-    users attributes - for example their unique ID or access card number.
-
-    To achieve this, the name of a SAML-attribute can be specified here.
-
-    It is however necessary to note, that even with this setting in use,
-    ticket-secrets need to be unique. This is why when this setting is enabled,
-    the default, pretix-generated ticket-secret is prefixed with the attributes
-    value.
-
-    Example: A users ``cardid`` attribute has the value of ``01189998819991197253``.
-    The default random ticket secret would have been
-    ``yczygpw9877akz2xwdhtdyvdqwkv7npj``. The resulting new secret will now be
-    ``01189998819991197253_yczygpw9877akz2xwdhtdyvdqwkv7npj``.
-
-    That way, the ticket secret is still unique, but when checking into an event,
-    the user can easily be searched and found using their identifier.
-
-IdP-provided E-Mail addresses, names
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-By default, pretix will only authenticate the user and not process the received
-data any further.
-
-However, there are a few exceptions to this rule.
-
-There are a few `magic` attributes that pretix will use to automatically populate
-the corresponding fields within the checkout process **and lock them out from
-user editing**.
-
-  * ``givenName`` and ``sn``: If both of those attributes are present and pretix
-    is configured to collect the users name, these attributes' values are used
-    for the given and family name respectively.
-  * ``email``: If this attribute is present, the E-Mail-address of the users will
-    be set to the one transmitted through the attributes.
-
-The latter might pose a problem, if the IdP is transmitting an ``email`` attribute
-which does contain a system-level mail address which is only used as an internal
-identifier but not as a real mailbox. In this case, please consider setting the
-``friendlyName`` of the attribute to a different value than ``email`` or removing
-this field from the list of requested attributes altogether.
-
-Saving attributes to questions
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-By setting the ``internal identifier`` of a user-defined question to the same name
-as a SAML attribute, pretix will save the value of said attribute into the question.
-
-All the same as in the above section on E-Mail addresses, those fields become
-non-editable by the user.
-
-Please be aware that some specialty question types might not be compatible with
-the SAML attributes due to specific format requirements. If in doubt (or if the
-checkout fails/the information is not properly saved), try setting the question
-type to a simple type like "Text (one line)".
-
-Notes and configuration examples
---------------------------------
-
-Requesting SAML 1.0 and 2.0 attributes from an academic IdP
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This requests the ``eduPersonPrincipalName`` (also sometimes called EPPN),
-``email``, ``givenName`` and ``sn`` both in SAML 1.0 and SAML 2.0 attributes.
-
-.. sourcecode:: json
-
-    [
-        {
-            "attributeValue": [],
-            "friendlyName": "eduPersonPrincipalName",
-            "isRequired": true,
-            "name": "urn:mace:dir:attribute-def:eduPersonPrincipalName",
-            "nameFormat": "urn:mace:shibboleth:1.0:attributeNamespace:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "eduPersonPrincipalName",
-            "isRequired": true,
-            "name": "urn:oid:1.3.6.1.4.1.5923.1.1.1.6",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "email",
-            "isRequired": true,
-            "name": "urn:mace:dir:attribute-def:mail",
-            "nameFormat": "urn:mace:shibboleth:1.0:attributeNamespace:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "email",
-            "isRequired": true,
-            "name": "urn:oid:0.9.2342.19200300.100.1.3",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "givenName",
-            "isRequired": true,
-            "name": "urn:mace:dir:attribute-def:givenName",
-            "nameFormat": "urn:mace:shibboleth:1.0:attributeNamespace:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "givenName",
-            "isRequired": true,
-            "name": "urn:oid:2.5.4.42",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "sn",
-            "isRequired": true,
-            "name": "urn:mace:dir:attribute-def:sn",
-            "nameFormat": "urn:mace:shibboleth:1.0:attributeNamespace:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "sn",
-            "isRequired": true,
-            "name": "urn:oid:2.5.4.4",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        }
-    ]
-
-skIDentity IdP Metadata URL
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Since the IdP Metadata URL for `skIDentity`_ is not readily documented/visible
-in their backend, we document it here:
-``https://service.skidentity.de/fs/saml/metadata``
-
-Requesting skIDentity attributes for electronic identity cards
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This requests the basic ``eIdentifier``, ``IDType``, ``IDIssuer``, and
-``NameID`` from the `skIDentity`_ SAML service, which are available for
-electronic ID cards such as the German ePA/NPA. (Other attributes such as
-the name and address are available at additional cost from the IdP).
-
-.. sourcecode:: json
-
-    [
-        {
-            "attributeValue": [],
-            "friendlyName": "eIdentifier",
-            "isRequired": true,
-            "name": "http://www.skidentity.de/att/eIdentifier",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "IDType",
-            "isRequired": true,
-            "name": "http://www.skidentity.de/att/IDType",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "IDIssuer",
-            "isRequired": true,
-            "name": "http://www.skidentity.de/att/IDIssuer",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "NameID",
-            "isRequired": true,
-            "name": "http://www.skidentity.de/att/NameID",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        }
-    ]
-
-.. _pretix.eu: https://pretix.eu
-.. _Test-, Basic- and Advanced-Federation: https://doku.tid.dfn.de/en:metadata
-.. _skIDentity: https://www.skidentity.de/

doc/spelling_wordlist.txt

@@ -17,7 +17,6 @@ bic
 BIC
 boolean
 booleans
-bugfix
 cancelled
 casted
 Ceph
@@ -78,7 +77,6 @@ mixin
 mixins
 multi
 multidomain
-multiplicator
 namespace
 namespaced
 namespaces

doc/user/events/email.rst

@@ -203,4 +203,4 @@ Then, please contact support@pretix.eu and we will enable DKIM for your domain o
 
 
 .. _Sender Policy Framework: https://en.wikipedia.org/wiki/Sender_Policy_Framework
-.. _SPF specification: http://www.open-spf.org/SPF_Record_Syntax
+.. _SPF specification: http://www.openspf.org/SPF_Record_Syntax

doc/user/events/ticket_secrets.rst

@@ -1,5 +1,3 @@
-.. _secret_generators:
-
 Ticket secret generators
 ========================
 

doc/user/events/widget.rst

@@ -4,7 +4,8 @@ Embeddable Widget
 =================
 
 If you want to show your ticket shop on your event website or blog, you can use our JavaScript widget. This way,
-users will not need to leave your site to buy their ticket in most cases.
+users will not need to leave your site to buy their ticket in most cases. The widget will still open a new tab
+for the checkout if the user is on a mobile device.
 
 To obtain the correct HTML code for embedding your event into your website, we recommend that you go to the "Widget"
 tab of your event's settings. You can specify some optional settings there (for example the language of the widget)
@@ -309,10 +310,6 @@ Currently, the following attributes are understood by pretix itself:
   always be modified. Note that this is not a security feature and can easily be overridden by users, so do not rely
   on this for authentication.
 
-* If ``data-consent="…"`` is given, the cookie consent mechanism will be initialized with consent for the given cookie
-  providers. All other providers will be disabled, no consent dialog will be shown. This is useful if you already
-  asked the user for consent and don't want them to be asked again. Example: ``data-consent="facebook,google_analytics"``
-
 Any configured pretix plugins might understand more data fields. For example, if the appropriate plugins on pretix
 Hosted or pretix Enterprise are active, you can pass the following fields:
 

src/.update-locales

@@ -34,7 +34,5 @@ git push
 # Unlock Weblate
 for c in $COMPONENTS; do
 	wlc unlock $c;
-done
-for c in $COMPONENTS; do
 	wlc pull $c;
 done

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.7.0"
+__version__ = "4.1.0"

src/pretix/api/auth/devicesecurity.py

@@ -70,38 +70,9 @@ class PretixScanSecurityProfile(AllowListSecurityProfile):
     )
 
 
-class PretixScanNoSyncNoSearchSecurityProfile(AllowListSecurityProfile):
-    identifier = 'pretixscan_online_kiosk'
-    verbose_name = _('pretixSCAN (kiosk mode, no order sync, no search)')
-    allowlist = (
-        ('GET', 'api-v1:version'),
-        ('GET', 'api-v1:device.eventselection'),
-        ('POST', 'api-v1:device.update'),
-        ('POST', 'api-v1:device.revoke'),
-        ('POST', 'api-v1:device.roll'),
-        ('GET', 'api-v1:event-list'),
-        ('GET', 'api-v1:event-detail'),
-        ('GET', 'api-v1:subevent-list'),
-        ('GET', 'api-v1:subevent-detail'),
-        ('GET', 'api-v1:itemcategory-list'),
-        ('GET', 'api-v1:item-list'),
-        ('GET', 'api-v1:question-list'),
-        ('GET', 'api-v1:badgelayout-list'),
-        ('GET', 'api-v1:badgeitem-list'),
-        ('GET', 'api-v1:checkinlist-list'),
-        ('GET', 'api-v1:checkinlist-status'),
-        ('POST', 'api-v1:checkinlist-failed_checkins'),
-        ('POST', 'api-v1:checkinlistpos-redeem'),
-        ('GET', 'api-v1:revokedsecrets-list'),
-        ('GET', 'api-v1:orderposition-pdf_image'),
-        ('GET', 'api-v1:event.settings'),
-        ('POST', 'api-v1:upload'),
-    )
-
-
 class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
-    identifier = 'pretixscan_online_noorders'
-    verbose_name = _('pretixSCAN (online only, no order sync)')
+    identifier = 'pretixscan_online_kiosk'
+    verbose_name = _('pretixSCAN (kiosk mode, online only)')
     allowlist = (
         ('GET', 'api-v1:version'),
         ('GET', 'api-v1:device.eventselection'),
@@ -120,7 +91,6 @@ class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:checkinlist-list'),
         ('GET', 'api-v1:checkinlist-status'),
         ('POST', 'api-v1:checkinlist-failed_checkins'),
-        ('GET', 'api-v1:checkinlistpos-list'),
         ('POST', 'api-v1:checkinlistpos-redeem'),
         ('GET', 'api-v1:revokedsecrets-list'),
         ('GET', 'api-v1:orderposition-pdf_image'),
@@ -163,12 +133,9 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
         ('POST', 'api-v1:orderrefund-list'),
         ('POST', 'api-v1:orderrefund-done'),
         ('POST', 'api-v1:cartposition-list'),
-        ('POST', 'api-v1:cartposition-bulk-create'),
         ('GET', 'api-v1:checkinlist-list'),
         ('POST', 'api-v1:checkinlistpos-redeem'),
         ('POST', 'plugins:pretix_posbackend:order.posprintlog'),
-        ('POST', 'plugins:pretix_posbackend:order.poslock'),
-        ('DELETE', 'plugins:pretix_posbackend:order.poslock'),
         ('DELETE', 'api-v1:cartposition-detail'),
         ('GET', 'api-v1:giftcard-list'),
         ('POST', 'api-v1:giftcard-transact'),
@@ -176,8 +143,6 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
         ('POST', 'plugins:pretix_posbackend:posreceipt-list'),
         ('POST', 'plugins:pretix_posbackend:posclosing-list'),
         ('POST', 'plugins:pretix_posbackend:posdebugdump-list'),
-        ('POST', 'plugins:pretix_posbackend:posdebuglogentry-list'),
-        ('POST', 'plugins:pretix_posbackend:posdebuglogentry-bulk-create'),
         ('GET', 'plugins:pretix_posbackend:poscashier-list'),
         ('POST', 'plugins:pretix_posbackend:stripeterminal.token'),
         ('GET', 'api-v1:revokedsecrets-list'),
@@ -195,7 +160,6 @@ DEVICE_SECURITY_PROFILES = {
         FullAccessSecurityProfile,
         PretixScanSecurityProfile,
         PretixScanNoSyncSecurityProfile,
-        PretixScanNoSyncNoSearchSecurityProfile,
         PretixPosSecurityProfile,
     )
 }

src/pretix/api/migrations/0006_alter_webhook_target_url.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.2 on 2021-07-05 07:56
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixapi', '0005_auto_20191028_1541'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='webhook',
-            name='target_url',
-            field=models.URLField(max_length=255),
-        ),
-    ]

src/pretix/api/migrations/0007_alter_webhookcall_target_url.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.4 on 2021-09-15 11:06
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixapi', '0006_alter_webhook_target_url'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='webhookcall',
-            name='target_url',
-            field=models.URLField(max_length=255),
-        ),
-    ]

src/pretix/api/models.py

@@ -95,7 +95,7 @@ class OAuthRefreshToken(AbstractRefreshToken):
 class WebHook(models.Model):
     organizer = models.ForeignKey('pretixbase.Organizer', on_delete=models.CASCADE, related_name='webhooks')
     enabled = models.BooleanField(default=True, verbose_name=_("Enable webhook"))
-    target_url = models.URLField(verbose_name=_("Target URL"), max_length=255)
+    target_url = models.URLField(verbose_name=_("Target URL"))
     all_events = models.BooleanField(default=True, verbose_name=_("All events (including newly created ones)"))
     limit_events = models.ManyToManyField('pretixbase.Event', verbose_name=_("Limit to events"), blank=True)
 
@@ -120,7 +120,7 @@ class WebHookEventListener(models.Model):
 class WebHookCall(models.Model):
     webhook = models.ForeignKey('WebHook', on_delete=models.CASCADE, related_name='calls')
     datetime = models.DateTimeField(auto_now_add=True)
-    target_url = models.URLField(max_length=255)
+    target_url = models.URLField()
     action_type = models.CharField(max_length=255)
     is_retry = models.BooleanField(default=False)
     execution_time = models.FloatField(null=True)

src/pretix/api/pagination.py

@@ -1,27 +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 rest_framework.pagination import PageNumberPagination
-
-
-class Pagination(PageNumberPagination):
-    page_size_query_param = 'page_size'
-    max_page_size = 50

src/pretix/api/serializers/cart.py

@@ -73,61 +73,53 @@ class CartPositionCreateSerializer(I18nAwareModelSerializer):
                 minutes=self.context['event'].settings.get('reservation_time', as_type=int)
             )
 
-        new_quotas = (validated_data.get('variation').quotas.filter(subevent=validated_data.get('subevent'))
-                      if validated_data.get('variation')
-                      else validated_data.get('item').quotas.filter(subevent=validated_data.get('subevent')))
-        if len(new_quotas) == 0:
-            raise ValidationError(
-                gettext_lazy('The product "{}" is not assigned to a quota.').format(
-                    str(validated_data.get('item'))
-                )
-            )
-        for quota in new_quotas:
-            avail = quota.availability(_cache=self.context['quota_cache'])
-            if avail[0] != Quota.AVAILABILITY_OK or (avail[1] is not None and avail[1] < 1):
+        with self.context['event'].lock():
+            new_quotas = (validated_data.get('variation').quotas.filter(subevent=validated_data.get('subevent'))
+                          if validated_data.get('variation')
+                          else validated_data.get('item').quotas.filter(subevent=validated_data.get('subevent')))
+            if len(new_quotas) == 0:
                 raise ValidationError(
-                    gettext_lazy('There is not enough quota available on quota "{}" to perform '
-                                 'the operation.').format(
-                        quota.name
+                    gettext_lazy('The product "{}" is not assigned to a quota.').format(
+                        str(validated_data.get('item'))
                     )
                 )
+            for quota in new_quotas:
+                avail = quota.availability()
+                if avail[0] != Quota.AVAILABILITY_OK or (avail[1] is not None and avail[1] < 1):
+                    raise ValidationError(
+                        gettext_lazy('There is not enough quota available on quota "{}" to perform '
+                                     'the operation.').format(
+                            quota.name
+                        )
+                    )
+            attendee_name = validated_data.pop('attendee_name', '')
+            if attendee_name and not validated_data.get('attendee_name_parts'):
+                validated_data['attendee_name_parts'] = {
+                    '_legacy': attendee_name
+                }
 
-        for quota in new_quotas:
-            oldsize = self.context['quota_cache'][quota.pk][1]
-            newsize = oldsize - 1 if oldsize is not None else None
-            self.context['quota_cache'][quota.pk] = (
-                Quota.AVAILABILITY_OK if newsize is None or newsize > 0 else Quota.AVAILABILITY_GONE,
-                newsize
-            )
+            seated = validated_data.get('item').seat_category_mappings.filter(subevent=validated_data.get('subevent')).exists()
+            if validated_data.get('seat'):
+                if not seated:
+                    raise ValidationError('The specified product does not allow to choose a seat.')
+                try:
+                    seat = self.context['event'].seats.get(seat_guid=validated_data['seat'], subevent=validated_data.get('subevent'))
+                except Seat.DoesNotExist:
+                    raise ValidationError('The specified seat does not exist.')
+                except Seat.MultipleObjectsReturned:
+                    raise ValidationError('The specified seat ID is not unique.')
+                else:
+                    validated_data['seat'] = seat
+                    if not seat.is_available(
+                        sales_channel=validated_data.get('sales_channel', 'web'),
+                        distance_ignore_cart_id=validated_data['cart_id'],
+                    ):
+                        raise ValidationError(gettext_lazy('The selected seat "{seat}" is not available.').format(seat=seat.name))
+            elif seated:
+                raise ValidationError('The specified product requires to choose a seat.')
 
-        attendee_name = validated_data.pop('attendee_name', '')
-        if attendee_name and not validated_data.get('attendee_name_parts'):
-            validated_data['attendee_name_parts'] = {
-                '_legacy': attendee_name
-            }
-
-        seated = validated_data.get('item').seat_category_mappings.filter(subevent=validated_data.get('subevent')).exists()
-        if validated_data.get('seat'):
-            if not seated:
-                raise ValidationError('The specified product does not allow to choose a seat.')
-            try:
-                seat = self.context['event'].seats.get(seat_guid=validated_data['seat'], subevent=validated_data.get('subevent'))
-            except Seat.DoesNotExist:
-                raise ValidationError('The specified seat does not exist.')
-            except Seat.MultipleObjectsReturned:
-                raise ValidationError('The specified seat ID is not unique.')
-            else:
-                validated_data['seat'] = seat
-                if not seat.is_available(
-                    sales_channel=validated_data.get('sales_channel', 'web'),
-                    distance_ignore_cart_id=validated_data['cart_id'],
-                ):
-                    raise ValidationError(gettext_lazy('The selected seat "{seat}" is not available.').format(seat=seat.name))
-        elif seated:
-            raise ValidationError('The specified product requires to choose a seat.')
-
-        validated_data.pop('sales_channel')
-        cp = CartPosition.objects.create(event=self.context['event'], **validated_data)
+            validated_data.pop('sales_channel')
+            cp = CartPosition.objects.create(event=self.context['event'], **validated_data)
 
         for answ_data in answers_data:
             options = answ_data.pop('options')

src/pretix/api/serializers/checkin.py

@@ -60,7 +60,7 @@ class CheckinListSerializer(I18nAwareModelSerializer):
         full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
         full_data.update(data)
 
-        for item in full_data.get('limit_products', []):
+        for item in full_data.get('limit_products'):
             if event != item.event:
                 raise ValidationError(_('One or more items do not belong to this event.'))
 

src/pretix/api/serializers/event.py

@@ -54,7 +54,7 @@ from pretix.base.models.items import SubEventItem, SubEventItemVariation
 from pretix.base.services.seating import (
     SeatProtected, generate_seats, validate_plan_change,
 )
-from pretix.base.settings import LazyI18nStringList, validate_event_settings
+from pretix.base.settings import validate_event_settings
 from pretix.base.signals import api_event_settings_fields
 
 logger = logging.getLogger(__name__)
@@ -637,7 +637,7 @@ class SubEventSerializer(I18nAwareModelSerializer):
 class TaxRuleSerializer(CountryFieldMixin, I18nAwareModelSerializer):
     class Meta:
         model = TaxRule
-        fields = ('id', 'name', 'rate', 'price_includes_tax', 'eu_reverse_charge', 'home_country', 'internal_name', 'keep_gross_if_rate_changes')
+        fields = ('id', 'name', 'rate', 'price_includes_tax', 'eu_reverse_charge', 'home_country')
 
 
 class EventSettingsSerializer(SettingsSerializer):
@@ -704,7 +704,6 @@ class EventSettingsSerializer(SettingsSerializer):
         'payment_term_accept_late',
         'payment_explanation',
         'payment_pending_hidden',
-        'mail_days_order_expire_warning',
         'ticket_download',
         'ticket_download_date',
         'ticket_download_addons',
@@ -713,6 +712,7 @@ class EventSettingsSerializer(SettingsSerializer):
         'ticket_download_require_validated_email',
         'ticket_secret_length',
         'mail_prefix',
+        'mail_from',
         'mail_from_name',
         'mail_attach_ical',
         'mail_attach_tickets',
@@ -733,7 +733,6 @@ class EventSettingsSerializer(SettingsSerializer):
         'invoice_numbers_prefix_cancellations',
         'invoice_numbers_counter_length',
         'invoice_attendee_name',
-        'invoice_event_location',
         'invoice_include_expire_date',
         'invoice_address_explanation_text',
         'invoice_email_attachment',
@@ -763,7 +762,6 @@ class EventSettingsSerializer(SettingsSerializer):
         'cancel_allow_user_paid_refund_as_giftcard',
         'cancel_allow_user_paid_require_approval',
         'change_allow_user_variation',
-        'change_allow_user_addons',
         'change_allow_user_until',
         'change_allow_user_price',
         'primary_color',
@@ -791,10 +789,6 @@ class EventSettingsSerializer(SettingsSerializer):
         data = super().validate(data)
         settings_dict = self.instance.freeze()
         settings_dict.update(data)
-
-        if data.get('confirm_texts') is not None:
-            data['confirm_texts'] = LazyI18nStringList(data['confirm_texts'])
-
         validate_event_settings(self.event, settings_dict)
         return data
 

src/pretix/api/serializers/item.py

@@ -31,10 +31,9 @@
 # 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 os.path
+
 from decimal import Decimal
 
-from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.db.models import QuerySet
@@ -58,10 +57,8 @@ class InlineItemVariationSerializer(I18nAwareModelSerializer):
     class Meta:
         model = ItemVariation
         fields = ('id', 'value', 'active', 'description',
-                  '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',)
+                  'position', 'default_price', 'price', 'original_price',
+                  'require_membership', 'require_membership_types',)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -75,10 +72,8 @@ class ItemVariationSerializer(I18nAwareModelSerializer):
     class Meta:
         model = ItemVariation
         fields = ('id', 'value', 'active', 'description',
-                  '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',)
+                  'position', 'default_price', 'price', 'original_price',
+                  'require_membership', 'require_membership_types',)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -166,7 +161,7 @@ class ItemSerializer(I18nAwareModelSerializer):
     meta_data = MetaDataField(required=False, source='*')
     picture = UploadedFileField(required=False, allow_null=True, allowed_types=(
         'image/png', 'image/jpeg', 'image/gif'
-    ), max_size=settings.FILE_UPLOAD_MAX_SIZE_IMAGE)
+    ), max_size=10 * 1024 * 1024)
 
     class Meta:
         model = Item
@@ -177,7 +172,7 @@ class ItemSerializer(I18nAwareModelSerializer):
                   'min_per_order', 'max_per_order', 'checkin_attention', 'has_variations', 'variations',
                   'addons', 'bundles', 'original_price', 'require_approval', 'generate_tickets',
                   'show_quota_left', 'hidden_if_available', 'allow_waitinglist', 'issue_giftcard', 'meta_data',
-                  'require_membership', 'require_membership_types', 'require_membership_hidden', 'grant_membership_type',
+                  'require_membership', 'require_membership_types', 'grant_membership_type',
                   'grant_membership_duration_like_event', 'grant_membership_duration_days',
                   'grant_membership_duration_months')
         read_only_fields = ('has_variations',)
@@ -250,16 +245,10 @@ class ItemSerializer(I18nAwareModelSerializer):
         addons_data = validated_data.pop('addons') if 'addons' in validated_data else {}
         bundles_data = validated_data.pop('bundles') if 'bundles' in validated_data else {}
         meta_data = validated_data.pop('meta_data', None)
-        picture = validated_data.pop('picture', None)
-        require_membership_types = validated_data.pop('require_membership_types', [])
         item = Item.objects.create(**validated_data)
-        if picture:
-            item.picture.save(os.path.basename(picture.name), picture)
-        if require_membership_types:
-            item.require_membership_types.add(*require_membership_types)
 
         for variation_data in variations_data:
-            require_membership_types = variation_data.pop('require_membership_types', [])
+            require_membership_types = variation_data.pop('require_membership_types')
             v = ItemVariation.objects.create(item=item, **variation_data)
             if require_membership_types:
                 v.require_membership_types.add(*require_membership_types)
@@ -280,10 +269,7 @@ class ItemSerializer(I18nAwareModelSerializer):
 
     def update(self, instance, validated_data):
         meta_data = validated_data.pop('meta_data', None)
-        picture = validated_data.pop('picture', None)
         item = super().update(instance, validated_data)
-        if picture:
-            item.picture.save(os.path.basename(picture.name), picture)
 
         # Meta data
         if meta_data is not None:

src/pretix/api/serializers/order.py

@@ -26,7 +26,6 @@ from collections import Counter, defaultdict
 from decimal import Decimal
 
 import pycountry
-from django.conf import settings
 from django.core.files import File
 from django.db.models import F, Q
 from django.utils.timezone import now
@@ -192,7 +191,7 @@ class AnswerSerializer(I18nAwareModelSerializer):
         )
         if cf.type not in allowed_types:
             raise ValidationError('The submitted file "{fid}" has a file type that is not allowed in this field.'.format(fid=data))
-        if cf.file.size > settings.FILE_UPLOAD_MAX_SIZE_OTHER:
+        if cf.file.size > 10 * 1024 * 1024:
             raise ValidationError('The submitted file "{fid}" is too large to be used in this field.'.format(fid=data))
 
         data['options'] = []
@@ -934,8 +933,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
     consume_carts = serializers.ListField(child=serializers.CharField(), required=False)
     force = serializers.BooleanField(default=False, required=False)
     payment_date = serializers.DateTimeField(required=False, allow_null=True)
-    send_email = serializers.BooleanField(default=False, required=False, allow_null=True)
-    require_approval = serializers.BooleanField(default=False, required=False)
+    send_email = serializers.BooleanField(default=False, required=False)
     simulate = serializers.BooleanField(default=False, required=False)
     customer = serializers.SlugRelatedField(slug_field='identifier', queryset=Customer.objects.none(), required=False)
 
@@ -948,7 +946,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         model = Order
         fields = ('code', 'status', 'testmode', 'email', 'phone', 'locale', 'payment_provider', 'fees', 'comment', 'sales_channel',
                   'invoice_address', 'positions', 'checkin_attention', 'payment_info', 'payment_date', 'consume_carts',
-                  'force', 'send_email', 'simulate', 'customer', 'custom_followup_at', 'require_approval')
+                  'force', 'send_email', 'simulate', 'customer', 'custom_followup_at')
 
     def validate_payment_provider(self, pp):
         if pp is None:
@@ -1042,8 +1040,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         force = validated_data.pop('force', False)
         simulate = validated_data.pop('simulate', False)
         self._send_mail = validated_data.pop('send_email', False)
-        if self._send_mail is None:
-            self._send_mail = validated_data.get('sales_channel') in self.context['event'].settings.mail_sales_channel_placed_paid
 
         if 'invoice_address' in validated_data:
             iadata = validated_data.pop('invoice_address')
@@ -1222,8 +1218,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
             order.set_expires(subevents=[p.get('subevent') for p in positions_data])
             order.meta_info = "{}"
             order.total = Decimal('0.00')
-            if validated_data.get('require_approval') is not None:
-                order.require_approval = validated_data['require_approval']
             if simulate:
                 order = WrappedModel(order)
                 order.last_modified = now()
@@ -1409,7 +1403,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                 state=OrderPayment.PAYMENT_STATE_CREATED
             )
 
-        order.create_transactions(is_new=True, fees=fees, positions=pos_map.values())
         return order
 
 
@@ -1431,9 +1424,9 @@ class InlineInvoiceLineSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = InvoiceLine
-        fields = ('position', 'description', 'item', 'variation', 'subevent', 'attendee_name', 'event_date_from',
+        fields = ('position', 'description', 'item', 'variation', 'attendee_name', 'event_date_from',
                   'event_date_to', 'gross_value', 'tax_value', 'tax_rate', 'tax_name', 'fee_type',
-                  'fee_internal_type', 'event_location')
+                  'fee_internal_type')
 
 
 class InvoiceSerializer(I18nAwareModelSerializer):

src/pretix/api/serializers/organizer.py

@@ -275,7 +275,6 @@ class OrganizerSettingsSerializer(SettingsSerializer):
     default_fields = [
         'customer_accounts',
         'customer_accounts_link_by_email',
-        'invoice_regenerate_allowed',
         'contact_mail',
         'imprint_url',
         'organizer_info_text',
@@ -295,15 +294,7 @@ class OrganizerSettingsSerializer(SettingsSerializer):
         'theme_color_background',
         'theme_round_borders',
         'primary_font',
-        'organizer_logo_image_inherit',
-        'organizer_logo_image',
-        'privacy_url',
-        'cookie_consent',
-        'cookie_consent_dialog_title',
-        'cookie_consent_dialog_text',
-        'cookie_consent_dialog_text_secondary',
-        'cookie_consent_dialog_button_yes',
-        'cookie_consent_dialog_button_no',
+        'organizer_logo_image'
     ]
 
     def __init__(self, *args, **kwargs):

src/pretix/api/views/cart.py

@@ -21,18 +21,14 @@
 #
 from django.db import transaction
 from rest_framework import status, viewsets
-from rest_framework.decorators import action
-from rest_framework.exceptions import ValidationError
 from rest_framework.filters import OrderingFilter
 from rest_framework.mixins import CreateModelMixin, DestroyModelMixin
 from rest_framework.response import Response
-from rest_framework.settings import api_settings
 
 from pretix.api.serializers.cart import (
     CartPositionCreateSerializer, CartPositionSerializer,
 )
 from pretix.base.models import CartPosition
-from pretix.base.services.locking import NoLockManager
 
 
 class CartPositionViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnlyModelViewSet):
@@ -54,61 +50,18 @@ class CartPositionViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnly
     def get_serializer_context(self):
         ctx = super().get_serializer_context()
         ctx['event'] = self.request.event
-        ctx['quota_cache'] = {}
         return ctx
 
     def create(self, request, *args, **kwargs):
         serializer = CartPositionCreateSerializer(data=request.data, context=self.get_serializer_context())
         serializer.is_valid(raise_exception=True)
-        with transaction.atomic(), self.request.event.lock():
+        with transaction.atomic():
             self.perform_create(serializer)
-        cp = serializer.instance
-        serializer = CartPositionSerializer(cp, context=serializer.context)
+            cp = serializer.instance
+            serializer = CartPositionSerializer(cp, context=serializer.context)
+
         headers = self.get_success_headers(serializer.data)
         return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
 
-    @action(detail=False, methods=['POST'])
-    def bulk_create(self, request, *args, **kwargs):
-        if not isinstance(request.data, list):  # noqa
-            return Response({"error": "Please supply a list"}, status=status.HTTP_400_BAD_REQUEST)
-
-        ctx = self.get_serializer_context()
-        with transaction.atomic():
-            serializers = [
-                CartPositionCreateSerializer(data=d, context=ctx)
-                for d in request.data
-            ]
-
-            lockfn = self.request.event.lock
-            if not any(s.is_valid(raise_exception=False) for s in serializers):
-                lockfn = NoLockManager
-
-            results = []
-            with lockfn():
-                for s in serializers:
-                    if s.is_valid(raise_exception=False):
-                        try:
-                            cp = s.save()
-                        except ValidationError as e:
-                            results.append({
-                                'success': False,
-                                'data': None,
-                                'errors': {api_settings.NON_FIELD_ERRORS_KEY: e.detail},
-                            })
-                        else:
-                            results.append({
-                                'success': True,
-                                'data': CartPositionSerializer(cp, context=ctx).data,
-                                'errors': None,
-                            })
-                    else:
-                        results.append({
-                            'success': False,
-                            'data': None,
-                            'errors': s.errors,
-                        })
-
-        return Response({'results': results}, status=status.HTTP_200_OK)
-
     def perform_create(self, serializer):
         serializer.save()

src/pretix/api/views/checkin.py

@@ -20,7 +20,6 @@
 # <https://www.gnu.org/licenses/>.
 #
 import django_filters
-from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.db.models import (
@@ -33,7 +32,6 @@ from django.utils.functional import cached_property
 from django.utils.timezone import now
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
 from django_scopes import scopes_disabled
-from packaging.version import parse
 from rest_framework import viewsets
 from rest_framework.decorators import action
 from rest_framework.fields import DateTimeField
@@ -423,20 +421,13 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
             nonce=nonce,
             forced=force,
         )
-        raw_barcode_for_checkin = None
 
         try:
             queryset = self.get_queryset(ignore_status=True, ignore_products=True)
             if self.kwargs['pk'].isnumeric():
                 op = queryset.get(Q(pk=self.kwargs['pk']) | Q(secret=self.kwargs['pk']))
             else:
-                # In application/x-www-form-urlencoded, you can encodes space ' ' with '+' instead of '%20'.
-                # `id`, however, is part of a path where this technically is not allowed. Old versions of our
-                # scan apps still do it, so we try work around it!
-                try:
-                    op = queryset.get(secret=self.kwargs['pk'])
-                except OrderPosition.DoesNotExist:
-                    op = queryset.get(secret=self.kwargs['pk'].replace('+', ' '))
+                op = queryset.get(secret=self.kwargs['pk'])
         except OrderPosition.DoesNotExist:
             revoked_matches = list(self.request.event.revoked_secrets.filter(secret=self.kwargs['pk']))
             if len(revoked_matches) == 0:
@@ -464,41 +455,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                     error_reason=Checkin.REASON_INVALID,
                     **common_checkin_args,
                 )
-
-                if force and isinstance(self.request.auth, Device):
-                    # There was a bug in libpretixsync: If you scanned a ticket in offline mode that was
-                    # valid at the time but no longer exists at time of upload, the device would retry to
-                    # upload the same scan over and over again. Since we can't update all devices quickly,
-                    # here's a dirty workaround to make it stop.
-                    try:
-                        brand = self.request.auth.software_brand
-                        ver = parse(self.request.auth.software_version)
-                        legacy_mode = (
-                            (brand == 'pretixSCANPROXY' and ver < parse('0.0.3')) or
-                            (brand == 'pretixSCAN Android' and ver < parse('1.11.2')) or
-                            (brand == 'pretixSCAN' and ver < parse('1.11.2'))
-                        )
-                        if legacy_mode:
-                            return Response({
-                                'status': 'error',
-                                'reason': Checkin.REASON_ALREADY_REDEEMED,
-                                'reason_explanation': None,
-                                'require_attention': False,
-                                '__warning': 'Compatibility hack active due to detected old pretixSCAN version',
-                            }, status=400)
-                    except:  # we don't care e.g. about invalid version numbers
-                        pass
-
-                return Response({
-                    'detail': 'Not found.',  # for backwards compatibility
-                    'status': 'error',
-                    'reason': Checkin.REASON_INVALID,
-                    'reason_explanation': None,
-                    'require_attention': False,
-                }, status=404)
-            elif revoked_matches and force:
-                op = revoked_matches[0].position
-                raw_barcode_for_checkin = self.kwargs['pk']
+                raise Http404()
             else:
                 op = revoked_matches[0].position
                 op.order.log_action('pretix.event.checkin.revoked', data={
@@ -549,8 +506,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                     user=self.request.user,
                     auth=self.request.auth,
                     type=type,
-                    raw_barcode=raw_barcode_for_checkin,
-                    from_revoked_secret=True,
+                    raw_barcode=None,
                 )
             except RequiredQuestionsError as e:
                 return Response({
@@ -610,7 +566,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
         )
         if cf.type not in allowed_types:
             raise ValidationError('The submitted file "{fid}" has a file type that is not allowed in this field.'.format(fid=data))
-        if cf.file.size > settings.FILE_UPLOAD_MAX_SIZE_OTHER:
+        if cf.file.size > 10 * 1024 * 1024:
             raise ValidationError('The submitted file "{fid}" is too large to be used in this field.'.format(fid=data))
 
         return cf.file

src/pretix/api/views/exporters.py

@@ -69,7 +69,7 @@ class ExportersMixin:
         cf = get_object_or_404(CachedFile, id=kwargs['cfid'])
         if cf.file:
             resp = ChunkBasedFileResponse(cf.file.file, content_type=cf.type)
-            resp['Content-Disposition'] = 'attachment; filename="{}"'.format(cf.filename).encode("ascii", "ignore")
+            resp['Content-Disposition'] = 'attachment; filename="{}"'.format(cf.filename)
             return resp
         elif not settings.HAS_CELERY:
             return Response(
@@ -132,7 +132,7 @@ class EventExportersViewSet(ExportersMixin, viewsets.ViewSet):
     def exporters(self):
         exporters = []
         responses = register_data_exporters.send(self.request.event)
-        for ex in sorted([response(self.request.event, self.request.organizer) for r, response in responses if response], key=lambda ex: str(ex.verbose_name)):
+        for ex in sorted([response(self.request.event) for r, response in responses], key=lambda ex: str(ex.verbose_name)):
             ex._serializer = JobRunSerializer(exporter=ex)
             exporters.append(ex)
         return exporters
@@ -151,7 +151,7 @@ class OrganizerExportersViewSet(ExportersMixin, viewsets.ViewSet):
             organizer=self.request.organizer
         )
         responses = register_multievent_data_exporters.send(self.request.organizer)
-        for ex in sorted([response(events, self.request.organizer) for r, response in responses if response], key=lambda ex: str(ex.verbose_name)):
+        for ex in sorted([response(events) for r, response in responses if response], key=lambda ex: str(ex.verbose_name)):
             ex._serializer = JobRunSerializer(exporter=ex, events=events)
             exporters.append(ex)
         return exporters

src/pretix/api/views/order.py

@@ -92,9 +92,6 @@ with scopes_disabled():
         subevent_after = django_filters.IsoDateTimeFilter(method='subevent_after_qs')
         subevent_before = django_filters.IsoDateTimeFilter(method='subevent_before_qs')
         search = django_filters.CharFilter(method='search_qs')
-        item = django_filters.CharFilter(field_name='all_positions', lookup_expr='item_id')
-        variation = django_filters.CharFilter(field_name='all_positions', lookup_expr='variation_id')
-        subevent = django_filters.CharFilter(field_name='all_positions', lookup_expr='subevent_id')
 
         class Meta:
             model = Order
@@ -217,9 +214,7 @@ class OrderViewSet(viewsets.ModelViewSet):
                     'positions',
                     opq.all().prefetch_related(
                         Prefetch('checkins', queryset=Checkin.objects.all()),
-                        'item', 'variation',
-                        Prefetch('answers', queryset=QuestionAnswer.objects.prefetch_related('options', 'question').order_by('question__position')),
-                        'seat',
+                        'item', 'variation', 'answers', 'answers__options', 'answers__question', 'seat',
                     )
                 )
             )
@@ -646,11 +641,7 @@ class OrderViewSet(viewsets.ModelViewSet):
                     payment and order.total == Decimal('0.00') and order.status == Order.STATUS_PAID and
                     not order.require_approval and payment.provider == "free"
                 )
-                if order.require_approval:
-                    email_template = request.event.settings.mail_text_order_placed_require_approval
-                    log_entry = 'pretix.event.order.email.order_placed_require_approval'
-                    email_attendees = False
-                elif free_flow:
+                if free_flow:
                     email_template = request.event.settings.mail_text_order_free
                     log_entry = 'pretix.event.order.email.order_free'
                     email_attendees = request.event.settings.mail_send_order_free_attendee
@@ -663,13 +654,12 @@ class OrderViewSet(viewsets.ModelViewSet):
 
                 _order_placed_email(
                     request.event, order, payment.payment_provider if payment else None, email_template,
-                    log_entry, invoice, payment, is_free=free_flow
+                    log_entry, invoice, payment
                 )
                 if email_attendees:
                     for p in order.positions.all():
                         if p.addon_to_id is None and p.attendee_email and p.attendee_email != order.email:
-                            _order_placed_email_attendee(request.event, order, p, email_attendees_template, log_entry,
-                                                         is_free=free_flow)
+                            _order_placed_email_attendee(request.event, order, p, email_attendees_template, log_entry)
 
                 if not free_flow and order.status == Order.STATUS_PAID and payment:
                     payment._send_paid_mail(invoice, None, '')
@@ -1461,14 +1451,8 @@ class InvoiceViewSet(viewsets.ReadOnlyModelViewSet):
         inv = self.get_object()
         if inv.canceled:
             raise ValidationError('The invoice has already been canceled.')
-        if not inv.event.settings.invoice_regenerate_allowed:
-            raise PermissionDenied('Invoices may not be changed after they are created.')
         elif inv.shredded:
             raise PermissionDenied('The invoice file is no longer stored on the server.')
-        elif inv.sent_to_organizer:
-            raise PermissionDenied('The invoice file has already been exported.')
-        elif now().astimezone(self.request.event.timezone).date() - inv.date > datetime.timedelta(days=1):
-            raise PermissionDenied('The invoice file is too old to be regenerated.')
         else:
             inv = regenerate_invoice(inv)
             inv.order.log_action(

src/pretix/api/webhooks.py

@@ -261,7 +261,7 @@ def register_default_webhook_events(sender, **kwargs):
         ),
         ParametrizedEventWebhookEvent(
             'pretix.event.deleted',
-            _('Event deleted'),
+            _('Event details changed'),
         ),
         ParametrizedSubEventWebhookEvent(
             'pretix.subevent.added',

src/pretix/base/apps.py

@@ -47,7 +47,6 @@ class PretixBaseConfig(AppConfig):
         from . import notifications  # NOQA
         from . import email  # NOQA
         from .services import auth, checkin, export, mail, tickets, cart, orderimport, orders, invoices, cleanup, update_check, quotas, notifications, vouchers  # NOQA
-        from .models import _transactions  # NOQA
         from django.conf import settings
 
         try:

src/pretix/base/auth.py

@@ -94,9 +94,6 @@ class BaseAuthBackend:
         This method will be called after the user filled in the login form. ``request`` will contain
         the current request and ``form_data`` the input for the form fields defined in ``login_form_fields``.
         You are expected to either return a ``User`` object (if login was successful) or ``None``.
-
-        You are expected to either return a ``User`` object (if login was successful) or ``None``. You should
-        obtain this user object using ``User.objects.get_or_create_for_backend``.
         """
         return
 
@@ -107,9 +104,7 @@ class BaseAuthBackend:
         reverse proxy, you can directly return a ``User`` object that will be logged in.
 
         ``request`` will contain the current request.
-
-        You are expected to either return a ``User`` object (if login was successful) or ``None``. You should
-        obtain this user object using ``User.objects.get_or_create_for_backend``.
+        You are expected to either return a ``User`` object (if login was successful) or ``None``.
         """
         return
 
@@ -151,8 +146,7 @@ class NativeAuthBackend(BaseAuthBackend):
         d = OrderedDict([
             ('email', forms.EmailField(label=_("E-mail"), max_length=254,
                                        widget=forms.EmailInput(attrs={'autofocus': 'autofocus'}))),
-            ('password', forms.CharField(label=_("Password"), widget=forms.PasswordInput,
-                                         max_length=4096)),
+            ('password', forms.CharField(label=_("Password"), widget=forms.PasswordInput)),
         ])
         return d
 

src/pretix/base/channels.py

@@ -82,13 +82,6 @@ class SalesChannel:
         """
         return False
 
-    @property
-    def customer_accounts_supported(self) -> bool:
-        """
-        If this property is ``True``, checkout will show the customer login step.
-        """
-        return True
-
 
 def get_all_sales_channels():
     global _ALL_CHANNELS

src/pretix/base/email.py

@@ -25,7 +25,6 @@ from datetime import timedelta
 from decimal import Decimal
 from itertools import groupby
 from smtplib import SMTPResponseException
-from typing import TypeVar
 
 import css_inline
 from django.conf import settings
@@ -33,7 +32,6 @@ from django.core.mail.backends.smtp import EmailBackend
 from django.db.models import Count
 from django.dispatch import receiver
 from django.template.loader import get_template
-from django.utils.formats import date_format
 from django.utils.timezone import now
 from django.utils.translation import (
     get_language, gettext_lazy as _, pgettext_lazy,
@@ -51,23 +49,23 @@ from pretix.base.templatetags.rich_text import markdown_compile_email
 
 logger = logging.getLogger('pretix.base.email')
 
-T = TypeVar("T", bound=EmailBackend)
 
+class CustomSMTPBackend(EmailBackend):
 
-def test_custom_smtp_backend(backend: T, from_addr: str) -> None:
-    try:
-        backend.open()
-        backend.connection.ehlo_or_helo_if_needed()
-        (code, resp) = backend.connection.mail(from_addr, [])
-        if code != 250:
-            logger.warning('Error testing mail settings, code %d, resp: %s' % (code, resp))
-            raise SMTPResponseException(code, resp)
-        (code, resp) = backend.connection.rcpt('testdummy@pretix.eu')
-        if (code != 250) and (code != 251):
-            logger.warning('Error testing mail settings, code %d, resp: %s' % (code, resp))
-            raise SMTPResponseException(code, resp)
-    finally:
-        backend.close()
+    def test(self, from_addr):
+        try:
+            self.open()
+            self.connection.ehlo_or_helo_if_needed()
+            (code, resp) = self.connection.mail(from_addr, [])
+            if code != 250:
+                logger.warn('Error testing mail settings, code %d, resp: %s' % (code, resp))
+                raise SMTPResponseException(code, resp)
+            (code, resp) = self.connection.rcpt('testdummy@pretix.eu')
+            if (code != 250) and (code != 251):
+                logger.warn('Error testing mail settings, code %d, resp: %s' % (code, resp))
+                raise SMTPResponseException(code, resp)
+        finally:
+            self.close()
 
 
 class BaseHTMLMailRenderer:
@@ -165,20 +163,9 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
                 has_addons=Count('addons')
             ))
             htmlctx['cart'] = [(k, list(v)) for k, v in groupby(
-                sorted(
-                    positions,
-                    key=lambda op: (
-                        (op.addon_to.positionid if op.addon_to_id else op.positionid),
-                        op.positionid
-                    )
-                ),
-                key=lambda op: (
-                    op.item,
-                    op.variation,
-                    op.subevent,
-                    op.attendee_name,
-                    (op.pk if op.addon_to_id else None),
-                    (op.pk if op.has_addons else None)
+                positions, key=lambda op: (
+                    op.item, op.variation, op.subevent, op.attendee_name,
+                    (op.pk if op.addon_to_id else None), (op.pk if op.has_addons else None)
                 )
             )]
 
@@ -465,15 +452,6 @@ def base_placeholders(sender, **kwargs):
                 }
             ),
         ),
-        SimpleFunctionalMailTextPlaceholder(
-            'event_location', ['event_or_subevent'], lambda event_or_subevent: str(event_or_subevent.location or ''),
-            lambda event: str(event.location or ''),
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'event_admission_time', ['event_or_subevent'],
-            lambda event_or_subevent: date_format(event_or_subevent.date_admission, 'TIME_FORMAT') if event_or_subevent.date_admission else '',
-            lambda event: date_format(event.date_admission, 'TIME_FORMAT') if event.date_admission else '',
-        ),
         SimpleFunctionalMailTextPlaceholder(
             'subevent', ['waiting_list_entry', 'event'],
             lambda waiting_list_entry, event: str(waiting_list_entry.subevent or event),
@@ -484,16 +462,6 @@ def base_placeholders(sender, **kwargs):
             lambda waiting_list_entry, event: (waiting_list_entry.subevent or event).get_date_from_display(),
             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_entry', 'event'],
-            lambda waiting_list_entry, event: build_absolute_uri(
-                event, 'presale:event.waitinglist.remove'
-            ) + '?voucher=' + waiting_list_entry.voucher.code,
-            lambda event: build_absolute_uri(
-                event,
-                'presale:event.waitinglist.remove',
-            ) + '?voucher=68CYU2H6ZTP3WLK5',
-        ),
         SimpleFunctionalMailTextPlaceholder(
             'url', ['waiting_list_entry', 'event'],
             lambda waiting_list_entry, event: build_absolute_uri(
@@ -561,22 +529,6 @@ def base_placeholders(sender, **kwargs):
             'voucher_list', ['voucher_list'], lambda voucher_list: '  \n'.join(voucher_list),
             '    68CYU2H6ZTP3WLK5\n    7MB94KKPVEPSMVF2'
         ),
-        SimpleFunctionalMailTextPlaceholder(
-            # join vouchers with two spaces at end of line so markdown-parser inserts a <br>
-            'voucher_url_list', ['event', 'voucher_list'],
-            lambda event, voucher_list: '  \n'.join([
-                build_absolute_uri(
-                    event, 'presale:event.redeem'
-                ) + '?voucher=' + c
-                for c in voucher_list
-            ]),
-            lambda event: '  \n'.join([
-                build_absolute_uri(
-                    event, 'presale:event.redeem'
-                ) + '?voucher=' + c
-                for c in ['68CYU2H6ZTP3WLK5', '7MB94KKPVEPSMVF2']
-            ]),
-        ),
         SimpleFunctionalMailTextPlaceholder(
             'url', ['event', 'voucher_list'], lambda event, voucher_list: build_absolute_uri(event, 'presale:event.index', kwargs={
                 'event': event.slug,
@@ -643,10 +595,6 @@ def base_placeholders(sender, **kwargs):
             'meta_%s' % k, ['event'], lambda event, k=k: event.meta_data[k],
             v
         ))
-        ph.append(SimpleFunctionalMailTextPlaceholder(
-            'meta_%s' % k, ['event_or_subevent'], lambda event_or_subevent, k=k: event_or_subevent.meta_data[k],
-            v
-        ))
 
     return ph
 

src/pretix/base/exporter.py

@@ -47,15 +47,12 @@ from django.db.models import QuerySet
 from django.utils.formats import localize
 from django.utils.translation import gettext, gettext_lazy as _
 from openpyxl import Workbook
-from openpyxl.cell.cell import ILLEGAL_CHARACTERS_RE, KNOWN_TYPES, Cell
+from openpyxl.cell.cell import ILLEGAL_CHARACTERS_RE, KNOWN_TYPES
 
 from pretix.base.models import Event
 
 
 def excel_safe(val):
-    if isinstance(val, Cell):
-        return val
-
     if not isinstance(val, KNOWN_TYPES):
         val = str(val)
 
@@ -73,9 +70,8 @@ class BaseExporter:
     This is the base class for all data exporters
     """
 
-    def __init__(self, event, organizer, progress_callback=lambda v: None):
+    def __init__(self, event, progress_callback=lambda v: None):
         self.event = event
-        self.organizer = organizer
         self.progress_callback = progress_callback
         self.is_multievent = isinstance(event, QuerySet)
         if isinstance(event, QuerySet):
@@ -224,13 +220,9 @@ class ListExporter(BaseExporter):
                 writer.writerow(line)
             return self.get_filename() + '.csv', 'text/csv', output.getvalue().encode("utf-8")
 
-    def prepare_xlsx_sheet(self, ws):
-        pass
-
     def _render_xlsx(self, form_data, output_file=None):
         wb = Workbook(write_only=True)
         ws = wb.create_sheet()
-        self.prepare_xlsx_sheet(ws)
         try:
             ws.title = str(self.verbose_name)
         except:

src/pretix/base/exporters/invoices.py

@@ -324,6 +324,7 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
                 _('Tax rate'),
                 _('Tax name'),
                 _('Event start date'),
+
                 _('Date'),
                 _('Order code'),
                 _('E-mail address'),
@@ -347,8 +348,6 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
                 _('Invoice recipient:') + ' ' + _('Beneficiary'),
                 _('Invoice recipient:') + ' ' + _('Internal reference'),
                 _('Payment providers'),
-                _('Event end date'),
-                _('Location'),
             ]
 
             p_providers = OrderPayment.objects.filter(
@@ -407,9 +406,7 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
                     ', '.join([
                         str(self.providers.get(p, p)) for p in sorted(set((l.payment_providers or '').split(',')))
                         if p and p != 'free'
-                    ]),
-                    date_format(l.event_date_to, "SHORT_DATE_FORMAT") if l.event_date_to else "",
-                    l.event_location or "",
+                    ])
                 ]
 
     @cached_property

src/pretix/base/exporters/json.py

@@ -55,20 +55,16 @@ class JSONExporter(BaseExporter):
                     'name': str(self.event.organizer.name),
                     'slug': self.event.organizer.slug
                 },
-                'meta_data': self.event.meta_data,
                 'categories': [
                     {
                         'id': category.id,
                         'name': str(category.name),
-                        'description': str(category.description),
-                        'position': category.position,
                         'internal_name': category.internal_name
                     } for category in self.event.categories.all()
                 ],
                 'items': [
                     {
                         'id': item.id,
-                        'position': item.position,
                         'name': str(item.name),
                         'internal_name': str(item.internal_name),
                         'category': item.category_id,
@@ -77,35 +73,13 @@ class JSONExporter(BaseExporter):
                         'tax_name': str(item.tax_rule.name) if item.tax_rule else None,
                         'admission': item.admission,
                         'active': item.active,
-                        'sales_channels': item.sales_channels,
-                        'description': str(item.description),
-                        'available_from': item.available_from,
-                        'available_until': item.available_until,
-                        'require_voucher': item.require_voucher,
-                        'hide_without_voucher': item.hide_without_voucher,
-                        'allow_cancel': item.allow_cancel,
-                        'require_bundling': item.require_bundling,
-                        'min_per_order': item.min_per_order,
-                        'max_per_order': item.max_per_order,
-                        'checkin_attention': item.checkin_attention,
-                        'original_price': item.original_price,
-                        'issue_giftcard': item.issue_giftcard,
-                        'meta_data': item.meta_data,
-                        'require_membership': item.require_membership,
                         'variations': [
                             {
                                 'id': variation.id,
                                 'active': variation.active,
                                 'price': variation.default_price if variation.default_price is not None else
                                 item.default_price,
-                                'name': str(variation),
-                                'description': str(variation.description),
-                                'position': variation.position,
-                                'require_membership': variation.require_membership,
-                                'sales_channels': variation.sales_channels,
-                                'available_from': variation.available_from,
-                                'available_until': variation.available_until,
-                                'hide_without_voucher': variation.hide_without_voucher,
+                                'name': str(variation)
                             } for variation in item.variations.all()
                         ]
                     } for item in self.event.items.select_related('tax_rule').prefetch_related('variations')
@@ -113,13 +87,7 @@ class JSONExporter(BaseExporter):
                 'questions': [
                     {
                         'id': question.id,
-                        'identifier': question.identifier,
-                        'required': question.required,
                         'question': str(question.question),
-                        'position': question.position,
-                        'hidden': question.hidden,
-                        'ask_during_checkin': question.ask_during_checkin,
-                        'help_text': str(question.help_text),
                         'type': question.type
                     } for question in self.event.questions.all()
                 ],
@@ -127,18 +95,7 @@ class JSONExporter(BaseExporter):
                     {
                         'code': order.code,
                         'status': order.status,
-                        'customer': order.customer.identifier if order.customer else None,
-                        'testmode': order.testmode,
                         'user': order.email,
-                        'email': order.email,
-                        'phone': str(order.phone),
-                        'locale': order.locale,
-                        'comment': order.comment,
-                        'custom_followup_at': order.custom_followup_at,
-                        'require_approval': order.require_approval,
-                        'checkin_attention': order.checkin_attention,
-                        'sales_channel': order.sales_channel,
-                        'expires': order.expires,
                         'datetime': order.datetime,
                         'fees': [
                             {
@@ -151,21 +108,11 @@ class JSONExporter(BaseExporter):
                         'positions': [
                             {
                                 'id': position.id,
-                                'positionid': position.positionid,
                                 'item': position.item_id,
                                 'variation': position.variation_id,
-                                'subevent': position.subevent_id,
-                                'seat': position.seat.seat_guid if position.seat else None,
                                 'price': position.price,
-                                'tax_rate': position.tax_rate,
-                                'tax_value': position.tax_value,
                                 'attendee_name': position.attendee_name,
                                 'attendee_email': position.attendee_email,
-                                'company': position.company,
-                                'street': position.street,
-                                'zipcode': position.zipcode,
-                                'country': str(position.country) if position.country else None,
-                                'state': position.state,
                                 'secret': position.secret,
                                 'addon_to': position.addon_to_id,
                                 'answers': [
@@ -177,30 +124,15 @@ class JSONExporter(BaseExporter):
                             } for position in order.positions.all()
                         ]
                     } for order in
-                    self.event.orders.all().prefetch_related('positions', 'positions__answers', 'positions__seat', 'customer', 'fees')
+                    self.event.orders.all().prefetch_related('positions', 'positions__answers', 'fees')
                 ],
                 'quotas': [
                     {
                         'id': quota.id,
                         'size': quota.size,
-                        'subevent': quota.subevent_id,
                         'items': [item.id for item in quota.items.all()],
                         'variations': [variation.id for variation in quota.variations.all()],
                     } for quota in self.event.quotas.all().prefetch_related('items', 'variations')
-                ],
-                'subevents': [
-                    {
-                        'id': se.id,
-                        'name': str(se.name),
-                        'location': str(se.location),
-                        'date_from': se.date_from,
-                        'date_to': se.date_to,
-                        'date_admission': se.date_admission,
-                        'geo_lat': se.geo_lat,
-                        'geo_lon': se.geo_lon,
-                        'is_public': se.is_public,
-                        'meta_data': se.meta_data,
-                    } for se in self.event.subevents.all()
                 ]
             }
         }

src/pretix/base/exporters/orderlist.py

@@ -33,7 +33,6 @@
 # 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
@@ -43,10 +42,10 @@ from django.db.models import (
     Case, CharField, Count, DateTimeField, F, IntegerField, Max, Min, OuterRef,
     Q, Subquery, Sum, When,
 )
-from django.db.models.functions import Coalesce
+from django.db.models.functions import Coalesce, TruncDate
 from django.dispatch import receiver
 from django.utils.functional import cached_property
-from django.utils.timezone import get_current_timezone, make_aware, now
+from django.utils.timezone import get_current_timezone, now
 from django.utils.translation import gettext as _, gettext_lazy, pgettext
 
 from pretix.base.models import (
@@ -130,7 +129,7 @@ class OrderListExporter(MultiSheetListExporter):
                  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. '
+                 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!')
              )),
         ]
@@ -182,43 +181,41 @@ class OrderListExporter(MultiSheetListExporter):
 
         if form_data.get('date_from'):
             date_value = form_data.get('date_from')
-            if not isinstance(date_value, date):
+            if isinstance(date_value, str):
                 date_value = dateutil.parser.parse(date_value).date()
-            datetime_value = make_aware(datetime.combine(date_value, time(0, 0, 0)), self.timezone)
 
-            filters[f'{rel}datetime__gte'] = datetime_value
+            annotations['date'] = TruncDate(f'{rel}datetime')
+            filters['date__gte'] = date_value
 
         if form_data.get('date_to'):
             date_value = form_data.get('date_to')
-            if not isinstance(date_value, date):
+            if isinstance(date_value, str):
                 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
+            annotations['date'] = TruncDate(f'{rel}datetime')
+            filters['date__lte'] = date_value
 
         if form_data.get('event_date_from'):
             date_value = form_data.get('event_date_from')
-            if not isinstance(date_value, date):
+            if isinstance(date_value, str):
                 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
+            filters['event_date_max__gte'] = date_value
 
         if form_data.get('event_date_to'):
             date_value = form_data.get('event_date_to')
-            if not isinstance(date_value, date):
+            if isinstance(date_value, str):
                 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
+            filters['event_date_min__lte'] = date_value
 
         if filters:
             return qs.annotate(**annotations).filter(**filters)
@@ -573,7 +570,6 @@ class OrderListExporter(MultiSheetListExporter):
             pgettext('address', 'State'),
             _('Voucher'),
             _('Pseudonymization ID'),
-            _('Ticket secret'),
             _('Seat ID'),
             _('Seat name'),
             _('Seat zone'),
@@ -670,7 +666,6 @@ class OrderListExporter(MultiSheetListExporter):
                     op.state or '',
                     op.voucher.code if op.voucher else '',
                     op.pseudonymization_id,
-                    op.secret,
                 ]
 
                 if op.seat:
@@ -875,78 +870,6 @@ class QuotaListExporter(ListExporter):
         return '{}_quotas'.format(self.event.slug)
 
 
-def generate_GiftCardTransactionListExporter(organizer):  # hackhack
-    class GiftcardTransactionListExporter(ListExporter):
-        identifier = 'giftcardtransactionlist'
-        verbose_name = gettext_lazy('Gift card transactions')
-
-        @property
-        def additional_form_fields(self):
-            d = [
-                ('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)
-            return d
-
-        def iterate_list(self, form_data):
-            qs = GiftCardTransaction.objects.filter(
-                card__issuer=organizer,
-            ).order_by('datetime').select_related('card', 'order', 'order__event')
-
-            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'),
-                _('Test mode'),
-                _('Date'),
-                _('Amount'),
-                _('Currency'),
-                _('Order'),
-            ]
-            yield headers
-
-            for obj in qs:
-                row = [
-                    obj.card.secret,
-                    _('TEST MODE') if obj.card.testmode else '',
-                    obj.datetime.astimezone(self.timezone).strftime('%Y-%m-%d %H:%M:%S'),
-                    obj.value,
-                    obj.card.currency,
-                    obj.order.full_code if obj.order else None,
-                ]
-                yield row
-
-        def get_filename(self):
-            return '{}_giftcardtransactions'.format(organizer.slug)
-    return GiftcardTransactionListExporter
-
-
 class GiftcardRedemptionListExporter(ListExporter):
     identifier = 'giftcardredemptionlist'
     verbose_name = gettext_lazy('Gift card redemptions')
@@ -1139,8 +1062,3 @@ def register_multievent_i_giftcardredemptionlist_exporter(sender, **kwargs):
 @receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_giftcardlist")
 def register_multievent_i_giftcardlist_exporter(sender, **kwargs):
     return generate_GiftCardListExporter(sender)
-
-
-@receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_giftcardtransactionlist")
-def register_multievent_i_giftcardtransactionlist_exporter(sender, **kwargs):
-    return generate_GiftCardTransactionListExporter(sender)

src/pretix/base/forms/__init__.py

@@ -38,7 +38,6 @@ import i18nfield.forms
 from django import forms
 from django.forms.models import ModelFormMetaclass
 from django.utils.crypto import get_random_string
-from django.utils.translation import gettext_lazy as _
 from formtools.wizard.views import SessionWizardView
 from hierarkey.forms import HierarkeyForm
 
@@ -119,33 +118,6 @@ class SettingsForm(i18nfield.forms.I18nFormMixin, HierarkeyForm):
                 self.cleaned_data[k] = self.initial[k]
         return super().save()
 
-    def clean(self):
-        d = super().clean()
-
-        # There is logic in HierarkeyForm.save() to only persist fields that changed. HierarkeyForm determines if
-        # something changed by comparing `self._s.get(name)` to `value`. This leaves an edge case open for multi-lingual
-        # text fields. On the very first load, the initial value in `self._s.get(name)` will be a LazyGettextProxy-based
-        # string. However, only some of the languages are usually visible, so even if the user does not change anything
-        # at all, it will be considered a changed value and stored. We do not want that, as it makes it very hard to add
-        # languages to an organizer/event later on. So we trick it and make sure nothing gets changed in that situation.
-        for name, field in self.fields.items():
-            if isinstance(field, SecretKeySettingsField) and d.get(name) == SECRET_REDACTED and not self.initial.get(name):
-                self.add_error(
-                    name,
-                    _('Due to technical reasons you cannot set inputs, that need to be masked (e.g. passwords), to %(value)s.') % {'value': SECRET_REDACTED}
-                )
-
-            if isinstance(field, i18nfield.forms.I18nFormField):
-                value = d.get(name)
-                if not value:
-                    continue
-
-                current = self._s.get(name, as_type=type(value))
-                if name not in self.changed_data:
-                    d[name] = current
-
-        return d
-
     def get_new_filename(self, name: str) -> str:
         from pretix.base.models import Event
 

src/pretix/base/forms/auth.py

@@ -154,7 +154,6 @@ class RegistrationForm(forms.Form):
         widget=forms.PasswordInput(attrs={
             'autocomplete': 'new-password'  # see https://bugs.chromium.org/p/chromium/issues/detail?id=370363#c7
         }),
-        max_length=4096,
         required=True
     )
     password_repeat = forms.CharField(
@@ -162,7 +161,6 @@ class RegistrationForm(forms.Form):
         widget=forms.PasswordInput(attrs={
             'autocomplete': 'new-password'  # see https://bugs.chromium.org/p/chromium/issues/detail?id=370363#c7
         }),
-        max_length=4096,
         required=True
     )
     keep_logged_in = forms.BooleanField(label=_("Keep me logged in"), required=False)
@@ -206,13 +204,11 @@ class PasswordRecoverForm(forms.Form):
     password = forms.CharField(
         label=_('Password'),
         widget=forms.PasswordInput,
-        max_length=4096,
         required=True
     )
     password_repeat = forms.CharField(
         label=_('Repeat password'),
-        widget=forms.PasswordInput,
-        max_length=4096,
+        widget=forms.PasswordInput
     )
 
     def __init__(self, user_id=None, *args, **kwargs):

src/pretix/base/forms/questions.py

@@ -37,21 +37,21 @@ import json
 import logging
 from decimal import Decimal
 from io import BytesIO
+from urllib.error import HTTPError
 
 import dateutil.parser
 import pycountry
 import pytz
+import vat_moss.errors
+import vat_moss.id
 from babel import Locale
 from django import forms
-from django.conf import settings
 from django.contrib import messages
 from django.core.exceptions import ValidationError
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.validators import (
-    MaxValueValidator, MinValueValidator, RegexValidator,
-)
+from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db.models import QuerySet
-from django.forms import Select, widgets
+from django.forms import Select
 from django.utils import translation
 from django.utils.formats import date_format
 from django.utils.html import escape
@@ -75,9 +75,8 @@ from pretix.base.i18n import (
     get_babel_locale, get_language_without_region, language,
 )
 from pretix.base.models import InvoiceAddress, Question, QuestionOption
-from pretix.base.models.tax import VAT_ID_COUNTRIES, ask_for_vat_id
-from pretix.base.services.tax import (
-    VATIDFinalError, VATIDTemporaryError, validate_vat_id,
+from pretix.base.models.tax import (
+    EU_COUNTRIES, cc_to_vat_prefix, is_eu_country,
 )
 from pretix.base.settings import (
     COUNTRIES_WITH_STATE_IN_ADDRESS, PERSON_NAME_SALUTATIONS,
@@ -154,9 +153,8 @@ class NamePartsWidget(forms.MultiWidget):
                     final_attrs,
                     id='%s_%s' % (id_, i),
                     title=self.scheme['fields'][i][1],
+                    placeholder=self.scheme['fields'][i][1],
                 )
-                if not isinstance(widget, widgets.Select):
-                    these_attrs['placeholder'] = self.scheme['fields'][i][1]
                 if self.scheme['fields'][i][0] in REQUIRED_NAME_PARTS:
                     if self.field.required:
                         these_attrs['required'] = 'required'
@@ -189,15 +187,6 @@ class NamePartsFormField(forms.MultiValueField):
         defaults = {
             'widget': self.widget,
             'max_length': kwargs.pop('max_length', None),
-            'validators': [
-                RegexValidator(
-                    # The following characters should never appear in a name anywhere of
-                    # the world. However, they commonly appear in inputs generated by spam
-                    # bots.
-                    r'^[^$€/%§{}<>~]*$',
-                    message=_('Please do not use special characters in names.')
-                )
-            ]
         }
         self.scheme_name = kwargs.pop('scheme')
         self.titles = kwargs.pop('titles')
@@ -218,7 +207,6 @@ class NamePartsFormField(forms.MultiValueField):
             if fname == 'title' and self.scheme_titles:
                 d = dict(defaults)
                 d.pop('max_length', None)
-                d.pop('validators', None)
                 field = forms.ChoiceField(
                     **d,
                     choices=[('', '')] + [(d, d) for d in self.scheme_titles[1]]
@@ -227,7 +215,6 @@ class NamePartsFormField(forms.MultiValueField):
             elif fname == 'salutation':
                 d = dict(defaults)
                 d.pop('max_length', None)
-                d.pop('validators', None)
                 field = forms.ChoiceField(
                     **d,
                     choices=[('', '---')] + PERSON_NAME_SALUTATIONS
@@ -346,41 +333,23 @@ class WrappedPhoneNumberPrefixWidget(PhoneNumberPrefixWidget):
 def guess_country(event):
     # Try to guess the initial country from either the country of the merchant
     # or the locale. This will hopefully save at least some users some scrolling :)
+    locale = get_language_without_region()
     country = event.settings.region or event.settings.invoice_address_from_country
     if not country:
-        country = get_country_by_locale(get_language_without_region())
+        valid_countries = countries.countries
+        if '-' in locale:
+            parts = locale.split('-')
+            # TODO: does this actually work?
+            if parts[1].upper() in valid_countries:
+                country = Country(parts[1].upper())
+            elif parts[0].upper() in valid_countries:
+                country = Country(parts[0].upper())
+        else:
+            if locale.upper() in valid_countries:
+                country = Country(locale.upper())
     return country
 
 
-def get_country_by_locale(locale):
-    country = None
-    valid_countries = countries.countries
-    if '-' in locale:
-        parts = locale.split('-')
-        # TODO: does this actually work?
-        if parts[1].upper() in valid_countries:
-            country = Country(parts[1].upper())
-        elif parts[0].upper() in valid_countries:
-            country = Country(parts[0].upper())
-    else:
-        if locale.upper() in valid_countries:
-            country = Country(locale.upper())
-    return country
-
-
-def guess_phone_prefix(event):
-    with language(get_babel_locale()):
-        country = str(guess_country(event))
-        return get_phone_prefix(country)
-
-
-def get_phone_prefix(country):
-    for prefix, values in _COUNTRY_CODE_TO_REGION_CODE.items():
-        if country in values:
-            return prefix
-    return None
-
-
 class QuestionCheckboxSelectMultiple(forms.CheckboxSelectMultiple):
     option_template_name = 'pretixbase/forms/widgets/checkbox_option_with_links.html'
 
@@ -538,7 +507,7 @@ class PortraitImageField(SizeValidationMixin, ExtValidationMixin, forms.FileFiel
 
     def __init__(self, *args, **kwargs):
         kwargs.setdefault('ext_whitelist', (".png", ".jpg", ".jpeg", ".jfif", ".tif", ".tiff", ".bmp"))
-        kwargs.setdefault('max_size', settings.FILE_UPLOAD_MAX_SIZE_IMAGE)
+        kwargs.setdefault('max_size', 10 * 1024 * 1024)
         super().__init__(*args, **kwargs)
 
 
@@ -770,7 +739,7 @@ class BaseQuestionsForm(forms.Form):
                             ".pptx", ".ppt", ".doc", ".xlsx", ".xls", ".jfif", ".heic", ".heif", ".pages",
                             ".bmp", ".tif", ".tiff"
                         ),
-                        max_size=settings.FILE_UPLOAD_MAX_SIZE_OTHER,
+                        max_size=10 * 1024 * 1024,
                     )
             elif q.type == Question.TYPE_DATE:
                 attrs = {}
@@ -811,26 +780,25 @@ class BaseQuestionsForm(forms.Form):
                 if q.valid_datetime_max:
                     field.validators.append(MaxDateTimeValidator(q.valid_datetime_max))
             elif q.type == Question.TYPE_PHONENUMBER:
-                if initial:
+                with language(get_babel_locale()):
+                    default_country = guess_country(event)
+                    default_prefix = None
+                    for prefix, values in _COUNTRY_CODE_TO_REGION_CODE.items():
+                        if str(default_country) in values:
+                            default_prefix = prefix
                     try:
-                        initial = PhoneNumber().from_string(initial.answer)
+                        initial = PhoneNumber().from_string(initial.answer) if initial else "+{}.".format(default_prefix)
                     except NumberParseException:
                         initial = None
-
-                if not initial:
-                    phone_prefix = guess_phone_prefix(event)
-                    if phone_prefix:
-                        initial = "+{}.".format(phone_prefix)
-
-                field = PhoneNumberField(
-                    label=label, required=required,
-                    help_text=help_text,
-                    # We now exploit an implementation detail in PhoneNumberPrefixWidget to allow us to pass just
-                    # a country code but no number as an initial value. It's a bit hacky, but should be stable for
-                    # the future.
-                    initial=initial,
-                    widget=WrappedPhoneNumberPrefixWidget()
-                )
+                    field = PhoneNumberField(
+                        label=label, required=required,
+                        help_text=help_text,
+                        # We now exploit an implementation detail in PhoneNumberPrefixWidget to allow us to pass just
+                        # a country code but no number as an initial value. It's a bit hacky, but should be stable for
+                        # the future.
+                        initial=initial,
+                        widget=WrappedPhoneNumberPrefixWidget()
+                    )
             field.question = q
             if answers:
                 # Cache the answer object for later use
@@ -901,12 +869,6 @@ class BaseQuestionsForm(forms.Form):
                 if question_is_required(q) and not answer and answer != 0 and not field.errors:
                     raise ValidationError({'question_%d' % q.pk: [_('This field is required.')]})
 
-        # Strip invisible question from cleaned_data so they don't end up in the database
-        for q in question_cache.values():
-            answer = d.get('question_%d' % q.pk)
-            if q.dependency_question_id and not question_is_visible(q.dependency_question_id, q.dependency_values) and answer is not None:
-                d['question_%d' % q.pk] = None
-
         return d
 
 
@@ -938,7 +900,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
                 'data-display-dependency': '#id_is_business_1',
                 'autocomplete': 'organization',
             }),
-            'vat_id': forms.TextInput(attrs={'data-display-dependency': '#id_is_business_1', 'data-countries-with-vat-id': ','.join(VAT_ID_COUNTRIES)}),
+            'vat_id': forms.TextInput(attrs={'data-display-dependency': '#id_is_business_1', 'data-countries-in-eu': ','.join(EU_COUNTRIES)}),
             'internal_reference': forms.TextInput,
         }
         labels = {
@@ -958,18 +920,6 @@ class BaseInvoiceAddressForm(forms.ModelForm):
         super().__init__(*args, **kwargs)
         if not event.settings.invoice_address_vatid:
             del self.fields['vat_id']
-        elif self.validate_vat_id:
-            self.fields['vat_id'].help_text = '<br/>'.join([
-                str(_('Optional, but depending on the country you reside in we might need to charge you '
-                      'additional taxes if you do not enter it.')),
-                str(_('If you are registered in Switzerland, you can enter your UID instead.')),
-            ])
-        else:
-            self.fields['vat_id'].help_text = '<br/>'.join([
-                str(_('Optional, but it might be required for you to claim tax benefits on your invoice '
-                      'depending on your and the seller’s country of residence.')),
-                str(_('If you are registered in Switzerland, you can enter your UID instead.')),
-            ])
 
         self.fields['country'].choices = CachedCountries()
 
@@ -1001,7 +951,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
         self.fields['state'].widget.is_required = True
 
         # Without JavaScript the VAT ID field is not hidden, so we empty the field if a country outside the EU is selected.
-        if cc and not ask_for_vat_id(cc) and fprefix + 'vat_id' in self.data:
+        if cc and not is_eu_country(cc) and fprefix + 'vat_id' in self.data:
             self.data = self.data.copy()
             del self.data[fprefix + 'vat_id']
 
@@ -1026,7 +976,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
             scheme=event.settings.name_scheme,
             titles=event.settings.name_scheme_titles,
             label=_('Name'),
-            initial=self.instance.name_parts,
+            initial=(self.instance.name_parts if self.instance else self.instance.name_parts),
         )
         if event.settings.invoice_address_required and not event.settings.invoice_address_company_required and not self.all_optional:
             if not event.settings.invoice_name_required:
@@ -1051,7 +1001,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
         if not data.get('is_business'):
             data['company'] = ''
             data['vat_id'] = ''
-        if data.get('is_business') and not ask_for_vat_id(data.get('country')):
+        if data.get('is_business') and not is_eu_country(data.get('country')):
             data['vat_id'] = ''
         if self.event.settings.invoice_address_required:
             if data.get('is_business') and not data.get('company'):
@@ -1074,23 +1024,36 @@ class BaseInvoiceAddressForm(forms.ModelForm):
             # Do not save the country if it is the only field set -- we don't know the user even checked it!
             self.cleaned_data['country'] = ''
 
+        if data.get('vat_id') and is_eu_country(data.get('country')) and data.get('vat_id')[:2] != cc_to_vat_prefix(str(data.get('country'))):
+            raise ValidationError(_('Your VAT ID does not match the selected country.'))
+
         if self.validate_vat_id and self.instance.vat_id_validated and 'vat_id' not in self.changed_data:
             pass
-        elif self.validate_vat_id and data.get('is_business') and ask_for_vat_id(data.get('country')) and data.get('vat_id'):
+        elif self.validate_vat_id and data.get('is_business') and is_eu_country(data.get('country')) and data.get('vat_id'):
             try:
-                normalized_id = validate_vat_id(data.get('vat_id'), str(data.get('country')))
-                self.instance.vat_id_validated = True
-                self.instance.vat_id = normalized_id
-            except VATIDFinalError as e:
-                if self.all_optional:
-                    self.instance.vat_id_validated = False
-                    messages.warning(self.request, e.message)
-                else:
-                    raise ValidationError(e.message)
-            except VATIDTemporaryError as e:
+                result = vat_moss.id.validate(data.get('vat_id'))
+                if result:
+                    country_code, normalized_id, company_name = result
+                    self.instance.vat_id_validated = True
+                    self.instance.vat_id = normalized_id
+            except (vat_moss.errors.InvalidError, ValueError):
+                raise ValidationError(_('This VAT ID is not valid. Please re-check your input.'))
+            except vat_moss.errors.WebServiceUnavailableError:
+                logger.exception('VAT ID checking failed for country {}'.format(data.get('country')))
                 self.instance.vat_id_validated = False
                 if self.request and self.vat_warning:
-                    messages.warning(self.request, e.message)
+                    messages.warning(self.request, _('Your VAT ID could not be checked, as the VAT checking service of '
+                                                     'your country is currently not available. We will therefore '
+                                                     'need to charge VAT on your invoice. You can get the tax amount '
+                                                     'back via the VAT reimbursement process.'))
+            except (vat_moss.errors.WebServiceError, HTTPError):
+                logger.exception('VAT ID checking failed for country {}'.format(data.get('country')))
+                self.instance.vat_id_validated = False
+                if self.request and self.vat_warning:
+                    messages.warning(self.request, _('Your VAT ID could not be checked, as the VAT checking service of '
+                                                     'your country returned an incorrect result. We will therefore '
+                                                     'need to charge VAT on your invoice. Please contact support to '
+                                                     'resolve this manually.'))
         else:
             self.instance.vat_id_validated = False
 

src/pretix/base/forms/user.py

@@ -55,7 +55,6 @@ class UserSettingsForm(forms.ModelForm):
         'pw_current_wrong': _("The current password you entered was not correct."),
         'pw_mismatch': _("Please enter the same password twice"),
         'rate_limit': _("For security reasons, please wait 5 minutes before you try again."),
-        'pw_equal': _("Please choose a password different to your current one.")
     }
 
     old_pw = forms.CharField(max_length=255,
@@ -159,12 +158,6 @@ class UserSettingsForm(forms.ModelForm):
                 code='pw_current'
             )
 
-        if password1 and password1 == old_pw:
-            raise forms.ValidationError(
-                self.error_messages['pw_equal'],
-                code='pw_equal'
-            )
-
         if password1:
             self.instance.set_password(password1)
 

src/pretix/base/forms/widgets.py

@@ -86,6 +86,14 @@ class TimePickerWidget(forms.TimeInput):
 
 class UploadedFileWidget(forms.ClearableFileInput):
     def __init__(self, *args, **kwargs):
+        # Browsers can't recognize that the server already has a file uploaded
+        # Don't mark this input as being required if we already have an answer
+        # (this needs to be done via the attrs, otherwise we wouldn't get the "required" star on the field label)
+        attrs = kwargs.get('attrs', {})
+        if kwargs.get('required') and kwargs.get('initial'):
+            attrs.update({'required': None})
+        kwargs.update({'attrs': attrs})
+
         self.position = kwargs.pop('position')
         self.event = kwargs.pop('event')
         self.answer = kwargs.pop('answer')
@@ -117,15 +125,6 @@ class UploadedFileWidget(forms.ClearableFileInput):
                     'answer': self.answer.pk,
                 })
 
-    def get_context(self, name, value, attrs):
-        # Browsers can't recognize that the server already has a file uploaded
-        # Don't mark this input as being required if we already have an answer
-        # (this needs to be done via the attrs, otherwise we wouldn't get the "required" star on the field label)
-        ctx = super().get_context(name, value, attrs)
-        if ctx['widget']['is_initial']:
-            ctx['widget']['attrs']['required'] = False
-        return ctx
-
     def format_value(self, value):
         if self.is_initial(value):
             return self.FakeFile(value, self.position, self.event, self.answer)
@@ -185,7 +184,7 @@ class BusinessBooleanRadio(forms.RadioSelect):
         self.require_business = require_business
         if self.require_business:
             choices = (
-                ('business', _('Business or institutional customer')),
+                ('business', _('Business customer')),
             )
         else:
             choices = (

src/pretix/base/invoice.py

@@ -395,13 +395,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
             return txt
 
         if not self.invoice.event.has_subevents and self.invoice.event.settings.show_dates_on_frontpage:
-            tz = self.invoice.event.timezone
-            show_end_date = (
-                self.invoice.event.settings.show_date_to and
-                self.invoice.event.date_to and
-                self.invoice.event.date_to.astimezone(tz).date() != self.invoice.event.date_from.astimezone(tz).date()
-            )
-            if show_end_date:
+            if self.invoice.event.settings.show_date_to and self.invoice.event.date_to:
                 p_str = (
                     shorten(self.invoice.event.name) + '\n' +
                     pgettext('invoice', '{from_date}\nuntil {to_date}').format(
@@ -556,10 +550,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
         for line in self.invoice.lines.all():
             if has_taxes:
                 tdata.append((
-                    Paragraph(
-                        bleach.clean(line.description, tags=['br']).strip().replace('<br>', '<br/>').replace('\n', '<br />\n'),
-                        self.stylesheet['Normal']
-                    ),
+                    Paragraph(line.description, self.stylesheet['Normal']),
                     "1",
                     localize(line.tax_rate) + " %",
                     money_filter(line.net_value, self.invoice.event.currency),
@@ -567,10 +558,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
                 ))
             else:
                 tdata.append((
-                    Paragraph(
-                        bleach.clean(line.description, tags=['br']).strip().replace('<br>', '<br/>').replace('\n', '<br />\n'),
-                        self.stylesheet['Normal']
-                    ),
+                    Paragraph(line.description, self.stylesheet['Normal']),
                     "1",
                     money_filter(line.gross_value, self.invoice.event.currency),
                 ))
@@ -607,7 +595,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
         table.setStyle(TableStyle(tstyledata))
         story.append(table)
 
-        story.append(Spacer(1, 10 * mm))
+        story.append(Spacer(1, 15 * mm))
 
         if self.invoice.payment_provider_text:
             story.append(Paragraph(
@@ -623,14 +611,12 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
                 self.invoice.additional_text,
                 self.stylesheet['Normal']
             ))
-            story.append(Spacer(1, 5 * mm))
+            story.append(Spacer(1, 15 * mm))
 
         tstyledata = [
             ('ALIGN', (1, 0), (-1, -1), 'RIGHT'),
             ('LEFTPADDING', (0, 0), (0, -1), 0),
             ('RIGHTPADDING', (-1, 0), (-1, -1), 0),
-            ('TOPPADDING', (0, 0), (-1, -1), 1),
-            ('BOTTOMPADDING', (0, 0), (-1, -1), 1),
             ('FONTSIZE', (0, 0), (-1, -1), 8),
             ('FONTNAME', (0, 0), (-1, -1), self.font_regular),
         ]
@@ -783,55 +769,44 @@ class Modern1Renderer(ClassicInvoiceRenderer):
         ]
 
     def _draw_metadata(self, canvas):
-        # Draws the "invoice number -- date" line. This has gotten a little more complicated since we
-        # encountered some events with very long invoice numbers. In this case, we automatically reduce
-        # the font size until it fits.
         begin_top = 100 * mm
 
-        def _draw(label, value, value_size, x, width):
-            if canvas.stringWidth(value, self.font_regular, value_size) > width and value_size > 6:
-                return False
-            textobject = canvas.beginText(x, self.pagesize[1] - begin_top)
+        textobject = canvas.beginText(self.left_margin, self.pagesize[1] - begin_top)
+        textobject.setFont(self.font_regular, 8)
+        textobject.textLine(pgettext('invoice', 'Order code'))
+        textobject.moveCursor(0, 5)
+        textobject.setFont(self.font_regular, 10)
+        textobject.textLine(self.invoice.order.full_code)
+        canvas.drawText(textobject)
+
+        if self.invoice.is_cancellation:
+            textobject = canvas.beginText(self.left_margin + 50 * mm, self.pagesize[1] - begin_top)
             textobject.setFont(self.font_regular, 8)
-            textobject.textLine(label)
+            textobject.textLine(pgettext('invoice', 'Cancellation number'))
             textobject.moveCursor(0, 5)
-            textobject.setFont(self.font_regular, value_size)
-            textobject.textLine(value)
-            return textobject
+            textobject.setFont(self.font_regular, 10)
+            textobject.textLine(self.invoice.number)
+            canvas.drawText(textobject)
 
-        value_size = 10
-        while value_size >= 5:
-            objects = [
-                _draw(pgettext('invoice', 'Order code'), self.invoice.order.full_code, value_size, self.left_margin, 45 * mm)
-            ]
-
-            p = Paragraph(
-                date_format(self.invoice.date, "DATE_FORMAT"),
-                style=ParagraphStyle(name=f'Normal{value_size}', fontName=self.font_regular, fontSize=value_size, leading=value_size * 1.2)
-            )
-            w = stringWidth(p.text, p.frags[0].fontName, p.frags[0].fontSize)
-            p.wrapOn(canvas, w, 15 * mm)
-            date_x = self.pagesize[0] - w - self.right_margin
-
-            if self.invoice.is_cancellation:
-                objects += [
-                    _draw(pgettext('invoice', 'Cancellation number'), self.invoice.number,
-                          value_size, self.left_margin + 50 * mm, 45 * mm),
-                    _draw(pgettext('invoice', 'Original invoice'), self.invoice.refers.number,
-                          value_size, self.left_margin + 100 * mm, date_x - self.left_margin - 100 * mm - 5 * mm),
-                ]
-            else:
-                objects += [
-                    _draw(pgettext('invoice', 'Invoice number'), self.invoice.number,
-                          value_size, self.left_margin + 70 * mm, date_x - self.left_margin - 70 * mm - 5 * mm),
-                ]
-
-            if all(objects):
-                for o in objects:
-                    canvas.drawText(o)
-                break
-            value_size -= 1
+            textobject = canvas.beginText(self.left_margin + 100 * mm, self.pagesize[1] - begin_top)
+            textobject.setFont(self.font_regular, 8)
+            textobject.textLine(pgettext('invoice', 'Original invoice'))
+            textobject.moveCursor(0, 5)
+            textobject.setFont(self.font_regular, 10)
+            textobject.textLine(self.invoice.refers.number)
+            canvas.drawText(textobject)
+        else:
+            textobject = canvas.beginText(self.left_margin + 70 * mm, self.pagesize[1] - begin_top)
+            textobject.textLine(pgettext('invoice', 'Invoice number'))
+            textobject.moveCursor(0, 5)
+            textobject.setFont(self.font_regular, 10)
+            textobject.textLine(self.invoice.number)
+            canvas.drawText(textobject)
 
+        p = Paragraph(date_format(self.invoice.date, "DATE_FORMAT"), style=self.stylesheet['Normal'])
+        w = stringWidth(p.text, p.frags[0].fontName, p.frags[0].fontSize)
+        p.wrapOn(canvas, w, 15 * mm)
+        date_x = self.pagesize[0] - w - self.right_margin
         p.drawOn(canvas, date_x, self.pagesize[1] - begin_top - 10 - 6)
 
         textobject = canvas.beginText(date_x, self.pagesize[1] - begin_top)

src/pretix/base/management/commands/_migrations.py

@@ -1,67 +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/>.
-#
-"""
-Django, for theoretically very valid reasons, creates migrations for *every single thing*
-we change on a model. Even the `help_text`! This makes sense, as we don't know if any
-database backend unknown to us might actually use this information for its database schema.
-
-However, pretix only supports PostgreSQL, MySQL, MariaDB and SQLite and we can be pretty
-certain that some changes to models will never require a change to the database. In this case,
-not creating a migration for certain changes will save us some performance while applying them
-*and* allow for a cleaner git history. Win-win!
-
-Only caveat is that we need to do some dirty monkeypatching to achieve it...
-"""
-from django.db import models
-from django.db.migrations.operations import models as modelops
-from django_countries.fields import CountryField
-
-
-def monkeypatch_migrations():
-    modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("verbose_name")
-    modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("verbose_name_plural")
-    modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("ordering")
-    modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("get_latest_by")
-    modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("default_manager_name")
-    modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("permissions")
-    modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("default_permissions")
-    IGNORED_ATTRS = [
-        # (field type, attribute name, banlist of field sub-types)
-        (models.Field, 'verbose_name', []),
-        (models.Field, 'help_text', []),
-        (models.Field, 'validators', []),
-        (models.Field, 'editable', [models.DateField, models.DateTimeField, models.DateField, models.BinaryField]),
-        (models.Field, 'blank', [models.DateField, models.DateTimeField, models.AutoField, models.NullBooleanField,
-                                 models.TimeField]),
-        (models.CharField, 'choices', [CountryField])
-    ]
-
-    original_deconstruct = models.Field.deconstruct
-
-    def new_deconstruct(self):
-        name, path, args, kwargs = original_deconstruct(self)
-        for ftype, attr, banlist in IGNORED_ATTRS:
-            if isinstance(self, ftype) and not any(isinstance(self, ft) for ft in banlist):
-                kwargs.pop(attr, None)
-        return name, path, args, kwargs
-
-    models.Field.deconstruct = new_deconstruct

src/pretix/base/management/commands/check_order_transactions.py

@@ -1,107 +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 decimal import Decimal
-
-from django.core.management.base import BaseCommand
-from django.db import models
-from django.db.models import (
-    Case, Count, F, OuterRef, Q, Subquery, Sum, Value, When,
-)
-from django.db.models.functions import Coalesce
-from django_scopes import scopes_disabled
-
-from pretix.base.models import Order, OrderFee, OrderPosition
-from pretix.base.models.orders import Transaction
-
-
-class Command(BaseCommand):
-    help = "Check order for consistency with their transactions"
-
-    @scopes_disabled()
-    def handle(self, *args, **options):
-        qs = Order.objects.annotate(
-            position_total=Coalesce(
-                Subquery(
-                    OrderPosition.objects.filter(
-                        order=OuterRef('pk')
-                    ).order_by().values('order').annotate(p=Sum('price')).values('p'),
-                    output_field=models.DecimalField(decimal_places=2, max_digits=10)
-                ), Value(0), output_field=models.DecimalField(decimal_places=2, max_digits=10)
-            ),
-            position_cnt=Case(
-                When(Q(status__in=('e', 'c')) | Q(require_approval=True), then=Value(0)),
-                default=Coalesce(
-                    Subquery(
-                        OrderPosition.objects.filter(
-                            order=OuterRef('pk')
-                        ).order_by().values('order').annotate(p=Count('*')).values('p'),
-                        output_field=models.IntegerField()
-                    ), Value(0), output_field=models.IntegerField()
-                ),
-                output_field=models.IntegerField()
-            ),
-            fee_total=Coalesce(
-                Subquery(
-                    OrderFee.objects.filter(
-                        order=OuterRef('pk')
-                    ).order_by().values('order').annotate(p=Sum('value')).values('p'),
-                    output_field=models.DecimalField(decimal_places=2, max_digits=10)
-                ), Value(0), output_field=models.DecimalField(decimal_places=2, max_digits=10)
-            ),
-            tx_total=Coalesce(
-                Subquery(
-                    Transaction.objects.filter(
-                        order=OuterRef('pk')
-                    ).order_by().values('order').annotate(p=Sum(F('price') * F('count'))).values('p'),
-                    output_field=models.DecimalField(decimal_places=2, max_digits=10)
-                ), Value(0), output_field=models.DecimalField(decimal_places=2, max_digits=10)
-            ),
-            tx_cnt=Coalesce(
-                Subquery(
-                    Transaction.objects.filter(
-                        order=OuterRef('pk'),
-                        item__isnull=False,
-                    ).order_by().values('order').annotate(p=Sum(F('count'))).values('p'),
-                    output_field=models.DecimalField(decimal_places=2, max_digits=10)
-                ), Value(0), output_field=models.DecimalField(decimal_places=2, max_digits=10)
-            ),
-        ).annotate(
-            correct_total=Case(
-                When(Q(status=Order.STATUS_CANCELED) | Q(status=Order.STATUS_EXPIRED) | Q(require_approval=True),
-                     then=Value(0)),
-                default=F('position_total') + F('fee_total'),
-                output_field=models.DecimalField(decimal_places=2, max_digits=10)
-            ),
-        ).exclude(
-            total=F('position_total') + F('fee_total'),
-            tx_total=F('correct_total'),
-            tx_cnt=F('position_cnt')
-        ).select_related('event')
-        for o in qs:
-            if abs(o.tx_total - o.correct_total) < Decimal('0.00001') and abs(o.position_total + o.fee_total - o.total) < Decimal('0.00001') \
-                    and o.tx_cnt == o.position_cnt:
-                # Ignore SQLite which treats Decimals like floats…
-                continue
-            print(f"Error in order {o.full_code}: status={o.status}, sum(positions)+sum(fees)={o.position_total + o.fee_total}, "
-                  f"order.total={o.total}, sum(transactions)={o.tx_total}, expected={o.correct_total}, pos_cnt={o.position_cnt}, tx_pos_cnt={o.tx_cnt}")
-
-        self.stderr.write(self.style.SUCCESS('Check completed.'))

src/pretix/base/management/commands/create_order_transactions.py

@@ -1,95 +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 time
-
-from django.core.management.base import BaseCommand
-from django.db.models import F, Max, Q
-from django.utils.timezone import now
-from django_scopes import scopes_disabled
-from tqdm import tqdm
-
-from pretix.base.models import Order
-
-
-class Command(BaseCommand):
-    help = "Create missing order transactions"
-
-    def add_arguments(self, parser):
-        parser.add_argument(
-            "--slowdown",
-            dest="interval",
-            type=int,
-            default=0,
-            help="Interval for staggered execution. If set to a value different then zero, we will "
-                 "wait this many milliseconds between every order we process.",
-        )
-
-    @scopes_disabled()
-    def handle(self, *args, **options):
-        t = 0
-        qs = Order.objects.annotate(
-            last_transaction=Max('transactions__created')
-        ).filter(
-            Q(last_transaction__isnull=True) | Q(last_modified__gt=F('last_transaction')),
-            require_approval=False,
-        ).prefetch_related(
-            'all_positions', 'all_fees'
-        ).order_by(
-            'pk'
-        )
-        last_pk = 0
-        with tqdm(total=qs.count()) as pbar:
-            while True:
-                batch = list(qs.filter(pk__gt=last_pk)[:5000])
-                if not batch:
-                    break
-
-                for o in batch:
-                    if o.last_transaction is None:
-                        tn = o.create_transactions(
-                            positions=o.all_positions.all(),
-                            fees=o.all_fees.all(),
-                            dt_now=o.datetime,
-                            migrated=True,
-                            is_new=True,
-                            _backfill_before_cancellation=True,
-                        )
-                        o.create_transactions(
-                            positions=o.all_positions.all(),
-                            fees=o.all_fees.all(),
-                            dt_now=o.cancellation_date or (o.expires if o.status == Order.STATUS_EXPIRED else o.datetime),
-                            migrated=True,
-                        )
-                    else:
-                        tn = o.create_transactions(
-                            positions=o.all_positions.all(),
-                            fees=o.all_fees.all(),
-                            dt_now=now(),
-                            migrated=True,
-                        )
-                    if tn:
-                        t += 1
-                    time.sleep(0)
-                    pbar.update(1)
-                last_pk = batch[-1].pk
-
-        self.stderr.write(self.style.SUCCESS(f'Created transactions for {t} orders.'))

src/pretix/base/management/commands/export.py

@@ -103,7 +103,7 @@ class Command(BaseCommand):
 
             with language(locale), override(timezone):
                 for receiver, response in signal_result:
-                    ex = response(e, o, report_status)
+                    ex = response(e, report_status)
                     if ex.identifier == options['export_provider']:
                         params = json.loads(options.get('parameters') or '{}')
                         with open(options['output_file'], 'wb') as f:

src/pretix/base/management/commands/makemigrations.py

@@ -32,11 +32,53 @@
 # 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.
 
+"""
+Django, for theoretically very valid reasons, creates migrations for *every single thing*
+we change on a model. Even the `help_text`! This makes sense, as we don't know if any
+database backend unknown to us might actually use this information for its database schema.
+
+However, pretix only supports PostgreSQL, MySQL, MariaDB and SQLite and we can be pretty
+certain that some changes to models will never require a change to the database. In this case,
+not creating a migration for certain changes will save us some performance while applying them
+*and* allow for a cleaner git history. Win-win!
+
+Only caveat is that we need to do some dirty monkeypatching to achieve it...
+"""
 from django.core.management.commands.makemigrations import Command as Parent
+from django.db import models
+from django.db.migrations.operations import models as modelops
+from django_countries.fields import CountryField
 
-from ._migrations import monkeypatch_migrations
+modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("verbose_name")
+modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("verbose_name_plural")
+modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("ordering")
+modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("get_latest_by")
+modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("default_manager_name")
+modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("permissions")
+modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("default_permissions")
+IGNORED_ATTRS = [
+    # (field type, attribute name, banlist of field sub-types)
+    (models.Field, 'verbose_name', []),
+    (models.Field, 'help_text', []),
+    (models.Field, 'validators', []),
+    (models.Field, 'editable', [models.DateField, models.DateTimeField, models.DateField, models.BinaryField]),
+    (models.Field, 'blank', [models.DateField, models.DateTimeField, models.AutoField, models.NullBooleanField,
+                             models.TimeField]),
+    (models.CharField, 'choices', [CountryField])
+]
 
-monkeypatch_migrations()
+original_deconstruct = models.Field.deconstruct
+
+
+def new_deconstruct(self):
+    name, path, args, kwargs = original_deconstruct(self)
+    for ftype, attr, banlist in IGNORED_ATTRS:
+        if isinstance(self, ftype) and not any(isinstance(self, ft) for ft in banlist):
+            kwargs.pop(attr, None)
+    return name, path, args, kwargs
+
+
+models.Field.deconstruct = new_deconstruct
 
 
 class Command(Parent):

src/pretix/base/management/commands/migrate.py

@@ -32,6 +32,12 @@
 # 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.
 
+"""
+Django tries to be helpful by suggesting to run "makemigrations" in red font on every "migrate"
+run when there are things we have no migrations for. Usually, this is intended, and running
+"makemigrations" can really screw up the environment of a user, so we want to prevent novice
+users from doing that by going really dirty and filtering it from the output.
+"""
 import sys
 
 from django.core.management.base import OutputWrapper
@@ -39,15 +45,9 @@ from django.core.management.commands.migrate import Command as Parent
 
 
 class OutputFilter(OutputWrapper):
-    """
-    Django tries to be helpful by suggesting to run "makemigrations" in red font on every "migrate"
-    run when there are things we have no migrations for. Usually, this is intended, and running
-    "makemigrations" can really screw up the environment of a user, so we want to prevent novice
-    users from doing that by going really dirty and filtering it from the output.
-    """
     banlist = (
-        "have changes that are not yet reflected",
-        "re-run 'manage.py migrate'"
+        "Your models have changes that are not yet reflected",
+        "Run 'manage.py makemigrations' to make new "
     )
 
     def write(self, msg, style_func=None, ending=None):

src/pretix/base/middleware.py

@@ -208,7 +208,7 @@ def _parse_csp(header):
 
 
 def _render_csp(h):
-    return "; ".join(k + ' ' + ' '.join(v) for k, v in h.items() if v)
+    return "; ".join(k + ' ' + ' '.join(v) for k, v in h.items())
 
 
 def _merge_csp(a, b):

src/pretix/base/migrations/0196_auto_20210523_1322.py

@@ -1,38 +0,0 @@
-# Generated by Django 3.2.2 on 2021-05-23 13:22
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-import pretix.helpers.countries
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0195_auto_20210622_1457'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='invoiceaddress',
-            name='customer',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='invoice_addresses', to='pretixbase.customer'),
-        ),
-        migrations.CreateModel(
-            name='AttendeeProfile',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
-                ('attendee_name_cached', models.CharField(max_length=255, null=True)),
-                ('attendee_name_parts', models.JSONField(default=dict)),
-                ('attendee_email', models.EmailField(max_length=254, null=True)),
-                ('company', models.CharField(max_length=255, null=True)),
-                ('street', models.TextField(null=True)),
-                ('zipcode', models.CharField(max_length=30, null=True)),
-                ('city', models.CharField(max_length=255, null=True)),
-                ('country', pretix.helpers.countries.FastCountryField(countries=pretix.helpers.countries.CachedCountries, max_length=2, null=True)),
-                ('state', models.CharField(max_length=255, null=True)),
-                ('answers', models.JSONField(default=list)),
-                ('customer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='attendee_profiles', to='pretixbase.customer')),
-            ],
-        ),
-    ]

src/pretix/base/migrations/0197_auto_20210914_0814.py

@@ -1,36 +0,0 @@
-# Generated by Django 3.2.4 on 2021-09-14 08:14
-
-from django.db import migrations, models
-
-import pretix.base.models.fields
-import pretix.base.models.items
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0196_auto_20210523_1322'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='itemvariation',
-            name='available_from',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='itemvariation',
-            name='available_until',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='itemvariation',
-            name='hide_without_voucher',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name='itemvariation',
-            name='sales_channels',
-            field=pretix.base.models.fields.MultiStringField(default=pretix.base.models.items._all_sales_channels_identifiers),
-        ),
-    ]

src/pretix/base/migrations/0198_invoice_sent_to_customer.py

@@ -1,21 +0,0 @@
-# Generated by Django 3.2.4 on 2021-09-30 10:25
-from datetime import datetime
-
-from django.db import migrations, models
-from pytz import UTC
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0197_auto_20210914_0814'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='invoice',
-            name='sent_to_customer',
-            field=models.DateTimeField(blank=True, null=True, default=UTC.localize(datetime(1970, 1, 1, 0, 0, 0, 0))),
-            preserve_default=False,
-        ),
-    ]

src/pretix/base/migrations/0199_auto_20211005_1050.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.2.4 on 2021-10-05 10:50
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0198_invoice_sent_to_customer'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='item',
-            name='require_membership_hidden',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name='itemvariation',
-            name='require_membership_hidden',
-            field=models.BooleanField(default=False),
-        ),
-    ]

src/pretix/base/migrations/0200_transaction.py

@@ -1,38 +0,0 @@
-# Generated by Django 3.2.4 on 2021-10-18 10:27
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0199_auto_20211005_1050'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Transaction',
-            fields=[
-                ('id', models.BigAutoField(primary_key=True, serialize=False)),
-                ('created', models.DateTimeField(auto_now_add=True, db_index=True)),
-                ('datetime', models.DateTimeField(db_index=True)),
-                ('migrated', models.BooleanField(default=False)),
-                ('positionid', models.PositiveIntegerField(default=1, null=True)),
-                ('count', models.IntegerField(default=1)),
-                ('price', models.DecimalField(decimal_places=2, max_digits=10)),
-                ('tax_rate', models.DecimalField(decimal_places=2, max_digits=7)),
-                ('tax_value', models.DecimalField(decimal_places=2, max_digits=10)),
-                ('fee_type', models.CharField(max_length=100, null=True)),
-                ('internal_type', models.CharField(max_length=255, null=True)),
-                ('item', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='pretixbase.item')),
-                ('order', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='transactions', to='pretixbase.order')),
-                ('subevent', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='pretixbase.subevent')),
-                ('tax_rule', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='pretixbase.taxrule')),
-                ('variation', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='pretixbase.itemvariation')),
-            ],
-            options={
-                'ordering': ('datetime', 'pk'),
-            },
-        ),
-    ]

src/pretix/base/migrations/0201_invoiceline_event_location.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.4 on 2021-11-03 09:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0200_transaction'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='invoiceline',
-            name='event_location',
-            field=models.TextField(null=True),
-        ),
-    ]

src/pretix/base/migrations/0202_user_needs_password_change.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2021-11-04 13:05
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0201_invoiceline_event_location'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='needs_password_change',
-            field=models.BooleanField(default=False),
-        ),
-    ]

src/pretix/base/migrations/0203_orderposition_is_bundled.py

@@ -1,17 +0,0 @@
-# Generated by Django 3.2.2 on 2021-11-08 07:51
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('pretixbase', '0202_user_needs_password_change'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='orderposition',
-            name='is_bundled',
-            field=models.BooleanField(default=False),
-        ),
-    ]

src/pretix/base/migrations/0204_orderposition_backfill_is_bundled.py

@@ -1,46 +0,0 @@
-# Generated by Django 3.2.2 on 2021-11-08 07:51
-
-from django.db import migrations, models
-from django.db.models import Count, OuterRef, Subquery
-from django.db.models.functions import Coalesce
-
-
-def fill_is_bundled(apps, schema_editor):
-    # We cannot really know if a position was bundled or an add-on, but we can at least guess
-    ItemBundle = apps.get_model("pretixbase", "ItemBundle")
-    OrderPosition = apps.get_model("pretixbase", "OrderPosition")
-
-    for ib in ItemBundle.objects.iterator():
-        OrderPosition.all.alias(
-            pos_earlier=Coalesce(Subquery(
-                OrderPosition.all.filter(
-                    canceled=False,
-                    addon_to=OuterRef('addon_to'),
-                    item=ib.bundled_item,
-                    variation=ib.bundled_variation,
-                    positionid__lt=OuterRef('positionid'),
-                ).values('addon_to').order_by().annotate(c=Count('*')).values('c'),
-                output_field=models.IntegerField()
-            ), 0)
-        ).filter(
-            canceled=False,
-            addon_to__item=ib.base_item,
-            item=ib.bundled_item,
-            variation=ib.bundled_variation,
-            pos_earlier__lt=ib.count,
-        ).update(
-            is_bundled=True
-        )
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('pretixbase', '0203_orderposition_is_bundled'),
-    ]
-
-    operations = [
-        migrations.RunPython(
-            fill_is_bundled,
-            migrations.RunPython.noop,
-        ),
-    ]

src/pretix/base/migrations/0205_itemvariation_require_approval.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.9 on 2021-12-13 14:21
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0204_orderposition_backfill_is_bundled'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='itemvariation',
-            name='require_approval',
-            field=models.BooleanField(default=False),
-        ),
-    ]