Use Stripe's new connect onboardning

.dockerignore

@@ -1,10 +1,3 @@
 doc/
 env/
 res/
-local/
-.git/
-pretixeu/
-src/data/
-src/pretix/static.dist/
-src/dist/
-

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.6
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -30,8 +30,7 @@ RUN apt-get update && \
     mkdir /data && \
     useradd -ms /bin/bash -d /pretix -u 15371 pretixuser && \
     echo 'pretixuser ALL=(ALL) NOPASSWD:SETENV: /usr/bin/supervisord' >> /etc/sudoers && \
-    mkdir /static && \
-    mkdir /etc/supervisord
+    mkdir /static
 
 ENV LC_ALL=C.UTF-8 \
     DJANGO_SETTINGS_MODULE=production_settings
@@ -48,13 +47,12 @@ RUN pip3 install -U \
         -r requirements.txt \
         -r requirements/memcached.txt \
         -r requirements/mysql.txt \
-        gunicorn django-extensions ipython && \
+        -r requirements/redis.txt \
+        gunicorn && \
     rm -rf ~/.cache/pip
 
 COPY deployment/docker/pretix.bash /usr/local/bin/pretix
-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/supervisord.conf /etc/supervisord.conf
 COPY deployment/docker/nginx.conf /etc/nginx/nginx.conf
 COPY deployment/docker/production_settings.py /pretix/src/production_settings.py
 COPY src /pretix/src

deployment/docker/nginx.conf

@@ -1,13 +1,10 @@
 user www-data www-data;
-worker_processes auto;
+worker_processes 1;
 pid /var/run/nginx.pid;
 daemon off;
