Remove eu_reverse_charge rule

.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
@@ -46,6 +37,10 @@ if [ "$1" == "taskworker" ]; then
     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

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/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,12 +97,7 @@ 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``.
 

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/resources/events.rst

@@ -47,8 +47,6 @@ item_meta_properties                  object                     Item-specific m
 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.
 ===================================== ========================== =======================================================
 
 
@@ -93,11 +91,6 @@ sales_channels                        list                       A list of sales
 
    The attribute ``valid_keys`` has been added.
 
-.. versionchanged:: 3.14
-
-    The attribute ``sales_channels`` has been added.
-
-
 Endpoints
 ---------
 
@@ -154,16 +147,11 @@ 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 +170,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,21 +219,16 @@ 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"
-        ]
+        }
       }
 
    :param organizer: The ``slug`` field of the organizer to fetch
@@ -297,11 +279,6 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
-        ],
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 
@@ -337,11 +314,6 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
-        ],
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 
@@ -397,11 +369,6 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
-        ],
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 
@@ -437,11 +404,6 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
-        ],
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 
@@ -511,11 +473,6 @@ Endpoints
           "pretix.plugins.stripe",
           "pretix.plugins.paypal",
           "pretix.plugins.pretixdroid"
-        ],
-        "sales_channels": [
-          "web",
-          "pretixpos",
-          "resellers"
         ]
       }
 

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"
       }
 

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/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/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

@@ -58,7 +58,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
 

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.13.0.dev0"

src/pretix/api/auth/devicesecurity.py

@@ -102,17 +102,12 @@ 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/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
 
 
@@ -124,8 +124,7 @@ class EventSerializer(I18nAwareModelSerializer):
         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')
+                  'plugins', 'seat_category_mapping', 'timezone', 'item_meta_properties', 'valid_keys')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -555,7 +554,7 @@ class SubEventSerializer(I18nAwareModelSerializer):
 class TaxRuleSerializer(CountryFieldMixin, I18nAwareModelSerializer):
     class Meta:
         model = TaxRule
-        fields = ('id', 'name', 'rate', 'price_includes_tax', 'eu_reverse_charge', 'home_country')
+        fields = ('id', 'name', 'rate', 'price_includes_tax')
 
 
 class EventSettingsSerializer(serializers.Serializer):
@@ -574,7 +573,6 @@ class EventSettingsSerializer(serializers.Serializer):
         'presale_start_show_date',
         'locales',
         'locale',
-        'region',
         'last_order_modification_date',
         'show_quota_left',
         'waiting_list_enabled',
@@ -598,12 +596,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,7 +606,6 @@ 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',
@@ -668,17 +661,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 +693,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

@@ -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')

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)
@@ -45,7 +44,6 @@ 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 +60,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 +69,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)),

src/pretix/api/views/device.py

@@ -131,7 +131,7 @@ class EventSelectionView(APIView):
 
     @property
     def base_event_qs(self):
-        qs = self.request.auth.get_events_with_any_permission().annotate(
+        qs = self.request.auth.organizer.events.annotate(
             first_date=Coalesce('date_admission', 'date_from'),
             last_date=Coalesce('date_to', 'date_from'),
         ).filter(
@@ -154,7 +154,6 @@ class EventSelectionView(APIView):
         ).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:

src/pretix/api/views/event.py

@@ -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
@@ -391,7 +385,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

@@ -33,7 +33,7 @@ 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_secret,
 )
 from pretix.base.models.orders import RevokedTicketSecret
 from pretix.base.payment import PaymentException
@@ -65,7 +65,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 +84,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:
@@ -558,15 +544,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 +563,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 +655,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 +867,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 +932,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 +939,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 +954,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

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)

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'),
         ]
@@ -485,7 +437,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'),
                 ]

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/middleware.py

@@ -3,7 +3,7 @@ from urllib.parse import urlsplit
 
 import pytz
 from django.conf import settings
-from django.http import Http404, HttpRequest, HttpResponse
+from django.http import HttpRequest, HttpResponse, Http404
 from django.middleware.common import CommonMiddleware
 from django.urls import get_script_prefix
 from django.utils import timezone, translation
@@ -15,8 +15,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 +35,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 +192,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 +216,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'"

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/0170_auto_20201030_2109.py

@@ -0,0 +1,49 @@
+# Generated by Django 3.0.10 on 2020-10-30 21:09
+import json
+
+from django.db import migrations
+
+
+def migrate_tax_rules(apps, schema_editor):
+    TaxRule = apps.get_model('pretixbase', 'TaxRule')
+    for tr in TaxRule.objects.filter(eu_reverse_charge=True):
+        if tr.custom_rules and tr.custom_rules != '[]':
+            # Custom rules take precedence
+            continue
+        r = [{
+            'country': str(tr.home_country),
+            'address_type': '',
+            'action': 'vat'
+        }, {
+            'country': 'EU',
+            'address_type': 'business_vat_id',
+            'action': 'reverse'
+        }, {
+            'country': 'EU',
+            'address_type': '',
+            'action': 'vat'
+        }, {
+            'country': 'ZZ',
+            'address_type': '',
+            'action': 'no'
+        }]
+        tr.custom_rules = json.dumps(r)
+        tr.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('pretixbase', '0169_checkinlist_gates'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_tax_rules, migrations.RunPython.noop),
+        migrations.RemoveField(
+            model_name='taxrule',
+            name='eu_reverse_charge',
+        ),
+        migrations.RemoveField(
+            model_name='taxrule',
+            name='home_country',
+        ),
+    ]

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,
-        )
-    ]

src/pretix/base/migrations/0174_merge_20201222_1031.py

@@ -1,14 +0,0 @@
-# Generated by Django 3.0.11 on 2020-12-22 10:31
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0173_auto_20201211_1648'),
-        ('pretixbase', '0162b_auto_20201218_1810'),
-    ]
-
-    operations = [
-    ]

src/pretix/base/models/base.py

@@ -28,8 +28,6 @@ class CachedFile(models.Model):
     filename = models.CharField(max_length=255)
     type = models.CharField(max_length=255)
     file = models.FileField(null=True, blank=True, upload_to=cachedfile_name, max_length=255)
-    web_download = models.BooleanField(default=True)  # allow web download, True for backwards compatibility in plugins
-    session_key = models.TextField(null=True, blank=True)  # only allow download in this session
 
 
 @receiver(post_delete, sender=CachedFile)
@@ -51,8 +49,9 @@ class LoggingMixin:
         :param user: The user performing the action (optional)
         """
         from pretix.api.models import OAuthAccessToken, OAuthApplication
-        from pretix.api.webhooks import notify_webhooks
+        from pretix.api.webhooks import get_all_webhook_events, notify_webhooks
 
+        from ..notifications import get_all_notification_types
         from ..services.notifications import notify
         from .devices import Device
         from .event import Event
@@ -94,11 +93,21 @@ class LoggingMixin:
         if save:
             logentry.save()
 
-            if logentry.notification_type:
-                notify.apply_async(args=(logentry.pk,))
-            if logentry.webhook_type:
-                notify_webhooks.apply_async(args=(logentry.pk,))
+            no_types = get_all_notification_types()
+            wh_types = get_all_webhook_events()
 
+            no_type = None
+            wh_type = None
+            typepath = logentry.action_type
+            while (not no_type or not wh_types) and '.' in typepath:
+                wh_type = wh_type or wh_types.get(typepath + ('.*' if typepath != logentry.action_type else ''))
+                no_type = no_type or no_types.get(typepath + ('.*' if typepath != logentry.action_type else ''))
+                typepath = typepath.rsplit('.', 1)[0]
+
+            if no_type:
+                notify.apply_async(args=(logentry.pk,))
+            if wh_type:
+                notify_webhooks.apply_async(args=(logentry.pk,))
         return logentry
 
 

src/pretix/base/models/checkin.py

@@ -20,7 +20,7 @@ class CheckinList(LoggedModel):
     include_pending = models.BooleanField(verbose_name=pgettext_lazy('checkin', 'Include pending orders'),
                                           default=False,
                                           help_text=_('With this option, people will be able to check in even if the '
-                                                      'order has not been paid.'))
+                                                      'order have not been paid.'))
     gates = models.ManyToManyField(
         'Gate', verbose_name=_("Gates"), blank=True,
         help_text=_("Does not have any effect for the validation of tickets, only for the automatic configuration of "

src/pretix/base/models/devices.py

@@ -222,15 +222,3 @@ class Device(LoggedModel):
             return self.organizer.events.all()
         else:
             return self.limit_events.all()
-
-    def get_events_with_permission(self, permission, request=None):
-        """
-        Returns a queryset of events the device has a specific permissions to.
-
-        :param request: Ignored, for compatibility with User model
-        :return: Iterable of Events
-        """
-        if permission in self.permission_set():
-            return self.get_events_with_any_permission()
-        else:
-            return self.organizer.events.none()

src/pretix/base/models/event.py

@@ -23,7 +23,6 @@ from django_scopes import ScopedManager, scopes_disabled
 from i18nfield.fields import I18nCharField, I18nTextField
 
 from pretix.base.models.base import LoggedModel
-from pretix.base.models.fields import MultiStringField
 from pretix.base.reldate import RelativeDateWrapper
 from pretix.base.validators import EventSlugBanlistValidator
 from pretix.helpers.database import GroupConcat
@@ -119,49 +118,25 @@ class EventMixin:
     def timezone(self):
         return pytz.timezone(self.settings.timezone)
 
-    @property
-    def effective_presale_end(self):
-        """
-        Returns the effective presale end date, taking for subevents into consideration if the presale end
-        date might have been further limited by the event-level presale end date
-        """
-        if isinstance(self, SubEvent):
-            presale_ends = [self.presale_end, self.event.presale_end]
-            return min(filter(lambda x: x is not None, presale_ends)) if any(presale_ends) else None
-        else:
-            return self.presale_end
-
     @property
     def presale_has_ended(self):
         """
         Is true, when ``presale_end`` is set and in the past.
         """
-        if self.effective_presale_end:
-            return now() > self.effective_presale_end
+        if self.presale_end:
+            return now() > self.presale_end
         elif self.date_to:
             return now() > self.date_to
         else:
             return now().astimezone(self.timezone).date() > self.date_from.astimezone(self.timezone).date()
 
-    @property
-    def effective_presale_start(self):
-        """
-        Returns the effective presale start date, taking for subevents into consideration if the presale start
-        date might have been further limited by the event-level presale start date
-        """
-        if isinstance(self, SubEvent):
-            presale_starts = [self.presale_start, self.event.presale_start]
-            return max(filter(lambda x: x is not None, presale_starts)) if any(presale_starts) else None
-        else:
-            return self.presale_start
-
     @property
     def presale_is_running(self):
         """
         Is true, when ``presale_end`` is not set or in the future and ``presale_start`` is not
         set or in the past.
         """
-        if self.effective_presale_start and now() < self.effective_presale_start:
+        if self.presale_start and now() < self.presale_start:
             return False
         return not self.presale_has_ended
 
@@ -269,34 +244,6 @@ class EventMixin:
             return Quota.AVAILABILITY_RESERVED
         return Quota.AVAILABILITY_GONE
 
-    def free_seats(self, ignore_voucher=None, sales_channel='web', include_blocked=False):
-        qs_annotated = self._seats(ignore_voucher=ignore_voucher)
-
-        qs = qs_annotated.filter(has_order=False, has_cart=False, has_voucher=False)
-        if self.settings.seating_minimal_distance > 0:
-            qs = qs.filter(has_closeby_taken=False)
-
-        if not (sales_channel in self.settings.seating_allow_blocked_seats_for_channel or include_blocked):
-            qs = qs.filter(blocked=False)
-        return qs
-
-    def total_seats(self, ignore_voucher=None):
-        return self._seats(ignore_voucher=ignore_voucher)
-
-    def taken_seats(self, ignore_voucher=None):
-        return self._seats(ignore_voucher=ignore_voucher).filter(has_order=True)
-
-    def blocked_seats(self, ignore_voucher=None):
-        qs = self._seats(ignore_voucher=ignore_voucher)
-        q = (
-            Q(has_cart=True)
-            | Q(has_voucher=True)
-            | Q(blocked=True)
-        )
-        if self.settings.seating_minimal_distance > 0:
-            q |= Q(has_closeby_taken=True, has_order=False)
-        return qs.filter(q)
-
 
 @settings_hierarkey.add(parent_field='organizer', cache_namespace='event')
 class Event(EventMixin, LoggedModel):
@@ -332,8 +279,6 @@ class Event(EventMixin, LoggedModel):
     :type plugins: str
     :param has_subevents: Enable event series functionality
     :type has_subevents: bool
-    :param sales_channels: A list of sales channel identifiers, that this event is available for sale on
-    :type sales_channels: list
     """
 
     settings_namespace = 'event'
@@ -412,11 +357,7 @@ class Event(EventMixin, LoggedModel):
     )
     seating_plan = models.ForeignKey('SeatingPlan', on_delete=models.PROTECT, null=True, blank=True,
                                      related_name='events')
-    sales_channels = MultiStringField(
-        verbose_name=_('Restrict to specific sales channels'),
-        help_text=_('Only sell tickets for this event on the following sales channels.'),
-        default=['web'],
-    )
+
     objects = ScopedManager(organizer='organizer')
 
     class Meta:
@@ -453,7 +394,7 @@ class Event(EventMixin, LoggedModel):
         if img:
             return urljoin(build_absolute_uri(self, 'presale:event.index'), img)
 
-    def _seats(self, ignore_voucher=None):
+    def free_seats(self, ignore_voucher=None, sales_channel='web', include_blocked=False):
         from .seating import Seat
 
         qs_annotated = Seat.annotated(self.seats, self.pk, None,
@@ -461,7 +402,13 @@ class Event(EventMixin, LoggedModel):
                                       minimal_distance=self.settings.seating_minimal_distance,
                                       distance_only_within_row=self.settings.seating_distance_within_row)
 
-        return qs_annotated
+        qs = qs_annotated.filter(has_order=False, has_cart=False, has_voucher=False)
+        if self.settings.seating_minimal_distance > 0:
+            qs = qs.filter(has_closeby_taken=False)
+
+        if not (sales_channel in self.settings.seating_allow_blocked_seats_for_channel or include_blocked):
+            qs = qs.filter(blocked=False)
+        return qs
 
     @property
     def presale_has_ended(self):
@@ -528,7 +475,7 @@ class Event(EventMixin, LoggedModel):
 
         return locking.LockManager(self)
 
-    def get_mail_backend(self, timeout=None, force_custom=False):
+    def get_mail_backend(self, force_custom=False):
         """
         Returns an email server connection, either by using the system-wide connection
         or by returning a custom one based on the event's settings.
@@ -542,7 +489,7 @@ class Event(EventMixin, LoggedModel):
                                      password=self.settings.smtp_password,
                                      use_tls=self.settings.smtp_use_tls,
                                      use_ssl=self.settings.smtp_use_ssl,
-                                     fail_silently=False, timeout=timeout)
+                                     fail_silently=False)
         else:
             return get_connection(fail_silently=False)
 
@@ -560,14 +507,11 @@ class Event(EventMixin, LoggedModel):
     def copy_data_from(self, other):
         from ..signals import event_copy_data
         from . import (
-            Item, ItemAddOn, ItemBundle, ItemCategory, ItemMetaValue, Question,
-            Quota,
+            Item, ItemAddOn, ItemCategory, ItemMetaValue, Question, Quota,
         )
 
         self.plugins = other.plugins
         self.is_public = other.is_public
-        if other.date_admission:
-            self.date_admission = self.date_from + (other.date_admission - other.date_from)
         self.testmode = other.testmode
         self.save()
         self.log_action('pretix.object.cloned', data={'source': other.slug, 'source_id': other.pk})
@@ -629,14 +573,6 @@ class Event(EventMixin, LoggedModel):
             ia.addon_category = category_map[ia.addon_category.pk]
             ia.save()
 
-        for ia in ItemBundle.objects.filter(base_item__event=other).prefetch_related('base_item', 'bundled_item', 'bundled_variation'):
-            ia.pk = None
-            ia.base_item = item_map[ia.base_item.pk]
-            ia.bundled_item = item_map[ia.bundled_item.pk]
-            if ia.bundled_variation:
-                ia.bundled_variation = variation_map[ia.bundled_variation.pk]
-            ia.save()
-
         for q in Quota.objects.filter(event=other, subevent__isnull=True).prefetch_related('items', 'variations'):
             items = list(q.items.all())
             vars = list(q.variations.all())
@@ -1153,13 +1089,19 @@ class SubEvent(EventMixin, LoggedModel):
             date_format(self.date_from.astimezone(self.timezone), "TIME_FORMAT") if self.settings.show_times else ""
         ).strip()
 
-    def _seats(self, ignore_voucher=None):
+    def free_seats(self, ignore_voucher=None, sales_channel='web', include_blocked=False):
         from .seating import Seat
         qs_annotated = Seat.annotated(self.seats, self.event_id, self,
                                       ignore_voucher_id=ignore_voucher.pk if ignore_voucher else None,
                                       minimal_distance=self.settings.seating_minimal_distance,
                                       distance_only_within_row=self.settings.seating_distance_within_row)
-        return qs_annotated
+        qs = qs_annotated.filter(has_order=False, has_cart=False, has_voucher=False)
+        if self.settings.seating_minimal_distance > 0:
+            qs = qs.filter(has_closeby_taken=False)
+
+        if not (sales_channel in self.settings.seating_allow_blocked_seats_for_channel or include_blocked):
+            qs = qs.filter(blocked=False)
+        return qs
 
     @cached_property
     def settings(self):

src/pretix/base/models/items.py

@@ -314,7 +314,7 @@ class Item(LoggedModel):
     )
     allow_waitinglist = models.BooleanField(
         verbose_name=_("Show a waiting list for this ticket"),
-        help_text=_("This will only work if waiting lists are enabled for this event."),
+        help_text=_("This will only work of waiting lists are enabled for this event."),
         default=True
     )
     show_quota_left = models.NullBooleanField(
@@ -1084,18 +1084,6 @@ class Question(LoggedModel):
         'Question', null=True, blank=True, on_delete=models.SET_NULL, related_name='dependent_questions'
     )
     dependency_values = MultiStringField(default=[])
-    valid_number_min = models.DecimalField(decimal_places=6, max_digits=16, null=True, blank=True,
-                                           verbose_name=_('Minimum value'), help_text=_('Currently not supported in our apps'))
-    valid_number_max = models.DecimalField(decimal_places=6, max_digits=16, null=True, blank=True,
-                                           verbose_name=_('Maximum value'), help_text=_('Currently not supported in our apps'))
-    valid_date_min = models.DateField(null=True, blank=True,
-                                      verbose_name=_('Minimum value'), help_text=_('Currently not supported in our apps'))
-    valid_date_max = models.DateField(null=True, blank=True,
-                                      verbose_name=_('Maximum value'), help_text=_('Currently not supported in our apps'))
-    valid_datetime_min = models.DateTimeField(null=True, blank=True,
-                                              verbose_name=_('Minimum value'), help_text=_('Currently not supported in our apps'))
-    valid_datetime_max = models.DateTimeField(null=True, blank=True,
-                                              verbose_name=_('Maximum value'), help_text=_('Currently not supported in our apps'))
 
     objects = ScopedManager(organizer='event__organizer')
 
@@ -1185,24 +1173,14 @@ class Question(LoggedModel):
             answer = formats.sanitize_separators(answer)
             answer = str(answer).strip()
             try:
-                v = Decimal(answer)
-                if self.valid_number_min is not None and v < self.valid_number_min:
-                    raise ValidationError(_('The number is to low.'))
-                if self.valid_number_max is not None and v > self.valid_number_max:
-                    raise ValidationError(_('The number is to high.'))
-                return v
+                return Decimal(answer)
             except DecimalException:
                 raise ValidationError(_('Invalid number input.'))
         elif self.type == Question.TYPE_DATE:
             if isinstance(answer, date):
                 return answer
             try:
-                dt = dateutil.parser.parse(answer).date()
-                if self.valid_date_min is not None and dt < self.valid_date_min:
-                    raise ValidationError(_('Please choose a later date.'))
-                if self.valid_date_max is not None and dt > self.valid_date_max:
-                    raise ValidationError(_('Please choose an earlier date.'))
-                return dt
+                return dateutil.parser.parse(answer).date()
             except:
                 raise ValidationError(_('Invalid date input.'))
         elif self.type == Question.TYPE_TIME:
@@ -1219,14 +1197,9 @@ class Question(LoggedModel):
                 dt = dateutil.parser.parse(answer)
                 if is_naive(dt):
                     dt = make_aware(dt, pytz.timezone(self.event.settings.timezone))
+                return dt
             except:
                 raise ValidationError(_('Invalid datetime input.'))
-            else:
-                if self.valid_datetime_min is not None and dt < self.valid_datetime_min:
-                    raise ValidationError(_('Please choose a later date.'))
-                if self.valid_datetime_max is not None and dt > self.valid_datetime_max:
-                    raise ValidationError(_('Please choose an earlier date.'))
-                return dt
         elif self.type == Question.TYPE_COUNTRYCODE and answer:
             c = Country(answer.upper())
             if c.name:

src/pretix/base/models/log.py

@@ -63,42 +63,14 @@ class LogEntry(models.Model):
                 return response
         return self.action_type
 
-    @property
-    def webhook_type(self):
-        from pretix.api.webhooks import get_all_webhook_events
-
-        wh_types = get_all_webhook_events()
-        wh_type = None
-        typepath = self.action_type
-        while not wh_type and '.' in typepath:
-            wh_type = wh_type or wh_types.get(typepath + ('.*' if typepath != self.action_type else ''))
-            typepath = typepath.rsplit('.', 1)[0]
-        return wh_type
-
-    @property
-    def notification_type(self):
-        from pretix.base.notifications import get_all_notification_types
-
-        no_type = None
-        no_types = get_all_notification_types()
-        typepath = self.action_type
-        while not no_type and '.' in typepath:
-            no_type = no_type or no_types.get(typepath + ('.*' if typepath != self.action_type else ''))
-            typepath = typepath.rsplit('.', 1)[0]
-        return no_type
-
     @cached_property
     def organizer(self):
-        from .organizer import Organizer
-
         if self.event:
             return self.event.organizer
         elif hasattr(self.content_object, 'event'):
             return self.content_object.event.organizer
         elif hasattr(self.content_object, 'organizer'):
             return self.content_object.organizer
-        elif isinstance(self.content_object, Organizer):
-            return self.content_object
         return None
 
     @cached_property
@@ -216,16 +188,3 @@ class LogEntry(models.Model):
 
     def delete(self, using=None, keep_parents=False):
         raise TypeError("Logs cannot be deleted.")
-
-    @classmethod
-    def bulk_postprocess(cls, objects):
-        from pretix.api.webhooks import notify_webhooks
-
-        from ..services.notifications import notify
-
-        to_notify = [o.id for o in objects if o.notification_type]
-        if to_notify:
-            notify.apply_async(args=(to_notify,))
-        to_wh = [o.id for o in objects if o.webhook_type]
-        if to_wh:
-            notify_webhooks.apply_async(args=(to_wh,))

src/pretix/base/models/orders.py

@@ -31,7 +31,6 @@ from django_countries.fields import Country
 from django_scopes import ScopedManager, scopes_disabled
 from i18nfield.strings import LazyI18nString
 from jsonfallback.fields import FallbackJSONField
-from phonenumber_field.modelfields import PhoneNumberField
 from phonenumber_field.phonenumber import PhoneNumber
 from phonenumbers import NumberParseException
 
@@ -87,8 +86,6 @@ class Order(LockModel, LoggedModel):
     :type event: Event
     :param email: The email of the person who ordered this
     :type email: str
-    :param phone: The phone number of the person who ordered this
-    :type phone: str
     :param testmode: Whether this is a test mode order
     :type testmode: bool
     :param locale: The locale of this order
@@ -147,10 +144,6 @@ class Order(LockModel, LoggedModel):
         null=True, blank=True,
         verbose_name=_('E-mail')
     )
-    phone = PhoneNumberField(
-        null=True, blank=True,
-        verbose_name=_('Phone number'),
-    )
     locale = models.CharField(
         null=True, blank=True, max_length=32,
         verbose_name=_('Locale')
@@ -333,9 +326,6 @@ class Order(LockModel, LoggedModel):
                 payment_sum=payment_sum_sq,
                 refund_sum=refund_sum_sq,
             )
-            qs = qs.annotate(
-                computed_payment_refund_sum=Coalesce(payment_sum_sq, 0) - Coalesce(refund_sum_sq, 0),
-            )
 
         qs = qs.annotate(
             pending_sum_t=F('total') - Coalesce(payment_sum_sq, 0) + Coalesce(refund_sum_sq, 0),
@@ -649,7 +639,7 @@ class Order(LockModel, LoggedModel):
                 return
 
             if iteration > 20:
-                # Safeguard: If we don't find an unused and non-banlisted code within 20 iterations, we increase
+                # Safeguard: If we don't find an unused and non-blacklisted code within 20 iterations, we increase
                 # the length.
                 length += 1
                 iteration = 0
@@ -867,7 +857,7 @@ class Order(LockModel, LoggedModel):
         for k, v in self.event.meta_data.items():
             context['meta_' + k] = v
 
-        with language(self.locale, self.event.settings.region):
+        with language(self.locale):
             recipient = self.email
             if position and position.attendee_email:
                 recipient = position.attendee_email
@@ -900,7 +890,7 @@ class Order(LockModel, LoggedModel):
                 )
 
     def resend_link(self, user=None, auth=None):
-        with language(self.locale, self.event.settings.region):
+        with language(self.locale):
             email_template = self.event.settings.mail_text_resend_link
             email_context = get_email_context(event=self.event, order=self)
             email_subject = _('Your order: %(code)s') % {'code': self.code}
@@ -912,7 +902,7 @@ class Order(LockModel, LoggedModel):
 
     @property
     def positions_with_tickets(self):
-        for op in self.positions.select_related('item'):
+        for op in self.positions.all():
             if not op.generate_ticket:
                 continue
             yield op
@@ -1165,7 +1155,7 @@ class AbstractPosition(models.Model):
         (2) questions: a list of Question objects, extended by an 'answer' property
         """
         self.answ = {}