-worker_rlimit_nofile 262144;
 
 events {
-    worker_connections 16384;
-    multi_accept on;
-    use epoll;
+	worker_connections 4096;
 }
 
 http {

deployment/docker/pretix.bash

@@ -3,10 +3,7 @@ cd /pretix/src
 export DJANGO_SETTINGS_MODULE=production_settings
 export DATA_DIR=/data/
 export HOME=/pretix
-
-AUTOMIGRATE=${AUTOMIGRATE:-yes}
-NUM_WORKERS_DEFAULT=$((2 * $(nproc --all)))
-export NUM_WORKERS=${NUM_WORKERS:-$NUM_WORKERS_DEFAULT}
+export NUM_WORKERS=$((2 * $(nproc --all)))
 
 if [ ! -d /data/logs ]; then
     mkdir /data/logs;
@@ -19,16 +16,10 @@ if [ "$1" == "cron" ]; then
     exec python3 -m pretix runperiodic
 fi
 
-if [ "$AUTOMIGRATE" != "skip" ]; then
-  python3 -m pretix migrate --noinput
-fi
+python3 -m pretix migrate --noinput
 
 if [ "$1" == "all" ]; then
-    exec sudo -E /usr/bin/supervisord -n -c /etc/supervisord.all.conf
-fi
-
-if [ "$1" == "web" ]; then
-    exec sudo -E /usr/bin/supervisord -n -c /etc/supervisord.web.conf
+    exec sudo -E /usr/bin/supervisord -n -c /etc/supervisord.conf
 fi
 
 if [ "$1" == "webworker" ]; then
@@ -42,12 +33,17 @@ if [ "$1" == "webworker" ]; then
 fi
 
 if [ "$1" == "taskworker" ]; then
-    shift
-    exec celery -A pretix.celery_app worker -l info "$@"
+    export C_FORCE_ROOT=True
+    exec celery -A pretix.celery_app worker -l info
+fi
+
+if [ "$1" == "shell" ]; then
+    exec python3 -m pretix shell
 fi
 
 if [ "$1" == "upgrade" ]; then
     exec python3 -m pretix updatestyles
 fi
 
-exec python3 -m pretix "$@"
+echo "Specify argument: all|cron|webworker|taskworker|shell|upgrade"
+exit 1

deployment/docker/supervisord.all.conf

@@ -1,2 +0,0 @@
-[include]
-files = /etc/supervisord/*.conf

deployment/docker/supervisord.conf

@@ -0,0 +1,44 @@
+[unix_http_server]
+file=/tmp/supervisor.sock
+
+[supervisord]
+logfile=/tmp/supervisord.log
+logfile_maxbytes=50MB
+logfile_backups=10
+loglevel=info
+pidfile=/tmp/supervisord.pid
+nodaemon=false
+minfds=1024
+minprocs=200
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///tmp/supervisor.sock
+
+[program:pretixweb]
+command=/usr/local/bin/pretix webworker
+autostart=true
+autorestart=true
+priority=5
+user=pretixuser
+environment=HOME=/pretix
+
+[program:pretixtask]
+command=/usr/local/bin/pretix taskworker
+autostart=true
+autorestart=true
+priority=5
+user=pretixuser
+
+[program:nginx]
+command=/usr/sbin/nginx
+autostart=true
+autorestart=true
+priority=10
+stdout_events_enabled=true
+stderr_events_enabled=true
+
+[include]
+files = /etc/supervisord-*.conf

deployment/docker/supervisord.web.conf

@@ -1,2 +0,0 @@
-[include]
-files = /etc/supervisord/base.conf /etc/supervisord/nginx.conf /etc/supervisord/pretixweb.conf

deployment/docker/supervisord/base.conf

@@ -1,18 +0,0 @@
-[unix_http_server]
-file=/tmp/supervisor.sock
-
-[supervisord]
-logfile=/tmp/supervisord.log
-logfile_maxbytes=50MB
-logfile_backups=10
-loglevel=info
-pidfile=/tmp/supervisord.pid
-nodaemon=false
-minfds=1024
-minprocs=200
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[supervisorctl]
-serverurl=unix:///tmp/supervisor.sock

deployment/docker/supervisord/nginx.conf

@@ -1,7 +0,0 @@
-[program:nginx]
-command=/usr/sbin/nginx
-autostart=true
-autorestart=true
-priority=10
-stdout_events_enabled=true
-stderr_events_enabled=true

deployment/docker/supervisord/pretixtask.conf

@@ -1,6 +0,0 @@
-[program:pretixtask]
-command=/usr/local/bin/pretix taskworker
-autostart=true
-autorestart=true
-priority=5
-user=pretixuser

deployment/docker/supervisord/pretixweb.conf

@@ -1,7 +0,0 @@
-[program:pretixweb]
-command=/usr/local/bin/pretix webworker
-autostart=true
-autorestart=true
-priority=5
-user=pretixuser
-environment=HOME=/pretix

doc/_themes/pretix_theme/static/css/pretix.css

@@ -6099,6 +6099,3 @@ img.screenshot, a.screenshot img {
 .versionchanged p:last-child {
     margin-bottom: 0;
 }
-.rst-content td > .line-block {
-    margin-left: 0 !important;
-}

doc/admin/config.rst

@@ -23,14 +23,6 @@ The config file may contain the following sections (all settings are optional an
 default values). We suggest that you start from the examples given in one of the
 installation tutorials.
 
-.. note::
-
-    The configuration file is the recommended way to configure pretix. However, you can
-    also set them through environment variables. In this case, the syntax is
-    ``PRETIX_SECTION_CONFIG``. For example, to configure the setting ``password_reset``
-    from the ``[pretix]`` section, set ``PRETIX_PRETIX_PASSWORD_RESET=off`` in your
-    environment.
-
 pretix settings
 ---------------
 
@@ -105,14 +97,9 @@ Example::
 
 ``csp_log``
     Log violations of the Content Security Policy (CSP). Defaults to ``on``.
-
-``csp_additional_header``
-    Specifies a CSP header that will be **merged** with pretix's default header. For example, if you set this
-    to ``script-src https://mycdn.com``, pretix will add ``https://mycdn.com`` as an **additional** allowed source
-    to all CSP headers. Empty by default.
-
+    
 ``loglevel``
-    Set console and file log level (``DEBUG``, ``INFO``, ``WARNING``, ``ERROR`` or ``CRITICAL``). Defaults to ``INFO``.
+    Set console and file loglevel (``DEBUG``, ``INFO``, ``WARNING``, ``ERROR`` or ``CRITICAL``). Defaults to ``INFO``.
 
 Locale settings
 ---------------

doc/admin/installation/docker_smallscale.rst

@@ -135,7 +135,7 @@ Fill the configuration file ``/etc/pretix/pretix.cfg`` with the following conten
     user=pretix
     ; Replace with the password you chose above
     password=*********
-    ; In most docker setups, 172.17.0.1 is the address of the docker host. Adjust
+    ; In most docker setups, 172.17.0.1 is the address of the docker host. Adjuts
     ; this to wherever your database is running, e.g. the name of a linked container
     ; or of a mounted MySQL socket.
     host=172.17.0.1
@@ -284,26 +284,6 @@ Then, go to that directory and build the image::
 You can now use that image ``mypretix`` instead of ``pretix/standalone`` in your service file (see above). Be sure
 to re-build your custom image after you pulled ``pretix/standalone`` if you want to perform an update.
 
-Scaling up
-----------
-
-If you need to scale to multiple machines, please first read our :ref:`scaling guide <scaling>`.
-
-If you run the official docker container on multiple machines, it is recommended to set the environment
-variable ``AUTOMIGRATE=skip`` on all containers and run ``docker exec -it pretix.service pretix migrate``
-on one machine after each upgrade manually, otherwise multiple containers might try to upgrade the
-database schema at the same time.
-
-To run only the ``pretix-web`` component of pretix as well as a nginx server serving static files, you
-can invoke the container with ``docker run … pretix/standalone:stable web`` (instead of ``all``). You
-can adjust the number of ``gunicorn`` processes with the ``NUM_WORKERS`` environment variable (defaults to
-two times the number of CPUs detected).
-
-To run only ``pretix-worker``, you can run ``docker run … pretix/standalone:stable taskworker``. You can
-also pass arguments to limit the worker to specific queues or to change the number of concurrent task
-workers, e.g. ``docker run … taskworker -Q notifications --concurrency 32``.
-
-
 .. _Docker: https://docs.docker.com/engine/installation/linux/debian/
 .. _Postfix: https://www.digitalocean.com/community/tutorials/how-to-install-and-configure-postfix-as-a-send-only-smtp-server-on-ubuntu-16-04
 .. _nginx: https://botleg.com/stories/https-with-lets-encrypt-and-nginx/

doc/api/deviceauth.rst

@@ -49,15 +49,11 @@ information on your device as well as your API token:
        "device_id": 5,
        "unique_serial": "HHZ9LW9JWP390VFZ",
        "api_token": "1kcsh572fonm3hawalrncam4l1gktr2rzx25a22l8g9hx108o9oi0rztpcvwnfnd",
-       "name": "Bar",
-       "gate": {
-           "id": 3,
-           "name": "South entrance"
-       }
+       "name": "Bar"
    }
 
 Please make sure that you store this ``api_token`` value. We also recommend storing your device ID, your assigned
-``unique_serial``, and the ``organizer`` you have access to, but that's up to you. ``gate`` might be ``null``.
+``unique_serial``, and the ``organizer`` you have access to, but that's up to you.
 
 In case of an error, the response will look like this:
 
@@ -102,8 +98,6 @@ following endpoint:
        "software_version": "4.1.0"
    }
 
-You will receive a response equivalent to the response of your initialization request.
-
 Creating a new API key
 ----------------------
 
@@ -132,65 +126,12 @@ invalidate your API key. There is no way to reverse this operation.
 
 This can also be done by the user through the web interface.
 
-Permissions & security profiles
--------------------------------
+Permissions
+-----------
 
 Device authentication is currently hardcoded to grant the following permissions:
 
 * View event meta data and products etc.
-* View orders
-* Change orders
-* Manage gift cards
+* View and change orders
 
 Devices cannot change events or products and cannot access vouchers.
-
-Additionally, when creating a device through the user interface or API, a user can specify a "security profile" for
-the device. These include an allow list of specific API calls that may be made by the device. pretix ships with security
-policies for official pretix apps like pretixSCAN and pretixPOS.
-
-Removing a device
------------------
-
-If you want implement a way to to deprovision a device in your software, you can call the ``revoke`` endpoint to
-invalidate your API key. There is no way to reverse this operation.
-
-.. sourcecode:: http
-
-   POST /api/v1/device/revoke HTTP/1.1
-   Host: pretix.eu
-   Authorization: Device 1kcsh572fonm3hawalrncam4l1gktr2rzx25a22l8g9hx108o9oi0rztpcvwnfnd
-
-This can also be done by the user through the web interface.
-
-Event selection
----------------
-
-In most cases, your application should allow the user to select the event and check-in list they work with manually
-from a list. However, in some cases it is required to automatically configure the device for the correct event, for
-example in a kiosk-like situation where nobody is operating the device. In this case, the app can query the server
-for a suggestion which event should be used. You can also submit the configuration that is currently in use via
-query parameters:
-
-.. sourcecode:: http
-
-   GET /api/v1/device/eventselection?current_event=democon&current_subevent=42&current_checkinlist=542 HTTP/1.1
-   Host: pretix.eu
-   Authorization: Device 1kcsh572fonm3hawalrncam4l1gktr2rzx25a22l8g9hx108o9oi0rztpcvwnfnd
-
-You can get three response codes:
-
-* ``304`` The server things you already selected a good event
-* ``404`` The server has not found a suggestion for you
-* ``200`` The server suggests a new event (body see below)
-
-.. sourcecode:: http
-
-   HTTP/1.1 200 OK
-   Content-Type: application/json
-
-   {
-      "event": "democon",
-      "subevent": 23,
-      "checkinlist": 5
-   }
-

doc/api/oauth.rst

@@ -49,7 +49,7 @@ On a failed registration, a query string like ``?error=access_denied`` will be a
 
 .. note:: By default, the user is asked to give permission on every call to this URL. If you **only** request the
           ``profile`` scope, i.e. no access to organizer data, you can pass the ``approval_prompt=auto`` parameter
-          to skip user interaction on subsequent calls.
+          to skip user interaction on subsequen calls.
 
 Getting an access token
 -----------------------

doc/api/resources/checkinlists.rst

@@ -33,7 +33,6 @@ auto_checkin_sales_channels           list of strings            All items on th
 allow_multiple_entries                boolean                    If ``true``, subsequent scans of a ticket on this list should not show a warning but instead be stored as an additional check-in.
 allow_entry_after_exit                boolean                    If ``true``, subsequent scans of a ticket on this list are valid if the last scan of the ticket was an exit scan.
 rules                                 object                     Custom check-in logic. The contents of this field are currently not considered a stable API and modifications through the API are highly discouraged.
-exit_all_at                           datetime                   Automatically check out (i.e. perform an exit scan) at this point in time. After this happened, this property will automatically be set exactly one day into the future. Note that this field is considered "internal configuration" and if you pull the list with ``If-Modified-Since``, the daily change in this field will not trigger a response.
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.10
@@ -61,10 +60,6 @@ exit_all_at                           datetime                   Automatically c
 
     The ``subevent_match`` and ``exclude`` query parameters have been added.
 
-.. versionchanged:: 3.12
-
-    The ``exit_all_at`` attribute has been added.
-
 Endpoints
 ---------
 
@@ -108,7 +103,6 @@ Endpoints
             "subevent": null,
             "allow_multiple_entries": false,
             "allow_entry_after_exit": true,
-            "exit_all_at": null,
             "rules": {},
             "auto_checkin_sales_channels": [
               "pretixpos"
@@ -158,7 +152,6 @@ Endpoints
         "subevent": null,
         "allow_multiple_entries": false,
         "allow_entry_after_exit": true,
-        "exit_all_at": null,
         "rules": {},
         "auto_checkin_sales_channels": [
           "pretixpos"
@@ -195,7 +188,6 @@ Endpoints
       {
         "checkin_count": 17,
         "position_count": 42,
-        "inside_count": 12,
         "event": {
           "name": "Demo Conference"
         },

doc/api/resources/devices.rst

@@ -216,7 +216,7 @@ Device endpoints
       }
 
    :param organizer: The ``slug`` field of the organizer to modify
-   :param device_id: The ``device_id`` field of the device to modify
+   :param device_id: The ``device_id`` field of the deviec to modify
    :statuscode 200: no error
    :statuscode 400: The device could not be modified due to invalid submitted data
    :statuscode 401: Authentication failure

doc/api/resources/events.rst

@@ -44,11 +44,6 @@ seat_category_mapping                 object                     An object mappi
                                                                  (strings) to items in the event (integers or ``null``).
 timezone                              string                     Event timezone name
 item_meta_properties                  object                     Item-specific meta data parameters and default values.
-valid_keys                            object                     Cryptographic keys for non-default signature schemes.
-                                                                 For performance reason, value is omitted in lists and
-                                                                 only contained in detail views. Value can be cached.
-sales_channels                        list                       A list of sales channels this event is available for
-                                                                 sale on.
 ===================================== ========================== =======================================================
 
 
@@ -89,15 +84,6 @@ sales_channels                        list                       A list of sales
 
    The attribute ``item_meta_properties`` has been added.
 
-.. versionchanged:: 3.12
-
-   The attribute ``valid_keys`` has been added.
-
-.. versionchanged:: 3.14
-
-    The attribute ``sales_channels`` has been added.
-
-
 Endpoints
 ---------
 
@@ -154,15 +140,10 @@ Endpoints
             "timezone": "Europe/Berlin",
             "item_meta_properties": {},
             "plugins": [
-              "pretix.plugins.banktransfer",
-              "pretix.plugins.stripe",
-              "pretix.plugins.paypal",
+              "pretix.plugins.banktransfer"
+              "pretix.plugins.stripe"
+              "pretix.plugins.paypal"
               "pretix.plugins.ticketoutputpdf"
-            ],
-            "sales_channels": [
-              "web",
-              "pretixpos",
-              "resellers"
             ]
           }
         ]
@@ -182,7 +163,6 @@ Endpoints
         only contain the events matching the set criteria. Providing ``?attr[Format]=Seminar`` would return only those
         events having set their ``Format`` meta data to ``Seminar``, ``?attr[Format]=`` only those, that have no value
         set. Please note that this filter will respect default values set on organizer level.
-   :query sales_channel: If set to a sales channel identifier, only events allowed to be sold on the specified sales channel are returned.
    :param organizer: The ``slug`` field of a valid organizer
    :statuscode 200: no error
    :statuscode 401: Authentication failure
@@ -232,20 +212,10 @@ Endpoints
         "timezone": "Europe/Berlin",
         "item_meta_properties": {},
         "plugins": [
-          "pretix.plugins.banktransfer",
-          "pretix.plugins.stripe",
-          "pretix.plugins.paypal",
+          "pretix.plugins.banktransfer"
+          "pretix.plugins.stripe"
+          "pretix.plugins.paypal"
           "pretix.plugins.ticketoutputpdf"
-        ],
-        "valid_keys": {
-          "pretix_sig1": [
-            "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUNvd0JRWURLMlZ3QXlFQTdBRDcvdkZBMzNFc1k0ejJQSHI3aVpQc1o4bjVkaDBhalA4Z3l6Tm1tSXM9Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo="
-          ]
-        },
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 
@@ -297,11 +267,6 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
-        ],
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 
@@ -337,11 +302,6 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
-        ],
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 
@@ -397,11 +357,6 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
-        ],
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 
@@ -437,11 +392,6 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
-        ],
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 
@@ -511,11 +461,6 @@ Endpoints
           "pretix.plugins.stripe",
           "pretix.plugins.paypal",
           "pretix.plugins.pretixdroid"
-        ],
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 
@@ -527,7 +472,7 @@ Endpoints
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
 
 
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/
+.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/items/(id)/
 
    Delete an event. Note that events with orders cannot be deleted to ensure data integrity.
 

doc/api/resources/exporters.rst

@@ -1,215 +0,0 @@
-.. spelling:: checkin
-
-Data exporters
-==============
-
-pretix and it's plugins include a number of data exporters that allow you to bulk download various data from pretix in
-different formats. This page shows you how to use these exporters through the API.
-
-.. versionchanged:: 3.13
-
-   This feature has been added to the API.
-
-.. warning::
-
-   While we consider the methods listed on this page to be a stable API, the availability and specific input field
-   requirements of individual exporters is **not considered a stable API**. Specific exporters and their input parameters
-   may change at any time without warning.
-
-Listing available exporters
----------------------------
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/exporters/
-
-   Returns a list of all exporters available for a given event. You will receive a list of export methods as well as their
-   supported input fields. Note that the exact type and validation requirements of the input fields are not given in the
-   response, and you might need to look into the pretix web interface to figure out the exact input required.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/exporters/ 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": [
-          {
-            "identifier": "orderlist",
-            "verbose_name": "Order data",
-            "input_parameters": [
-              {
-                "name": "_format",
-                "required": true,
-                "choices": [
-                  "xlsx",
-                  "orders:default",
-                  "orders:excel",
-                  "orders:semicolon",
-                  "positions:default",
-                  "positions:excel",
-                  "positions:semicolon",
-                  "fees:default",
-                  "fees:excel",
-                  "fees:semicolon"
-                ]
-              },
-              {
-                "name": "paid_only",
-                "required": false
-              }
-            ]
-          }
-        ]
-      }
-
-   :query integer page: The page number in case of a multi-page result set, default is 1
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:get:: /api/v1/organizers/(organizer)/exporters/
-
-   Returns a list of all cross-event exporters available for a given organizer. You will receive a list of export methods as well as their
-   supported input fields. Note that the exact type and validation requirements of the input fields are not given in the
-   response, and you might need to look into the pretix web interface to figure out the exact input required.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/exporters/ 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": [
-          {
-            "identifier": "orderlist",
-            "verbose_name": "Order data",
-            "input_parameters": [
-              {
-                "name": "events",
-                "required": true
-              },
-              {
-                "name": "_format",
-                "required": true,
-                "choices": [
-                  "xlsx",
-                  "orders:default",
-                  "orders:excel",
-                  "orders:semicolon",
-                  "positions:default",
-                  "positions:excel",
-                  "positions:semicolon",
-                  "fees:default",
-                  "fees:excel",
-                  "fees:semicolon"
-                ]
-              },
-              {
-                "name": "paid_only",
-                "required": false
-              }
-            ]
-          }
-        ]
-      }
-
-   :query integer page: The page number in case of a multi-page result set, default is 1
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-Running an export
------------------
-
-Since exports often include large data sets, they might take longer than the duration of an HTTP request. Therefore,
-creating an export is a two-step process. First you need to start an export task with one of the following to API
-endpoints:
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/exporters/(identifier)/run/
-
-   Starts an export task. If your input parameters validate correctly, a ``202 Accepted`` status code is returned.
-   The body points you to the download URL of the result.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/exporters/orderlist/run/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "_format": "xlsx"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "download": "https://pretix.eu/api/v1/organizers/bigevents/events/sampleconf/orderlist/download/29891ede-196f-4942-9e26-d055a36e98b8/3f279f13-c198-4137-b49b-9b360ce9fcce/"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param identifier: The ``identifier`` field of the exporter to run
-   :statuscode 202: no error
-   :statuscode 400: Invalid input options
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
-.. http:post:: /api/v1/organizers/(organizer)/exporters/(identifier)/run/
-
-   The endpoint for organizer-level exports works just like event-level exports (see above).
-
-
-Downloading the result
-----------------------
-
-When starting an export, you receive a ``url`` for downloading the result. Running a ``GET`` request on that result will
-yield one of the following status codes:
-
-* ``200 OK`` – The export succeeded. The body will be your resulting file. Might be large!
-* ``409 Conflict`` – Your export is still running. The body will be JSON with the structure ``{"status": "running", "percentage": 40}``. ``percentage`` can be ``null`` if it is not known and ``status`` can be ``waiting`` before the task is actually being processed. Please retry, but wait at least one second before you do.
-* ``410 Gone`` – Running the export has failed permanently. The body will be JSON with the structure ``{"status": "failed", "message": "Error message"}``
-* ``404 Not Found`` – The export does not exist / is expired.
-
-.. warning::
-
-   Running exports puts a lot of stress on the system, we kindly ask you not to run more than two exports at the same time.
-

doc/api/resources/giftcards.rst

@@ -22,28 +22,9 @@ expires                               datetime                   Expiry date (or
 conditions                            string                     Special terms and conditions for this card (or ``null``)
 ===================================== ========================== =======================================================
 
-The gift card transaction resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the gift card transaction
-datetime                              datetime                   Creation date of the transaction
-value                                 money (string)             Transaction amount
-event                                 string                     Event slug, if the gift card was used in the web shop (or ``null``)
-order                                 string                     Order code, if the gift card was used in the web shop (or ``null``)
-text                                  string                     Custom text of the transaction (or ``null``)
-===================================== ========================== =======================================================
-
 Endpoints
 ---------
 
-.. versionadded:: 3.14
-
-   The transaction list endpoint was added.
-
 .. http:get:: /api/v1/organizers/(organizer)/giftcards/
 
    Returns a list of all gift cards issued by a given organizer.
@@ -269,45 +250,3 @@ Endpoints
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer does not exist **or** you have no permission to change this resource.
    :statuscode 409: There is not sufficient credit on the gift card.
-
-.. http:get:: /api/v1/organizers/(organizer)/giftcards/(id)/transactions/
-
-   List all transactions of a gift card.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/giftcards/1/transactions/ 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": 82,
-            "datetime": "2020-06-22T15:41:42.800534Z",
-            "value": "50.00",
-            "event": "democon",
-            "order": "FXQYW",
-            "text": null
-          }
-        ]
-      }
-
-   :param organizer: The ``slug`` field of the organizer to view
-   :param id: The ``id`` field of the gift card to view
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to view this resource.

doc/api/resources/index.rst

@@ -27,6 +27,5 @@ Resources and endpoints
    devices
    webhooks
    seatingplans
-   exporters
    billing_invoices
    billing_var

doc/api/resources/orders.rst

@@ -30,7 +30,6 @@ testmode                              boolean                    If ``true``, th
                                                                  test mode. Only orders in test mode can be deleted.
 secret                                string                     The secret contained in the link sent to the customer
 email                                 string                     The customer email address
-phone                                 string                     The customer phone number
 locale                                string                     The locale used for communication with this customer
 sales_channel                         string                     Channel this sale was created through, such as
                                                                  ``"web"``.
@@ -164,14 +163,6 @@ last_modified                         datetime                   Last modificati
 
    The ``exclude`` and ``subevent_after`` query parameter has been added.
 
-.. versionchanged:: 3.13
-
-   The ``subevent_before`` query parameter has been added.
-
-.. versionchanged:: 3.14
-
-   The ``phone`` attribute has been added.
-
 
 .. _order-position-resource:
 
@@ -377,7 +368,6 @@ List of all orders
             "secret": "k24fiuwvu8kxz3y1",
             "url": "https://test.pretix.eu/dummy/dummy/order/ABC12/k24fiuwvu8kxz3y1/",
             "email": "tester@example.org",
-            "phone": "+491234567",
             "locale": "en",
             "sales_channel": "web",
             "datetime": "2017-12-01T10:00:00Z",
@@ -500,8 +490,7 @@ 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 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 datetime subevent_after: Only return orders that contain a ticket for a subevent taking place after the given date.
    :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.
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
@@ -545,7 +534,6 @@ Fetching individual orders
         "secret": "k24fiuwvu8kxz3y1",
         "url": "https://test.pretix.eu/dummy/dummy/order/ABC12/k24fiuwvu8kxz3y1/",
         "email": "tester@example.org",
-        "phone": "+491234567",
         "locale": "en",
         "sales_channel": "web",
         "datetime": "2017-12-01T10:00:00Z",
@@ -712,8 +700,6 @@ Updating order fields
 
    * ``email``
 
-   * ``phone``
-
    * ``checkin_attention``
 
    * ``locale``
@@ -949,9 +935,9 @@ Creating orders
         during order generation and is not respected automatically when the order changes later.)
 
    * ``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
+   * ``send_mail`` (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. Defaults to
-     ``false``. Used to be ``send_mail`` before pretix 3.14.
+     ``false``.
 
    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
@@ -1985,7 +1971,6 @@ Order payment endpoints
         "amount": "23.00",
         "payment_date": "2017-12-04T12:13:12Z",
         "info": {},
-        "send_email": false,
         "provider": "banktransfer"
       }
 
@@ -2278,57 +2263,3 @@ Order refund endpoints
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
    :statuscode 404: The requested order or refund does not exist.
-
-Revoked ticket secrets
-----------------------
-
-With some non-default ticket secret generation methods, a list of revoked ticket secrets is required for proper validation.
-
-.. versionchanged:: 3.12
-
-   Added revocation lists.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/revokedsecrets/
-
-   Returns a list of all revoked secrets within a given event.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/revokedsecrets/ 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
-      X-Page-Generated: 2017-12-01T10:00:00Z
-
-      {
-        "count": 1,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id": 1234,
-            "secret": "k24fiuwvu8kxz3y1",
-            "created": "2017-12-01T10:00:00Z",
-          }
-        ]
-      }
-
-   :query integer page: The page number in case of a multi-page result set, default is 1
-   :query string ordering: Manually set the ordering of results. Valid fields to be used are ``secret`` and ``created``. Default: ``-created``
-   :query datetime created_since: Only return revocations that have been created since the given date.
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :resheader X-Page-Generated: The server time at the beginning of the operation. If you're using this API to fetch
-                                differences, this is the value you want to use as ``created_since`` in your next call.
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.

doc/api/resources/organizers.rst

@@ -90,120 +90,3 @@ Endpoints
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer does not exist **or** you have no permission to view it.
-
-Organizer settings
-------------------
-
-pretix organizers and events have lots and lots of parameters of different types that are stored in a key-value store on our system.
-Since many of these settings depend on each other in complex ways, we can not give direct access to all of these
-settings through the API. However, we do expose many of the simple and useful flags through the API.
-
-Please note that the available settings flags change between pretix versions, and we do not give a guarantee on backwards-compatibility like with other parts of the API.
-Therefore, we're also not including a list of the options here, but instead recommend to look at the endpoint output
-to see available options. The ``explain=true`` flag enables a verbose mode that provides you with human-readable
-information about the properties.
-
-.. note:: Please note that this is not a complete representation of all organizer settings. You will find more settings
-          in the web interface.
-
-.. warning:: This API is intended for advanced users. Even though we take care to validate your input, you will be
-             able to break your shops using this API by creating situations of conflicting settings. Please take care.
-
-.. versionchanged:: 3.14
-
-   Initial support for settings has been added to the API.
-
-.. http:get:: /api/v1/organizers/(organizer)/settings/
-
-   Get current values of organizer settings.
-
-   Permission required: "Can change organizer settings"
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/settings/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example standard response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "event_list_type": "calendar",
-        …
-      }
-
-   **Example verbose response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "event_list_type":
-          {
-            "value": "calendar",
-            "label": "Default overview style",
-            "help_text": "If your event series has more than 50 dates in the future, only the month or week calendar can be used."
-          }
-        },
-        …
-      }
-
-   :param organizer: The ``slug`` field of the organizer to access
-   :query explain: Set to ``true`` to enable verbose response mode
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to view this resource.
-
-.. http:patch:: /api/v1/organizers/(organizer)/settings/
-
-   Updates organizer settings. Note that ``PUT`` is not allowed here, only ``PATCH``.
-
-    .. warning::
-
-       Settings can be stored at different levels in pretix. If a value is not set on organizer level, a default setting
-       from a higher level (global) will be returned. If you explicitly set a setting on organizer level, it
-       will no longer be inherited from the higher levels. Therefore, we recommend you to send only settings that you
-       explicitly want to set on organizer level. To unset a settings, pass ``null``.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/settings/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "event_list_type": "calendar"
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "event_list_type": "calendar",
-        …
-      }
-
-   :param organizer: The ``slug`` field of the organizer to update
-   :statuscode 200: no error
-   :statuscode 400: The organizer could not be updated due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.

doc/api/resources/questions.rst

@@ -1,7 +1,4 @@
-.. spelling::
-
-   checkin
-   datetime
+.. spelling:: checkin
 
 .. _rest-questions:
 
@@ -56,12 +53,6 @@ options                               list of objects            In case of ques
 ├ identifier                          string                     An arbitrary string that can be used for matching with
                                                                  other sources.
 └ answer                              multi-lingual string       The displayed value of this option
-valid_number_min                      string                     Minimum value for number questions (optional)
-valid_number_max                      string                     Maximum value for number questions (optional)
-valid_date_min                        date                       Minimum value for date questions (optional)
-valid_date_max                        date                       Maximum value for date questions (optional)
-valid_datetime_min                    datetime                   Minimum value for date and time questions (optional)
-valid_datetime_max                    datetime                   Maximum value for date and time questions (optional)
 dependency_question                   integer                    Internal ID of a different question. The current
                                                                  question will only be shown if the question given in
                                                                  this attribute is set to the value given in
@@ -101,10 +92,6 @@ dependency_value                      string                     An old version
 
   The attribute ``help_text`` has been added.
 
-.. versionchanged:: 3.14
-
-  The attributes ``valid_*`` have been added.
-
 Endpoints
 ---------
 
@@ -150,12 +137,6 @@ Endpoints
             "ask_during_checkin": false,
             "hidden": false,
             "print_on_invoice": false,
-            "valid_number_min": null,
-            "valid_number_max": null,
-            "valid_date_min": null,
-            "valid_date_max": null,
-            "valid_datetime_min": null,
-            "valid_datetime_max": null,
             "dependency_question": null,
             "dependency_value": null,
             "dependency_values": [],
@@ -227,12 +208,6 @@ Endpoints
         "ask_during_checkin": false,
         "hidden": false,
         "print_on_invoice": false,
-        "valid_number_min": null,
-        "valid_number_max": null,
-        "valid_date_min": null,
-        "valid_date_max": null,
-        "valid_datetime_min": null,
-        "valid_datetime_max": null,
         "dependency_question": null,
         "dependency_value": null,
         "dependency_values": [],
@@ -327,12 +302,6 @@ Endpoints
         "dependency_question": null,
         "dependency_value": null,
         "dependency_values": [],
-        "valid_number_min": null,
-        "valid_number_max": null,
-        "valid_date_min": null,
-        "valid_date_max": null,
-        "valid_datetime_min": null,
-        "valid_datetime_max": null,
         "options": [
           {
             "id": 1,
@@ -408,12 +377,6 @@ Endpoints
         "dependency_question": null,
         "dependency_value": null,
         "dependency_values": [],
-        "valid_number_min": null,
-        "valid_number_max": null,
-        "valid_date_min": null,
-        "valid_date_max": null,
-        "valid_datetime_min": null,
-        "valid_datetime_max": null,
         "options": [
           {
             "id": 1,

doc/api/resources/subevents.rst

@@ -51,7 +51,6 @@ seating_plan                          integer                    If reserved sea
                                                                  plan. Otherwise ``null``.
 seat_category_mapping                 object                     An object mapping categories of the seating plan
                                                                  (strings) to items in the event (integers or ``null``).
-last_modified                         datetime                   Last modification of this object
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.7
@@ -81,10 +80,6 @@ last_modified                         datetime                   Last modificati
 
    The ``disabled`` attribute has been added to ``item_price_overrides`` and ``variation_price_overrides``.
 
-.. versionchanged:: 3.12
-
-   The ``last_modified`` attribute has been added.
-
 Endpoints
 ---------
 
@@ -153,8 +148,6 @@ Endpoints
    :query ends_after: If set to a date and time, only events that happen during of after the given time are returned.
    :param organizer: The ``slug`` field of a valid organizer
    :param event: The ``slug`` field of the main event
-   :query datetime modified_since: Only return objects that have changed since the given date. Be careful: This does not
-       allow you to know if a subevent was deleted.
    :query array attr[meta_data_key]: By providing the key and value of a meta data attribute, the list of sub-events
         will only contain the sub-events matching the set criteria. Providing ``?attr[Format]=Seminar`` would return
         only those sub-events having set their ``Format`` meta data to ``Seminar``, ``?attr[Format]=`` only those, that

doc/api/resources/webhooks.rst

@@ -31,10 +31,8 @@ action_types                          list of strings            A list of actio
 The following values for ``action_types`` are valid with pretix core:
 
     * ``pretix.event.order.placed``
-    * ``pretix.event.order.placed.require_approval``
     * ``pretix.event.order.paid``
     * ``pretix.event.order.canceled``
-    * ``pretix.event.order.reactivated``
     * ``pretix.event.order.expired``
     * ``pretix.event.order.modified``
     * ``pretix.event.order.contact.changed``
@@ -44,12 +42,6 @@ The following values for ``action_types`` are valid with pretix core:
     * ``pretix.event.order.denied``
     * ``pretix.event.checkin``
     * ``pretix.event.checkin.reverted``
-    * ``pretix.event.added``
-    * ``pretix.event.changed``
-    * ``pretix.event.deleted``
-    * ``pretix.subevent.added``
-    * ``pretix.subevent.changed``
-    * ``pretix.subevent.deleted``
 
 Installed plugins might register more valid values.
 

doc/conf.py

@@ -52,7 +52,6 @@ extensions = [
     'sphinx.ext.coverage',
     'sphinxcontrib.httpdomain',
     'sphinxcontrib.images',
-    'sphinxemoji.sphinxemoji',
 ]
 if HAS_PYENCHANT:
     extensions.append('sphinxcontrib.spelling')

doc/development/api/customview.rst

@@ -14,9 +14,7 @@ Control panel views
 -------------------
 
 If you want to add a custom view to the control area of an event, just register an URL in your
-``urls.py`` that lives in the ``/control/`` subpath:
-
-.. code-block:: python
+``urls.py`` that lives in the ``/control/`` subpath::
 
     from django.conf.urls import url
 
@@ -46,9 +44,7 @@ If only the ``organizer`` parameter is present, it will be ensured that:
 * The user has permission to access view the current organizer
 
 If you want to require specific permission types, we provide you with a decorator or a mixin for
-your views:
-
-.. code-block:: python
+your views::
 
     from pretix.control.permissions import (
         event_permission_required, EventPermissionRequiredMixin
@@ -65,9 +61,8 @@ your views:
         ...
 
 Similarly, there is ``organizer_permission_required`` and ``OrganizerPermissionRequiredMixin``. In case of
-event-related views, there is also a signal that allows you to add the view to the event navigation like this:
+event-related views, there is also a signal that allows you to add the view to the event navigation like this::
 
-.. code-block:: python
 
     from django.urls import resolve, reverse
     from django.dispatch import receiver
@@ -95,9 +90,7 @@ Event settings view
 -------------------
 
 A special case of a control panel view is a view hooked into the event settings page. For this case, there is a
-special navigation signal:
-
-.. code-block:: python
+special navigation signal::
 
     @receiver(nav_event_settings, dispatch_uid='friends_tickets_nav_settings')
     def navbar_settings(sender, request, **kwargs):
@@ -112,9 +105,7 @@ special navigation signal:
         }]
 
 Also, your view should inherit from ``EventSettingsViewMixin`` and your template from ``pretixcontrol/event/settings_base.html``
-for good integration. If you just want to display a form, you could do it like the following:
-
-.. code-block:: python
+for good integration. If you just want to display a form, you could do it like the following::
 
     class MySettingsView(EventSettingsViewMixin, EventSettingsFormView):
         model = Event
@@ -156,9 +147,7 @@ Including a custom view into the participant-facing frontend is a little bit dif
 no path prefix like ``control/``.
 
 First, define your URL in your ``urls.py``, but this time in the ``event_patterns`` section and wrapped by
-``event_url``:
-
-.. code-block:: python
+``event_url``::
 
     from pretix.multidomain import event_url
 
@@ -193,9 +182,8 @@ standard Django request handling: There are `ViewSets`_ to group related views i
 automatically build URL configurations from them.
 
 To integrate a custom viewset with pretix' REST API, you can just register with one of our routers within the
-``urls.py`` module of your plugin:
+``urls.py`` module of your plugin::
 
-.. code-block:: python
 
     from pretix.api.urls import event_router, router, orga_router
 
@@ -212,9 +200,7 @@ in the control panel. However, you need to make sure on your own only to return
 .event`` and ``request.organizer`` are available as usual.
 
 To require a special permission like ``can_view_orders``, you do not need to inherit from a special ViewSet base
-class, you can just set the ``permission`` attribute on your viewset:
-
-.. code-block:: python
+class, you can just set the ``permission`` attribute on your viewset::
 
     class MyViewSet(ModelViewSet):
         permission = 'can_view_orders'
@@ -222,9 +208,8 @@ class, you can just set the ``permission`` attribute on your viewset:
 
 If you want to check the permission only for some methods of your viewset, you have to do it yourself. Note here that
 API authentications can be done via user sessions or API tokens and you should therefore check something like the
-following:
+following::
 
-.. code-block:: python
 
     perm_holder = (request.auth if isinstance(request.auth, TeamAPIToken) else request.user)
     if perm_holder.has_event_permission(request.event.organizer, request.event, 'can_view_orders'):

doc/development/api/email.rst

@@ -15,9 +15,7 @@ Output registration
 The email HTML renderer API does not make a lot of usage from signals, however, it
 does use a signal to get a list of all available email renderers. Your plugin
 should listen for this signal and return the subclass of ``pretix.base.email.BaseHTMLMailRenderer``
-that we'll provide in this plugin:
-
-.. code-block:: python
+that we'll provide in this plugin::
 
     from django.dispatch import receiver
 
@@ -74,9 +72,7 @@ class ``TemplateBasedMailRenderer`` that you can re-use to perform the following
 * Call `inlinestyler`_ to convert all ``<style>`` style sheets to inline ``style=""``
   attributes for better compatibility
 
-To use it, you just need to implement some variables:
-
-.. code-block:: python
+To use it, you just need to implement some variables::
 
     class ClassicMailRenderer(TemplateBasedMailRenderer):
         verbose_name = _('pretix default')

doc/development/api/exporter.rst

@@ -17,9 +17,7 @@ Exporter registration
 The exporter API does not make a lot of usage from signals, however, it does use a signal to get a list of
 all available exporters. Your plugin should listen for this signal and return the subclass of
 ``pretix.base.exporter.BaseExporter``
-that we'll provide in this plugin:
-
-.. code-block:: python
+that we'll provide in this plugin::
 
     from django.dispatch import receiver
 
@@ -33,9 +31,7 @@ that we'll provide in this plugin:
 
 Some exporters might also prove to be useful, when provided on an organizer-level. In order to declare your
 exporter as capable of providing exports spanning multiple events, your plugin should listen for this signal
-and return the subclass of ``pretix.base.exporter.BaseExporter`` that we'll provide in this plugin:
-
-.. code-block:: python
+and return the subclass of ``pretix.base.exporter.BaseExporter`` that we'll provide in this plugin::
 
     from django.dispatch import receiver
 

doc/development/api/general.rst

@@ -12,8 +12,7 @@ Core
 
 .. automodule:: pretix.base.signals
    :members: periodic_task, event_live_issues, event_copy_data, email_filter, register_notification_types,
-      item_copy_data, register_sales_channels, register_global_settings, quota_availability, global_email_filter,
-      register_ticket_secret_generators
+      item_copy_data, register_sales_channels, register_global_settings, quota_availability, global_email_filter
 
 Order events
 """"""""""""
@@ -34,7 +33,7 @@ Frontend
 --------
 
 .. automodule:: pretix.presale.signals
-   :members: html_head, html_footer, footer_link, front_page_top, front_page_bottom, front_page_bottom_widget, fee_calculation_for_cart, contact_form_fields, question_form_fields, contact_form_fields_overrides, question_form_fields_overrides, checkout_confirm_messages, checkout_confirm_page_content, checkout_all_optional, html_page_header, sass_preamble, sass_postamble, render_seating_plan, checkout_flow_steps, position_info, position_info_top, item_description, global_html_head, global_html_footer, global_html_page_header
+   :members: html_head, html_footer, footer_link, front_page_top, front_page_bottom, front_page_bottom_widget, fee_calculation_for_cart, contact_form_fields, question_form_fields, checkout_confirm_messages, checkout_confirm_page_content, checkout_all_optional, html_page_header, sass_preamble, sass_postamble, render_seating_plan, checkout_flow_steps, position_info, position_info_top, item_description, global_html_head, global_html_footer, global_html_page_header
 
 
 .. automodule:: pretix.presale.signals
@@ -58,7 +57,7 @@ Backend
 .. automodule:: pretix.control.signals
    :members: nav_event, html_head, html_page_start, quota_detail_html, nav_topbar, nav_global, nav_organizer, nav_event_settings,
              order_info, event_settings_widget, oauth_application_registered, order_position_buttons, subevent_forms,
-             item_formsets, order_search_filter_q, order_search_forms
+             item_formsets, order_search_filter_q
 
 .. automodule:: pretix.base.signals
    :members: logentry_display, logentry_object_link, requiredaction_display, timeline_events

doc/development/api/invoice.rst

@@ -15,9 +15,7 @@ Output registration
 The invoice renderer API does not make a lot of usage from signals, however, it
 does use a signal to get a list of all available invoice renderers. Your plugin
 should listen for this signal and return the subclass of ``pretix.base.invoice.BaseInvoiceRenderer``
-that we'll provide in this plugin:
-
-.. code-block:: python
+that we'll provide in this plugin::
 
     from django.dispatch import receiver
 

doc/development/api/payment.rst

@@ -19,9 +19,7 @@ Provider registration
 The payment provider API does not make a lot of usage from signals, however, it
 does use a signal to get a list of all available payment providers. Your plugin
 should listen for this signal and return the subclass of ``pretix.base.payment.BasePaymentProvider``
-that the plugin will provide:
-
-.. code-block:: python
+that the plugin will provide::
 
     from django.dispatch import receiver
 
@@ -142,9 +140,7 @@ it is necessary to introduce additional views. One example is the PayPal
 provider. It redirects the user to a PayPal website in the
 :py:meth:`BasePaymentProvider.checkout_prepare` step of the checkout process
 and provides PayPal with a URL to redirect back to. This URL points to a
-view which looks roughly like this:
-
-.. code-block:: python
+view which looks roughly like this::
 
     @login_required
     def success(request):

doc/development/api/placeholder.rst

@@ -13,9 +13,7 @@ Placeholder registration
 
 The placeholder API does not make a lot of usage from signals, however, it
 does use a signal to get a list of all available email placeholders. Your plugin
-should listen for this signal and return an instance of a subclass of ``pretix.base.email.BaseMailTextPlaceholder``:
-
-.. code-block:: python
+should listen for this signal and return an instance of a subclass of ``pretix.base.email.BaseMailTextPlaceholder``::
 
     from django.dispatch import receiver
 
@@ -73,9 +71,7 @@ Helper class for simple placeholders
 ------------------------------------
 
 pretix ships with a helper class that makes it easy to provide placeholders based on simple
-functions:
-
-.. code-block:: python
+functions::
 
      placeholder = SimpleFunctionalMailTextPlaceholder(
          'code', ['order'], lambda order: order.code, sample='F8VVL'

doc/development/api/plugins.rst

@@ -55,9 +55,7 @@ restricted         boolean (optional)   ``False`` by default, restricts a plugin
 compatibility      string               Specifier for compatible pretix versions.
 ================== ==================== ===========================================================
 
-A working example would be:
-
-.. code-block:: python
+A working example would be::
 
     try:
         from pretix.base.plugins import PluginConfig
@@ -83,7 +81,7 @@ A working example would be:
 
     default_app_config = 'pretix_paypal.PaypalApp'
 
-The ``AppConfig`` class may implement a property ``compatibility_errors``, that checks
+The ``AppConfig`` class may implement a property ``compatiblity_errors``, that checks
 whether the pretix installation meets all requirements of the plugin. If so,
 it should contain ``None`` or an empty list, otherwise a list of strings containing
 human-readable error messages. We recommend using the ``django.utils.functional.cached_property``
@@ -98,9 +96,7 @@ Plugin registration
 
 Somehow, pretix needs to know that your plugin exists at all. For this purpose, we
 make use of the `entry point`_ feature of setuptools. To register a plugin that lives
-in a separate python package, your ``setup.py`` should contain something like this:
-
-.. code-block:: python
+in a separate python package, your ``setup.py`` should contain something like this::
 
     setup(
         args...,
@@ -122,9 +118,7 @@ The various components of pretix define a number of signals which your plugin ca
 listen for. We will go into the details of the different signals in the following
 pages. We suggest that you put your signal receivers into a ``signals`` submodule
 of your plugin. You should extend your ``AppConfig`` (see above) by the following
-method to make your receivers available:
-
-.. code-block:: python
+method to make your receivers available::
 
     class PaypalApp(AppConfig):
         …
@@ -133,9 +127,7 @@ method to make your receivers available:
             from . import signals  # NOQA
 
 You can optionally specify code that is executed when your plugin is activated for an event
-in the ``installed`` method:
-
-.. code-block:: python
+in the ``installed`` method::
 
     class PaypalApp(AppConfig):
         …

doc/development/api/shredder.rst

@@ -74,7 +74,7 @@ looks like this:
 
         def generate_files(self) -> List[Tuple[str, str, str]]:
             yield 'invoice-addresses.json', 'application/json', json.dumps({
-                ia.order.code: InvoiceAddressSerializer(ia).data
+                ia.order.code: InvoiceAdddressSerializer(ia).data
                 for ia in InvoiceAddress.objects.filter(order__event=self.event)
             }, indent=4)
 

doc/development/api/ticketoutput.rst

@@ -17,9 +17,7 @@ Output registration
 The ticket output API does not make a lot of usage from signals, however, it
 does use a signal to get a list of all available ticket outputs. Your plugin
 should listen for this signal and return the subclass of ``pretix.base.ticketoutput.BaseTicketOutput``
-that we'll provide in this plugin:
-
-.. code-block:: python
+that we'll provide in this plugin::
 
     from django.dispatch import receiver
 

doc/development/implementation/background.rst

@@ -12,9 +12,7 @@ Implementing a task
 -------------------
 
 A common pattern for implementing asynchronous tasks can be seen a lot in ``pretix.base.services``
-and looks like this:
-
-.. code-block:: python
+and looks like this::
 
     from pretix.celery_app import app
 
@@ -36,15 +34,13 @@ If your user needs to wait for the response of the asynchronous task, there are
 that will probably move to ``pretix.base`` at some point. They consist of the view mixin ``AsyncAction`` that allows
 you to easily write a view that kicks off and waits for an asynchronous task. ``AsyncAction`` will determine whether
 to run the task asynchronously or not and will do some magic to look nice for users with and without JavaScript support.
-A usage example taken directly from the code is:
-
-.. code-block:: python
+A usage example taken directly from the code is::
 
     class OrderCancelDo(EventViewMixin, OrderDetailMixin, AsyncAction, View):
         """
         A view that executes a task asynchronously. A POST request will kick off the
         task into the background or run it in the foreground if celery is not installed.
-        In the former case, subsequent GET calls can be used to determine the current
+        In the former case, subsequent GET calls can be used to determinine the current
         status of the task.
         """
 
@@ -83,9 +79,7 @@ A usage example taken directly from the code is:
             return super().get_error_message(exception)
 
 On the client side, this can be used by simply adding a ``data-asynctask`` attribute to an HTML form. This will enable
-AJAX sending of the form and display a loading indicator:
-
-.. code-block:: html
+AJAX sending of the form and display a loading indicator::
 
     <form method="post" data-asynctask
           action="{% eventurl request.event "presale:event.order.cancel.do" … %}">

doc/development/implementation/i18n.rst

@@ -27,9 +27,7 @@ numbers and dates, ``LazyDate`` and ``LazyNumber``. There also is a ``LazyLocale
 exceptions with gettext-localized exception messages.
 
 Last, but definitely not least, we have the ``language`` context manager (``pretix.base.i18n.language``) that allows
-you to execute a piece of code with a different locale:
-
-.. code-block:: python
+you to execute a piece of code with a different locale::
 
     with language('de'):
         render_mail_template()

doc/development/implementation/logging.rst

@@ -16,9 +16,7 @@ We recommend all relevant models to inherit from ``LoggedModel`` as it simplifie
 .. autoclass:: pretix.base.models.LoggedModel
    :members: log_action, all_logentries
 
-To actually log an action, you can just call the ``log_action`` method on your object:
-
-.. code-block:: python
+To actually log an action, you can just call the ``log_action`` method on your object::
 
    order.log_action('pretix.event.order.canceled', user=user, data={})
 
@@ -31,9 +29,7 @@ Logging form actions
 """"""""""""""""""""
 
 A very common use case is to log the changes to a model that have been done in a ``ModelForm``. In this case,
-we generally use a custom ``form_valid`` method on our ``FormView`` that looks like this:
-
-.. code-block:: python
+we generally use a custom ``form_valid`` method on our ``FormView`` that looks like this::
 
     @transaction.atomic
     def form_valid(self, form):
@@ -44,9 +40,7 @@ we generally use a custom ``form_valid`` method on our ``FormView`` that looks l
         messages.success(self.request, _('Your changes have been saved.'))
         return super().form_valid(form)
 
-It gets a little bit more complicated if your form allows file uploads:
-
-.. code-block:: python
+It gets a little bit more complicated if your form allows file uploads::
 
     @transaction.atomic
     def form_valid(self, form):
@@ -73,9 +67,7 @@ following ready-to-include template::
 
 We now need a way to translate the action codes like ``pretix.event.changed`` into human-readable
 strings. The :py:attr:`pretix.base.signals.logentry_display` signals allows you to do so. A simple
-implementation could look like:
-
-.. code-block:: python
+implementation could look like::
 
     from django.utils.translation import gettext as _
     from pretix.base.signals import logentry_display
@@ -96,9 +88,7 @@ Sending notifications
 
 If you think that the logged information might be important or urgent enough to send out a notification to interested
 organizers. In this case, you should listen for the :py:attr:`pretix.base.signals.register_notification_types` signal
-to register a notification type:
-
-.. code-block:: python
+to register a notification type::
 
     @receiver(register_notification_types)
     def register_my_notification_types(sender, **kwargs):
@@ -113,9 +103,7 @@ You should subclass the base ``NotificationType`` class and implement all its me
 .. autoclass:: pretix.base.notifications.NotificationType
    :members: action_type, verbose_name, required_permission, build_notification
 
-A simple implementation could look like this:
-
-.. code-block:: python
+A simple implementation could look like this::
 
     class MyNotificationType(NotificationType):
         required_permission = "can_view_orders"
@@ -155,9 +143,7 @@ Logging technical information
 -----------------------------
 
 If you just want to log technical information to a log file on disk that does not need to be parsed
-and displayed later, you can just use Python's ``logging`` module:
-
-.. code-block:: python
+and displayed later, you can just use Python's ``logging`` module::
 
    import logging
 
@@ -165,9 +151,7 @@ and displayed later, you can just use Python's ``logging`` module:
 
    logger.info('Startup complete.')
 
-This is also very useful to provide debugging information when an exception occurs:
-
-.. code-block:: python
+This is also very useful to provide debugging information when an exception occurs::
 
    try:
       foo()

doc/development/implementation/permissions.rst

@@ -15,9 +15,7 @@ Requiring permissions for a view
 --------------------------------
 
 pretix provides a number of useful mixins and decorators that allow you to specify that a user needs a certain
-permission level to access a view:
-
-.. code-block:: python
+permission level to access a view::
 
     from pretix.control.permissions import (
         OrganizerPermissionRequiredMixin, organizer_permission_required
@@ -46,9 +44,7 @@ permission level to access a view:
         # Only users with *any* permission on this organizer can access this
 
 
-Of course, the same is available on event level:
-
-.. code-block:: python
+Of course, the same is available on event level::
 
     from pretix.control.permissions import (
         EventPermissionRequiredMixin, event_permission_required
@@ -77,9 +73,7 @@ Of course, the same is available on event level:
         # Only users with *any* permission on this event can access this
 
 You can also require that this view is only accessible by system administrators with an active "admin session"
-(see below for what this means):
-
-.. code-block:: python
+(see below for what this means)::
 
     from pretix.control.permissions import (
         AdministratorPermissionRequiredMixin, administrator_permission_required
@@ -95,9 +89,7 @@ You can also require that this view is only accessible by system administrators
         # ...
 
 In rare cases it might also be useful to expose a feature only to people who have a staff account but do not
-necessarily have an active admin session:
-
-.. code-block:: python
+necessarily have an active admin session::
 
     from pretix.control.permissions import (
         StaffMemberRequiredMixin, staff_member_required

doc/development/implementation/settings.rst

@@ -39,9 +39,7 @@ subclass that also adds support for internationalized fields:
 
 .. autoclass:: pretix.base.forms.SettingsForm
 
-You can simply use it like this:
-
-.. code-block:: python
+You can simply use it like this::
 
    class EventSettingsForm(SettingsForm):
        show_date_to = forms.BooleanField(
@@ -58,9 +56,7 @@ You can simply use it like this:
 Defaults in plugins
 -------------------
 
-Plugins can add custom hardcoded defaults in the following way:
-
-.. code-block:: python
+Plugins can add custom hardcoded defaults in the following way::
 
     from pretix.base.settings import settings_hierarkey
 

doc/development/setup.rst

@@ -117,7 +117,7 @@ for example, to check for any errors in any staged files when committing::
     export GIT_WORK_TREE=../
     export GIT_DIR=../.git
     source ../env/bin/activate  # Adjust to however you activate your virtual environment
-    for file in $(git diff --cached --name-only | grep -E '\.py$' | grep -Ev "migrations|mt940\.py|pretix/settings\.py|make_testdata\.py|testutils/settings\.py|tests/settings\.py|pretix/base/models/__init__\.py|.*_pb2\.py")
+    for file in $(git diff --cached --name-only | grep -E '\.py$' | grep -Ev "migrations|mt940\.py|pretix/settings\.py|make_testdata\.py|testutils/settings\.py|tests/settings\.py|pretix/base/models/__init__\.py")
     do
       echo $file
       git show ":$file" | flake8 - --stdin-display-name="$file" || exit 1 # we only want to lint the staged changes, not any un-staged changes

doc/plugins/banktransfer.rst

@@ -34,8 +34,6 @@ transactions                          list of objects            Transactions in
 ├ payer                               string                     Payment source
 ├ reference                           string                     Payment reference
 ├ amount                              string                     Payment amount
-├ iban                                string                     Payment IBAN
-├ bic                                 string                     Payment BIC
 ├ date                                string                     Payment date (in **user-inputted** format)
 ├ order                               string                     Associated order code (or ``null``)
 └ comment                             string                     Internal comment
@@ -85,8 +83,6 @@ Endpoints
                 "date": "26.06.2017",
                 "payer": "John Doe",
                 "order": null,
-                "iban": "",
-                "bic": "",
                 "checksum": "5de03a601644dfa63420dacfd285565f8375a8f2",
                 "reference": "GUTSCHRIFT\r\nSAMPLECONF-NAB12 EREF: SAMPLECONF-NAB12\r\nIBAN: DE1234556…",
                 "state": "nomatch",
@@ -136,8 +132,6 @@ Endpoints
             "comment": "",
             "date": "26.06.2017",
             "payer": "John Doe",
-            "iban": "",
-            "bic": "",
             "order": null,
             "checksum": "5de03a601644dfa63420dacfd285565f8375a8f2",
             "reference": "GUTSCHRIFT\r\nSAMPLECONF-NAB12 EREF: SAMPLECONF-NAB12\r\nIBAN: DE1234556…",

doc/requirements.txt

@@ -3,8 +3,7 @@ sphinx==2.3.*
 sphinx-rtd-theme
 sphinxcontrib-httpdomain
 sphinxcontrib-images
-sphinxcontrib-spelling==4.*
-sphinxemoji
+sphinxcontrib-spelling
 pygments-markdown-lexer
 # See https://github.com/rfk/pyenchant/pull/130
 git+https://github.com/raphaelm/pyenchant.git@patch-1#egg=pyenchant

doc/spelling_wordlist.txt

@@ -10,11 +10,7 @@ availabilities
 backend
 backends
 banktransfer
-barcode
-barcodes
 Bcc
-bic
-BIC
 boolean
 booleans
 cancelled
@@ -51,15 +47,12 @@ gunicorn
 guid
 hardcoded
 hostname
-iban
-IBAN
 ics
 idempotency
 iframe
 incrementing
 inofficial
 invalidations
-iOS
 iterable
 Jimdo
 jwt
@@ -98,9 +91,7 @@ prepending
 preprocessor
 presale
 pretix
-pretixSCAN
 pretixdroid
-pretixPOS
 pretixpresale
 prometheus
 proxied

doc/user/events/giftcards.rst

@@ -3,8 +3,6 @@
    Warengutschein
    Wertgutschein
 
-.. _giftcards:
-
 Gift cards
 ==========
 

doc/user/events/ticket_secrets.rst

@@ -1,93 +0,0 @@
-Ticket secret generators
-========================
-
-pretix allows you to change the way in which ticket secrets (also known as "ticket codes", "barcodes", …)
-are generated. This affects the value of the QR code in any tickets issued by pretix, regardless of ticket
-format.
-
-.. note:: This is intended for highly advanced use cases, usually when huge numbers of tickets (> 25k per event)
-          are involved. **If you don't know whether you need this, you probably don't.**
-
-Default: Random secrets
------------------------
-
-By default, pretix generates a random code for every ticket, consisting of 32 lower case characters and
-numbers. The characters ``oO1il`` are avoided to reduce confusion when ticket codes are printed and need to
-be typed in manually.
-
-Choosing random codes has a number of advantages:
-
-* Ticket codes are short, which makes QR codes easier to scan. At the same time, it is absolutely impossible to
-  guess or forge a valid ticket code.
-
-* The code does not need to change if the ticket changes. For example, if an attendee is re-booked to a
-  different product or date, they can keep their ticket and it is just mapped to the new product in the
-  database.
-
-This approach works really well for 99 % or events running with pretix.
-The big caveat is that the scanner needs to access a database of all ticket codes in order to know whether a ticket
-code is valid and what kind of ticket it represents.
-
-When scanning online this is no problem at all, since the pretix server always has such a database. In case your local
-internet connection is interrupted or the pretix server goes down, though, there needs to be a database locally on the
-scanner.
-
-Therefore, our pretixSCAN apps by default download the database of all valid tickets onto the device itself. This makes
-it possible to seamlessly switch into offline mode when the connection is lost and continue scanning with the maximum
-possible feature set.
-
-There are a few situations in which this approach is not ideal:
-
-* When running a single event with 25k or more valid tickets, downloading all ticket data onto the scanner may just
-  take too much time and resources.
-
-* When the risk of losing sensible data by losing one of the scanner devices is not acceptable.
-
-* When offline mode needs to be used regularly and newly-purchased tickets need to be valid immediately after purchase,
-  without being able to tolerate a few minutes of delay.
-
-Signature schemes
------------------
-
-The alternative approach that is included with pretix is to choose a signature-based ticket code generation scheme.
-These secrets include the most important information that is required for verifying their validity and use modern
-cryptography to make sure they cannot be forged.
-
-Currently, pretix ships with one such scheme ("pretix signature scheme 1") which encodes the product, the product
-variation, and the date (if inside an event series) into the ticket code and signs the code with a `EdDSA`_ signature.
-This allows to verify whether a ticket is allowed to enter without any database or connection to the server, but has
-a few important drawbacks:
-
-* Whenever the product, variation or date of a ticket changes or the ticket is canceled, the ticket code needs to be
-  changed and the old code needs to be put on a revocation list. This revocation list again needs to be downloaded by
-  all scanning devices (but is usually much smaller than the ticket database). The main downside is that the attendee
-  needs to download their new ticket and can no longer use the old one.
-
-* Scanning in offline mode is much more limited, since the scanner has no information about previous usages of the
-  ticket, attendee names, seating information, etc.
-
-Comparison of scanning behavior
--------------------------------
-
-=============================================== =================================== =================================== =================================== ================================= =====================================
-Scan mode                                       Online                                                                  Offline
------------------------------------------------ ----------------------------------- -----------------------------------------------------------------------------------------------------------------------------------------------
-Synchronization setting                         any                                 Synchronize orders                                                      Don't synchronize orders
------------------------------------------------ ----------------------------------- ----------------------------------------------------------------------- -----------------------------------------------------------------------
-Ticket secrets                                  any                                 Random                              Signed                              Random                            Signed
-=============================================== =================================== =================================== =================================== ================================= =====================================
-Scenario supported on platforms                 Android, Desktop, iOS               Android, Desktop, iOS               Android, Desktop                    Android, Desktop                  Android, Desktop
-Synchronization speed for large data sets                                           slow                                slow                                fast                              fast
-Tickets can be scanned                          yes                                 yes                                 yes                                 no                                yes
-Ticket is valid after sale                      immediately                         next sync (~5 minutes)              immediately                         never                             immediately
-Same ticket can be scanned multiple times       no                                  yes, before data is synced          yes, before data is synced          n/a                               yes, always
-Custom check-in rules                           yes                                 yes                                 yes (limited directly after sale)   n/a                               yes, but only based on product,
-                                                                                                                                                                                              variation and date, not on previous
-                                                                                                                                                                                              scans
-Name and seat visible on scanner                yes                                 yes                                 yes (except directly after sale)    n/a                               no
-Order-specific check-in attention flag          yes                                 yes                                 yes (except directly after sale)    n/a                               no
-Ticket search by order code or name             yes                                 yes                                 yes (except directly after sale)    no                                no
-Check-in statistics on scanner                  yes                                 yes                                 mostly accurate                     no                                no
-=============================================== =================================== =================================== =================================== ================================= =====================================
-
-.. _EdDSA: https://en.wikipedia.org/wiki/EdDSA#Ed25519

doc/user/events/tickets.rst

@@ -9,33 +9,26 @@ At "Settings" → "Tickets", you can configure the ticket download options that
 
 The top of this page shows a short list of options relevant for all download formats:
 
-Allow users to download tickets
+Use feature
   This can be used to completely enable or disable ticket downloads all over your ticket shop.
 
-Generate tickets for add-on products
-  By default, tickets can not be downloaded for order positions which are only an add-on to other order positions. If
-  you enable this, this behavior will be changed and add-on products will get their own tickets as well. If disabled,
-  you can still print a list of chosen add-ons e.g. on the PDF tickets.
-
-Generate tickets for all products
-  By default, tickets will only be generated for products that are marked as admission products. Enable this option to
-  generate tickets for all products instead.
-
-Generate tickets for pending orders
-  By default, ticket download is only possible for paid orders. If you run an event where people usually pay only after
-  the event, you can check this box to enable ticket download even before.
-
 Download date
   If you set a date here, no ticket download will be offered before this date. If no date is set, tickets can be
   downloaded immediately after the payment for an order has been received.
 
+Offer to download tickets separately for add-on products
+  By default, tickets can not be downloaded for order positions which are only an add-on to other order positions. If
+  you enable this, this behavior will be changed and add-on products will get their own tickets as well. If disabled,
+  you can still print a list of chosen add-ons e.g. on the PDF tickets.
+
+Generate tickets for non-admission products
+  By default, tickets will only be generated for products that are marked as admission products. Enable this option to
+  generate tickets for all products instead.
+
+Offer to download tickets even before an order is paid
+  By default, ticket download is only possible for paid orders. If you run an event where people usually pay only after
+  the event, you can check this box to enable ticket download even before.
+
 Below these settings, the detail settings for the various ticket file formats are offered. They differ from format to
 format and only share the common "Enable" setting that can be used to turn them on. By default, pretix ships with
-a PDF output plugin that you can configure through a visual design editor.
-
-**Advanced topics:**
-
-.. toctree::
-   :maxdepth: 1
-
-   ticket_secrets
+a PDF output plugin that you can configure through a visual design editor.

doc/user/events/widget.rst

@@ -1,5 +1,3 @@
-.. _widget:
-
 Embeddable Widget
 =================
 

doc/user/glossary.rst

@@ -1,181 +0,0 @@
-Glossary
-========
-
-This page gives definitions of domain-specific terms that we use a lot inside pretix and that might be used slightly
-differently elsewhere, as well as their official translations to other languages. In some cases, things have a different
-name internally, which is noted with a |:wrench:| symbol. If you only use pretix, you'll never see these, but if you're
-going to develop around pretix, for example connect to pretix through our API, you need to know these as well.
-
-
-
-.. rst-class:: rest-resource-table
-
-.. list-table:: Glossary
-   :widths: 15 30
-   :header-rows: 1
-
-   * - Term
-     - Definition
-   * - | |:gb:| **Organizer**
-       | |:de:| Veranstalter
-     - An organizer represents the entity using pretix, usually the company or institution running one or multiple events.
-       In terms of navigation in the system, organizers are the "middle layer" between the system itself and the specific
-       events.
-       Multiple organizers on the same pretix system are fully separated from each other with very few exceptions.
-   * - | |:gb:| **Event**
-       | |:de:| Veranstaltung
-     - An event is the central entity in pretix that you and your customers interact with all the time. An event
-       represents one **shop** in which things like tickets can be bought. Since the introduction of event series (see
-       below), this might include multiple events in the real world.
-
-       Every purchase needs to be connected to an event, and most things are completely separate between different
-       events, i.e. most actions and configurations in pretix are done per-event.
-   * - | |:gb:| **Event series**
-       | |:de:| Veranstaltungsreihe
-     - An event series is one of two types of events. Unlike a non-series event, an event series groups together
-       multiple real-world events into one pretix shop. Examples are time-slot-based booking for a museum, a band on
-       tour, a theater group playing the same play multiple times, etc.
-   * - | |:gb:| **Date**
-       | |:de:| Termin
-       | |:wrench:| Subevent
-     - A date represents a single real-world event inside an event series. Dates can differ from each other in name,
-       date, time, location, pricing, capacity, and seating plans, but otherwise share the same configuration.
-   * - | |:gb:| **Product**
-       | |:de:| Produkt
-       | |:wrench:| Item
-     - A product is anything that can be sold, such as a specific type of ticket or merchandise.
-   * - | |:gb:| **Admission product**
-       | |:de:| Zutrittsprodukt
-     - A product is considered an **admission product** if its purchase represents a person being granted access to your
-       event. This applies to most ticketing products, but not e.g. to merchandise.
-   * - | |:gb:| **Variation**
-       | |:de:| Variante
-       | |:wrench:| Item variation
-     - Some products come in multiple variations that can differ in description, price and capacity. Examples would
-       include "Adult" and "Child" in case of a concert ticket, or "S", "M", "L", … in case of a t-shirt product.
-   * - | |:gb:| **Category**
-       | |:de:| Kategorie
-     - Products can be grouped together in categories. This is mostly to organize them cleanly in the frontend if you
-       have lots of them.
-   * - | |:gb:| **Quota**
-       | |:de:| Kontingent
-     - A quota is a capacity pool that defines how many times a product can be sold. A quota can be connected to multiple
-       products, in which case all of them are counted together. This is useful e.g. if you have full-price and reduced
-       tickets and only want to sell a certain number of tickets in total. The same way, multiple quotas can be connected
-       to the same product, in which case the ticket will be available as long as all of them have capacity left.
-   * - | |:gb:| **Add-on product**
-       | |:de:| Zusatzprodukt
-     - An add-on product is a product that is purchased as an upgrade or optional addition to a different product.
-       Examples would be include a conference ticket that optionally allows to buy a public transport ticket for the
-       same day, or a family ticket for 4 persons that allows you to add additional persons at a small cost, or a
-       "two workshops" package that allows you to select two of a larger number of workshops at a discounted price.
-       In all cases, there is a "main product" (the conference ticket, the family ticket) and a number of "add-on products"
-       that can be chosen from.
-   * - | |:gb:| **Bundled product**
-       | |:de:| Enthaltenes Produkt
-     - A bundled product is a product that is automatically put into the cart when another product is purchased. It's
-       similar to an add-on product, except that the customer has no choice between whether it is added or which of a
-       set of product is added.
-   * - | |:gb:| **Question**
-       | |:de:| Frage
-     - A question is a custom field that customers need to fill in when purchasing a specific product.
-   * - | |:gb:| **Voucher**
-       | |:de:| Gutschein
-     - A voucher is a code that can be used for multiple purposes: To grant a discount to specific customers, to only
-       show certain products to certain customers, or to keep a seat open for someone specific even though you are
-       sold out. If a voucher is used to apply a discount, the price of the purchased product is reduced by the
-       discounted amount. Vouchers are connected to a specific event.
-   * - | |:gb:| **Gift card**
-       | |:de:| Geschenkgutschein
-     - A :ref:`gift card <giftcards>` is a coupon representing an exact amount of money that can be used for purchases
-       of any kind. Gift cards can be sold, created manually, or used as a method to refund your customer without paying
-       them back directly.
-       Unlike a voucher, it does not reduce the price of the purchased products when redeemed, but instead works as a
-       payment method to lower the amount that needs to be paid through other methods. Gift cards are specific to an
-       organizer by default but can even by shared between organizers.
-   * - | |:gb:| **Cart**
-       | |:de:| Warenkorb
-     - A cart is a collection of products that are reserved by a customer who is currently completing the checkout
-       process, but has not yet finished it.
-   * - | |:gb:| **Order**
-       | |:de:| Bestellung
-     - An order is a purchase by a client, containing multiple different products. An order goes through various
-       states and can change during its lifetime.
-   * - | |:gb:| **Order code**
-       | |:de:| Bestellnummer
-     - An order code is the unique identifier of an order, usually consisting of 5 numbers and letters.
-   * - | |:gb:| **Order position**
-       | |:de:| Bestellposition
-     - An order position is a single line inside an order, representing the purchase of one specific product. If the
-       product is an admission product, this represents an attendee.
-   * - | |:gb:| **Attendees**
-       | |:de:| Teilnehmende
-     - An attendee is the person designated to use a specific order position to access the event.
-   * - | |:gb:| **Fee**
-       | |:de:| Gebühr
-     - A fee is an additional type of line inside an order that represents a cost that needs to be paid by the customer,
-       but is not related to a specific product. A typical example is a shipping fee.
-   * - | |:gb:| **Invoice** and **Cancellation**
-       | |:de:| Rechnung und Rechnungskorrektur
-     - An invoice refers to a legal document created to document a purchase for tax purposes. Invoices have individual
-       numbers and no longer change after they have been issued. Every invoice is connected to an order, but an order
-       can have multiple invoices: If an order changes, a cancellation document is created for the old invoice and a
-       new invoice is created.
-   * - | |:gb:| **Check-in**
-       | |:de:| Check-in
-     - A check-in is the event of someone being successfully scanned at an entry or exit of the event.
-   * - | |:gb:| **Check-in list**
-       | |:de:| Check-in-Liste
-     - A check-in list is used to configure who can be scanned at a specific entry or exit of the event. Check-in lists
-       are isolated from each other, so by default each ticket is valid once on every check-in list individually. They
-       are therefore often used to represent *parts* of an event, either time-wise (e.g. conference days) or space-wise
-       (e.g. rooms).
-   * - | |:gb:| **Plugin**
-       | |:de:| Erweiterung
-     - A plugin is an optional software module that contains additional functionality and can be turned on and off per
-       event. If you host pretix on your own server, most plugins need to be installed separately.
-   * - | |:gb:| **Tax rule**
-       | |:de:| Steuer-Regel
-     - A tax rule defines how sales taxes are calculated for a product, possibly depending on type and country of the
-       customer.
-   * - | |:gb:| **Ticket**
-       | |:de:| Ticket
-     - A ticket usually refers to the actual file presented to the customer to be used at check-in, i.e. the PDF or
-       Passbook file carrying the QR code. In some cases, "ticket" may also be used to refer to an order position,
-       especially in case of admission products.
-   * - | |:gb:| **Ticket secret**
-       | |:de:| Ticket-Code
-     - The ticket secret (sometimes "ticket code") is what's contained in the QR code on the ticket.
-   * - | |:gb:| **Badge**
-       | |:de:| Badge
-     - A badge refers to the file used as a name tag for an attendee of your event.
-   * - | |:gb:| **User**
-       | |:de:| Benutzer
-     - A user is anyone who can sign into the backend interface of pretix.
-   * - | |:gb:| **Team**
-       | |:de:| Team
-     - A :ref:`team <user-teams>` is a collection of users who are granted some level of access to a set of events.
-   * - | |:gb:| **Device**
-       | |:de:| Gerät
-     - A device is something that talks to pretix but does not run on a server. Usually a device refers to an
-       installation of pretixSCAN, pretixPOS or some compatible third-party app on one of your computing devices.
-   * - | |:gb:| **Gate**
-       | |:de:| Station
-     - A gate is a location at your event where people are being scanned, e.g. an entry or exit door. You can configure
-       gates in pretix to group multiple devices together that are used in the same location, mostly for statistical
-       purposes.
-   * - | |:gb:| **Widget**
-       | |:de:| Widget
-     - The :ref:`widget` is a JavaScript component that can be used to embed the shop of an event or a list of events
-       into a third-party web page.
-   * - | |:gb:| **Sales channel**
-       | |:de:| Verkaufskanal
-     - A sales channel refers to the type in which a purchase arrived in the system, e.g. through pretix' web shop itself,
-       or through other channels like box office or reseller sales.
-   * - | |:gb:| **Box office**
-       | |:de:| Abendkasse
-     - Box office purchases refer to all purchases made in-person from the organizer directly, through a point of sale
-       system like pretixPOS.
-   * - | |:gb:| **Reseller**
-       | |:de:| Vorverkaufsstelle
-     - Resellers are third-party entities offering in-person sales of events to customers.

doc/user/index.rst

@@ -15,4 +15,3 @@ wanting to use pretix to sell tickets.
    events/giftcards
    faq
    markdown
-   glossary

src/MANIFEST.in

@@ -1,6 +1,5 @@
 include LICENSE
 include README.rst
-global-include *.proto
 recursive-include pretix/static *
 recursive-include pretix/static.dist *
 recursive-include pretix/locale *

src/Makefile

@@ -7,7 +7,7 @@ localecompile:
 
 localegen:
 	./manage.py makemessages --keep-pot --ignore "pretix/helpers/*" $(LNGS)
-	./manage.py makemessages --keep-pot -d djangojs --ignore "pretix/helpers/*" --ignore "pretix/static/jsi18n/*" --ignore "pretix/static/jsi18n/*" --ignore "pretix/static.dist/*" --ignore "data/*" --ignore "pretix/static/rrule/*" --ignore "build/*" $(LNGS)
+	./manage.py makemessages --keep-pot -d djangojs --ignore "pretix/helpers/*" --ignore "pretix/static/jsi18n/*" --ignore "pretix/static/jsi18n/*" --ignore "pretix/static.dist/*" --ignore "data/*" --ignore "build/*" $(LNGS)
 
 staticfiles: jsi18n
 	./manage.py collectstatic --noinput

src/pretix/__init__.py

@@ -1 +1 @@
-__version__ = "3.15.0.dev0"
+__version__ = "3.12.0.dev0"

src/pretix/api/auth/devicesecurity.py

@@ -3,7 +3,7 @@ from django.utils.translation import ugettext_lazy as _
 
 class FullAccessSecurityProfile:
     identifier = 'full'
-    verbose_name = _('Full device access (reading and changing orders and gift cards, reading of products and settings)')
+    verbose_name = _('Full access')
 
     def is_allowed(self, request):
         return True
@@ -22,10 +22,8 @@ class PretixScanSecurityProfile(AllowListSecurityProfile):
     verbose_name = _('pretixSCAN')
     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:device.update'),
+        ('GET', 'api-v1:device.revoke'),
         ('GET', 'api-v1:event-list'),
         ('GET', 'api-v1:event-detail'),
         ('GET', 'api-v1:subevent-list'),
@@ -39,7 +37,6 @@ class PretixScanSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:checkinlist-status'),
         ('GET', 'api-v1:checkinlistpos-list'),
         ('POST', 'api-v1:checkinlistpos-redeem'),
-        ('GET', 'api-v1:revokedsecrets-list'),
         ('GET', 'api-v1:order-list'),
         ('GET', 'api-v1:event.settings'),
     )
@@ -50,10 +47,8 @@ class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
     verbose_name = _('pretixSCAN (kiosk mode, online only)')
     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:device.update'),
+        ('GET', 'api-v1:device.revoke'),
         ('GET', 'api-v1:event-list'),
         ('GET', 'api-v1:event-detail'),
         ('GET', 'api-v1:subevent-list'),
@@ -66,7 +61,6 @@ class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:checkinlist-list'),
         ('GET', 'api-v1:checkinlist-status'),
         ('POST', 'api-v1:checkinlistpos-redeem'),
-        ('GET', 'api-v1:revokedsecrets-list'),
         ('GET', 'api-v1:event.settings'),
     )
 
@@ -76,10 +70,8 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
     verbose_name = _('pretixPOS')
     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:device.update'),
+        ('GET', 'api-v1:device.revoke'),
         ('GET', 'api-v1:event-list'),
         ('GET', 'api-v1:event-detail'),
         ('GET', 'api-v1:subevent-list'),
@@ -102,17 +94,11 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
         ('DELETE', 'api-v1:cartposition-detail'),
         ('GET', 'api-v1:giftcard-list'),
         ('POST', 'api-v1:giftcard-transact'),
-        ('GET', 'plugins:pretix_posbackend:posclosing-list'),
         ('POST', 'plugins:pretix_posbackend:posreceipt-list'),
         ('POST', 'plugins:pretix_posbackend:posclosing-list'),
         ('POST', 'plugins:pretix_posbackend:posdebugdump-list'),
         ('POST', 'plugins:pretix_posbackend:stripeterminal.token'),
-        ('GET', 'api-v1:revokedsecrets-list'),
         ('GET', 'api-v1:event.settings'),
-        ('GET', 'plugins:pretix_seating:event.event'),
-        ('GET', 'plugins:pretix_seating:event.event.subevent'),
-        ('GET', 'plugins:pretix_seating:event.plan'),
-        ('GET', 'plugins:pretix_seating:selection.simple'),
     )
 
 

src/pretix/api/serializers/cart.py

@@ -87,10 +87,7 @@ class CartPositionCreateSerializer(I18nAwareModelSerializer):
                     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'],
-                    ):
+                    if not seat.is_available(sales_channel=validated_data.get('sales_channel', 'web')):
                         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.')
@@ -107,7 +104,6 @@ class CartPositionCreateSerializer(I18nAwareModelSerializer):
     def validate_cart_id(self, cid):
         if cid and not cid.endswith('@api'):
             raise ValidationError('Cart ID should end in @api or be empty.')
-        return cid
 
     def validate_item(self, item):
         if item.event != self.context['event']:

src/pretix/api/serializers/checkin.py

@@ -15,7 +15,7 @@ class CheckinListSerializer(I18nAwareModelSerializer):
         model = CheckinList
         fields = ('id', 'name', 'all_products', 'limit_products', 'subevent', 'checkin_count', 'position_count',
                   'include_pending', 'auto_checkin_sales_channels', 'allow_multiple_entries', 'allow_entry_after_exit',
-                  'rules', 'exit_all_at')
+                  'rules')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

src/pretix/api/serializers/event.py

@@ -17,7 +17,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 DEFAULTS, validate_event_settings
+from pretix.base.settings import DEFAULTS, validate_settings
 from pretix.base.signals import api_event_settings_fields
 
 
@@ -95,42 +95,19 @@ class TimeZoneField(ChoiceField):
         )
 
 
-class ValidKeysField(Field):
-    def to_representation(self, value):
-        return value.cache.get_or_set(
-            'ticket_secret_valid_keys',
-            lambda: self._get(value),
-            120
-        )
-
-    def _get(self, value):
-        return {
-            'pretix_sig1': [
-                value.settings.ticket_secrets_pretix_sig1_pubkey
-            ] if value.settings.ticket_secrets_pretix_sig1_pubkey else []
-        }
-
-
 class EventSerializer(I18nAwareModelSerializer):
     meta_data = MetaDataField(required=False, source='*')
     item_meta_properties = MetaPropertyField(required=False, source='*')
     plugins = PluginsField(required=False, source='*')
     seat_category_mapping = SeatCategoryMappingField(source='*', required=False)
     timezone = TimeZoneField(required=False, choices=[(a, a) for a in common_timezones])
-    valid_keys = ValidKeysField(source='*', read_only=True)
 
     class Meta:
         model = Event
         fields = ('name', 'slug', 'live', 'testmode', 'currency', 'date_from',
                   'date_to', 'date_admission', 'is_public', 'presale_start',
                   'presale_end', 'location', 'geo_lat', 'geo_lon', 'has_subevents', 'meta_data', 'seating_plan',
-                  'plugins', 'seat_category_mapping', 'timezone', 'item_meta_properties', 'valid_keys',
-                  'sales_channels')
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if not hasattr(self.context['request'], 'event'):
-            self.fields.pop('valid_keys')
+                  'plugins', 'seat_category_mapping', 'timezone', 'item_meta_properties')
 
     def validate(self, data):
         data = super().validate(data)
@@ -392,7 +369,7 @@ class SubEventSerializer(I18nAwareModelSerializer):
         fields = ('id', 'name', 'date_from', 'date_to', 'active', 'date_admission',
                   'presale_start', 'presale_end', 'location', 'geo_lat', 'geo_lon', 'event', 'is_public',
                   'seating_plan', 'item_price_overrides', 'variation_price_overrides', 'meta_data',
-                  'seat_category_mapping', 'last_modified')
+                  'seat_category_mapping')
 
     def validate(self, data):
         data = super().validate(data)
@@ -574,7 +551,6 @@ class EventSettingsSerializer(serializers.Serializer):
         'presale_start_show_date',
         'locales',
         'locale',
-        'region',
         'last_order_modification_date',
         'show_quota_left',
         'waiting_list_enabled',
@@ -598,12 +574,8 @@ class EventSettingsSerializer(serializers.Serializer):
         'attendee_addresses_required',
         'attendee_company_asked',
         'attendee_company_required',
-        'attendee_data_explanation_text',
         'confirm_texts',
         'order_email_asked_twice',
-        'order_phone_asked',
-        'order_phone_required',
-        'checkout_phone_helptext',
         'payment_term_mode',
         'payment_term_days',
         'payment_term_weekdays',
@@ -612,13 +584,11 @@ class EventSettingsSerializer(serializers.Serializer):
         'payment_term_expire_automatically',
         'payment_term_accept_late',
         'payment_explanation',
-        'payment_pending_hidden',
         'ticket_download',
         'ticket_download_date',
         'ticket_download_addons',
         'ticket_download_nonadm',
         'ticket_download_pending',
-        'ticket_download_require_validated_email',
         'mail_prefix',
         'mail_from',
         'mail_from_name',
@@ -668,17 +638,10 @@ class EventSettingsSerializer(serializers.Serializer):
         'change_allow_user_variation',
         'change_allow_user_until',
         'change_allow_user_price',
-        'primary_color',
-        'theme_color_success',
-        'theme_color_danger',
-        'theme_color_background',
-        'theme_round_borders',
-        'primary_font',
     ]
 
     def __init__(self, *args, **kwargs):
         self.event = kwargs.pop('event')
-        self.changed_data = []
         super().__init__(*args, **kwargs)
         for fname in self.default_fields:
             kwargs = DEFAULTS[fname].get('serializer_kwargs', {})
@@ -707,17 +670,15 @@ class EventSettingsSerializer(serializers.Serializer):
         for attr, value in validated_data.items():
             if value is None:
                 instance.delete(attr)
-                self.changed_data.append(attr)
             elif instance.get(attr, as_type=type(value)) != value:
                 instance.set(attr, value)
-                self.changed_data.append(attr)
         return instance
 
     def validate(self, data):
         data = super().validate(data)
         settings_dict = self.instance.freeze()
         settings_dict.update(data)
-        validate_event_settings(self.event, settings_dict)
+        validate_settings(self.event, settings_dict)
         return data
 
 

src/pretix/api/serializers/exporters.py

@@ -1,127 +0,0 @@
-from django import forms
-from django.http import QueryDict
-from rest_framework import serializers
-
-
-class FormFieldWrapperField(serializers.Field):
-    def __init__(self, *args, **kwargs):
-        self.form_field = kwargs.pop('form_field')
-        super().__init__(*args, **kwargs)
-
-    def to_representation(self, value):
-        return self.form_field.widget.format_value(value)
-
-    def to_internal_value(self, data):
-        d = self.form_field.widget.value_from_datadict({'name': data}, {}, 'name')
-        d = self.form_field.clean(d)
-        return d
-
-
-simple_mappings = (
-    (forms.DateField, serializers.DateField, tuple()),
-    (forms.TimeField, serializers.TimeField, tuple()),
-    (forms.SplitDateTimeField, serializers.DateTimeField, tuple()),
-    (forms.DateTimeField, serializers.DateTimeField, tuple()),
-    (forms.DecimalField, serializers.DecimalField, ('max_digits', 'decimal_places', 'min_value', 'max_value')),
-    (forms.FloatField, serializers.FloatField, tuple()),
-    (forms.IntegerField, serializers.IntegerField, tuple()),
-    (forms.EmailField, serializers.EmailField, tuple()),
-    (forms.UUIDField, serializers.UUIDField, tuple()),
-    (forms.URLField, serializers.URLField, tuple()),
-    (forms.NullBooleanField, serializers.NullBooleanField, tuple()),
-    (forms.BooleanField, serializers.BooleanField, tuple()),
-)
-
-
-class SerializerDescriptionField(serializers.Field):
-    def to_representation(self, value):
-        fields = []
-        for k, v in value.fields.items():
-            d = {
-                'name': k,
-                'required': v.required,
-            }
-            if isinstance(v, serializers.ChoiceField):
-                d['choices'] = list(v.choices.keys())
-            fields.append(d)
-
-        return fields
-
-
-class ExporterSerializer(serializers.Serializer):
-    identifier = serializers.CharField()
-    verbose_name = serializers.CharField()
-    input_parameters = SerializerDescriptionField(source='_serializer')
-
-
-class PrimaryKeyRelatedField(serializers.PrimaryKeyRelatedField):
-    def to_representation(self, value):
-        if isinstance(value, int):
-            return value
-        return super().to_representation(value)
-
-
-class JobRunSerializer(serializers.Serializer):
-    def __init__(self, *args, **kwargs):
-        ex = kwargs.pop('exporter')
-        events = kwargs.pop('events', None)
-        super().__init__(*args, **kwargs)
-        if events is not None:
-            self.fields["events"] = serializers.SlugRelatedField(
-                queryset=events,
-                required=True,
-                allow_empty=False,
-                slug_field='slug',
-                many=True
-            )
-        for k, v in ex.export_form_fields.items():
-            for m_from, m_to, m_kwargs in simple_mappings:
-                if isinstance(v, m_from):
-                    self.fields[k] = m_to(
-                        required=v.required,
-                        allow_null=not v.required,
-                        validators=v.validators,
-                        **{kwarg: getattr(v, kwargs, None) for kwarg in m_kwargs}
-                    )
-                    break
-
-            if isinstance(v, forms.ModelMultipleChoiceField):
-                self.fields[k] = PrimaryKeyRelatedField(
-                    queryset=v.queryset,
-                    required=v.required,
-                    allow_empty=not v.required,
-                    validators=v.validators,
-                    many=True
-                )
-            elif isinstance(v, forms.ModelChoiceField):
-                self.fields[k] = PrimaryKeyRelatedField(
-                    queryset=v.queryset,
-                    required=v.required,
-                    allow_null=not v.required,
-                    validators=v.validators,
-                )
-            elif isinstance(v, forms.MultipleChoiceField):
-                self.fields[k] = serializers.MultipleChoiceField(
-                    choices=v.choices,
-                    required=v.required,
-                    allow_empty=not v.required,
-                    validators=v.validators,
-                )
-            elif isinstance(v, forms.ChoiceField):
-                self.fields[k] = serializers.ChoiceField(
-                    choices=v.choices,
-                    required=v.required,
-                    allow_null=not v.required,
-                    validators=v.validators,
-                )
-            else:
-                self.fields[k] = FormFieldWrapperField(form_field=v, required=v.required, allow_null=not v.required)
-
-    def to_internal_value(self, data):
-        if isinstance(data, QueryDict):
-            data = data.copy()
-        for k, v in self.fields.items():
-            if isinstance(v, serializers.ManyRelatedField) and k not in data:
-                data[k] = []
-        data = super().to_internal_value(data)
-        return data

src/pretix/api/serializers/item.py

@@ -277,9 +277,7 @@ class QuestionSerializer(I18nAwareModelSerializer):
         model = Question
         fields = ('id', 'question', 'type', 'required', 'items', 'options', 'position',
                   'ask_during_checkin', 'identifier', 'dependency_question', 'dependency_values',
-                  'hidden', 'dependency_value', 'print_on_invoice', 'help_text', 'valid_number_min',
-                  'valid_number_max', 'valid_date_min', 'valid_date_max', 'valid_datetime_min', 'valid_datetime_max'
-                  )
+                  'hidden', 'dependency_value', 'print_on_invoice', 'help_text')
 
     def validate_identifier(self, value):
         Question._clean_identifier(self.context['event'], value, self.instance)

src/pretix/api/serializers/order.py

@@ -21,7 +21,7 @@ from pretix.base.models import (
     OrderPosition, Question, QuestionAnswer, Seat, SubEvent, TaxRule, Voucher,
 )
 from pretix.base.models.orders import (
-    CartPosition, OrderFee, OrderPayment, OrderRefund, RevokedTicketSecret,
+    CartPosition, OrderFee, OrderPayment, OrderRefund,
 )
 from pretix.base.pdf import get_variables
 from pretix.base.services.cart import error_messages
@@ -180,7 +180,7 @@ class PdfDataSerializer(serializers.Field):
         res = {}
 
         ev = instance.subevent or instance.order.event
-        with language(instance.order.locale, instance.order.event.settings.region):
+        with language(instance.order.locale):
             # This needs to have some extra performance improvements to avoid creating hundreds of queries when
             # we serialize a list.
 
@@ -361,7 +361,7 @@ class OrderSerializer(I18nAwareModelSerializer):
     class Meta:
         model = Order
         fields = (
-            'code', 'status', 'testmode', 'secret', 'email', 'phone', 'locale', 'datetime', 'expires', 'payment_date',
+            'code', 'status', 'testmode', 'secret', 'email', 'locale', 'datetime', 'expires', 'payment_date',
             'payment_provider', 'fees', 'total', 'comment', 'invoice_address', 'positions', 'downloads',
             'checkin_attention', 'last_modified', 'payments', 'refunds', 'require_approval', 'sales_channel',
             'url'
@@ -393,7 +393,7 @@ class OrderSerializer(I18nAwareModelSerializer):
     def update(self, instance, validated_data):
         # Even though all fields that shouldn't be edited are marked as read_only in the serializer
         # (hopefully), we'll be extra careful here and be explicit about the model fields we update.
-        update_fields = ['comment', 'checkin_attention', 'email', 'locale', 'phone']
+        update_fields = ['comment', 'checkin_attention', 'email', 'locale']
 
         if 'invoice_address' in validated_data:
             iadata = validated_data.pop('invoice_address')
@@ -682,7 +682,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)
+    send_mail = serializers.BooleanField(default=False, required=False)
     simulate = serializers.BooleanField(default=False, required=False)
 
     def __init__(self, *args, **kwargs):
@@ -691,9 +691,9 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = Order
-        fields = ('code', 'status', 'testmode', 'email', 'phone', 'locale', 'payment_provider', 'fees', 'comment', 'sales_channel',
+        fields = ('code', 'status', 'testmode', 'email', 'locale', 'payment_provider', 'fees', 'comment', 'sales_channel',
                   'invoice_address', 'positions', 'checkin_attention', 'payment_info', 'payment_date', 'consume_carts',
-                  'force', 'send_email', 'simulate')
+                  'force', 'send_mail', 'simulate')
 
     def validate_payment_provider(self, pp):
         if pp is None:
@@ -786,7 +786,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         payment_date = validated_data.pop('payment_date', now())
         force = validated_data.pop('force', False)
         simulate = validated_data.pop('simulate', False)
-        self._send_mail = validated_data.pop('send_email', False)
+        self._send_mail = validated_data.pop('send_mail', False)
 
         if 'invoice_address' in validated_data:
             iadata = validated_data.pop('invoice_address')
@@ -1209,10 +1209,3 @@ class OrderRefundCreateSerializer(I18nAwareModelSerializer):
         order = OrderRefund(order=self.context['order'], payment=p, **validated_data)
         order.save()
         return order
-
-
-class RevokedTicketSecretSerializer(I18nAwareModelSerializer):
-
-    class Meta:
-        model = RevokedTicketSecret
-        fields = ('id', 'secret', 'created')

src/pretix/api/serializers/organizer.py

@@ -1,22 +1,19 @@
 from decimal import Decimal
 
 from django.db.models import Q
-from django.utils.translation import gettext_lazy as _
-from hierarkey.proxy import HierarkeyProxy
+from django.utils.translation import get_language, gettext_lazy as _
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.api.serializers.order import CompatibleJSONField
 from pretix.base.auth import get_auth_backends
-from pretix.base.i18n import get_language_without_region
 from pretix.base.models import (
-    Device, GiftCard, GiftCardTransaction, Organizer, SeatingPlan, Team,
-    TeamAPIToken, TeamInvite, User,
+    Device, GiftCard, Organizer, SeatingPlan, Team, TeamAPIToken, TeamInvite,
+    User,
 )
 from pretix.base.models.seating import SeatingPlanLayoutValidator
 from pretix.base.services.mail import SendMailException, mail
-from pretix.base.settings import DEFAULTS, validate_organizer_settings
 from pretix.helpers.urls import build_absolute_uri
 
 
@@ -62,21 +59,6 @@ class GiftCardSerializer(I18nAwareModelSerializer):
         fields = ('id', 'secret', 'issuance', 'value', 'currency', 'testmode', 'expires', 'conditions')
 
 
-class OrderEventSlugField(serializers.RelatedField):
-
-    def to_representation(self, obj):
-        return obj.event.slug
-
-
-class GiftCardTransactionSerializer(I18nAwareModelSerializer):
-    order = serializers.SlugRelatedField(slug_field='code', read_only=True)
-    event = OrderEventSlugField(source='order', read_only=True)
-
-    class Meta:
-        model = GiftCardTransaction
-        fields = ('id', 'datetime', 'value', 'event', 'order', 'text')
-
-
 class EventSlugField(serializers.SlugRelatedField):
     def get_queryset(self):
         return self.context['organizer'].events.all()
@@ -146,7 +128,7 @@ class TeamInviteSerializer(serializers.ModelSerializer):
                     })
                 },
                 event=None,
-                locale=get_language_without_region()  # TODO: expose?
+                locale=get_language()  # TODO: expose?
             )
         except SendMailException:
             pass  # Already logged
@@ -205,64 +187,3 @@ class TeamMemberSerializer(serializers.ModelSerializer):
         fields = (
             'id', 'email', 'fullname', 'require_2fa'
         )
-
-
-class OrganizerSettingsSerializer(serializers.Serializer):
-    default_fields = [
-        'organizer_info_text',
-        'event_list_type',
-        'event_list_availability',
-        'organizer_homepage_text',
-        'organizer_link_back',
-        'organizer_logo_image_large',
-        'giftcard_length',
-        'giftcard_expiry_years',
-        'locales',
-        'region',
-        'event_team_provisioning',
-        'primary_color',
-        'theme_color_success',
-        'theme_color_danger',
-        'theme_color_background',
-        'theme_round_borders',
-        'primary_font'
-    ]
-
-    def __init__(self, *args, **kwargs):
-        self.organizer = kwargs.pop('organizer')
-        self.changed_data = []
-        super().__init__(*args, **kwargs)
-        for fname in self.default_fields:
-            kwargs = DEFAULTS[fname].get('serializer_kwargs', {})
-            if callable(kwargs):
-                kwargs = kwargs()
-            kwargs.setdefault('required', False)
-            kwargs.setdefault('allow_null', True)
-            form_kwargs = DEFAULTS[fname].get('form_kwargs', {})
-            if callable(form_kwargs):
-                form_kwargs = form_kwargs()
-            if 'serializer_class' not in DEFAULTS[fname]:
-                raise ValidationError('{} has no serializer class'.format(fname))
-            f = DEFAULTS[fname]['serializer_class'](
-                **kwargs
-            )
-            f._label = form_kwargs.get('label', fname)
-            f._help_text = form_kwargs.get('help_text')
-            self.fields[fname] = f
-
-    def update(self, instance: HierarkeyProxy, validated_data):
-        for attr, value in validated_data.items():
-            if value is None:
-                instance.delete(attr)
-                self.changed_data.append(attr)
-            elif instance.get(attr, as_type=type(value)) != value:
-                instance.set(attr, value)
-                self.changed_data.append(attr)
-        return instance
-
-    def validate(self, data):
-        data = super().validate(data)
-        settings_dict = self.instance.freeze()
-        settings_dict.update(data)
-        validate_organizer_settings(self.organizer, settings_dict)
-        return data

src/pretix/api/urls.py

@@ -7,8 +7,8 @@ from rest_framework import routers
 from pretix.api.views import cart
 
 from .views import (
-    checkin, device, event, exporters, item, oauth, order, organizer, user,
-    version, voucher, waitinglist, webhooks,
+    checkin, device, event, item, oauth, order, organizer, user, version,
+    voucher, waitinglist, webhooks,
 )
 
 router = routers.DefaultRouter()
@@ -22,7 +22,6 @@ orga_router.register(r'seatingplans', organizer.SeatingPlanViewSet)
 orga_router.register(r'giftcards', organizer.GiftCardViewSet)
 orga_router.register(r'teams', organizer.TeamViewSet)
 orga_router.register(r'devices', organizer.DeviceViewSet)
-orga_router.register(r'exporters', exporters.OrganizerExportersViewSet, basename='exporters')
 
 team_router = routers.DefaultRouter()
 team_router.register(r'members', organizer.TeamMemberViewSet)
@@ -40,12 +39,10 @@ event_router.register(r'vouchers', voucher.VoucherViewSet)
 event_router.register(r'orders', order.OrderViewSet)
 event_router.register(r'orderpositions', order.OrderPositionViewSet)
 event_router.register(r'invoices', order.InvoiceViewSet)
-event_router.register(r'revokedsecrets', order.RevokedSecretViewSet, basename='revokedsecrets')
 event_router.register(r'taxrules', event.TaxRuleViewSet)
 event_router.register(r'waitinglistentries', waitinglist.WaitingListViewSet)
 event_router.register(r'checkinlists', checkin.CheckinListViewSet)
 event_router.register(r'cartpositions', cart.CartPositionViewSet)
-event_router.register(r'exporters', exporters.EventExportersViewSet, basename='exporters')
 
 checkinlist_router = routers.DefaultRouter()
 checkinlist_router.register(r'positions', checkin.CheckinListPositionViewSet, basename='checkinlistpos')
@@ -62,9 +59,6 @@ order_router = routers.DefaultRouter()
 order_router.register(r'payments', order.PaymentViewSet)
 order_router.register(r'refunds', order.RefundViewSet)
 
-giftcard_router = routers.DefaultRouter()
-giftcard_router.register(r'transactions', organizer.GiftCardTransactionViewSet)
-
 # Force import of all plugins to give them a chance to register URLs with the router
 for app in apps.get_app_configs():
     if hasattr(app, 'PretixPluginMeta'):
@@ -74,9 +68,6 @@ for app in apps.get_app_configs():
 urlpatterns = [
     url(r'^', include(router.urls)),
     url(r'^organizers/(?P<organizer>[^/]+)/', include(orga_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/settings/$', organizer.OrganizerSettingsView.as_view(),
-        name="organizer.settings"),
-    url(r'^organizers/(?P<organizer>[^/]+)/giftcards/(?P<giftcard>[^/]+)/', include(giftcard_router.urls)),
     url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/settings/$', event.EventSettingsView.as_view(),
         name="event.settings"),
     url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/', include(event_router.urls)),
@@ -94,7 +85,6 @@ urlpatterns = [
     url(r"^device/update$", device.UpdateView.as_view(), name="device.update"),
     url(r"^device/roll$", device.RollKeyView.as_view(), name="device.roll"),
     url(r"^device/revoke$", device.RevokeKeyView.as_view(), name="device.revoke"),
-    url(r"^device/eventselection$", device.EventSelectionView.as_view(), name="device.eventselection"),
     url(r"^me$", user.MeView.as_view(), name="user.me"),
     url(r"^version$", version.VersionView.as_view(), name="version"),
 ]

src/pretix/api/views/checkin.py

@@ -1,8 +1,6 @@
 import django_filters
 from django.core.exceptions import ValidationError
-from django.db.models import (
-    Count, Exists, F, Max, OuterRef, Prefetch, Q, Subquery,
-)
+from django.db.models import Count, F, Max, OuterRef, Prefetch, Q, Subquery
 from django.db.models.functions import Coalesce
 from django.http import Http404
 from django.shortcuts import get_object_or_404
@@ -92,12 +90,20 @@ class CheckinListViewSet(viewsets.ModelViewSet):
     def status(self, *args, **kwargs):
         with language(self.request.event.settings.locale):
             clist = self.get_object()
-            cqs = clist.positions.annotate(
-                checkedin=Exists(Checkin.objects.filter(list_id=clist.pk, position=OuterRef('pk'), type=Checkin.TYPE_ENTRY))
-            ).filter(
-                checkedin=True,
+            cqs = Checkin.objects.filter(
+                position__order__event=clist.event,
+                position__order__status__in=[Order.STATUS_PAID] + ([Order.STATUS_PENDING] if clist.include_pending else []),
+                list=clist
             )
-            pqs = clist.positions
+            pqs = OrderPosition.objects.filter(
+                order__event=clist.event,
+                order__status__in=[Order.STATUS_PAID] + ([Order.STATUS_PENDING] if clist.include_pending else []),
+            )
+            if clist.subevent:
+                pqs = pqs.filter(subevent=clist.subevent)
+            if not clist.all_products:
+                pqs = pqs.filter(item__in=clist.limit_products.values_list('id', flat=True))
+                cqs = cqs.filter(position__item__in=clist.limit_products.values_list('id', flat=True))
 
             ev = clist.subevent or clist.event
             response = {
@@ -105,8 +111,7 @@ class CheckinListViewSet(viewsets.ModelViewSet):
                     'name': str(ev.name),
                 },
                 'checkin_count': cqs.count(),
-                'position_count': pqs.count(),
-                'inside_count': clist.inside_count,
+                'position_count': pqs.count()
             }
 
             op_by_item = {
@@ -118,12 +123,12 @@ class CheckinListViewSet(viewsets.ModelViewSet):
                 for p in pqs.order_by().values('variation').annotate(cnt=Count('id'))
             }
             c_by_item = {
-                p['item']: p['cnt']
-                for p in cqs.order_by().values('item').annotate(cnt=Count('id'))
+                p['position__item']: p['cnt']
+                for p in cqs.order_by().values('position__item').annotate(cnt=Count('id'))
             }
             c_by_variation = {
-                p['variation']: p['cnt']
-                for p in cqs.order_by().values('variation').annotate(cnt=Count('id'))
+                p['position__variation']: p['cnt']
+                for p in cqs.order_by().values('position__variation').annotate(cnt=Count('id'))
             }
 
             if not clist.all_products:
@@ -257,7 +262,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
 
         return qs
 
-    @action(detail=False, methods=['POST'], url_name='redeem', url_path='(?P<pk>.*)/redeem')
+    @action(detail=False, methods=['POST'], url_name='redeem', url_path='(?P<pk>[^/]+)/redeem')
     def redeem(self, *args, **kwargs):
         force = bool(self.request.data.get('force', False))
         type = self.request.data.get('type', None) or Checkin.TYPE_ENTRY
@@ -278,23 +283,13 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
             else:
                 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 or not force:
-                self.request.event.log_action('pretix.event.checkin.unknown', data={
-                    'datetime': dt,
-                    'type': type,
-                    'list': self.checkinlist.pk,
-                    'barcode': self.kwargs['pk']
-                }, user=self.request.user, auth=self.request.auth)
-                raise Http404()
-
-            op = revoked_matches[0].position
-            op.order.log_action('pretix.event.checkin.revoked', data={
+            self.request.event.log_action('pretix.event.checkin.unknown', data={
                 'datetime': dt,
                 'type': type,
                 'list': self.checkinlist.pk,
                 'barcode': self.kwargs['pk']
             }, user=self.request.user, auth=self.request.auth)
+            raise Http404()
 
         given_answers = {}
         if 'answers' in self.request.data:
@@ -335,7 +330,6 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                 'position': op.id,
                 'positionid': op.positionid,
                 'errorcode': e.code,
-                'force': force,
                 'datetime': dt,
                 'type': type,
                 'list': self.checkinlist.pk

src/pretix/api/views/device.py

@@ -1,16 +1,14 @@
 import logging
 
-from django.db.models import Exists, OuterRef, Q
-from django.db.models.functions import Coalesce
 from django.utils.timezone import now
-from rest_framework import serializers, status
+from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
 from pretix.api.auth.device import DeviceTokenAuthentication
-from pretix.base.models import CheckinList, Device, SubEvent
-from pretix.base.models.devices import Gate, generate_api_token
+from pretix.base.models import Device
+from pretix.base.models.devices import generate_api_token
 
 logger = logging.getLogger(__name__)
 
@@ -30,25 +28,14 @@ class UpdateRequestSerializer(serializers.Serializer):
     software_version = serializers.CharField(max_length=190)
 
 
-class GateSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Gate
-        fields = [
-            'id',
-            'name',
-            'identifier',
-        ]
-
-
 class DeviceSerializer(serializers.ModelSerializer):
     organizer = serializers.SlugRelatedField(slug_field='slug', read_only=True)
-    gate = GateSerializer(read_only=True)
 
     class Meta:
         model = Device
         fields = [
             'organizer', 'device_id', 'unique_serial', 'api_token',
-            'name', 'security_profile', 'gate'
+            'name', 'security_profile'
         ]
 
 
@@ -124,157 +111,3 @@ class RevokeKeyView(APIView):
 
         serializer = DeviceSerializer(device)
         return Response(serializer.data)
-
-
-class EventSelectionView(APIView):
-    authentication_classes = (DeviceTokenAuthentication,)
-
-    @property
-    def base_event_qs(self):
-        qs = self.request.auth.get_events_with_any_permission().annotate(
-            first_date=Coalesce('date_admission', 'date_from'),
-            last_date=Coalesce('date_to', 'date_from'),
-        ).filter(
-            live=True,
-            has_subevents=False
-        ).order_by('first_date')
-        if self.request.auth.gate:
-            has_cl = CheckinList.objects.filter(
-                event=OuterRef('pk'),
-                gates__in=[self.request.auth.gate]
-            )
-            qs = qs.annotate(has_cl=Exists(has_cl)).filter(has_cl=True)
-        return qs
-
-    @property
-    def base_subevent_qs(self):
-        qs = SubEvent.objects.annotate(
-            first_date=Coalesce('date_admission', 'date_from'),
-            last_date=Coalesce('date_to', 'date_from'),
-        ).filter(
-            event__organizer=self.request.auth.organizer,
-            event__live=True,
-            event__in=self.request.auth.get_events_with_any_permission(),
-            active=True,
-        ).select_related('event').order_by('first_date')
-        if self.request.auth.gate:
-            has_cl = CheckinList.objects.filter(
-                Q(subevent__isnull=True) | Q(subevent=OuterRef('pk')),
-                event_id=OuterRef('event_id'),
-                gates__in=[self.request.auth.gate]
-            )
-            qs = qs.annotate(has_cl=Exists(has_cl)).filter(has_cl=True)
-        return qs
-
-    def get(self, request, format=None):
-        device = request.auth
-        current_event = None
-        current_subevent = None
-        if 'current_event' in request.query_params:
-            current_event = device.organizer.events.filter(slug=request.query_params['current_event']).first()
-            if current_event and 'current_subevent' in request.query_params:
-                current_subevent = current_event.subevents.filter(pk=request.query_params['current_subevent']).first()
-            if current_event and current_event.has_subevents and not current_subevent:
-                current_event = None
-
-        if current_event:
-            current_ev = current_subevent or current_event
-            current_ev_start = current_ev.date_admission or current_ev.date_from
-            tz = current_event.timezone
-            if current_ev.date_to and current_ev_start < now() < current_ev.date_to:
-                # The event that is selected is currently running. Good enough.
-                return Response(status=status.HTTP_304_NOT_MODIFIED)
-
-        # The event that is selected is not currently running. We cannot rely on all events having a proper end date.
-        # In any case, we'll need to decide between the event that last started (and might still be running) and the
-        # event that starts next (and might already be letting people in), so let's get these two!
-        last_started_ev = self.base_event_qs.filter(first_date__lte=now()).last() or self.base_subevent_qs.filter(
-            first_date__lte=now()).last()
-
-        upcoming_event = self.base_event_qs.filter(first_date__gt=now()).first()
-        upcoming_subevent = self.base_subevent_qs.filter(first_date__gt=now()).first()
-        if upcoming_event and upcoming_subevent:
-            if upcoming_event.first_date > upcoming_subevent.first_date:
-                upcoming_ev = upcoming_subevent
-            else:
-                upcoming_ev = upcoming_event
-        else:
-            upcoming_ev = upcoming_event or upcoming_subevent
-
-        if not upcoming_ev and not last_started_ev:
-            # Ooops, no events here
-            return Response(status=status.HTTP_404_NOT_FOUND)
-        elif upcoming_ev and not last_started_ev:
-            # No event running, so let's take the next one
-            return self._suggest_event(current_event, upcoming_ev)
-        elif last_started_ev and not upcoming_ev:
-            # No event upcoming, so let's take the next one
-            return self._suggest_event(current_event, last_started_ev)
-
-        if last_started_ev.date_to and now() < last_started_ev.date_to:
-            # The event that last started is currently running. Good enough.
-            return self._suggest_event(current_event, last_started_ev)
-
-        if not current_event:
-            tz = (upcoming_event or last_started_ev).timezone
-
-        lse_d = last_started_ev.date_from.astimezone(tz).date()
-        upc_d = upcoming_ev.date_from.astimezone(tz).date()
-        now_d = now().astimezone(tz).date()
-        if lse_d == now_d and upc_d != now_d:
-            # Last event was today, next is tomorrow, stick with today
-            return self._suggest_event(current_event, last_started_ev)
-        elif lse_d != now_d and upc_d == now_d:
-            # Last event was yesterday, next is today, stick with today
-            return self._suggest_event(current_event, upcoming_ev)
-
-        # Both last and next event are today, we switch over in the middle
-        if now() > last_started_ev.last_date + (upcoming_ev.first_date - last_started_ev.last_date) / 2:
-            return self._suggest_event(current_event, upcoming_ev)
-        else:
-            return self._suggest_event(current_event, last_started_ev)
-
-    def _suggest_event(self, current_event, ev):
-        current_checkinlist = None
-        if current_event and 'current_checkinlist' in self.request.query_params:
-            current_checkinlist = current_event.checkin_lists.filter(
-                pk=self.request.query_params['current_checkinlist']
-            ).first()
-        if isinstance(ev, SubEvent):
-            checkinlist_qs = ev.event.checkin_lists.filter(Q(subevent__isnull=True) | Q(subevent=ev))
-        else:
-            checkinlist_qs = ev.checkin_lists
-
-        if self.request.auth.gate:
-            checkinlist_qs = checkinlist_qs.filter(gates__in=[self.request.auth.gate])
-
-        checkinlist = None
-        if current_checkinlist:
-            checkinlist = checkinlist_qs.filter(Q(name=current_checkinlist.name) | Q(pk=current_checkinlist.pk)).first()
-        if not checkinlist:
-            checkinlist = checkinlist_qs.first()
-        r = {
-            'event': {
-                'slug': ev.event.slug if isinstance(ev, SubEvent) else ev.slug,
-                'name': str(ev.event.name) if isinstance(ev, SubEvent) else str(ev.name),
-            },
-            'subevent': ev.pk if isinstance(ev, SubEvent) else None,
-            'checkinlist': checkinlist.pk if checkinlist else None,
-        }
-
-        if r == {
-            'event': {
-                'slug': current_event.slug if current_event else None,
-                'name': str(current_event.name) if current_event else None,
-            },
-            'subevent': (
-                int(self.request.query_params.get('current_subevent'))
-                if self.request.query_params.get('current_subevent') else None
-            ),
-            'checkinlist': (
-                int(self.request.query_params.get('current_checkinlist'))
-                if self.request.query_params.get('current_checkinlist') else None
-            ),
-        }:
-            return Response(status=status.HTTP_304_NOT_MODIFIED)
-        return Response(r)

src/pretix/api/views/event.py

@@ -4,7 +4,7 @@ from django.db.models import ProtectedError, Q
 from django.utils.timezone import now
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
 from django_scopes import scopes_disabled
-from rest_framework import filters, serializers, views, viewsets
+from rest_framework import filters, views, viewsets
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
 
@@ -18,9 +18,7 @@ from pretix.base.models import (
     CartPosition, Device, Event, TaxRule, TeamAPIToken,
 )
 from pretix.base.models.event import SubEvent
-from pretix.base.settings import SETTINGS_AFFECTING_CSS
 from pretix.helpers.dicts import merge_dicts
-from pretix.presale.style import regenerate_css
 from pretix.presale.views.organizer import filter_qs_by_attr
 
 with scopes_disabled():
@@ -28,7 +26,6 @@ with scopes_disabled():
         is_past = django_filters.rest_framework.BooleanFilter(method='is_past_qs')
         is_future = django_filters.rest_framework.BooleanFilter(method='is_future_qs')
         ends_after = django_filters.rest_framework.IsoDateTimeFilter(method='ends_after_qs')
-        sales_channel = django_filters.rest_framework.CharFilter(method='sales_channel_qs')
 
         class Meta:
             model = Event
@@ -70,9 +67,6 @@ with scopes_disabled():
             else:
                 return queryset.exclude(expr)
 
-        def sales_channel_qs(self, queryset, name, value):
-            return queryset.filter(sales_channels__contains=value)
-
 
 class EventViewSet(viewsets.ModelViewSet):
     serializer_class = EventSerializer
@@ -95,6 +89,7 @@ class EventViewSet(viewsets.ModelViewSet):
             )
 
         qs = filter_qs_by_attr(qs, self.request)
+
         return qs.prefetch_related(
             'meta_values', 'meta_values__property', 'seat_category_mappings'
         )
@@ -199,7 +194,6 @@ with scopes_disabled():
         is_past = django_filters.rest_framework.BooleanFilter(method='is_past_qs')
         is_future = django_filters.rest_framework.BooleanFilter(method='is_future_qs')
         ends_after = django_filters.rest_framework.IsoDateTimeFilter(method='ends_after_qs')
-        modified_since = django_filters.IsoDateTimeFilter(field_name='last_modified', lookup_expr='gte')
 
         class Meta:
             model = SubEvent
@@ -239,8 +233,6 @@ class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
     write_permission = 'can_change_event_settings'
     filter_backends = (DjangoFilterBackend, filters.OrderingFilter)
     filterset_class = SubEventFilter
-    ordering = ('date_from',)
-    ordering_fields = ('id', 'date_from', 'last_modified')
 
     def get_queryset(self):
         if getattr(self.request, 'event', None):
@@ -262,20 +254,6 @@ class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
             'subeventitem_set', 'subeventitemvariation_set', 'seat_category_mappings'
         )
 
-    def list(self, request, **kwargs):
-        date = serializers.DateTimeField().to_representation(now())
-        queryset = self.filter_queryset(self.get_queryset())
-
-        page = self.paginate_queryset(queryset)
-        if page is not None:
-            serializer = self.get_serializer(page, many=True)
-            resp = self.get_paginated_response(serializer.data)
-            resp['X-Page-Generated'] = date
-            return resp
-
-        serializer = self.get_serializer(queryset, many=True)
-        return Response(serializer.data, headers={'X-Page-Generated': date})
-
     def perform_update(self, serializer):
         original_data = self.get_serializer(instance=serializer.instance).data
         super().perform_update(serializer)
@@ -391,7 +369,5 @@ class EventSettingsView(views.APIView):
                     k: v for k, v in s.validated_data.items()
                 }
             )
-        if any(p in s.changed_data for p in SETTINGS_AFFECTING_CSS):
-            regenerate_css.apply_async(args=(request.organizer.pk,))
         s = EventSettingsSerializer(instance=request.event.settings, event=request.event)
         return Response(s.data)

src/pretix/api/views/exporters.py

@@ -1,154 +0,0 @@
-from datetime import timedelta
-
-from celery.result import AsyncResult
-from django.conf import settings
-from django.http import Http404
-from django.shortcuts import get_object_or_404
-from django.utils.functional import cached_property
-from django.utils.timezone import now
-from rest_framework import status, viewsets
-from rest_framework.decorators import action
-from rest_framework.response import Response
-from rest_framework.reverse import reverse
-
-from pretix.api.serializers.exporters import (
-    ExporterSerializer, JobRunSerializer,
-)
-from pretix.base.models import CachedFile, Device, TeamAPIToken
-from pretix.base.services.export import export, multiexport
-from pretix.base.signals import (
-    register_data_exporters, register_multievent_data_exporters,
-)
-from pretix.helpers.http import ChunkBasedFileResponse
-
-
-class ExportersMixin:
-    def list(self, request, *args, **kwargs):
-        res = ExporterSerializer(self.exporters, many=True)
-        return Response({
-            "count": len(self.exporters),
-            "next": None,
-            "previous": None,
-            "results": res.data
-        })
-
-    def get_object(self):
-        instances = [e for e in self.exporters if e.identifier == self.kwargs.get('pk')]
-        if not instances:
-            raise Http404()
-        return instances[0]
-
-    def retrieve(self, request, *args, **kwargs):
-        instance = self.get_object()
-        serializer = ExporterSerializer(instance)
-        return Response(serializer.data)
-
-    @action(detail=True, methods=['GET'], url_name='download', url_path='download/(?P<asyncid>[^/]+)/(?P<cfid>[^/]+)')
-    def download(self, *args, **kwargs):
-        cf = get_object_or_404(CachedFile, id=kwargs['cfid'])
-        if cf.file:
-            resp = ChunkBasedFileResponse(cf.file.file, content_type=cf.type)
-            resp['Content-Disposition'] = 'attachment; filename="{}"'.format(cf.filename)
-            return resp
-        elif not settings.HAS_CELERY:
-            return Response(
-                {'status': 'failed', 'message': 'Unknown file ID or export failed'},
-                status=status.HTTP_410_GONE
-            )
-
-        res = AsyncResult(kwargs['asyncid'])
-        if res.failed():
-            if isinstance(res.info, dict) and res.info['exc_type'] == 'ExportError':
-                msg = res.info['exc_message']
-            else:
-                msg = 'Internal error'
-            return Response(
-                {'status': 'failed', 'message': msg},
-                status=status.HTTP_410_GONE
-            )
-
-        return Response(
-            {
-                'status': 'running' if res.state in ('PROGRESS', 'STARTED', 'SUCCESS') else 'waiting',
-                'percentage': res.result.get('value', None) if res.result else None,
-            },
-            status=status.HTTP_409_CONFLICT
-        )
-
-    @action(detail=True, methods=['POST'])
-    def run(self, *args, **kwargs):
-        instance = self.get_object()
-        serializer = JobRunSerializer(exporter=instance, data=self.request.data, **self.get_serializer_kwargs())
-        serializer.is_valid(raise_exception=True)
-
-        cf = CachedFile(web_download=False)
-        cf.date = now()
-        cf.expires = now() + timedelta(hours=24)
-        cf.save()
-        d = serializer.data
-        for k, v in d.items():
-            if isinstance(v, set):
-                d[k] = list(v)
-        async_result = self.do_export(cf, instance, d)
-
-        url_kwargs = {
-            'asyncid': str(async_result.id),
-            'cfid': str(cf.id),
-        }
-        url_kwargs.update(self.kwargs)
-        return Response({
-            'download': reverse('api-v1:exporters-download', kwargs=url_kwargs, request=self.request)
-        }, status=status.HTTP_202_ACCEPTED)
-
-
-class EventExportersViewSet(ExportersMixin, viewsets.ViewSet):
-    permission = 'can_view_orders'
-
-    def get_serializer_kwargs(self):
-        return {}
-
-    @cached_property
-    def exporters(self):
-        exporters = []
-        responses = register_data_exporters.send(self.request.event)
-        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
-
-    def do_export(self, cf, instance, data):
-        return export.apply_async(args=(self.request.event.id, str(cf.id), instance.identifier, data))
-
-
-class OrganizerExportersViewSet(ExportersMixin, viewsets.ViewSet):
-    permission = None
-
-    @cached_property
-    def exporters(self):
-        exporters = []
-        events = (self.request.auth or self.request.user).get_events_with_permission('can_view_orders', request=self.request).filter(
-            organizer=self.request.organizer
-        )
-        responses = register_multievent_data_exporters.send(self.request.organizer)
-        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
-
-    def get_serializer_kwargs(self):
-        return {
-            'events': self.request.auth.get_events_with_permission('can_view_orders', request=self.request).filter(
-                organizer=self.request.organizer
-            )
-        }
-
-    def do_export(self, cf, instance, data):
-        return multiexport.apply_async(kwargs={
-            'organizer': self.request.organizer.id,
-            'user': self.request.user.id if self.request.user.is_authenticated else None,
-            'token': self.request.auth.pk if isinstance(self.request.auth, TeamAPIToken) else None,
-            'device': self.request.auth.pk if isinstance(self.request.auth, Device) else None,
-            'fileid': str(cf.id),
-            'provider': instance.identifier,
-            'form_data': data
-        })

src/pretix/api/views/order.py

@@ -26,18 +26,15 @@ from pretix.api.serializers.order import (
     InvoiceSerializer, OrderCreateSerializer, OrderPaymentCreateSerializer,
     OrderPaymentSerializer, OrderPositionSerializer,
     OrderRefundCreateSerializer, OrderRefundSerializer, OrderSerializer,
-    PriceCalcSerializer, RevokedTicketSecretSerializer,
-    SimulatedOrderSerializer,
+    PriceCalcSerializer, SimulatedOrderSerializer,
 )
 from pretix.base.i18n import language
 from pretix.base.models import (
     CachedCombinedTicket, CachedTicket, Device, Event, Invoice, InvoiceAddress,
     Order, OrderFee, OrderPayment, OrderPosition, OrderRefund, Quota, SubEvent,
-    TaxRule, TeamAPIToken, generate_secret,
+    TeamAPIToken, generate_position_secret, generate_secret,
 )
-from pretix.base.models.orders import RevokedTicketSecret
 from pretix.base.payment import PaymentException
-from pretix.base.secrets import assign_ticket_secret
 from pretix.base.services import tickets
 from pretix.base.services.invoices import (
     generate_cancellation, generate_invoice, invoice_pdf, invoice_qualified,
@@ -65,7 +62,6 @@ with scopes_disabled():
         modified_since = django_filters.IsoDateTimeFilter(field_name='last_modified', lookup_expr='gte')
         created_since = django_filters.IsoDateTimeFilter(field_name='datetime', lookup_expr='gte')
         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')
 
         class Meta:
@@ -85,19 +81,6 @@ with scopes_disabled():
             ).filter(has_se_after=True)
             return qs
 
-        def subevent_before_qs(self, qs, name, value):
-            qs = qs.annotate(
-                has_se_before=Exists(
-                    OrderPosition.all.filter(
-                        subevent_id__in=SubEvent.objects.filter(
-                            Q(date_from__lt=value), event=OuterRef(OuterRef('event_id'))
-                        ).values_list('id'),
-                        order_id=OuterRef('pk'),
-                    )
-                )
-            ).filter(has_se_before=True)
-            return qs
-
         def search_qs(self, qs, name, value):
             u = value
             if "-" in value:
@@ -500,9 +483,8 @@ class OrderViewSet(viewsets.ModelViewSet):
         order = self.get_object()
         order.secret = generate_secret()
         for op in order.all_positions.all():
-            assign_ticket_secret(
-                request.event, op, force_invalidate=True, save=True
-            )
+            op.secret = generate_position_secret()
+            op.save()
         order.save(update_fields=['secret'])
         CachedTicket.objects.filter(order_position__order=order).delete()
         CachedCombinedTicket.objects.filter(order=order).delete()
@@ -558,15 +540,10 @@ class OrderViewSet(viewsets.ModelViewSet):
             )
 
     def create(self, request, *args, **kwargs):
-        if 'send_mail' in request.data and 'send_email' not in request.data:
-            request.data['send_email'] = request.data['send_mail']
         serializer = OrderCreateSerializer(data=request.data, context=self.get_serializer_context())
         serializer.is_valid(raise_exception=True)
         with transaction.atomic():
-            try:
-                self.perform_create(serializer)
-            except TaxRule.SaleNotAllowed:
-                raise ValidationError(_('One of the selected products is not available in the selected country.'))
+            self.perform_create(serializer)
             send_mail = serializer._send_mail
             order = serializer.instance
             if not order.pk:
@@ -582,7 +559,7 @@ class OrderViewSet(viewsets.ModelViewSet):
                 auth=request.auth,
             )
 
-        with language(order.locale, self.request.event.settings.region):
+        with language(order.locale):
             order_placed.send(self.request.event, order=order)
             if order.status == Order.STATUS_PAID:
                 order_paid.send(self.request.event, order=order)
@@ -674,17 +651,6 @@ class OrderViewSet(viewsets.ModelViewSet):
                     }
                 )
 
-            if 'phone' in self.request.data and serializer.instance.phone != self.request.data.get('phone'):
-                serializer.instance.log_action(
-                    'pretix.event.order.phone.changed',
-                    user=self.request.user,
-                    auth=self.request.auth,
-                    data={
-                        'old_phone': serializer.instance.phone,
-                        'new_phone': self.request.data.get('phone'),
-                    }
-                )
-
             if 'locale' in self.request.data and serializer.instance.locale != self.request.data.get('locale'):
                 serializer.instance.log_action(
                     'pretix.event.order.locale.changed',
@@ -897,7 +863,7 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, viewsets.ReadOnlyModelViewS
 
         price = get_price(**kwargs)
         tr = kwargs.get('tax_rule', kwargs.get('item').tax_rule)
-        with language(data.get('locale') or self.request.event.settings.locale, self.request.event.settings.region):
+        with language(data.get('locale') or self.request.event.settings.locale):
             return Response({
                 'gross': price.gross,
                 'gross_formatted': money_filter(price.gross, self.request.event.currency, hide_currency=True),
@@ -962,7 +928,6 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
     def get_serializer_context(self):
         ctx = super().get_serializer_context()
         ctx['order'] = get_object_or_404(Order, code=self.kwargs['order'], event=self.request.event)
-        ctx['event'] = self.request.event
         return ctx
 
     def get_queryset(self):
@@ -970,7 +935,6 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
         return order.payments.all()
 
     def create(self, request, *args, **kwargs):
-        send_mail = request.data.get('send_email', True)
         serializer = OrderPaymentCreateSerializer(data=request.data, context=self.get_serializer_context())
         serializer.is_valid(raise_exception=True)
         with transaction.atomic():
@@ -986,8 +950,7 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
                         user=self.request.user if self.request.user.is_authenticated else None,
                         auth=self.request.auth,
                         count_waitinglist=False,
-                        force=request.data.get('force', False),
-                        send_mail=send_mail,
+                        force=request.data.get('force', False)
                     )
                 except Quota.QuotaExceededException:
                     pass
@@ -1335,26 +1298,3 @@ class InvoiceViewSet(viewsets.ReadOnlyModelViewSet):
                 auth=self.request.auth,
             )
             return Response(status=204)
-
-
-with scopes_disabled():
-    class RevokedSecretFilter(FilterSet):
-        created_since = django_filters.IsoDateTimeFilter(field_name='created', lookup_expr='gte')
-
-        class Meta:
-            model = RevokedTicketSecret
-            fields = []
-
-
-class RevokedSecretViewSet(viewsets.ReadOnlyModelViewSet):
-    serializer_class = RevokedTicketSecretSerializer
-    queryset = RevokedTicketSecret.objects.none()
-    filter_backends = (DjangoFilterBackend, OrderingFilter)
-    ordering = ('-created',)
-    ordering_fields = ('created', 'secret')
-    filterset_class = RevokedSecretFilter
-    permission = 'can_view_orders'
-    write_permission = 'can_change_orders'
-
-    def get_queryset(self):
-        return RevokedTicketSecret.objects.filter(event=self.request.event)

src/pretix/api/views/organizer.py

@@ -6,9 +6,7 @@ from django.shortcuts import get_object_or_404
 from django.utils.functional import cached_property
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
 from django_scopes import scopes_disabled
-from rest_framework import (
-    filters, mixins, serializers, status, views, viewsets,
-)
+from rest_framework import filters, mixins, serializers, status, viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import MethodNotAllowed, PermissionDenied
 from rest_framework.mixins import CreateModelMixin, DestroyModelMixin
@@ -17,18 +15,15 @@ from rest_framework.viewsets import GenericViewSet
 
 from pretix.api.models import OAuthAccessToken
 from pretix.api.serializers.organizer import (
-    DeviceSerializer, GiftCardSerializer, GiftCardTransactionSerializer,
-    OrganizerSerializer, OrganizerSettingsSerializer, SeatingPlanSerializer,
-    TeamAPITokenSerializer, TeamInviteSerializer, TeamMemberSerializer,
-    TeamSerializer,
+    DeviceSerializer, GiftCardSerializer, OrganizerSerializer,
+    SeatingPlanSerializer, TeamAPITokenSerializer, TeamInviteSerializer,
+    TeamMemberSerializer, TeamSerializer,
 )
 from pretix.base.models import (
-    Device, GiftCard, GiftCardTransaction, Organizer, SeatingPlan, Team,
-    TeamAPIToken, TeamInvite, User,
+    Device, GiftCard, Organizer, SeatingPlan, Team, TeamAPIToken, TeamInvite,
+    User,
 )
-from pretix.base.settings import SETTINGS_AFFECTING_CSS
 from pretix.helpers.dicts import merge_dicts
-from pretix.presale.style import regenerate_organizer_css
 
 
 class OrganizerViewSet(viewsets.ReadOnlyModelViewSet):
@@ -196,24 +191,6 @@ class GiftCardViewSet(viewsets.ModelViewSet):
         raise MethodNotAllowed("Gift cards cannot be deleted.")
 
 
-class GiftCardTransactionViewSet(viewsets.ReadOnlyModelViewSet):
-    serializer_class = GiftCardTransactionSerializer
-    queryset = GiftCardTransaction.objects.none()
-    permission = 'can_manage_gift_cards'
-    write_permission = 'can_manage_gift_cards'
-
-    @cached_property
-    def giftcard(self):
-        if self.request.GET.get('include_accepted') == 'true':
-            qs = self.request.organizer.accepted_gift_cards
-        else:
-            qs = self.request.organizer.issued_gift_cards.all()
-        return get_object_or_404(qs, pk=self.kwargs.get('giftcard'))
-
-    def get_queryset(self):
-        return self.giftcard.transactions.select_related('order', 'order__event')
-
-
 class TeamViewSet(viewsets.ModelViewSet):
     serializer_class = TeamSerializer
     queryset = Team.objects.none()
@@ -419,37 +396,3 @@ class DeviceViewSet(mixins.CreateModelMixin,
             data=self.request.data
         )
         return inst
-
-
-class OrganizerSettingsView(views.APIView):
-    permission = 'can_change_organizer_settings'
-
-    def get(self, request, *args, **kwargs):
-        s = OrganizerSettingsSerializer(instance=request.organizer.settings, organizer=request.organizer)
-        if 'explain' in request.GET:
-            return Response({
-                fname: {
-                    'value': s.data[fname],
-                    'label': getattr(field, '_label', fname),
-                    'help_text': getattr(field, '_help_text', None)
-                } for fname, field in s.fields.items()
-            })
-        return Response(s.data)
-
-    def patch(self, request, *wargs, **kwargs):
-        s = OrganizerSettingsSerializer(
-            instance=request.organizer.settings, data=request.data, partial=True,
-            organizer=request.organizer
-        )
-        s.is_valid(raise_exception=True)
-        with transaction.atomic():
-            s.save()
-            self.request.organizer.log_action(
-                'pretix.organizer.settings', user=self.request.user, auth=self.request.auth, data={
-                    k: v for k, v in s.validated_data.items()
-                }
-            )
-        if any(p in s.changed_data for p in SETTINGS_AFFECTING_CSS):
-            regenerate_organizer_css.apply_async(args=(request.organizer.pk,))
-        s = OrganizerSettingsSerializer(instance=request.organizer.settings, organizer=request.organizer)
-        return Response(s.data)

src/pretix/api/webhooks.py

@@ -7,7 +7,7 @@ import requests
 from celery.exceptions import MaxRetriesExceededError
 from django.db.models import Exists, OuterRef, Q
 from django.dispatch import receiver
-from django.utils.translation import gettext_lazy as _, pgettext_lazy
+from django.utils.translation import gettext_lazy as _
 from django_scopes import scope, scopes_disabled
 from requests import RequestException
 
@@ -97,67 +97,6 @@ class ParametrizedOrderWebhookEvent(WebhookEvent):
         }
 
 
-class ParametrizedEventWebhookEvent(WebhookEvent):
-    def __init__(self, action_type, verbose_name):
-        self._action_type = action_type
-        self._verbose_name = verbose_name
-        super().__init__()
-
-    @property
-    def action_type(self):
-        return self._action_type
-
-    @property
-    def verbose_name(self):
-        return self._verbose_name
-
-    def build_payload(self, logentry: LogEntry):
-        if logentry.action_type == 'pretix.event.deleted':
-            organizer = logentry.content_object
-            return {
-                'notification_id': logentry.pk,
-                'organizer': organizer.slug,
-                'event': logentry.parsed_data.get('slug'),
-                'action': logentry.action_type,
-            }
-
-        event = logentry.content_object
-        if not event:
-            return None
-
-        return {
-            'notification_id': logentry.pk,
-            'organizer': event.organizer.slug,
-            'event': event.slug,
-            'action': logentry.action_type,
-        }
-
-
-class ParametrizedSubEventWebhookEvent(WebhookEvent):
-    def __init__(self, action_type, verbose_name):
-        self._action_type = action_type
-        self._verbose_name = verbose_name
-        super().__init__()
-
-    @property
-    def action_type(self):
-        return self._action_type
-
-    @property
-    def verbose_name(self):
-        return self._verbose_name
-
-    def build_payload(self, logentry: LogEntry):
-        # do not use content_object, this is also called in deletion
-        return {
-            'notification_id': logentry.pk,
-            'organizer': logentry.event.organizer.slug,
-            'event': logentry.event.slug,
-            'subevent': logentry.object_id,
-            'action': logentry.action_type,
-        }
-
-
 class ParametrizedOrderPositionWebhookEvent(ParametrizedOrderWebhookEvent):
 
     def build_payload(self, logentry: LogEntry):
@@ -230,69 +169,44 @@ def register_default_webhook_events(sender, **kwargs):
             'pretix.event.checkin.reverted',
             _('Ticket check-in reverted'),
         ),
-        ParametrizedEventWebhookEvent(
-            'pretix.event.added',
-            _('Event created'),
-        ),
-        ParametrizedEventWebhookEvent(
-            'pretix.event.changed',
-            _('Event details changed'),
-        ),
-        ParametrizedEventWebhookEvent(
-            'pretix.event.deleted',
-            _('Event details changed'),
-        ),
-        ParametrizedSubEventWebhookEvent(
-            'pretix.subevent.added',
-            pgettext_lazy('subevent', 'Event series date added'),
-        ),
-        ParametrizedSubEventWebhookEvent(
-            'pretix.subevent.changed',
-            pgettext_lazy('subevent', 'Event series date changed'),
-        ),
-        ParametrizedSubEventWebhookEvent(
-            'pretix.subevent.deleted',
-            pgettext_lazy('subevent', 'Event series date deleted'),
-        ),
     )
 
 
 @app.task(base=TransactionAwareTask, acks_late=True)
-def notify_webhooks(logentry_ids: list):
-    if not isinstance(logentry_ids, list):
-        logentry_ids = [logentry_ids]
-    qs = LogEntry.all.select_related('event', 'event__organizer').filter(id__in=logentry_ids)
-    _org, _at, webhooks = None, None, None
-    for logentry in qs:
-        if not logentry.organizer:
-            break  # We need to know the organizer
+def notify_webhooks(logentry_id: int):
+    logentry = LogEntry.all.select_related('event', 'event__organizer').get(id=logentry_id)
 
-        notification_type = logentry.webhook_type
+    if not logentry.organizer:
+        return  # We need to know the organizer
 
-        if not notification_type:
-            break  # Ignore, no webhooks for this event type
+    types = get_all_webhook_events()
+    notification_type = None
+    typepath = logentry.action_type
+    while not notification_type and '.' in typepath:
+        notification_type = types.get(typepath + ('.*' if typepath != logentry.action_type else ''))
+        typepath = typepath.rsplit('.', 1)[0]
 
-        if _org != logentry.organizer or _at != logentry.action_type or webhooks is None:
-            _org = logentry.organizer
-            _at = logentry.action_type
+    if not notification_type:
+        return  # Ignore, no webhooks for this event type
 
-            # All webhooks that registered for this notification
-            event_listener = WebHookEventListener.objects.filter(
-                webhook=OuterRef('pk'),
-                action_type=notification_type.action_type
-            )
-            webhooks = WebHook.objects.annotate(has_el=Exists(event_listener)).filter(
-                organizer=logentry.organizer,
-                has_el=True,
-                enabled=True
-            )
-            if logentry.event_id:
-                webhooks = webhooks.filter(
-                    Q(all_events=True) | Q(limit_events__pk=logentry.event_id)
-                )
+    # All webhooks that registered for this notification
+    event_listener = WebHookEventListener.objects.filter(
+        webhook=OuterRef('pk'),
+        action_type=notification_type.action_type
+    )
 
-        for wh in webhooks:
-            send_webhook.apply_async(args=(logentry.id, notification_type.action_type, wh.pk))
+    webhooks = WebHook.objects.annotate(has_el=Exists(event_listener)).filter(
+        organizer=logentry.organizer,
+        has_el=True,
+        enabled=True
+    )
+    if logentry.event_id:
+        webhooks = webhooks.filter(
+            Q(all_events=True) | Q(limit_events__pk=logentry.event_id)
+        )
+
+    for wh in webhooks:
+        send_webhook.apply_async(args=(logentry_id, notification_type.action_type, wh.pk))
 
 
 @app.task(base=ProfiledTask, bind=True, max_retries=9, acks_late=True)
@@ -336,7 +250,7 @@ def send_webhook(self, logentry_id: int, action_type: str, webhook_id: int):
                     webhook.enabled = False
                     webhook.save()
                 elif resp.status_code > 299:
-                    raise self.retry(countdown=2 ** (self.request.retries * 2))  # max is 2 ** (8*2) = 65536 seconds = ~18 hours
+                    raise self.retry(countdown=2 ** (self.request.retries * 2))
             except RequestException as e:
                 WebHookCall.objects.create(
                     webhook=webhook,
@@ -348,6 +262,6 @@ def send_webhook(self, logentry_id: int, action_type: str, webhook_id: int):
                     payload=json.dumps(payload),
                     response_body=str(e)[:1024 * 1024]
                 )
-                raise self.retry(countdown=2 ** (self.request.retries * 2))  # max is 2 ** (8*2) = 65536 seconds = ~18 hours
+                raise self.retry(countdown=2 ** (self.request.retries * 2))
         except MaxRetriesExceededError:
             pass

src/pretix/base/banlist.py

@@ -73,8 +73,8 @@ banlist = [
     "wtf"
 ]
 
-banlist_regex = re.compile('(' + '|'.join(banlist) + ')')
+blacklist_regex = re.compile('(' + '|'.join(banlist) + ')')
 
 
 def banned(string):
-    return bool(banlist_regex.search(string.lower()))
+    return bool(blacklist_regex.search(string.lower()))

src/pretix/base/email.py

@@ -115,7 +115,7 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
             'body': body_md,
             'subject': str(subject),
             'color': settings.PRETIX_PRIMARY_COLOR,
-            'rtl': get_language() in settings.LANGUAGES_RTL or get_language().split('-')[0] in settings.LANGUAGES_RTL,
+            'rtl': get_language() in settings.LANGUAGES_RTL
         }
         if self.event:
             htmlctx['event'] = self.event

src/pretix/base/exporters/__init__.py

@@ -4,4 +4,3 @@ from .invoices import *  # noqa
 from .json import *  # noqa
 from .mail import *  # noqa
 from .orderlist import *  # noqa
-from .waitinglist import *  # noqa

src/pretix/base/exporters/mail.py

@@ -41,7 +41,7 @@ class MailExporter(BaseExporter):
                      initial=[Order.STATUS_PENDING, Order.STATUS_PAID],
                      choices=Order.STATUS_CHOICE,
                      widget=forms.CheckboxSelectMultiple,
-                     required=True
+                     required=False
                  )),
             ]
         )

src/pretix/base/exporters/orderlist.py

@@ -53,23 +53,9 @@ class OrderListExporter(MultiSheetListExporter):
                      initial=True,
                      required=False
                  )),
-                ('include_payment_amounts',
-                 forms.BooleanField(
-                     label=_('Include payment amounts'),
-                     initial=False,
-                     required=False
-                 )),
             ]
         )
 
-    def _get_all_payment_methods(self, qs):
-        pps = dict(get_all_payment_providers())
-        return sorted([(pp, pps[pp]) for pp in set(
-            OrderPayment.objects.exclude(provider='free').filter(order__event__in=self.events).values_list(
-                'provider', flat=True
-            ).distinct()
-        )], key=lambda pp: pp[0])
-
     def _get_all_tax_rates(self, qs):
         tax_rates = set(
             a for a
@@ -139,7 +125,7 @@ class OrderListExporter(MultiSheetListExporter):
         tax_rates = self._get_all_tax_rates(qs)
 
         headers = [
-            _('Event slug'), _('Order code'), _('Order total'), _('Status'), _('Email'), _('Phone number'), _('Order date'),
+            _('Event slug'), _('Order code'), _('Order total'), _('Status'), _('Email'), _('Order date'),
             _('Order time'), _('Company'), _('Name'),
         ]
         name_scheme = PERSON_NAME_SCHEMES[self.event.settings.name_scheme] if not self.is_multievent else None
@@ -147,8 +133,8 @@ class OrderListExporter(MultiSheetListExporter):
             for k, label, w in name_scheme['fields']:
                 headers.append(label)
         headers += [
-            _('Address'), _('ZIP code'), _('City'), _('Country'), pgettext('address', 'State'),
-            _('Custom address field'), _('VAT ID'), _('Date of last payment'), _('Fees'), _('Order locale')
+            _('Address'), _('ZIP code'), _('City'), _('Country'), pgettext('address', 'State'), _('VAT ID'),
+            _('Date of last payment'), _('Fees'), _('Order locale')
         ]
 
         for tr in tax_rates:
@@ -164,10 +150,6 @@ class OrderListExporter(MultiSheetListExporter):
         headers.append(_('Comment'))
         headers.append(_('Positions'))
         headers.append(_('Payment providers'))
-        if form_data.get('include_payment_amounts'):
-            payment_methods = self._get_all_payment_methods(qs)
-            for id, vn in payment_methods:
-                headers.append(_('Paid by {method}').format(method=vn))
 
         yield headers
 
@@ -181,23 +163,6 @@ class OrderListExporter(MultiSheetListExporter):
                 taxsum=Sum('tax_value'), grosssum=Sum('value')
             )
         }
-        if form_data.get('include_payment_amounts'):
-            payment_sum_cache = {
-                (o['order__id'], o['provider']): o['grosssum'] for o in
-                OrderPayment.objects.values('provider', 'order__id').order_by().filter(
-                    state__in=[OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED]
-                ).annotate(
-                    grosssum=Sum('amount')
-                )
-            }
-            refund_sum_cache = {
-                (o['order__id'], o['provider']): o['grosssum'] for o in
-                OrderRefund.objects.values('provider', 'order__id').order_by().filter(
-                    state__in=[OrderRefund.REFUND_STATE_DONE, OrderRefund.REFUND_STATE_TRANSIT]
-                ).annotate(
-                    grosssum=Sum('amount')
-                )
-            }
         sum_cache = {
             (o['order__id'], o['tax_rate']): o for o in
             OrderPosition.objects.values('tax_rate', 'order__id').order_by().annotate(
@@ -215,7 +180,6 @@ class OrderListExporter(MultiSheetListExporter):
                 order.total,
                 order.get_status_display(),
                 order.email,
-                str(order.phone) if order.phone else '',
                 order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
                 order.datetime.astimezone(tz).strftime('%H:%M:%S'),
             ]
@@ -236,11 +200,10 @@ class OrderListExporter(MultiSheetListExporter):
                     order.invoice_address.country if order.invoice_address.country else
                     order.invoice_address.country_old,
                     order.invoice_address.state,
-                    order.invoice_address.custom_field,
                     order.invoice_address.vat_id,
                 ]
             except InvoiceAddress.DoesNotExist:
-                row += [''] * (9 + (len(name_scheme['fields']) if name_scheme and len(name_scheme['fields']) > 1 else 0))
+                row += [''] * (8 + (len(name_scheme['fields']) if name_scheme and len(name_scheme['fields']) > 1 else 0))
 
             row += [
                 order.payment_date.astimezone(tz).strftime('%Y-%m-%d') if order.payment_date else '',
@@ -271,14 +234,6 @@ class OrderListExporter(MultiSheetListExporter):
                 str(self.providers.get(p, p)) for p in sorted(set((order.payment_providers or '').split(',')))
                 if p and p != 'free'
             ]))
-
-            if form_data.get('include_payment_amounts'):
-                payment_methods = self._get_all_payment_methods(qs)
-                for id, vn in payment_methods:
-                    row.append(
-                        payment_sum_cache.get((order.id, id), Decimal('0.00')) -
-                        refund_sum_cache.get((order.id, id), Decimal('0.00'))
-                    )
             yield row
 
     def iterate_fees(self, form_data: dict):
@@ -304,7 +259,6 @@ class OrderListExporter(MultiSheetListExporter):
             _('Order code'),
             _('Status'),
             _('Email'),
-            _('Phone number'),
             _('Order date'),
             _('Order time'),
             _('Fee type'),
@@ -336,7 +290,6 @@ class OrderListExporter(MultiSheetListExporter):
                 order.code,
                 order.get_status_display(),
                 order.email,
-                str(order.phone) if order.phone else '',
                 order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
                 order.datetime.astimezone(tz).strftime('%H:%M:%S'),
                 op.get_fee_type_display(),
@@ -405,7 +358,6 @@ class OrderListExporter(MultiSheetListExporter):
             _('Position ID'),
             _('Status'),
             _('Email'),
-            _('Phone number'),
             _('Order date'),
             _('Order time'),
         ]
@@ -441,7 +393,6 @@ class OrderListExporter(MultiSheetListExporter):
             _('Seat zone'),
             _('Seat row'),
             _('Seat number'),
-            _('Order comment'),
         ]
 
         questions = list(Question.objects.filter(event__in=self.events))
@@ -485,7 +436,6 @@ class OrderListExporter(MultiSheetListExporter):
                     op.positionid,
                     order.get_status_display(),
                     order.email,
-                    str(order.phone) if order.phone else '',
                     order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
                     order.datetime.astimezone(tz).strftime('%H:%M:%S'),
                 ]
@@ -538,7 +488,6 @@ class OrderListExporter(MultiSheetListExporter):
                 else:
                     row += ['', '', '', '', '']
 
-                row.append(order.comment)
                 acache = {}
                 for a in op.answers.all():
                     # We do not want to localize Date, Time and Datetime question answers, as those can lead
@@ -579,7 +528,7 @@ class OrderListExporter(MultiSheetListExporter):
                     row += [''] * (8 + (len(name_scheme['fields']) if name_scheme and len(name_scheme['fields']) > 1 else 0))
                 row += [
                     order.sales_channel,
-                    order.locale,
+                    order.locale
                 ]
                 row.append(', '.join([
                     str(self.providers.get(p, p)) for p in sorted(set((op.payment_providers or '').split(',')))

src/pretix/base/exporters/waitinglist.py

@@ -1,165 +0,0 @@
-from collections import OrderedDict
-
-import pytz
-from django import forms
-from django.db.models import F, Q
-from django.dispatch import receiver
-from django.utils.timezone import now
-from django.utils.translation import gettext_lazy as _, pgettext_lazy
-
-from pretix.base.models.waitinglist import WaitingListEntry
-
-from ..exporter import ListExporter
-from ..signals import (
-    register_data_exporters, register_multievent_data_exporters,
-)
-
-
-class WaitingListExporter(ListExporter):
-    identifier = 'waitinglist'
-    verbose_name = _('Waiting list')
-
-    # map selected status to label and queryset-filter
-    status_filters = [
-        (
-            '',
-            _('All entries'),
-            lambda qs: qs
-        ),
-        (
-            'awaiting-voucher',
-            _('Waiting for a voucher'),
-            lambda qs: qs.filter(voucher__isnull=True)
-        ),
-        (
-            'voucher-assigned',
-            _('Voucher assigned'),
-            lambda qs: qs.filter(voucher__isnull=False)
-        ),
-        (
-            'awaiting-redemption',
-            _('Waiting for redemption'),
-            lambda qs: qs.filter(
-                voucher__isnull=False,
-                voucher__redeemed__lt=F('voucher__max_usages'),
-            ).filter(Q(voucher__valid_until__isnull=True) | Q(voucher__valid_until__gt=now()))
-        ),
-        (
-            'voucher-redeemed',
-            _('Voucher redeemed'),
-            lambda qs: qs.filter(
-                voucher__isnull=False,
-                voucher__redeemed__gte=F('voucher__max_usages'),
-            )
-        ),
-        (
-            'voucher-expired',
-            _('Voucher expired'),
-            lambda qs: qs.filter(
-                voucher__isnull=False,
-                voucher__redeemed__lt=F('voucher__max_usages'),
-                voucher__valid_until__isnull=False,
-                voucher__valid_until__lte=now()
-            )
-        ),
-    ]
-
-    def iterate_list(self, form_data):
-        # create dicts for easier access by key, which is passed by form_data[status]
-        status_labels = {k: v for k, v, c in self.status_filters}
-        queryset_mutators = {k: c for k, v, c in self.status_filters}
-
-        entries = WaitingListEntry.objects.filter(
-            event__in=self.events,
-        ).select_related(
-            'item', 'variation', 'voucher', 'subevent'
-        ).order_by('created')
-
-        # apply filter to queryset/entries according to status
-        # if unknown status-filter is given, django will handle the error
-        status_filter = form_data.get("status", "")
-        entries = queryset_mutators[status_filter](entries)
-
-        headers = [
-            _('Date'),
-            _('Email'),
-            _('Product name'),
-            _('Variation'),
-            _('Event slug'),
-            _('Event name'),
-            pgettext_lazy('subevents', 'Date'),  # Name of subevent
-            _('Start date'),  # Start date of subevent or event
-            _('End date'),  # End date of subevent or event
-            _('Language'),
-            _('Priority'),
-            _('Status'),
-            _('Voucher code'),
-        ]
-
-        yield headers
-        yield self.ProgressSetTotal(total=len(entries))
-
-        for entry in entries:
-            if entry.voucher:
-                if entry.voucher.redeemed >= entry.voucher.max_usages:
-                    status_label = status_labels['voucher-redeemed']
-                elif not entry.voucher.is_active():
-                    status_label = status_labels['voucher-expired']
-                else:
-                    status_label = status_labels['voucher-assigned']
-            else:
-                status_label = status_labels['awaiting-voucher']
-
-            # which event should be used to output dates in columns "Start date" and "End date"
-            event_for_date_columns = entry.subevent if entry.subevent else entry.event
-            tz = pytz.timezone(entry.event.settings.timezone)
-            datetime_format = '%Y-%m-%d %H:%M:%S'
-
-            row = [
-                entry.created.astimezone(tz).strftime(datetime_format),  # alternative: .isoformat(),
-                entry.email,
-                str(entry.item) if entry.item else "",
-                str(entry.variation) if entry.variation else "",
-                entry.event.slug,
-                entry.event.name,
-                entry.subevent.name if entry.subevent else "",
-                event_for_date_columns.date_from.astimezone(tz).strftime(datetime_format),
-                event_for_date_columns.date_to.astimezone(tz).strftime(datetime_format) if event_for_date_columns.date_to else "",
-                entry.locale,
-                str(entry.priority),
-                status_label,
-                entry.voucher.code if entry.voucher else '',
-            ]
-            yield row
-
-    @property
-    def additional_form_fields(self):
-        return OrderedDict(
-            [
-                ('status',
-                 forms.ChoiceField(
-                     label=_('Status'),
-                     initial=['awaiting-voucher'],
-                     required=False,
-                     choices=[(k, v) for (k, v, c) in self.status_filters]
-                 )),
-            ]
-        )
-
-    def get_filename(self):
-        if self.is_multievent:
-            event = self.events.first()
-            slug = event.organizer.slug if len(self.events) > 1 else event.slug
-        else:
-            slug = self.event.slug
-        return '{}_waitinglist'.format(slug)
-
-
-@receiver(register_data_exporters, dispatch_uid="exporter_waitinglist")
-def register_waitinglist_exporter(sender, **kwargs):
-    return WaitingListExporter
-
-
-@receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_waitinglist")
-def register_multievent_i_waitinglist_exporter(sender, **kwargs):
-    return WaitingListExporter

src/pretix/base/forms/auth.py

@@ -1,17 +1,12 @@
-import hashlib
-import ipaddress
-
 from django import forms
 from django.conf import settings
 from django.contrib.auth.password_validation import (
     password_validators_help_texts, validate_password,
 )
-from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 
 from pretix.base.models import User
 from pretix.helpers.dicts import move_to_end
-from pretix.helpers.http import get_client_ip
 
 
 class LoginForm(forms.Form):
@@ -23,7 +18,6 @@ class LoginForm(forms.Form):
 
     error_messages = {
         'invalid_login': _("This combination of credentials is not known to our system."),
-        'rate_limit': _("For security reasons, please wait 5 minutes before you try again."),
         'inactive': _("This account is inactive.")
     }
 
@@ -45,36 +39,10 @@ class LoginForm(forms.Form):
         else:
             move_to_end(self.fields, 'keep_logged_in')
 
-    @cached_property
-    def ratelimit_key(self):
-        if not settings.HAS_REDIS:
-            return None
-        client_ip = get_client_ip(self.request)
-        if not client_ip:
-            return None
-        try:
-            client_ip = ipaddress.ip_address(client_ip)
-        except ValueError:
-            # Web server not set up correctly
-            return None
-        if client_ip.is_private:
-            # This is the private IP of the server, web server not set up correctly
-            return None
-        return 'pretix_login_{}'.format(hashlib.sha1(str(client_ip).encode()).hexdigest())
-
     def clean(self):
         if all(k in self.cleaned_data for k, f in self.fields.items() if f.required):
-            if self.ratelimit_key:
-                from django_redis import get_redis_connection
-                rc = get_redis_connection("redis")
-                cnt = rc.get(self.ratelimit_key)
-                if cnt and int(cnt) > 10:
-                    raise forms.ValidationError(self.error_messages['rate_limit'], code='rate_limit')
             self.user_cache = self.backend.form_authenticate(self.request, self.cleaned_data)
             if self.user_cache is None:
-                if self.ratelimit_key:
-                    rc.incr(self.ratelimit_key)
-                    rc.expire(self.ratelimit_key, 300)
                 raise forms.ValidationError(
                     self.error_messages['invalid_login'],
                     code='invalid_login'

src/pretix/base/forms/questions.py

@@ -9,38 +9,32 @@ import pycountry
 import pytz
 import vat_moss.errors
 import vat_moss.id
+from babel import localedata
 from django import forms
 from django.contrib import messages
 from django.core.exceptions import ValidationError
-from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db.models import QuerySet
 from django.forms import Select
-from django.utils.formats import date_format
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
-from django.utils.timezone import get_current_timezone
-from django.utils.translation import gettext_lazy as _, pgettext_lazy
+from django.utils.translation import (
+    get_language, gettext_lazy as _, pgettext_lazy,
+)
 from django_countries import countries
 from django_countries.fields import Country, CountryField
 from phonenumber_field.formfields import PhoneNumberField
 from phonenumber_field.phonenumber import PhoneNumber
-from phonenumber_field.widgets import (
-    PhoneNumberPrefixWidget, PhonePrefixSelect,
-)
-from phonenumbers import NumberParseException, national_significant_number
+from phonenumber_field.widgets import PhoneNumberPrefixWidget
+from phonenumbers import NumberParseException
 from phonenumbers.data import _COUNTRY_CODE_TO_REGION_CODE
 
 from pretix.base.forms.widgets import (
     BusinessBooleanRadio, DatePickerWidget, SplitDateTimePickerWidget,
     TimePickerWidget, UploadedFileWidget,
 )
-from pretix.base.i18n import (
-    get_babel_locale, get_language_without_region, language,
-)
+from pretix.base.i18n import language
 from pretix.base.models import InvoiceAddress, Question, QuestionOption
-from pretix.base.models.tax import (
-    EU_COUNTRIES, cc_to_vat_prefix, is_eu_country,
-)
+from pretix.base.models.tax import EU_COUNTRIES, cc_to_vat_prefix
 from pretix.base.settings import (
     COUNTRIES_WITH_STATE_IN_ADDRESS, PERSON_NAME_SALUTATIONS,
     PERSON_NAME_SCHEMES, PERSON_NAME_TITLE_GROUPS,
@@ -205,18 +199,7 @@ class NamePartsFormField(forms.MultiValueField):
         return value
 
 
-class WrappedPhonePrefixSelect(PhonePrefixSelect):
-    def __init__(self, *args, **kwargs):
-        with language(get_babel_locale()):
-            super().__init__(*args, **kwargs)
-
-
 class WrappedPhoneNumberPrefixWidget(PhoneNumberPrefixWidget):
-
-    def __init__(self, attrs=None, initial=None):
-        widgets = (WrappedPhonePrefixSelect(initial), forms.TextInput())
-        super(PhoneNumberPrefixWidget, self).__init__(widgets, attrs)
-
     def render(self, name, value, attrs=None, renderer=None):
         output = super().render(name, value, attrs, renderer)
         return mark_safe(self.format_output(output))
@@ -224,44 +207,12 @@ class WrappedPhoneNumberPrefixWidget(PhoneNumberPrefixWidget):
     def format_output(self, rendered_widgets) -> str:
         return '<div class="nameparts-form-group">%s</div>' % ''.join(rendered_widgets)
 
-    def decompress(self, value):
-        """
-        If an incomplete phone number (e.g. without country prefix) is currently entered,
-        the default implementation just discards the value and shows nothing at all.
-        Let's rather show something invalid, so the user is prompted to fix it, instead of
-        silently deleting data.
-        """
-        if value:
-            if type(value) == PhoneNumber:
-                if value.country_code and value.national_number:
-                    return [
-                        "+%d" % value.country_code,
-                        national_significant_number(value),
-                    ]
-                return [
-                    None,
-                    str(value)
-                ]
-            elif "." in value:
-                return value.split(".")
-            else:
-                return [None, value]
-        return [None, ""]
-
-    def value_from_datadict(self, data, files, name):
-        # In contrast to defualt implementation, do not silently fail if a number without
-        # country prefix is entered
-        values = super(PhoneNumberPrefixWidget, self).value_from_datadict(data, files, name)
-        if values[1]:
-            return "%s.%s" % tuple(values)
-        return ""
-
 
 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
+    locale = get_language()
+    country = event.settings.invoice_address_from_country
     if not country:
         valid_countries = countries.countries
         if '-' in locale:
@@ -281,43 +232,6 @@ class QuestionCheckboxSelectMultiple(forms.CheckboxSelectMultiple):
     option_template_name = 'pretixbase/forms/widgets/checkbox_option_with_links.html'
 
 
-class MinDateValidator(MinValueValidator):
-    def __call__(self, value):
-        try:
-            return super().__call__(value)
-        except ValidationError as e:
-            e.params['limit_value'] = date_format(e.params['limit_value'], 'SHORT_DATE_FORMAT')
-            raise e
-
-
-class MinDateTimeValidator(MinValueValidator):
-    def __call__(self, value):
-        try:
-            return super().__call__(value)
-        except ValidationError as e:
-            e.params['limit_value'] = date_format(e.params['limit_value'].astimezone(get_current_timezone()), 'SHORT_DATETIME_FORMAT')
-            raise e
-
-
-class MaxDateValidator(MaxValueValidator):
-
-    def __call__(self, value):
-        try:
-            return super().__call__(value)
-        except ValidationError as e:
-            e.params['limit_value'] = date_format(e.params['limit_value'], 'SHORT_DATE_FORMAT')
-            raise e
-
-
-class MaxDateTimeValidator(MaxValueValidator):
-    def __call__(self, value):
-        try:
-            return super().__call__(value)
-        except ValidationError as e:
-            e.params['limit_value'] = date_format(e.params['limit_value'].astimezone(get_current_timezone()), 'SHORT_DATETIME_FORMAT')
-            raise e
-
-
 class BaseQuestionsForm(forms.Form):
     """
     This form class is responsible for asking order-related questions. This includes
@@ -476,10 +390,9 @@ class BaseQuestionsForm(forms.Form):
             elif q.type == Question.TYPE_NUMBER:
                 field = forms.DecimalField(
                     label=label, required=required,
-                    min_value=q.valid_number_min or Decimal('0.00'),
-                    max_value=q.valid_number_max,
                     help_text=q.help_text,
                     initial=initial.answer if initial else None,
+                    min_value=Decimal('0.00'),
                 )
             elif q.type == Question.TYPE_STRING:
                 field = forms.CharField(
@@ -538,21 +451,12 @@ class BaseQuestionsForm(forms.Form):
                     max_size=10 * 1024 * 1024,
                 )
             elif q.type == Question.TYPE_DATE:
-                attrs = {}
-                if q.valid_date_min:
-                    attrs['data-min'] = q.valid_date_min.isoformat()
-                if q.valid_date_max:
-                    attrs['data-max'] = q.valid_date_max.isoformat()
                 field = forms.DateField(
                     label=label, required=required,
                     help_text=help_text,
                     initial=dateutil.parser.parse(initial.answer).date() if initial and initial.answer else None,
-                    widget=DatePickerWidget(attrs),
+                    widget=DatePickerWidget(),
                 )
-                if q.valid_date_min:
-                    field.validators.append(MinDateValidator(q.valid_date_min))
-                if q.valid_date_max:
-                    field.validators.append(MaxDateValidator(q.valid_date_max))
             elif q.type == Question.TYPE_TIME:
                 field = forms.TimeField(
                     label=label, required=required,
@@ -565,18 +469,16 @@ class BaseQuestionsForm(forms.Form):
                     label=label, required=required,
                     help_text=help_text,
                     initial=dateutil.parser.parse(initial.answer).astimezone(tz) if initial and initial.answer else None,
-                    widget=SplitDateTimePickerWidget(
-                        time_format=get_format_without_seconds('TIME_INPUT_FORMATS'),
-                        min_date=q.valid_datetime_min,
-                        max_date=q.valid_datetime_max
-                    ),
+                    widget=SplitDateTimePickerWidget(time_format=get_format_without_seconds('TIME_INPUT_FORMATS')),
                 )
-                if q.valid_datetime_min:
-                    field.validators.append(MinDateTimeValidator(q.valid_datetime_min))
-                if q.valid_datetime_max:
-                    field.validators.append(MaxDateTimeValidator(q.valid_datetime_max))
             elif q.type == Question.TYPE_PHONENUMBER:
-                with language(get_babel_locale()):
+                babel_locale = 'en'
+                # Babel, and therefore django-phonenumberfield, do not support our custom locales such das de_Informal
+                if localedata.exists(get_language()):
+                    babel_locale = get_language()
+                elif localedata.exists(get_language()[:2]):
+                    babel_locale = get_language()[:2]
+                with language(babel_locale):
                     default_country = guess_country(event)
                     default_prefix = None
                     for prefix, values in _COUNTRY_CODE_TO_REGION_CODE.items():
@@ -746,7 +648,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 is_eu_country(cc) and fprefix + 'vat_id' in self.data:
+        if cc and cc not in EU_COUNTRIES and fprefix + 'vat_id' in self.data:
             self.data = self.data.copy()
             del self.data[fprefix + 'vat_id']
 
@@ -796,7 +698,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
         if not data.get('is_business'):
             data['company'] = ''
             data['vat_id'] = ''
-        if data.get('is_business') and not is_eu_country(data.get('country')):
+        if data.get('is_business') and not data.get('country') in EU_COUNTRIES:
             data['vat_id'] = ''
         if self.event.settings.invoice_address_required:
             if data.get('is_business') and not data.get('company'):
@@ -820,7 +722,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
             self.cleaned_data['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 is_eu_country(data.get('country')) and data.get('vat_id'):
+        elif self.validate_vat_id and data.get('is_business') and data.get('country') in EU_COUNTRIES and data.get('vat_id'):
             if data.get('vat_id')[:2] != cc_to_vat_prefix(str(data.get('country'))):
                 raise ValidationError(_('Your VAT ID does not match the selected country.'))
             try:

src/pretix/base/forms/user.py

@@ -1,5 +1,4 @@
 from django import forms
-from django.conf import settings
 from django.contrib.auth.hashers import check_password
 from django.contrib.auth.password_validation import (
     password_validators_help_texts, validate_password,
@@ -20,7 +19,6 @@ class UserSettingsForm(forms.ModelForm):
                         "address or password."),
         '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."),
     }
 
     old_pw = forms.CharField(max_length=255,
@@ -66,18 +64,6 @@ class UserSettingsForm(forms.ModelForm):
 
     def clean_old_pw(self):
         old_pw = self.cleaned_data.get('old_pw')
-
-        if old_pw and settings.HAS_REDIS:
-            from django_redis import get_redis_connection
-            rc = get_redis_connection("redis")
-            cnt = rc.incr('pretix_pwchange_%s' % self.user.pk)
-            rc.expire('pretix_pwchange_%s' % self.user.pk, 300)
-            if cnt > 10:
-                raise forms.ValidationError(
-                    self.error_messages['rate_limit'],
-                    code='rate_limit',
-                )
-
         if old_pw and not check_password(old_pw, self.user.password):
             raise forms.ValidationError(
                 self.error_messages['pw_current_wrong'],

src/pretix/base/forms/widgets.py

@@ -1,10 +1,9 @@
 import os
-from datetime import date
 
 from django import forms
 from django.utils.formats import get_format
 from django.utils.functional import lazy
-from django.utils.timezone import get_current_timezone, now
+from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 
 
@@ -93,7 +92,7 @@ class UploadedFileWidget(forms.ClearableFileInput):
 class SplitDateTimePickerWidget(forms.SplitDateTimeWidget):
     template_name = 'pretixbase/forms/widgets/splitdatetime.html'
 
-    def __init__(self, attrs=None, date_format=None, time_format=None, min_date=None, max_date=None):
+    def __init__(self, attrs=None, date_format=None, time_format=None):
         attrs = attrs or {}
         if 'placeholder' in attrs:
             del attrs['placeholder']
@@ -107,14 +106,6 @@ class SplitDateTimePickerWidget(forms.SplitDateTimeWidget):
         time_attrs['class'] += ' timepickerfield'
         date_attrs['autocomplete'] = 'date-picker-do-not-autofill'
         time_attrs['autocomplete'] = 'time-picker-do-not-autofill'
-        if min_date:
-            date_attrs['data-min'] = (
-                min_date if isinstance(min_date, date) else min_date.astimezone(get_current_timezone()).date()
-            ).isoformat()
-        if max_date:
-            date_attrs['data-max'] = (
-                max_date if isinstance(max_date, date) else max_date.astimezone(get_current_timezone()).date()
-            ).isoformat()
 
         def date_placeholder():
             df = date_format or get_format('DATE_INPUT_FORMATS')[0]

src/pretix/base/i18n.py

@@ -1,6 +1,5 @@
 from contextlib import contextmanager
 
-from babel import localedata
 from django.conf import settings
 from django.utils import translation
 from django.utils.formats import date_format, number_format
@@ -67,52 +66,10 @@ class LazyNumber:
         return number_format(self.value, decimal_pos=self.decimal_pos)
 
 
-ALLOWED_LANGUAGES = dict(settings.LANGUAGES)
-
-
-def get_babel_locale():
-    babel_locale = 'en'
-    # Babel, and therefore django-phonenumberfield, do not support our custom locales such das de_Informal
-    if localedata.exists(translation.get_language()):
-        babel_locale = translation.get_language()
-    elif localedata.exists(translation.get_language()[:2]):
-        babel_locale = translation.get_language()[:2]
-    return babel_locale
-
-
-def get_language_without_region(lng=None):
-    """
-    Returns the currently active language, but strips what pretix calls a ``region``. For example,
-    if the currently active language is ``en-us``, you will be returned ``en`` since pretix does not
-    ship with separate language files for ``en-us``. If the currently active language is ``pt-br``,
-    you will be returned ``pt-br`` since there are separate language files for ``pt-br``.
-
-    tl;dr: You will be always passed a language that is defined in settings.LANGUAGES.
-    """
-    lng = lng or translation.get_language() or settings.LANGUAGE_CODE
-    if lng not in ALLOWED_LANGUAGES:
-        lng = lng.split('-')[0]
-    if lng not in ALLOWED_LANGUAGES:
-        lng = settings.LANGUAGE_CODE
-    return lng
-
-
 @contextmanager
-def language(lng, region=None):
-    """
-    Temporarily change the active language to ``lng``. Will automatically be rolled back when the
-    context manager returns.
-
-    You can optionally pass a "region". For example, if you pass ``en`` as ``lng`` and ``US`` as
-    ``region``, the active language will be ``en-us``, which will mostly affect date/time
-    formatting. If you pass a ``lng`` that already contains a region, e.g. ``pt-br``, the ``region``
-    attribute will be ignored.
-    """
+def language(lng):
     _lng = translation.get_language()
-    lng = lng or settings.LANGUAGE_CODE
-    if '-' not in lng and region:
-        lng += '-' + region.lower()
-    translation.activate(lng)
+    translation.activate(lng or settings.LANGUAGE_CODE)
     try:
         yield
     finally:

src/pretix/base/invoice.py

@@ -144,7 +144,7 @@ class BaseReportlabInvoiceRenderer(BaseInvoiceRenderer):
 
     def _upper(self, val):
         # We uppercase labels, but not in every language
-        if get_language().startswith('el'):
+        if get_language() == 'el':
             return val
         return val.upper()
 

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

@@ -13,10 +13,6 @@ from ...signals import periodic_task
 class Command(BaseCommand):
     help = "Run periodic tasks"
 
-    def add_arguments(self, parser):
-        parser.add_argument('--tasks', action='store', type=str, help='Only execute the tasks with this name '
-                                                                      '(dotted path, comma separation)')
-
     def handle(self, *args, **options):
         verbosity = int(options['verbosity'])
 
@@ -24,13 +20,8 @@ class Command(BaseCommand):
             return
 
         for receiver in periodic_task._live_receivers(self):
-            name = f'{receiver.__module__}.{receiver.__name__}'
-            if options.get('tasks'):
-                if name not in options.get('tasks').split(','):
-                    continue
-
             if verbosity > 1:
-                self.stdout.write(f'Running {name}…')
+                self.stdout.write(f'Running {receiver.__module__}.{receiver.__name__}…')
             t0 = time.time()
             try:
                 r = receiver(signal=periodic_task, sender=self)
@@ -47,6 +38,6 @@ class Command(BaseCommand):
             else:
                 if options.get('verbosity') > 1:
                     if r is SKIPPED:
-                        self.stdout.write(self.style.SUCCESS(f'Skipped {name}'))
+                        self.stdout.write(self.style.SUCCESS(f'Skipped {receiver.__module__}.{receiver.__name__}'))
                     else:
-                        self.stdout.write(self.style.SUCCESS(f'Completed {name} in {round(time.time() - t0, 3)}s'))
+                        self.stdout.write(self.style.SUCCESS(f'Completed {receiver.__module__}.{receiver.__name__} in {round(time.time() - t0, 3)}s'))

src/pretix/base/middleware.py

@@ -3,8 +3,7 @@ from urllib.parse import urlsplit
 
 import pytz
 from django.conf import settings
-from django.http import Http404, HttpRequest, HttpResponse
-from django.middleware.common import CommonMiddleware
+from django.http import HttpRequest, HttpResponse
 from django.urls import get_script_prefix
 from django.utils import timezone, translation
 from django.utils.cache import patch_vary_headers
@@ -15,8 +14,7 @@ from django.utils.translation.trans_real import (
     parse_accept_lang_header,
 )
 
-from pretix.base.i18n import get_language_without_region
-from pretix.base.settings import global_settings_object
+from pretix.base.settings import GlobalSettingsObject
 from pretix.multidomain.urlreverse import (
     get_event_domain, get_organizer_domain,
 )
@@ -36,30 +34,19 @@ class LocaleMiddleware(MiddlewareMixin):
         # Normally, this middleware runs *before* the event is set. However, on event frontend pages it
         # might be run a second time by pretix.presale.EventMiddleware and in this case the event is already
         # set and can be taken into account for the decision.
-        if not request.path.startswith(get_script_prefix() + 'control'):
-            if hasattr(request, 'event'):
-                if language not in request.event.settings.locales:
-                    firstpart = language.split('-')[0]
-                    if firstpart in request.event.settings.locales:
-                        language = firstpart
-                    else:
-                        language = request.event.settings.locale
-                        for lang in request.event.settings.locales:
-                            if lang.startswith(firstpart + '-'):
-                                language = lang
-                                break
-                if '-' not in language and request.event.settings.region:
-                    language += '-' + request.event.settings.region
-            elif hasattr(request, 'organizer'):
-                if '-' not in language and request.organizer.settings.region:
-                    language += '-' + request.organizer.settings.region
-        else:
-            gs = global_settings_object(request)
-            if '-' not in language and gs.settings.region:
-                language += '-' + gs.settings.region
-
+        if hasattr(request, 'event') and not request.path.startswith(get_script_prefix() + 'control'):
+            if language not in request.event.settings.locales:
+                firstpart = language.split('-')[0]
+                if firstpart in request.event.settings.locales:
+                    language = firstpart
+                else:
+                    language = request.event.settings.locale
+                    for lang in request.event.settings.locales:
+                        if lang.startswith(firstpart + '-'):
+                            language = lang
+                            break
         translation.activate(language)
-        request.LANGUAGE_CODE = get_language_without_region()
+        request.LANGUAGE_CODE = translation.get_language()
 
         tzname = None
         if hasattr(request, 'event'):
@@ -204,7 +191,7 @@ class SecurityMiddleware(MiddlewareMixin):
         resp['P3P'] = 'CP=\"ALL DSP COR CUR ADM TAI OUR IND COM NAV INT\"'
 
         img_src = []
-        gs = global_settings_object(request)
+        gs = GlobalSettingsObject()
         if gs.settings.leaflet_tiles:
             img_src.append(gs.settings.leaflet_tiles[:gs.settings.leaflet_tiles.index("/", 10)].replace("{s}", "*"))
 
@@ -228,8 +215,6 @@ class SecurityMiddleware(MiddlewareMixin):
             h['report-uri'] = ["/csp_report/"]
         if 'Content-Security-Policy' in resp:
             _merge_csp(h, _parse_csp(resp['Content-Security-Policy']))
-        if settings.CSP_ADDITIONAL_HEADER:
-            _merge_csp(h, _parse_csp(settings.CSP_ADDITIONAL_HEADER))
 
         staticdomain = "'self'"
         dynamicdomain = "'self'"
@@ -267,15 +252,3 @@ class SecurityMiddleware(MiddlewareMixin):
             del resp['Content-Security-Policy']
 
         return resp
-
-
-class CustomCommonMiddleware(CommonMiddleware):
-
-    def get_full_path_with_slash(self, request):
-        """
-        Raise an error regardless of DEBUG mode when in POST, PUT, or PATCH.
-        """
-        new_path = super().get_full_path_with_slash(request)
-        if request.method in ('POST', 'PUT', 'PATCH'):
-            raise Http404('Please append a / at the end of the URL')
-        return new_path

src/pretix/base/migrations/0001_squashed_0028_auto_20160816_1242.py

@@ -482,7 +482,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='orderposition',
             name='secret',
-            field=models.CharField(db_index=True, default="invalid", max_length=64),
+            field=models.CharField(db_index=True, default=pretix.base.models.orders.generate_position_secret, max_length=64),
         ),
         migrations.AddField(
             model_name='order',

src/pretix/base/migrations/0010_orderposition_secret.py

@@ -17,6 +17,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='orderposition',
             name='secret',
-            field=models.CharField(default="invalid", max_length=64),
+            field=models.CharField(default=pretix.base.models.orders.generate_position_secret, max_length=64),
         ),
     ]

src/pretix/base/migrations/0025_auto_20160802_2202.py

@@ -38,7 +38,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='orderposition',
             name='secret',
-            field=models.CharField(db_index=True, default="invalid", max_length=64),
+            field=models.CharField(db_index=True, default=pretix.base.models.orders.generate_position_secret, max_length=64),
         ),
         migrations.AlterField(
             model_name='voucher',

src/pretix/base/migrations/0162b_auto_20201218_1810.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.0.11 on 2020-12-18 18:10
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0162_remove_seat_name'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='cachedfile',
-            name='session_key',
-            field=models.TextField(null=True),
-        ),
-        migrations.AddField(
-            model_name='cachedfile',
-            name='web_download',
-            field=models.BooleanField(default=True),
-        ),
-    ]

src/pretix/base/migrations/0164_subevent_last_modified.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.0.9 on 2020-10-15 16:12
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0163_device_security_profile'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='subevent',
-            name='last_modified',
-            field=models.DateTimeField(auto_now=True, db_index=True),
-        ),
-    ]

src/pretix/base/migrations/0165_auto_20201015_1924.py

@@ -1,29 +0,0 @@
-# Generated by Django 3.0.10 on 2020-10-15 19:24
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0164_subevent_last_modified'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='orderposition',
-            name='secret',
-            field=models.CharField(db_index=True, max_length=64),
-        ),
-        migrations.CreateModel(
-            name='RevokedTicketSecret',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
-                ('secret', models.TextField(db_index=True)),
-                ('created', models.DateTimeField(auto_now_add=True)),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='revoked_secrets', to='pretixbase.Event')),
-                ('position', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='revoked_secrets', to='pretixbase.OrderPosition')),
-            ],
-        ),
-    ]

src/pretix/base/migrations/0166_auto_20201015_2029.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.0.10 on 2020-10-15 20:29
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0165_auto_20201015_1924'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='orderposition',
-            name='secret',
-            field=models.CharField(db_index=True, max_length=255),
-        ),
-    ]

src/pretix/base/migrations/0167_checkinlist_exit_all_at.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.0.10 on 2020-10-20 06:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0166_auto_20201015_2029'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='checkinlist',
-            name='exit_all_at',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-    ]

src/pretix/base/migrations/0168_auto_20201023_1447.py

@@ -1,33 +0,0 @@
-# Generated by Django 3.0.9 on 2020-10-23 14:47
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0167_checkinlist_exit_all_at'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Gate',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=190)),
-                ('identifier', models.CharField(max_length=190)),
-                ('organizer', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='gates', to='pretixbase.Organizer')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='checkin',
-            name='gate',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='checkins', to='pretixbase.Gate'),
-        ),
-        migrations.AddField(
-            model_name='device',
-            name='gate',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='devices', to='pretixbase.Gate'),
-        ),
-    ]

src/pretix/base/migrations/0169_checkinlist_gates.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.0.10 on 2020-10-24 15:55
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0168_auto_20201023_1447'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='checkinlist',
-            name='gates',
-            field=models.ManyToManyField(to='pretixbase.Gate'),
-        ),
-    ]

src/pretix/base/migrations/0170_remove_hidden_urls.py

@@ -1,20 +0,0 @@
-# Generated by Django 3.0.9 on 2020-11-23 15:51
-
-from django.db import migrations
-
-
-def remove_old_settings(app, schema_editor):
-    EventSettingsStore = app.get_model('pretixbase', 'Event_SettingsStore')
-
-    EventSettingsStore.objects.filter(key__startswith='payment_', key__endswith='__hidden_url').delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0169_checkinlist_gates'),
-    ]
-
-    operations = [
-        migrations.RunPython(remove_old_settings, migrations.RunPython.noop)
-    ]

src/pretix/base/migrations/0171_auto_20201126_1635.py

@@ -1,49 +0,0 @@
-# Generated by Django 3.0.11 on 2020-11-26 16:35
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0170_remove_hidden_urls'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='question',
-            name='valid_date_max',
-            field=models.DateField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='question',
-            name='valid_date_min',
-            field=models.DateField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='question',
-            name='valid_datetime_max',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='question',
-            name='valid_datetime_min',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='question',
-            name='valid_number_max',
-            field=models.DecimalField(decimal_places=6, max_digits=16, null=True),
-        ),
-        migrations.AddField(
-            model_name='question',
-            name='valid_number_min',
-            field=models.DecimalField(decimal_places=6, max_digits=16, null=True),
-        ),
-        migrations.AlterField(
-            model_name='seat',
-            name='product',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='seats', to='pretixbase.Item'),
-        ),
-    ]

src/pretix/base/migrations/0172_event_sales_channels.py

@@ -1,20 +0,0 @@
-# Generated by Django 3.0.9 on 2020-12-02 12:37
-
-from django.db import migrations
-
-import pretix.base.models.fields
-from pretix.base.channels import get_all_sales_channels
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('pretixbase', '0171_auto_20201126_1635'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='event',
-            name='sales_channels',
-            field=pretix.base.models.fields.MultiStringField(default=list(get_all_sales_channels().keys())),
-        ),
-    ]

src/pretix/base/migrations/0173_auto_20201211_1648.py

@@ -1,51 +0,0 @@
-# Generated by Django 3.0.11 on 2020-12-11 16:48
-import json
-
-import phonenumber_field.modelfields
-from django.db import migrations
-
-import pretix.base.models.fields
-
-
-def migrate_settings(apps, schema_editor):
-    Order = apps.get_model('pretixbase', 'Order')
-    Event = apps.get_model('pretixbase', 'Event')
-    Event_SettingsStore = apps.get_model('pretixbase', 'Event_SettingsStore')
-    Event_SettingsStore.objects.filter(key='telephone_field_required').update(key='order_phone_required')
-    Event_SettingsStore.objects.filter(key='telephone_field_help_text').update(key='checkout_phone_helptext')
-    for e in Event.objects.filter(plugins__icontains="pretix_telephone"):
-        plugins = e.plugins.split(",")
-        plugins.remove("pretix_telephone")
-        e.plugins = ",".join(plugins)
-        e.save()
-        Event_SettingsStore.objects.create(object=e, key='order_phone_asked', value='True')
-    for o in Order.objects.filter(meta_info__icontains='"telephone"'):
-        mi = json.loads(o.meta_info)
-        if 'telephone' in mi.get('contact_form_data', {}):
-            mi['phone'] = mi['contact_form_data'].pop('telephone')
-            o.phone = mi['phone']
-            o.meta_info = json.dumps(mi)
-            o.save(update_fields=['meta_info', 'phone'])
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0172_event_sales_channels'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='order',
-            name='phone',
-            field=phonenumber_field.modelfields.PhoneNumberField(max_length=128, null=True, region=None),
-        ),
-        migrations.AlterField(
-            model_name='event',
-            name='sales_channels',
-            field=pretix.base.models.fields.MultiStringField(default=['web']),
-        ),
-        migrations.RunPython(
-            migrate_settings, migrations.RunPython.noop,
-        )
-    ]