-        for a in getattr(self, 'answerlist', self.answers.all()):  # use prefetch_related cache from get_cart
+        for a in self.answers.all():
             self.answ[a.question_id] = a
 
         # We need to clone our question objects, otherwise we will override the cached
@@ -1524,7 +1514,7 @@ class OrderPayment(models.Model):
     def _send_paid_mail_attendee(self, position, user):
         from pretix.base.services.mail import SendMailException
 
-        with language(self.order.locale, self.order.event.settings.region):
+        with language(self.order.locale):
             email_template = self.order.event.settings.mail_text_order_paid_attendee
             email_context = get_email_context(event=self.order.event, order=self.order, position=position)
             email_subject = _('Event registration confirmed: %(code)s') % {'code': self.order.code}
@@ -1542,7 +1532,7 @@ class OrderPayment(models.Model):
     def _send_paid_mail(self, invoice, user, mail_text):
         from pretix.base.services.mail import SendMailException
 
-        with language(self.order.locale, self.order.event.settings.region):
+        with language(self.order.locale):
             email_template = self.order.event.settings.mail_text_order_paid
             email_context = get_email_context(event=self.order.event, order=self.order, payment_info=mail_text)
             email_subject = _('Payment received for your order: %(code)s') % {'code': self.order.code}
@@ -1610,10 +1600,6 @@ class OrderPayment(models.Model):
             'local_id': r.local_id,
             'provider': r.provider,
         })
-
-        if self.order.pending_sum + r.amount == Decimal('0.00'):
-            self.refund.done()
-
         return r
 
 
@@ -1884,7 +1870,7 @@ class OrderFee(models.Model):
             self.tax_rule = self.order.event.settings.tax_rate_default
 
         if self.tax_rule:
-            tax = self.tax_rule.tax(self.value, base_price_is='gross', invoice_address=ia, force_fixed_gross_price=True)
+            tax = self.tax_rule.tax(self.value, base_price_is='gross', invoice_address=ia)
             self.tax_rate = tax.rate
             self.tax_value = tax.tax
         else:
@@ -2036,11 +2022,9 @@ class OrderPosition(AbstractPosition):
         except InvoiceAddress.DoesNotExist:
             ia = None
         if self.tax_rule:
-            tax = self.tax_rule.tax(self.price, invoice_address=ia, base_price_is='gross', force_fixed_gross_price=True)
+            tax = self.tax_rule.tax(self.price, invoice_address=ia, base_price_is='gross')
             self.tax_rate = tax.rate
             self.tax_value = tax.tax
-            if tax.gross != self.price:
-                raise ValueError('Invalid tax calculation')
         else:
             self.tax_value = Decimal('0.00')
             self.tax_rate = Decimal('0.00')
@@ -2050,7 +2034,6 @@ class OrderPosition(AbstractPosition):
 
         if self.tax_rate is None:
             self._calculate_tax()
-
         self.order.touch()
         if not self.pk:
             while not self.secret or OrderPosition.all.filter(
@@ -2114,7 +2097,7 @@ class OrderPosition(AbstractPosition):
         for k, v in self.event.meta_data.items():
             context['meta_' + k] = v
 
-        with language(self.order.locale, self.order.event.settings.region):
+        with language(self.order.locale):
             recipient = self.attendee_email
             try:
                 email_content = render_mail(template, context)
@@ -2142,7 +2125,7 @@ class OrderPosition(AbstractPosition):
 
     def resend_link(self, user=None, auth=None):
 
-        with language(self.order.locale, self.order.event.settings.region):
+        with language(self.order.locale):
             email_template = self.event.settings.mail_text_resend_link
             email_context = get_email_context(event=self.order.event, order=self.order, position=self)
             email_subject = _('Your event registration: %(code)s') % {'code': self.order.code}

src/pretix/base/models/organizer.py

@@ -357,15 +357,3 @@ class TeamAPIToken(models.Model):
             return self.team.organizer.events.all()
         else:
             return self.team.limit_events.all()
-
-    def get_events_with_permission(self, permission, request=None):
-        """
-        Returns a queryset of events the token has a specific permissions to.
-
-        :param request: Ignored, for compatibility with User model
-        :return: Iterable of Events
-        """
-        if getattr(self.team, permission, False):
-            return self.get_events_with_any_permission()
-        else:
-            return self.team.organizer.events.none()

src/pretix/base/models/seating.py

@@ -130,7 +130,7 @@ class Seat(models.Model):
     seat_number = models.CharField(max_length=190, blank=True, default="")
     seat_label = models.CharField(max_length=190, null=True)
     seat_guid = models.CharField(max_length=190, db_index=True)
-    product = models.ForeignKey('Item', null=True, blank=True, related_name='seats', on_delete=models.SET_NULL)
+    product = models.ForeignKey('Item', null=True, blank=True, related_name='seats', on_delete=models.CASCADE)
     blocked = models.BooleanField(default=False)
     sorting_rank = models.BigIntegerField(default=0)
     x = models.FloatField(null=True)

src/pretix/base/models/tax.py

@@ -1,18 +1,14 @@
 import json
 from decimal import Decimal
 
-from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils.formats import localize
-from django.utils.timezone import get_current_timezone, now
-from django.utils.translation import gettext_lazy as _, pgettext
+from django.utils.translation import gettext_lazy as _
 from i18nfield.fields import I18nCharField
-from i18nfield.strings import LazyI18nString
 
 from pretix.base.decimal import round_decimal
 from pretix.base.models.base import LoggedModel
 from pretix.base.templatetags.money import money_filter
-from pretix.helpers.countries import FastCountryField
 
 
 class TaxedPrice:
@@ -87,14 +83,6 @@ EU_CURRENCIES = {
 }
 
 
-def is_eu_country(cc):
-    cc = str(cc)
-    if cc == 'GB':
-        return now().astimezone(get_current_timezone()).year <= 2020
-    else:
-        return cc in EU_COUNTRIES
-
-
 def cc_to_vat_prefix(country_code):
     if country_code == 'GR':
         return 'EL'
@@ -117,29 +105,11 @@ class TaxRule(LoggedModel):
         verbose_name=_("The configured product prices include the tax amount"),
         default=True,
     )
-    eu_reverse_charge = models.BooleanField(
-        verbose_name=_("Use EU reverse charge taxation rules"),
-        default=False,
-        help_text=_("Not recommended. Most events will NOT be qualified for reverse charge since the place of "
-                    "taxation is the location of the event. This option disables charging VAT for all customers "
-                    "outside the EU and for business customers in different EU countries who entered a valid EU VAT "
-                    "ID. Only enable this option after consulting a tax counsel. No warranty given for correct tax "
-                    "calculation. USE AT YOUR OWN RISK.")
-    )
-    home_country = FastCountryField(
-        verbose_name=_('Merchant country'),
-        blank=True,
-        help_text=_('Your country of residence. This is the country the EU reverse charge rule will not apply in, '
-                    'if configured above.'),
-    )
     custom_rules = models.TextField(blank=True, null=True)
 
     class Meta:
         ordering = ('event', 'rate', 'id')
 
-    class SaleNotAllowed(Exception):
-        pass
-
     def allow_delete(self):
         from pretix.base.models.orders import OrderFee, OrderPosition
 
@@ -160,17 +130,13 @@ class TaxRule(LoggedModel):
             eu_reverse_charge=False
         )
 
-    def clean(self):
-        if self.eu_reverse_charge and not self.home_country:
-            raise ValidationError(_('You need to set your home country to use the reverse charge feature.'))
-
     def __str__(self):
         if self.price_includes_tax:
             s = _('incl. {rate}% {name}').format(rate=self.rate, name=self.name)
         else:
             s = _('plus {rate}% {name}').format(rate=self.rate, name=self.name)
-        if self.eu_reverse_charge:
-            s += ' ({})'.format(_('reverse charge enabled'))
+        if self.has_custom_rules:
+            s += ' ({})'.format(_('with custom rules'))
         return str(s)
 
     @property
@@ -182,14 +148,12 @@ class TaxRule(LoggedModel):
             return Decimal('0.00')
         if self.has_custom_rules:
             rule = self.get_matching_rule(invoice_address)
-            if rule.get('action', 'vat') == 'block':
-                raise self.SaleNotAllowed()
             if rule.get('action', 'vat') == 'vat' and rule.get('rate') is not None:
                 return Decimal(rule.get('rate'))
         return Decimal(self.rate)
 
     def tax(self, base_price, base_price_is='auto', currency=None, override_tax_rate=None, invoice_address=None,
-            subtract_from_gross=Decimal('0.00'), gross_price_is_tax_rate: Decimal = None, force_fixed_gross_price=False):
+            subtract_from_gross=Decimal('0.00'), gross_price_is_tax_rate: Decimal = None):
         from .event import Event
         try:
             currency = currency or self.event.currency
@@ -201,7 +165,7 @@ class TaxRule(LoggedModel):
             rate = override_tax_rate
         elif invoice_address:
             adjust_rate = self.tax_rate_for(invoice_address)
-            if (adjust_rate == gross_price_is_tax_rate or force_fixed_gross_price) and base_price_is == 'gross':
+            if adjust_rate == gross_price_is_tax_rate and base_price_is == 'gross':
                 rate = adjust_rate
             elif adjust_rate != rate:
                 normal_price = self.tax(base_price, base_price_is, currency, subtract_from_gross=subtract_from_gross)
@@ -256,7 +220,7 @@ class TaxRule(LoggedModel):
         rules = self._custom_rules
         if invoice_address:
             for r in rules:
-                if r['country'] == 'EU' and not is_eu_country(invoice_address.country):
+                if r['country'] == 'EU' and str(invoice_address.country) not in EU_COUNTRIES:
                     continue
                 if r['country'] not in ('ZZ', 'EU') and r['country'] != str(invoice_address.country):
                     continue
@@ -269,75 +233,16 @@ class TaxRule(LoggedModel):
                 return r
         return {'action': 'vat'}
 
-    def invoice_text(self, invoice_address):
-        if self._custom_rules:
-            rule = self.get_matching_rule(invoice_address)
-            t = rule.get('invoice_text', {})
-            if t and any(l for l in t.values()):
-                return str(LazyI18nString(t))
-        if self.is_reverse_charge(invoice_address):
-            if is_eu_country(invoice_address.country):
-                return pgettext(
-                    "invoice",
-                    "Reverse Charge: According to Article 194, 196 of Council Directive 2006/112/EEC, VAT liability "
-                    "rests with the service recipient."
-                )
-            else:
-                return pgettext(
-                    "invoice",
-                    "VAT liability rests with the service recipient."
-                )
-
     def is_reverse_charge(self, invoice_address):
         if self._custom_rules:
             rule = self.get_matching_rule(invoice_address)
             return rule['action'] == 'reverse'
-
-        if not self.eu_reverse_charge:
-            return False
-
-        if not invoice_address or not invoice_address.country:
-            return False
-
-        if not is_eu_country(invoice_address.country):
-            return False
-
-        if invoice_address.country == self.home_country:
-            return False
-
-        if invoice_address.is_business and invoice_address.vat_id and invoice_address.vat_id_validated:
-            return True
-
         return False
 
     def _tax_applicable(self, invoice_address):
         if self._custom_rules:
             rule = self.get_matching_rule(invoice_address)
-            if rule.get('action', 'vat') == 'block':
-                raise self.SaleNotAllowed()
             return rule.get('action', 'vat') == 'vat'
-
-        if not self.eu_reverse_charge:
-            # No reverse charge rules? Always apply VAT!
-            return True
-
-        if not invoice_address or not invoice_address.country:
-            # No country specified? Always apply VAT!
-            return True
-
-        if not is_eu_country(invoice_address.country):
-            # Non-EU country? Never apply VAT!
-            return False
-
-        if invoice_address.country == self.home_country:
-            # Within same EU country? Always apply VAT!
-            return True
-
-        if invoice_address.is_business and invoice_address.vat_id and invoice_address.vat_id_validated:
-            # Reverse charge case
-            return False
-
-        # Consumer in different EU country / invalid VAT
         return True
 
     def delete(self, *args, **kwargs):

src/pretix/base/models/waitinglist.py

@@ -125,7 +125,7 @@ class WaitingListEntry(LoggedModel):
             self.voucher = v
             self.save()
 
-        with language(self.locale, self.event.settings.region):
+        with language(self.locale):
             mail(
                 self.email,
                 _('You have been selected from the waitinglist for {event}').format(event=str(self.event)),

src/pretix/base/payment.py

@@ -513,7 +513,7 @@ class BasePaymentProvider:
 
         return timing and pricing
 
-    def payment_form_render(self, request: HttpRequest, total: Decimal, order: Order=None) -> str:
+    def payment_form_render(self, request: HttpRequest, total: Decimal) -> str:
         """
         When the user selects this provider as their preferred payment method,
         they will be shown the HTML you return from this method.
@@ -522,15 +522,13 @@ class BasePaymentProvider:
         and render the returned form. If your payment method doesn't require
         the user to fill out form fields, you should just return a paragraph
         of explanatory text.
-
-        :param order: Only set when this is a change to a new payment method for an existing order.
         """
         form = self.payment_form(request)
         template = get_template('pretixpresale/event/checkout_payment_form_default.html')
         ctx = {'request': request, 'form': form}
         return template.render(ctx)
 
-    def checkout_confirm_render(self, request, order: Order=None) -> str:
+    def checkout_confirm_render(self, request) -> str:
         """
         If the user has successfully filled in their payment data, they will be redirected
         to a confirmation page which lists all details of their order for a final review.
@@ -539,8 +537,6 @@ class BasePaymentProvider:
 
         In most cases, this should include a short summary of the user's input and
         a short explanation on how the payment process will continue.
-
-        :param order: Only set when this is a change to a new payment method for an existing order.
         """
         raise NotImplementedError()  # NOQA
 

src/pretix/base/pdf.py

@@ -39,7 +39,6 @@ from pretix.base.models import Order, OrderPosition
 from pretix.base.settings import PERSON_NAME_SCHEMES
 from pretix.base.signals import layout_text_variables
 from pretix.base.templatetags.money import money_filter
-from pretix.base.templatetags.phone_format import phone_format
 from pretix.presale.style import get_fonts
 
 logger = logging.getLogger(__name__)
@@ -122,26 +121,6 @@ DEFAULT_VARIABLES = OrderedDict((
         'editor_sample': _('John Doe\nSample company\nSesame Street 42\n12345 Any City\nAtlantis'),
         'evaluate': lambda op, order, event: op.address_format()
     }),
-    ("attendee_street", {
-        "label": _("Attendee street"),
-        "editor_sample": 'Sesame Street 42',
-        "evaluate": lambda op, order, ev: op.street or (op.addon_to.street if op.addon_to else '')
-    }),
-    ("attendee_zipcode", {
-        "label": _("Attendee ZIP code"),
-        "editor_sample": '12345',
-        "evaluate": lambda op, order, ev: op.zipcode or (op.addon_to.zipcode if op.addon_to else '')
-    }),
-    ("attendee_city", {
-        "label": _("Attendee city"),
-        "editor_sample": 'Any City',
-        "evaluate": lambda op, order, ev: op.city or (op.addon_to.city if op.addon_to else '')
-    }),
-    ("attendee_state", {
-        "label": _("Attendee state"),
-        "editor_sample": 'Sample State',
-        "evaluate": lambda op, order, ev: op.state or (op.addon_to.state if op.addon_to else '')
-    }),
     ("attendee_country", {
         "label": _("Attendee country"),
         "editor_sample": 'Atlantis',
@@ -230,11 +209,6 @@ DEFAULT_VARIABLES = OrderedDict((
         "editor_sample": _("Random City"),
         "evaluate": lambda op, order, ev: str(ev.location)
     }),
-    ("telephone", {
-        "label": _("Phone number"),
-        "editor_sample": "+01 1234 567890",
-        "evaluate": lambda op, order, ev: phone_format(order.phone)
-    }),
     ("invoice_name", {
         "label": _("Invoice address name"),
         "editor_sample": _("John Doe"),
@@ -245,31 +219,11 @@ DEFAULT_VARIABLES = OrderedDict((
         "editor_sample": _("Sample company"),
         "evaluate": lambda op, order, ev: order.invoice_address.company if getattr(order, 'invoice_address', None) else ''
     }),
-    ("invoice_street", {
-        "label": _("Invoice address street"),
-        "editor_sample": _("Sesame Street 42"),
-        "evaluate": lambda op, order, ev: order.invoice_address.street if getattr(order, 'invoice_address', None) else ''
-    }),
-    ("invoice_zipcode", {
-        "label": _("Invoice address ZIP code"),
-        "editor_sample": _("12345"),
-        "evaluate": lambda op, order, ev: order.invoice_address.zipcode if getattr(order, 'invoice_address', None) else ''
-    }),
     ("invoice_city", {
         "label": _("Invoice address city"),
         "editor_sample": _("Sample city"),
         "evaluate": lambda op, order, ev: order.invoice_address.city if getattr(order, 'invoice_address', None) else ''
     }),
-    ("invoice_state", {
-        "label": _("Invoice address state"),
-        "editor_sample": _("Sample State"),
-        "evaluate": lambda op, order, ev: order.invoice_address.state if getattr(order, 'invoice_address', None) else ''
-    }),
-    ("invoice_country", {
-        "label": _("Invoice address country"),
-        "editor_sample": _("Atlantis"),
-        "evaluate": lambda op, order, ev: str(getattr(order.invoice_address.country, 'name', '')) if getattr(order, 'invoice_address', None) else ''
-    }),
     ("addons", {
         "label": _("List of Add-Ons"),
         "editor_sample": _("Add-on 1\nAdd-on 2"),
@@ -427,7 +381,6 @@ class Renderer:
         self.layout = layout
         self.background_file = background_file
         self.variables = get_variables(event)
-        self.event = event
         if self.background_file:
             self.bg_bytes = self.background_file.read()
             self.bg_pdf = PdfFileReader(BytesIO(self.bg_bytes), strict=False)
@@ -494,7 +447,7 @@ class Renderer:
 
     def _get_text_content(self, op: OrderPosition, order: Order, o: dict, inner=False):
         if o.get('locale', None) and not inner:
-            with language(o['locale'], self.event.settings.region):
+            with language(o['locale']):
                 return self._get_text_content(op, order, o, True)
 
         ev = self._get_ev(op, order)

src/pretix/base/secrets.py

@@ -1,5 +1,4 @@
 import base64
-import inspect
 import struct
 
 from cryptography.hazmat.backends.openssl.backend import Backend
@@ -53,10 +52,10 @@ class BaseTicketSecretGenerator:
         return False
 
     def generate_secret(self, item: Item, variation: ItemVariation = None, subevent: SubEvent = None,
-                        attendee_name: str = None, current_secret: str = None, force_invalidate=False) -> str:
+                        current_secret: str = None, force_invalidate=False) -> str:
         """
         Generate a new secret for a ticket with product ``item``, variation ``variation``, subevent ``subevent``,
-        attendee name ``attendee_name`` (can be ``None``) and the current secret ``current_secret`` (if any).
+        and the current secret ``current_secret`` (if any).
 
         The result must be a string that should only contain the characters ``A-Za-z0-9+/=``.
 
@@ -71,11 +70,6 @@ class BaseTicketSecretGenerator:
         If ``force_invalidate`` is set to ``False`` and ``item``, ``variation`` and ``subevent`` have a different value
         as when ``current_secret`` was generated, then this method MAY OR MAY NOT return ``current_secret`` unchanged,
         depending on the semantics of the method.
-
-        .. note:: While it is guaranteed that ``generate_secret`` and the revocation list process are called every
-                  time the ``item``, ``variation``, or ``subevent`` parameters change, it is currently **NOT**
-                  guaranteed that this process is triggered if the ``attendee_name`` parameter changes. You should
-                  therefore not rely on this value for more than informational or debugging purposes.
         """
         raise NotImplementedError()
 
@@ -86,7 +80,7 @@ class RandomTicketSecretGenerator(BaseTicketSecretGenerator):
     use_revocation_list = False
 
     def generate_secret(self, item: Item, variation: ItemVariation = None, subevent: SubEvent = None,
-                        attendee_name: str = None, current_secret: str = None, force_invalidate=False):
+                        current_secret: str = None, force_invalidate=False):
         if current_secret and not force_invalidate:
             return current_secret
         return get_random_string(
@@ -193,17 +187,12 @@ def assign_ticket_secret(event, position, force_invalidate_if_revokation_list_us
     gen = event.ticket_secret_generator
     if gen.use_revocation_list and force_invalidate_if_revokation_list_used:
         force_invalidate = True
-
-    kwargs = {}
-    if 'attendee_name' in inspect.signature(gen.generate_secret).parameters:
-        kwargs['attendee_name'] = position.attendee_name
     secret = gen.generate_secret(
         item=position.item,
         variation=position.variation,
         subevent=position.subevent,
         current_secret=position.secret,
-        force_invalidate=force_invalidate,
-        **kwargs
+        force_invalidate=force_invalidate
     )
     changed = position.secret != secret
     if position.secret and changed and gen.use_revocation_list:

src/pretix/base/services/cancelevent.py

@@ -24,7 +24,7 @@ logger = logging.getLogger(__name__)
 
 
 def _send_wle_mail(wle: WaitingListEntry, subject: LazyI18nString, message: LazyI18nString, subevent: SubEvent):
-    with language(wle.locale, wle.event.settings.region):
+    with language(wle.locale):
         email_context = get_email_context(event_or_subevent=subevent or wle.event, event=wle.event)
         try:
             mail(
@@ -41,7 +41,7 @@ def _send_wle_mail(wle: WaitingListEntry, subject: LazyI18nString, message: Lazy
 
 def _send_mail(order: Order, subject: LazyI18nString, message: LazyI18nString, subevent: SubEvent,
                refund_amount: Decimal, user: User, positions: list):
-    with language(order.locale, order.event.settings.region):
+    with language(order.locale):
         try:
             ia = order.invoice_address
         except InvoiceAddress.DoesNotExist:

src/pretix/base/services/cart.py

@@ -106,7 +106,6 @@ error_messages = {
     'seat_unavailable': _('The seat you selected has already been taken. Please select a different seat.'),
     'seat_multiple': _('You can not select the same seat multiple times.'),
     'gift_card': _("You entered a gift card instead of a voucher. Gift cards can be entered later on when you're asked for your payment details."),
-    'country_blocked': _('One of the selected products is not available in the selected country.'),
 }
 
 
@@ -325,8 +324,6 @@ class CartManager:
                 custom_price_is_net=cp_is_net if cp_is_net is not None else self.event.settings.display_net_prices,
                 invoice_address=self.invoice_address, force_custom_price=force_custom_price, bundled_sum=bundled_sum
             )
-        except TaxRule.SaleNotAllowed:
-            raise CartError(error_messages['country_blocked'])
         except ValueError as e:
             if str(e) == 'price_too_high':
                 raise CartError(error_messages['price_too_high'])
@@ -1066,7 +1063,6 @@ def update_tax_rates(event: Event, cart_id: str, invoice_address: InvoiceAddress
         if pos.tax_rate != rate:
             current_net = pos.price - pos.tax_value
             new_gross = pos.item.tax(current_net, base_price_is='net', invoice_address=invoice_address).gross
-            totaldiff += new_gross - pos.price
             pos.price = new_gross
             pos.includes_tax = rate != Decimal('0.00')
             pos.override_tax_rate = rate

src/pretix/base/services/export.py

@@ -1,13 +1,12 @@
 from typing import Any, Dict
 
-from django.conf import settings
 from django.core.files.base import ContentFile
 from django.utils.timezone import override
 from django.utils.translation import gettext
 
 from pretix.base.i18n import LazyLocaleException, language
 from pretix.base.models import (
-    CachedFile, Device, Event, Organizer, TeamAPIToken, User, cachedfile_name,
+    CachedFile, Event, Organizer, User, cachedfile_name,
 )
 from pretix.base.services.tasks import (
     ProfiledEventTask, ProfiledOrganizerUserTask,
@@ -32,7 +31,7 @@ def export(self, event: Event, fileid: str, provider: str, form_data: Dict[str,
             )
 
     file = CachedFile.objects.get(id=fileid)
-    with language(event.settings.locale, event.settings.region), override(event.settings.timezone):
+    with language(event.settings.locale), override(event.settings.timezone):
         responses = register_data_exporters.send(event)
         for receiver, response in responses:
             ex = response(event, set_progress)
@@ -49,13 +48,7 @@ def export(self, event: Event, fileid: str, provider: str, form_data: Dict[str,
 
 
 @app.task(base=ProfiledOrganizerUserTask, throws=(ExportError,), bind=True)
-def multiexport(self, organizer: Organizer, user: User, device: int, token: int, fileid: str, provider: str, form_data: Dict[str, Any]) -> None:
-    if device:
-        device = Device.objects.get(pk=device)
-    if token:
-        device = TeamAPIToken.objects.get(pk=token)
-    allowed_events = (device or token or user).get_events_with_permission('can_view_orders')
-
+def multiexport(self, organizer: Organizer, user: User, fileid: str, provider: str, form_data: Dict[str, Any]) -> None:
     def set_progress(val):
         if not self.request.called_directly:
             self.update_state(
@@ -64,25 +57,10 @@ def multiexport(self, organizer: Organizer, user: User, device: int, token: int,
             )
 
     file = CachedFile.objects.get(id=fileid)
-    if user:
-        locale = user.locale
-        timezone = user.timezone
-        region = None  # todo: add to user?
-    else:
-        e = allowed_events.first()
-        if e:
-            locale = e.settings.locale
-            timezone = e.settings.timezone
-            region = e.settings.region
-        else:
-            locale = settings.LANGUAGE_CODE
-            timezone = settings.TIME_ZONE
-            region = None
-    with language(locale, region), override(timezone):
-        if isinstance(form_data['events'][0], str):
-            events = allowed_events.filter(slug__in=form_data.get('events'), organizer=organizer)
-        else:
-            events = allowed_events.filter(pk__in=form_data.get('events'))
+    with language(user.locale), override(user.timezone):
+        allowed_events = user.get_events_with_permission('can_view_orders')
+
+        events = allowed_events.filter(pk__in=form_data.get('events'))
         responses = register_multievent_data_exporters.send(organizer)
 
         for receiver, response in responses:

src/pretix/base/services/invoices.py

@@ -24,7 +24,7 @@ from pretix.base.i18n import language
 from pretix.base.models import (
     Invoice, InvoiceAddress, InvoiceLine, Order, OrderFee,
 )
-from pretix.base.models.tax import EU_CURRENCIES
+from pretix.base.models.tax import EU_COUNTRIES, EU_CURRENCIES
 from pretix.base.services.tasks import TransactionAwareTask
 from pretix.base.settings import GlobalSettingsObject
 from pretix.base.signals import invoice_line_text, periodic_task
@@ -43,7 +43,7 @@ def build_invoice(invoice: Invoice) -> Invoice:
 
     lp = invoice.order.payments.last()
 
-    with language(invoice.locale, invoice.event.settings.region):
+    with language(invoice.locale):
         invoice.invoice_from = invoice.event.settings.get('invoice_address_from')
         invoice.invoice_from_name = invoice.event.settings.get('invoice_address_from_name')
         invoice.invoice_from_zipcode = invoice.event.settings.get('invoice_address_from_zipcode')
@@ -142,8 +142,6 @@ def build_invoice(invoice: Invoice) -> Invoice:
         reverse_charge = False
 
         positions.sort(key=lambda p: p.sort_key)
-
-        tax_texts = []
         for i, p in enumerate(positions):
             if not invoice.event.settings.invoice_include_free and p.price == Decimal('0.00') and not p.addon_c:
                 continue
@@ -180,10 +178,22 @@ def build_invoice(invoice: Invoice) -> Invoice:
             if p.tax_rule and p.tax_rule.is_reverse_charge(ia) and p.price and not p.tax_value:
                 reverse_charge = True
 
-            if p.tax_rule:
-                tax_text = p.tax_rule.invoice_text(ia)
-                if tax_text and tax_text not in tax_texts:
-                    tax_texts.append(tax_text)
+        if reverse_charge:
+            if invoice.additional_text:
+                invoice.additional_text += "<br /><br />"
+            if str(invoice.invoice_to_country) in EU_COUNTRIES:
+                invoice.additional_text += pgettext(
+                    "invoice",
+                    "Reverse Charge: According to Article 194, 196 of Council Directive 2006/112/EEC, VAT liability "
+                    "rests with the service recipient."
+                )
+            else:
+                invoice.additional_text += pgettext(
+                    "invoice",
+                    "VAT liability rests with the service recipient."
+                )
+            invoice.reverse_charge = True
+            invoice.save()
 
         offset = len(positions)
         for i, fee in enumerate(invoice.order.fees.all()):
@@ -203,20 +213,6 @@ def build_invoice(invoice: Invoice) -> Invoice:
                 tax_name=fee.tax_rule.name if fee.tax_rule else ''
             )
 
-            if fee.tax_rule and fee.tax_rule.is_reverse_charge(ia) and fee.value and not fee.tax_value:
-                reverse_charge = True
-
-            if fee.tax_rule:
-                tax_text = fee.tax_rule.invoice_text(ia)
-                if tax_text and tax_text not in tax_texts:
-                    tax_texts.append(tax_text)
-
-        if tax_texts:
-            invoice.additional_text += "<br /><br />"
-            invoice.additional_text += "<br />".join(tax_texts)
-        invoice.reverse_charge = reverse_charge
-        invoice.save()
-
         return invoice
 
 
@@ -244,7 +240,7 @@ def generate_cancellation(invoice: Invoice, trigger_pdf=True):
     cancellation.date = timezone.now().date()
     cancellation.payment_provider_text = ''
     cancellation.file = None
-    with language(invoice.locale, invoice.event.settings.region):
+    with language(invoice.locale):
         cancellation.invoice_from = invoice.event.settings.get('invoice_address_from')
         cancellation.invoice_from_name = invoice.event.settings.get('invoice_address_from_name')
         cancellation.invoice_from_zipcode = invoice.event.settings.get('invoice_address_from_zipcode')
@@ -297,7 +293,7 @@ def invoice_pdf_task(invoice: int):
             return None
         if i.file:
             i.file.delete()
-        with language(i.locale, i.event.settings.region):
+        with language(i.locale):
             fname, ftype, fcontent = i.event.invoice_renderer.generate(i)
             i.file.save(fname, ContentFile(fcontent))
             i.save()
@@ -328,7 +324,7 @@ def build_preview_invoice_pdf(event):
     if not locale or locale == '__user__':
         locale = event.settings.locale
 
-    with rolledback_transaction(), language(locale, event.settings.region):
+    with rolledback_transaction(), language(locale):
         order = event.orders.create(status=Order.STATUS_PENDING, datetime=timezone.now(),
                                     expires=timezone.now(), code="PREVIEW", total=100 * event.tax_rules.count())
         invoice = Invoice(

src/pretix/base/services/mail.py

@@ -290,7 +290,7 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
                 except Order.DoesNotExist:
                     order = None
                 else:
-                    with language(order.locale, event.settings.region):
+                    with language(order.locale):
                         if position:
                             try:
                                 position = order.positions.get(pk=position)

src/pretix/base/services/notifications.py

@@ -15,59 +15,55 @@ from pretix.helpers.urls import build_absolute_uri
 
 @app.task(base=TransactionAwareTask, acks_late=True)
 @scopes_disabled()
-def notify(logentry_ids: list):
-    if not isinstance(logentry_ids, list):
-        logentry_ids = [logentry_ids]
+def notify(logentry_id: int):
+    logentry = LogEntry.all.select_related('event', 'event__organizer').get(id=logentry_id)
+    if not logentry.event:
+        return  # Ignore, we only have event-related notifications right now
+    types = get_all_notification_types(logentry.event)
 
-    qs = LogEntry.all.select_related('event', 'event__organizer').filter(id__in=logentry_ids)
+    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]
 
-    _event, _at, notify_specific, notify_global = None, None, None, None
-    for logentry in qs:
-        if not logentry.event:
-            break  # Ignore, we only have event-related notifications right now
+    if not notification_type:
+        return  # No suitable plugin
 
-        notification_type = logentry.notification_type
+    # All users that have the permission to get the notification
+    users = logentry.event.get_users_with_permission(
+        notification_type.required_permission
+    ).filter(notifications_send=True, is_active=True)
+    if logentry.user:
+        users = users.exclude(pk=logentry.user.pk)
 
-        if not notification_type:
-            break  # No suitable plugin
+    # Get all notification settings, both specific to this event as well as global
+    notify_specific = {
+        (ns.user, ns.method): ns.enabled
+        for ns in NotificationSetting.objects.filter(
+            event=logentry.event,
+            action_type=notification_type.action_type,
+            user__pk__in=users.values_list('pk', flat=True)
+        )
+    }
+    notify_global = {
+        (ns.user, ns.method): ns.enabled
+        for ns in NotificationSetting.objects.filter(
+            event__isnull=True,
+            action_type=notification_type.action_type,
+            user__pk__in=users.values_list('pk', flat=True)
+        )
+    }
 
-        if _event != logentry.event or _at != logentry.action_type or notify_global is None:
-            _event = logentry.event
-            _at = logentry.action_type
-            # All users that have the permission to get the notification
-            users = logentry.event.get_users_with_permission(
-                notification_type.required_permission
-            ).filter(notifications_send=True, is_active=True)
-            if logentry.user:
-                users = users.exclude(pk=logentry.user.pk)
+    for um, enabled in notify_specific.items():
+        user, method = um
+        if enabled:
+            send_notification.apply_async(args=(logentry_id, notification_type.action_type, user.pk, method))
 
-            # Get all notification settings, both specific to this event as well as global
-            notify_specific = {
-                (ns.user, ns.method): ns.enabled
-                for ns in NotificationSetting.objects.filter(
-                    event=logentry.event,
-                    action_type=notification_type.action_type,
-                    user__pk__in=users.values_list('pk', flat=True)
-                )
-            }
-            notify_global = {
-                (ns.user, ns.method): ns.enabled
-                for ns in NotificationSetting.objects.filter(
-                    event__isnull=True,
-                    action_type=notification_type.action_type,
-                    user__pk__in=users.values_list('pk', flat=True)
-                )
-            }
-
-        for um, enabled in notify_specific.items():
-            user, method = um
-            if enabled:
-                send_notification.apply_async(args=(logentry.id, notification_type.action_type, user.pk, method))
-
-        for um, enabled in notify_global.items():
-            user, method = um
-            if enabled and um not in notify_specific:
-                send_notification.apply_async(args=(logentry.id, notification_type.action_type, user.pk, method))
+    for um, enabled in notify_global.items():
+        user, method = um
+        if enabled and um not in notify_specific:
+            send_notification.apply_async(args=(logentry_id, notification_type.action_type, user.pk, method))
 
 
 @app.task(base=ProfiledTask, acks_late=True)

src/pretix/base/services/orderimport.py

@@ -65,7 +65,7 @@ def import_orders(event: Event, fileid: str, settings: dict, locale: str, user)
     # TODO: quotacheck?
     cf = CachedFile.objects.get(id=fileid)
     user = User.objects.get(pk=user)
-    with language(locale, event.settings.region):
+    with language(locale):
         cols = get_all_columns(event)
         parsed = parse_csv(cf.file)
         orders = []
@@ -163,7 +163,7 @@ def import_orders(event: Event, fileid: str, settings: dict, locale: str, user)
                     )
 
             for o in orders:
-                with language(o.locale, event.settings.region):
+                with language(o.locale):
                     order_placed.send(event, order=o)
                     if o.status == Order.STATUS_PAID:
                         order_paid.send(event, order=o)

src/pretix/base/services/orders.py

@@ -23,9 +23,7 @@ from django_scopes import scopes_disabled
 from pretix.api.models import OAuthApplication
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.email import get_email_context
-from pretix.base.i18n import (
-    LazyLocaleException, get_language_without_region, language,
-)
+from pretix.base.i18n import LazyLocaleException, language
 from pretix.base.models import (
     CartPosition, Device, Event, GiftCard, Item, ItemVariation, Order,
     OrderPayment, OrderPosition, Quota, Seat, SeatCategoryMapping, User,
@@ -91,7 +89,6 @@ error_messages = {
                              'positions have been removed from your cart.'),
     'seat_invalid': _('One of the seats in your order was invalid, we removed the position from your cart.'),
     'seat_unavailable': _('One of the seats in your order has been taken in the meantime, we removed the position from your cart.'),
-    'country_blocked': _('One of the selected products is not available in the selected country.'),
 }
 
 logger = logging.getLogger(__name__)
@@ -262,7 +259,7 @@ def approve_order(order, user=None, send_mail: bool=True, auth=None, force=False
             # send_mail will trigger PDF generation later
 
     if send_mail:
-        with language(order.locale, order.event.settings.region):
+        with language(order.locale):
             if order.total == Decimal('0.00'):
                 email_template = order.event.settings.mail_text_order_approved_free
                 email_subject = _('Order approved and confirmed: %(code)s') % {'code': order.code}
@@ -313,7 +310,7 @@ def deny_order(order, comment='', user=None, send_mail: bool=True, auth=None):
     if send_mail:
         email_template = order.event.settings.mail_text_order_denied
         email_context = get_email_context(event=order.event, order=order, comment=comment)
-        with language(order.locale, order.event.settings.region):
+        with language(order.locale):
             email_subject = _('Order denied: %(code)s') % {'code': order.code}
             try:
                 order.send_mail(
@@ -424,7 +421,7 @@ def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device
 
         if send_mail:
             email_template = order.event.settings.mail_text_order_canceled
-            with language(order.locale, order.event.settings.region):
+            with language(order.locale):
                 email_context = get_email_context(event=order.event, order=order)
                 email_subject = _('Order canceled: %(code)s') % {'code': order.code}
                 try:
@@ -618,39 +615,34 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
             current_discount = cp.price_before_voucher - cp.price
             max_discount = max(v_budget[cp.voucher] + current_discount, 0)
 
-        try:
-            if cp.is_bundled:
-                try:
-                    bundle = cp.addon_to.item.bundles.get(bundled_item=cp.item, bundled_variation=cp.variation)
-                    bprice = bundle.designated_price or 0
-                except ItemBundle.DoesNotExist:
-                    bprice = cp.price
-                except ItemBundle.MultipleObjectsReturned:
-                    raise OrderError("Invalid product configuration (duplicate bundle)")
-                price = get_price(cp.item, cp.variation, cp.voucher, bprice, cp.subevent, custom_price_is_net=False,
-                                  custom_price_is_tax_rate=cp.override_tax_rate,
-                                  invoice_address=address, force_custom_price=True, max_discount=max_discount)
-                pbv = get_price(cp.item, cp.variation, None, bprice, cp.subevent, custom_price_is_net=False,
-                                custom_price_is_tax_rate=cp.override_tax_rate,
-                                invoice_address=address, force_custom_price=True, max_discount=max_discount)
-                changed_prices[cp.pk] = bprice
-            else:
-                bundled_sum = 0
-                if not cp.addon_to_id:
-                    for bundledp in cp.addons.all():
-                        if bundledp.is_bundled:
-                            bundled_sum += changed_prices.get(bundledp.pk, bundledp.price)
+        if cp.is_bundled:
+            try:
+                bundle = cp.addon_to.item.bundles.get(bundled_item=cp.item, bundled_variation=cp.variation)
+                bprice = bundle.designated_price or 0
+            except ItemBundle.DoesNotExist:
+                bprice = cp.price
+            except ItemBundle.MultipleObjectsReturned:
+                raise OrderError("Invalid product configuration (duplicate bundle)")
+            price = get_price(cp.item, cp.variation, cp.voucher, bprice, cp.subevent, custom_price_is_net=False,
+                              custom_price_is_tax_rate=cp.override_tax_rate,
+                              invoice_address=address, force_custom_price=True, max_discount=max_discount)
+            pbv = get_price(cp.item, cp.variation, None, bprice, cp.subevent, custom_price_is_net=False,
+                            custom_price_is_tax_rate=cp.override_tax_rate,
+                            invoice_address=address, force_custom_price=True, max_discount=max_discount)
+            changed_prices[cp.pk] = bprice
+        else:
+            bundled_sum = 0
+            if not cp.addon_to_id:
+                for bundledp in cp.addons.all():
+                    if bundledp.is_bundled:
+                        bundled_sum += changed_prices.get(bundledp.pk, bundledp.price)
 
-                price = get_price(cp.item, cp.variation, cp.voucher, cp.price, cp.subevent, custom_price_is_net=False,
-                                  addon_to=cp.addon_to, invoice_address=address, bundled_sum=bundled_sum,
-                                  max_discount=max_discount, custom_price_is_tax_rate=cp.override_tax_rate)
-                pbv = get_price(cp.item, cp.variation, None, cp.price, cp.subevent, custom_price_is_net=False,
-                                addon_to=cp.addon_to, invoice_address=address, bundled_sum=bundled_sum,
-                                max_discount=max_discount, custom_price_is_tax_rate=cp.override_tax_rate)
-        except TaxRule.SaleNotAllowed:
-            err = err or error_messages['country_blocked']
-            cp.delete()
-            continue
+            price = get_price(cp.item, cp.variation, cp.voucher, cp.price, cp.subevent, custom_price_is_net=False,
+                              addon_to=cp.addon_to, invoice_address=address, bundled_sum=bundled_sum,
+                              max_discount=max_discount, custom_price_is_tax_rate=cp.override_tax_rate)
+            pbv = get_price(cp.item, cp.variation, None, cp.price, cp.subevent, custom_price_is_net=False,
+                            addon_to=cp.addon_to, invoice_address=address, bundled_sum=bundled_sum,
+                            max_discount=max_discount, custom_price_is_tax_rate=cp.override_tax_rate)
 
         if max_discount is not None:
             v_budget[cp.voucher] = v_budget[cp.voucher] + current_discount - (pbv.gross - price.gross)
@@ -778,9 +770,8 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
             status=Order.STATUS_PENDING,
             event=event,
             email=email,
-            phone=(meta_info or {}).get('contact_form_data', {}).get('phone'),
             datetime=now_dt,
-            locale=get_language_without_region(locale),
+            locale=locale,
             total=total,
             testmode=True if sales_channel.testmode_supported and event.testmode else False,
             meta_info=json.dumps(meta_info or {}),
@@ -1036,7 +1027,7 @@ def send_expiry_warnings(sender, **kwargs):
                     # Race condition
                     continue
 
-                with language(o.locale, settings.region):
+                with language(o.locale):
                     o.expiry_reminder_sent = True
                     o.save(update_fields=['expiry_reminder_sent'])
                     email_template = settings.mail_text_order_expire_warning
@@ -1113,7 +1104,7 @@ def send_download_reminders(sender, **kwargs):
             if not send:
                 continue
 
-            with language(o.locale, o.event.settings.region):
+            with language(o.locale):
                 o.download_reminder_sent = True
                 o.save(update_fields=['download_reminder_sent'])
                 email_template = event.settings.mail_text_download_reminder
@@ -1153,7 +1144,7 @@ def send_download_reminders(sender, **kwargs):
 
 
 def notify_user_changed_order(order, user=None, auth=None, invoices=[]):
-    with language(order.locale, order.event.settings.region):
+    with language(order.locale):
         email_template = order.event.settings.mail_text_order_changed
         email_context = get_email_context(event=order.event, order=order)
         email_subject = _('Your order has been changed: %(code)s') % {'code': order.code}
@@ -1183,7 +1174,6 @@ class OrderChangeManager:
         'seat_subevent_mismatch': _('You selected seat "{seat}" for a date that does not match the selected ticket date. Please choose a seat again.'),
         'seat_required': _('The selected product requires you to select a seat.'),
         'seat_forbidden': _('The selected product does not allow to select a seat.'),
-        'tax_rule_country_blocked': _('The selected country is blocked by your tax rule.'),
         'gift_card_change': _('You cannot change the price of a position that has been used to issue a gift card.'),
     }
     ItemOperation = namedtuple('ItemOperation', ('position', 'item', 'variation'))
@@ -1251,11 +1241,8 @@ class OrderChangeManager:
         self._operations.append(self.SeatOperation(position, seat))
 
     def change_subevent(self, position: OrderPosition, subevent: SubEvent):
-        try:
-            price = get_price(position.item, position.variation, voucher=position.voucher, subevent=subevent,
-                              invoice_address=self._invoice_address)
-        except TaxRule.SaleNotAllowed:
-            raise OrderError(self.error_messages['tax_rule_country_blocked'])
+        price = get_price(position.item, position.variation, voucher=position.voucher, subevent=subevent,
+                          invoice_address=self._invoice_address)
 
         if price is None:  # NOQA
             raise OrderError(self.error_messages['product_invalid'])
@@ -1275,11 +1262,8 @@ class OrderChangeManager:
         if (not variation and item.has_variations) or (variation and variation.item_id != item.pk):
             raise OrderError(self.error_messages['product_without_variation'])
 
-        try:
-            price = get_price(item, variation, voucher=position.voucher, subevent=subevent,
-                              invoice_address=self._invoice_address)
-        except TaxRule.SaleNotAllowed:
-            raise OrderError(self.error_messages['tax_rule_country_blocked'])
+        price = get_price(item, variation, voucher=position.voucher, subevent=subevent,
+                          invoice_address=self._invoice_address)
 
         if price is None:  # NOQA
             raise OrderError(self.error_messages['product_invalid'])
@@ -1337,10 +1321,7 @@ class OrderChangeManager:
             if not pos.price:
                 continue
 
-            try:
-                new_rate = tax_rule.tax_rate_for(ia)
-            except TaxRule.SaleNotAllowed:
-                raise OrderError(error_messages['tax_rule_country_blocked'])
+            new_rate = tax_rule.tax_rate_for(ia)
             # We use override_tax_rate to make sure .tax() doesn't get clever and re-adjusts the pricing itself
             if new_rate != pos.tax_rate:
                 if keep == 'net':
@@ -1393,13 +1374,10 @@ class OrderChangeManager:
                 except Seat.DoesNotExist:
                     raise OrderError(error_messages['seat_invalid'])
 
-        try:
-            if price is None:
-                price = get_price(item, variation, subevent=subevent, invoice_address=self._invoice_address)
-            else:
-                price = item.tax(price, base_price_is='gross', invoice_address=self._invoice_address)
-        except TaxRule.SaleNotAllowed:
-            raise OrderError(self.error_messages['tax_rule_country_blocked'])
+        if price is None:
+            price = get_price(item, variation, subevent=subevent, invoice_address=self._invoice_address)
+        else:
+            price = item.tax(price, base_price_is='gross', invoice_address=self._invoice_address)
 
         if price is None:
             raise OrderError(self.error_messages['product_invalid'])
@@ -1974,10 +1952,7 @@ class OrderChangeManager:
                     self._check_quotas()
                 self._check_seats()
                 self._check_complete_cancel()
-                try:
-                    self._perform_operations()
-                except TaxRule.SaleNotAllowed:
-                    raise OrderError(self.error_messages['tax_rule_country_blocked'])
+                self._perform_operations()
             self._recalculate_total_and_payment_fee()
             self._reissue_invoice()
             self._clear_tickets_cache()

src/pretix/base/services/quotas.py

@@ -113,11 +113,10 @@ class QuotaAvailability:
                 raise e
 
     def _write_cache(self, quotas, now_dt):
-        # We used to also delete item_quota_cache:* from the event cache here, but as the cache
-        # gets more complex, this does not seem worth it. The cache is only present for up to
-        # 5 seconds to prevent high peaks, and a 5-second delay in availability is usually
-        # tolerable
+        events = {q.event for q in quotas}
         update = []
+        for e in events:
+            e.cache.delete('item_quota_cache')
         for q in quotas:
             rewrite_cache = self._count_waitinglist and (
                 not q.cache_is_hot(now_dt) or self.results[q][0] > q.cached_availability_state

src/pretix/base/services/shredder.py

@@ -17,7 +17,7 @@ from pretix.celery_app import app
 
 
 @app.task(base=ProfiledEventTask)
-def export(event: Event, shredders: List[str], session_key=None) -> None:
+def export(event: Event, shredders: List[str]) -> None:
     known_shredders = event.get_data_shredders()
 
     with NamedTemporaryFile() as rawfile:
@@ -55,8 +55,6 @@ def export(event: Event, shredders: List[str], session_key=None) -> None:
         cf.date = now()
         cf.filename = event.slug + '.zip'
         cf.type = 'application/zip'
-        cf.session_key = session_key
-        cf.web_download = True
         cf.expires = now() + timedelta(hours=1)
         cf.save()
         cf.file.save(cachedfile_name(cf, cf.filename), rawfile)

src/pretix/base/services/stats.py

@@ -127,7 +127,6 @@ def order_overview(
         order__event=event
     ).annotate(
         status=Case(
-            When(order__status='n', order__require_approval=True, then=Value('unapproved')),
             When(canceled=True, then=Value('c')),
             default=F('order__status')
         )
@@ -136,7 +135,6 @@ def order_overview(
     ).annotate(cnt=Count('id'), price=Sum('price'), tax_value=Sum('tax_value')).order_by()
 
     states = {
-        'unapproved': 'unapproved',
         'canceled': Order.STATUS_CANCELED,
         'paid': Order.STATUS_PAID,
         'pending': Order.STATUS_PENDING,
@@ -200,7 +198,6 @@ def order_overview(
             order__event=event
         ).annotate(
             status=Case(
-                When(order__status='n', order__require_approval=True, then=Value('unapproved')),
                 When(canceled=True, then=Value('c')),
                 default=F('order__status')
             )

src/pretix/base/services/tasks.py

@@ -96,9 +96,8 @@ class OrganizerUserTask(app.Task):
         kwargs['organizer'] = organizer
 
         user_id = kwargs['user']
-        if user_id is not None:
-            user = User.objects.get(pk=user_id)
-            kwargs['user'] = user
+        user = User.objects.get(pk=user_id)
+        kwargs['user'] = user
 
         with scope(organizer=organizer):
             ret = super().__call__(*args, **kwargs)

src/pretix/base/services/tickets.py

@@ -23,7 +23,7 @@ logger = logging.getLogger(__name__)
 def generate_orderposition(order_position: int, provider: str):
     order_position = OrderPosition.objects.select_related('order', 'order__event').get(id=order_position)
 
-    with language(order_position.order.locale, order_position.order.event.settings.region):
+    with language(order_position.order.locale):
         responses = register_ticket_outputs.send(order_position.order.event)
         for receiver, response in responses:
             prov = response(order_position.order.event)
@@ -41,7 +41,7 @@ def generate_orderposition(order_position: int, provider: str):
 def generate_order(order: int, provider: str):
     order = Order.objects.select_related('event').get(id=order)
 
-    with language(order.locale, order.event.settings.region):
+    with language(order.locale):
         responses = register_ticket_outputs.send(order.event)
         for receiver, response in responses:
             prov = response(order.event)
@@ -75,7 +75,7 @@ class DummyRollbackException(Exception):
 def preview(event: int, provider: str):
     event = Event.objects.get(id=event)
 
-    with rolledback_transaction(), language(event.settings.locale, event.settings.region):
+    with rolledback_transaction(), language(event.settings.locale):
         item = event.items.create(name=_("Sample product"), default_price=42.23,
                                   description=_("Sample product description"))
         item2 = event.items.create(name=_("Sample workshop"), default_price=23.40)

src/pretix/base/settings.py

@@ -9,9 +9,7 @@ from django import forms
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.files import File
-from django.core.validators import (
-    MaxValueValidator, MinValueValidator, RegexValidator,
-)
+from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db.models import Model
 from django.utils.translation import (
     gettext_lazy as _, gettext_noop, pgettext, pgettext_lazy,
@@ -28,9 +26,7 @@ from pretix.base.reldate import (
     RelativeDateField, RelativeDateTimeField, RelativeDateWrapper,
     SerializerRelativeDateField, SerializerRelativeDateTimeField,
 )
-from pretix.control.forms import (
-    FontSelect, MultipleLanguagesWidget, SingleLanguageWidget,
-)
+from pretix.control.forms import MultipleLanguagesWidget, SingleLanguageWidget
 from pretix.helpers.countries import CachedCountries
 
 
@@ -42,18 +38,6 @@ def country_choice_kwargs():
     }
 
 
-def primary_font_kwargs():
-    from pretix.presale.style import get_fonts
-
-    choices = [('Open Sans', 'Open Sans')]
-    choices += [
-        (a, {"title": a, "data": v}) for a, v in get_fonts().items()
-    ]
-    return {
-        'choices': choices,
-    }
-
-
 class LazyI18nStringList(UserList):
     def __init__(self, init_list=None):
         super().__init__()
@@ -193,25 +177,6 @@ DEFAULTS = {
             help_text=_("Require customers to fill in the primary email address twice to avoid errors."),
         )
     },
-    'order_phone_asked': {
-        'default': 'False',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_("Ask for a phone number per order"),
-        )
-    },
-    'order_phone_required': {
-        'default': 'False',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_("Require a phone number per order"),
-            widget=forms.CheckboxInput(attrs={'data-checkbox-dependency': '#id_settings-order_phone_asked'}),
-        )
-    },
     'invoice_address_asked': {
         'default': 'True',
         'type': bool,
@@ -287,6 +252,7 @@ DEFAULTS = {
         'form_kwargs': dict(
             label=_("Ask for beneficiary"),
             widget=forms.CheckboxInput(attrs={'data-checkbox-dependency': '#id_invoice_address_asked'}),
+            required=False
         )
     },
     'invoice_address_custom_field': {
@@ -455,6 +421,7 @@ DEFAULTS = {
             widget_kwargs={'attrs': {
                 'rows': 3,
             }},
+            required=False,
             label=_("Guidance text"),
             help_text=_("This text will be shown above the payment options. You can explain the choices to the user here, "
                         "if you want.")
@@ -474,6 +441,7 @@ DEFAULTS = {
         'form_kwargs': dict(
             label=_("Set payment term"),
             widget=forms.RadioSelect,
+            required=True,
             choices=(
                 ('days', _("in days")),
                 ('minutes', _("in minutes"))
@@ -520,6 +488,7 @@ DEFAULTS = {
             widget=forms.CheckboxInput(
                 attrs={
                     'data-display-dependency': '#id_payment_term_mode_0',
+                    'data-required-if': '#id_payment_term_mode_0'
                 },
             ),
         )
@@ -572,18 +541,6 @@ DEFAULTS = {
                         "the pool and can be ordered by other people."),
         )
     },
-    'payment_pending_hidden': {
-        'default': 'False',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_('Hide "payment pending" state on customer-facing pages'),
-            help_text=_("The payment instructions panel will still be shown to the primary customer, but no indication "
-                        "of missing payment will be visible on the ticket pages of attendees who did not buy the ticket "
-                        "themselves.")
-        )
-    },
     'payment_giftcard__enabled': {
         'default': 'True',
         'type': bool
@@ -851,20 +808,6 @@ DEFAULTS = {
             label=_("Default language"),
         )
     },
-    'region': {
-        'default': None,
-        'type': str,
-        'form_class': forms.ChoiceField,
-        'serializer_class': serializers.ChoiceField,
-        'serializer_kwargs': lambda: dict(**country_choice_kwargs()),
-        'form_kwargs': lambda: dict(
-            label=_('Region'),
-            help_text=_('Will be used to determine date and time formatting as well as default country for customer '
-                        'addresses and phone numbers. For formatting, this takes less priority than the language and '
-                        'is therefore mostly relevant for languages used in different regions globally (like English).'),
-            **country_choice_kwargs()
-        ),
-    },
     'show_dates_on_frontpage': {
         'default': 'True',
         'type': bool,
@@ -1047,16 +990,7 @@ DEFAULTS = {
     },
     'event_list_availability': {
         'default': 'True',
-        'type': bool,
-        'serializer_class': serializers.BooleanField,
-        'form_class': forms.BooleanField,
-        'form_kwargs': dict(
-            label=_('Show availability in event overviews'),
-            help_text=_('If checked, the list of events will show if events are sold out. This might '
-                        'make for longer page loading times if you have lots of events and the shown status might be out '
-                        'of date for up to two minutes.'),
-            required=False
-        )
+        'type': bool
     },
     'event_list_type': {
         'default': 'list',
@@ -1665,106 +1599,26 @@ Your {event} team"""))
     'primary_color': {
         'default': settings.PRETIX_PRIMARY_COLOR,
         'type': str,
-        'form_class': forms.CharField,
-        'serializer_class': serializers.CharField,
-        'serializer_kwargs': dict(
-            validators=[
-                RegexValidator(regex='^#[0-9a-fA-F]{6}$',
-                               message=_('Please enter the hexadecimal code of a color, e.g. #990000.')),
-            ],
-        ),
-        'form_kwargs': dict(
-            label=_("Primary color"),
-            validators=[
-                RegexValidator(regex='^#[0-9a-fA-F]{6}$',
-                               message=_('Please enter the hexadecimal code of a color, e.g. #990000.')),
-            ],
-            widget=forms.TextInput(attrs={'class': 'colorpickerfield'})
-        ),
     },
     'theme_color_success': {
         'default': '#50A167',
-        'type': str,
-        'form_class': forms.CharField,
-        'serializer_class': serializers.CharField,
-        'serializer_kwargs': dict(
-            validators=[
-                RegexValidator(regex='^#[0-9a-fA-F]{6}$',
-                               message=_('Please enter the hexadecimal code of a color, e.g. #990000.')),
-            ],
-        ),
-        'form_kwargs': dict(
-            label=_("Accent color for success"),
-            help_text=_("We strongly suggest to use a shade of green."),
-            validators=[
-                RegexValidator(regex='^#[0-9a-fA-F]{6}$',
-                               message=_('Please enter the hexadecimal code of a color, e.g. #990000.')),
-            ],
-            widget=forms.TextInput(attrs={'class': 'colorpickerfield'})
-        ),
+        'type': str
     },
     'theme_color_danger': {
         'default': '#D36060',
-        'type': str,
-        'form_class': forms.CharField,
-        'serializer_class': serializers.CharField,
-        'serializer_kwargs': dict(
-            validators=[
-                RegexValidator(regex='^#[0-9a-fA-F]{6}$',
-                               message=_('Please enter the hexadecimal code of a color, e.g. #990000.')),
-            ],
-        ),
-        'form_kwargs': dict(
-            label=_("Accent color for errors"),
-            help_text=_("We strongly suggest to use a shade of red."),
-            validators=[
-                RegexValidator(regex='^#[0-9a-fA-F]{6}$',
-                               message=_('Please enter the hexadecimal code of a color, e.g. #990000.')),
-            ],
-            widget=forms.TextInput(attrs={'class': 'colorpickerfield'})
-        ),
+        'type': str
     },
     'theme_color_background': {
         'default': '#FFFFFF',
-        'type': str,
-        'form_class': forms.CharField,
-        'serializer_class': serializers.CharField,
-        'serializer_kwargs': dict(
-            validators=[
-                RegexValidator(regex='^#[0-9a-fA-F]{6}$',
-                               message=_('Please enter the hexadecimal code of a color, e.g. #990000.')),
-            ],
-        ),
-        'form_kwargs': dict(
-            label=_("Page background color"),
-            validators=[
-                RegexValidator(regex='^#[0-9a-fA-F]{6}$',
-                               message=_('Please enter the hexadecimal code of a color, e.g. #990000.')),
-            ],
-            widget=forms.TextInput(attrs={'class': 'colorpickerfield no-contrast'})
-        ),
+        'type': str
     },
     'theme_round_borders': {
         'default': 'True',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_("Use round edges"),
-        )
+        'type': bool
     },
     'primary_font': {
         'default': 'Open Sans',
-        'type': str,
-        'form_class': forms.ChoiceField,
-        'serializer_class': serializers.ChoiceField,
-        'serializer_kwargs': lambda: dict(**primary_font_kwargs()),
-        'form_kwargs': lambda: dict(
-            label=_('Font'),
-            help_text=_('Only respected by modern browsers.'),
-            widget=FontSelect,
-            **primary_font_kwargs()
-        ),
+        'type': str
     },
     'presale_css_file': {
         'default': None,
@@ -1800,13 +1654,7 @@ Your {event} team"""))
     },
     'organizer_logo_image_large': {
         'default': 'False',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_('Use header image in its full size'),
-            help_text=_('We recommend to upload a picture at least 1170 pixels wide.'),
-        )
+        'type': bool
     },
     'og_image': {
         'default': None,
@@ -1865,30 +1713,6 @@ Your {event} team"""))
                         "how to obtain a voucher code.")
         )
     },
-    'attendee_data_explanation_text': {
-        'default': '',
-        'type': LazyI18nString,
-        'serializer_class': I18nField,
-        'form_class': I18nFormField,
-        'form_kwargs': dict(
-            label=_("Attendee data explanation"),
-            widget=I18nTextarea,
-            widget_kwargs={'attrs': {'rows': '2'}},
-            help_text=_("This text will be shown above the questions asked for every admission product. You can use it e.g. to explain "
-                        "why you need information from them.")
-        )
-    },
-    'checkout_phone_helptext': {
-        'default': '',
-        'type': LazyI18nString,
-        'serializer_class': I18nField,
-        'form_class': I18nFormField,
-        'form_kwargs': dict(
-            label=_("Help text of the phone number field"),
-            widget_kwargs={'attrs': {'rows': '2'}},
-            widget=I18nTextarea
-        )
-    },
     'checkout_email_helptext': {
         'default': LazyI18nString.from_gettext(gettext_noop(
             'Make sure to enter a valid email address. We will send you an order '
@@ -1909,26 +1733,11 @@ Your {event} team"""))
     },
     'organizer_info_text': {
         'default': '',
-        'type': LazyI18nString,
-        'serializer_class': I18nField,
-        'form_class': I18nFormField,
-        'form_kwargs': dict(
-            label=_('Info text'),
-            widget=I18nTextarea,
-            help_text=_('Not displayed anywhere by default, but if you want to, you can use this e.g. in ticket templates.')
-        )
+        'type': LazyI18nString
     },
     'event_team_provisioning': {
         'default': 'True',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_('Allow creating a new team during event creation'),
-            help_text=_('Users that do not have access to all events under this organizer, must select one of their teams '
-                        'to have access to the created event. This setting allows users to create an event-specified team'
-                        ' on-the-fly, even when they do not have \"Can change teams and permissions\" permission.'),
-        )
+        'type': bool
     },
     'update_check_ack': {
         'default': 'False',
@@ -1970,10 +1779,6 @@ Your {event} team"""))
         'default': None,
         'type': str
     },
-    'mapquest_apikey': {
-        'default': None,
-        'type': str
-    },
     'leaflet_tiles': {
         'default': None,
         'type': str
@@ -2006,51 +1811,13 @@ Your {event} team"""))
             # When adding a new ordering, remember to also define it in the event model
         )
     },
-    'organizer_link_back': {
-        'default': 'False',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_('Link back to organizer overview on all event pages'),
-        )
-    },
-    'organizer_homepage_text': {
-        'default': '',
-        'type': LazyI18nString,
-        'serializer_class': I18nField,
-        'form_class': I18nFormField,
-        'form_kwargs': dict(
-            label=_('Homepage text'),
-            widget=I18nTextarea,
-            help_text=_('This will be displayed on the organizer homepage.')
-        )
-    },
     'name_scheme': {
         'default': 'full',
         'type': str
     },
     'giftcard_length': {
         'default': settings.ENTROPY['giftcard_secret'],
-        'type': int,
-        'form_class': forms.IntegerField,
-        'serializer_class': serializers.IntegerField,
-        'form_kwargs': dict(
-            label=_('Length of gift card codes'),
-            help_text=_('The system generates by default {}-character long gift card codes. However, if a different length '
-                        'is required, it can be set here.'.format(settings.ENTROPY['giftcard_secret'])),
-        )
-    },
-    'giftcard_expiry_years': {
-        'default': None,
-        'type': int,
-        'form_class': forms.IntegerField,
-        'serializer_class': serializers.IntegerField,
-        'form_kwargs': dict(
-            label=_('Validity of gift card codes in years'),
-            help_text=_('If you set a number here, gift cards will by default expire at the end of the year after this '
-                        'many years. If you keep it empty, gift cards do not have an explicit expiry date.'),
-        )
+        'type': int
     },
     'seating_choice': {
         'default': 'True',
@@ -2086,10 +1853,6 @@ Your {event} team"""))
         ),
     }
 }
-SETTINGS_AFFECTING_CSS = {
-    'primary_color', 'theme_color_success', 'theme_color_danger', 'primary_font',
-    'theme_color_background', 'theme_round_borders'
-}
 PERSON_NAME_TITLE_GROUPS = OrderedDict([
     ('english_common', (_('Most common English titles'), (
         'Mr',
@@ -2289,30 +2052,6 @@ PERSON_NAME_SCHEMES = OrderedDict([
             '_scheme': 'salutation_title_given_family',
         },
     }),
-    ('salutation_title_given_family_degree', {
-        'fields': (
-            ('salutation', pgettext_lazy('person_name', 'Salutation'), 1),
-            ('title', pgettext_lazy('person_name', 'Title'), 1),
-            ('given_name', _('Given name'), 2),
-            ('family_name', _('Family name'), 2),
-            ('degree', pgettext_lazy('person_name', 'Degree (after name)'), 2),
-        ),
-        'concatenation': lambda d: (
-            ' '.join(
-                str(p) for p in (d.get(key, '') for key in ["title", "given_name", "family_name"]) if p
-            ) +
-            str((', ' if d.get('degree') else '')) +
-            str(d.get('degree', ''))
-        ),
-        'sample': {
-            'salutation': pgettext_lazy('person_name_sample', 'Mr'),
-            'title': pgettext_lazy('person_name_sample', 'Dr'),
-            'given_name': pgettext_lazy('person_name_sample', 'John'),
-            'family_name': pgettext_lazy('person_name_sample', 'Doe'),
-            'degree': pgettext_lazy('person_name_sample', 'MA'),
-            '_scheme': 'salutation_title_given_family_degree',
-        },
-    }),
 ])
 COUNTRIES_WITH_STATE_IN_ADDRESS = {
     # Source: http://www.bitboost.com/ref/international-address-formats.html
@@ -2404,8 +2143,7 @@ class SettingsSandbox:
         self._event.settings.set(self._convert_key(key), value)
 
 
-def validate_event_settings(event, settings_dict):
-    from pretix.base.models import Event
+def validate_settings(event, settings_dict):
     from pretix.base.signals import validate_event_settings
 
     if 'locales' in settings_dict and settings_dict['locale'] not in settings_dict['locales']:
@@ -2436,20 +2174,4 @@ def validate_event_settings(event, settings_dict):
                 'payment_term_last': _('The last payment date cannot be before the end of presale.')
             })
 
-    if isinstance(event, Event):
-        validate_event_settings.send(sender=event, settings_dict=settings_dict)
-
-
-def validate_organizer_settings(organizer, settings_dict):
-    # This is not doing anything for the time being.
-    # But earlier we called validate_event_settings for the organizer, too - and that didn't do anything for
-    # organizer-settings either.
-    #
-    # N.B.: When actually fleshing out this stub, adding it to the OrganizerUpdateForm should be considered.
-    pass
-
-
-def global_settings_object(holder):
-    if not hasattr(holder, '_global_settings_object'):
-        holder._global_settings_object = GlobalSettingsObject()
-    return holder._global_settings_object
+    validate_event_settings.send(sender=event, settings_dict=settings_dict)