Expose logs of all running processes to docker

Currently translated at 99.2% (3830 of 3859 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/nl/

powered by weblate

.github/workflows/docs.yml

@@ -31,7 +31,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system packages
-        run: sudo apt install enchant hunspell aspell-en
+        run: sudo apt update && sudo apt install enchant hunspell aspell-en
       - name: Install Dependencies
         run: pip3 install --no-use-pep517 -Ur doc/requirements.txt
       - name: Spellcheck docs

.github/workflows/strings.yml

@@ -29,7 +29,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system packages
-        run: sudo apt install gettext
+        run: sudo apt update && sudo apt install gettext
       - name: Install Dependencies
         run: pip3 install --no-use-pep517 -Ur src/requirements.txt
       - name: Compile messages
@@ -54,7 +54,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system packages
-        run: sudo apt install enchant hunspell hunspell-de-de aspell-en aspell-de
+        run: sudo apt update && sudo apt install enchant hunspell hunspell-de-de aspell-en aspell-de
       - name: Install Dependencies
         run: pip3 install --no-use-pep517 -Ur src/requirements/dev.txt
       - name: Spellcheck translations

.github/workflows/style.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Install Dependencies
         run: pip3 install --no-use-pep517 -Ur src/requirements/dev.txt
       - name: Run isort
-        run: isort -c -rc -df .
+        run: isort -c .
         working-directory: ./src
   flake:
     name: flake8

.github/workflows/tests.yml

@@ -55,7 +55,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system dependencies
-        run: sudo apt install gettext mysql-client
+        run: sudo apt update && sudo apt install gettext mysql-client
       - name: Install Python dependencies
         run: pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt mysqlclient psycopg2-binary
       - name: Run checks

.gitlab-ci.yml

@@ -20,15 +20,17 @@ pypi:
         - cp /keys/.pypirc ~/.pypirc
         - virtualenv env
         - source env/bin/activate
-        - pip install -U pip wheel setuptools
+        - pip install -U pip wheel setuptools check-manifest twine
         - XDG_CACHE_HOME=/cache pip3 install -Ur src/requirements.txt -r src/requirements/dev.txt
         - cd src
         - python setup.py sdist
         - pip install dist/pretix-*.tar.gz
         - python -m pretix migrate
         - python -m pretix check
-        - python setup.py sdist upload
-        - python setup.py bdist_wheel upload
+        - check-manifest
+        - python setup.py sdist bdist_wheel
+        - twine check dist/*
+        - twine upload dist/*
     tags:
         - python3
     only:

Dockerfile

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

README.rst

@@ -19,9 +19,8 @@ Reinventing ticket presales, one ticket at a time.
 Project status & release cycle
 ------------------------------
 
-While there is always a lot to do and improve on, pretix by now has been in use for more than a dozen
-conferences that sold over ten thousand tickets combined without major problems. We therefore think of
-pretix as being stable and ready to use.
+While there is always a lot to do and improve on, pretix by now has been in use for thousands of events
+conferences that sold millions of tickets combined. We therefore think of pretix as being stable and ready to use.
 
 If you want to use or extend pretix, we strongly recommend to follow our `blog`_. We will announce all
 releases there. You can always find the latest stable version on PyPI or in the ``release/X.Y`` branch of
@@ -30,9 +29,13 @@ the sense that it does not break your data,  but its APIs might change without p
 
 To get started using pretix on your own server, look at the `installation guide`_ in our documentation.
 
-This project is 100 percent free and open source software. If you are interested in commercial support,
-hosting services or supporting this project financially, please go to `pretix.eu`_ or contact us at
-support@pretix.eu.
+Support
+-------
+
+This project is 100 percent free and open source software. You are welcome to ask questions in the GitHub
+repository. Private support via email or phone is only offered to customers of our pretix Hosted or pretix
+Enterprise offerings. If you are interested in commercial support, hosting services or supporting this project
+financially, please go to `pretix.eu`_ or contact us at support@pretix.eu.
 
 Contributing
 ------------
@@ -52,8 +55,8 @@ License
 The code in this repository is published under the terms of the Apache License. 
 See the LICENSE file for the complete license text.
 
-This project is maintained by Raphael Michel <mail@raphaelmichel.de>. See the
-AUTHORS file for a list of all the awesome folks who contributed to this project.
+This project is maintained by Raphael Michel. See the AUTHORS file for a list of all
+the awesome folks who contributed to this project.
 
 .. _installation guide: https://docs.pretix.eu/en/latest/admin/installation/index.html
 .. _developer documentation: https://docs.pretix.eu/en/latest/development/index.html

deployment/docker/nginx.conf

@@ -24,8 +24,8 @@ http {
 	default_type application/octet-stream;
 	add_header X-Content-Type-Options nosniff;
 
-	access_log /var/log/nginx/access.log private;
-	error_log /var/log/nginx/error.log;
+	access_log /dev/stdout private;
+	error_log /dev/stderr;
 	add_header Referrer-Policy same-origin;
 
 	gzip on;

deployment/docker/pretix.bash

@@ -5,6 +5,8 @@ export DATA_DIR=/data/
 export HOME=/pretix
 export NUM_WORKERS=$((2 * $(nproc --all)))
 
+AUTOMIGRATE=${AUTOMIGRATE:-yes}
+
 if [ ! -d /data/logs ]; then
     mkdir /data/logs;
 fi
@@ -16,10 +18,16 @@ if [ "$1" == "cron" ]; then
     exec python3 -m pretix runperiodic
 fi
 
-python3 -m pretix migrate --noinput
+if [ "$AUTOMIGRATE" != "skip" ]; then
+  python3 -m pretix migrate --noinput
+fi
 
 if [ "$1" == "all" ]; then
-    exec sudo /usr/bin/supervisord -n -c /etc/supervisord.conf
+    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
 fi
 
 if [ "$1" == "webworker" ]; then
@@ -33,17 +41,12 @@ if [ "$1" == "webworker" ]; then
 fi
 
 if [ "$1" == "taskworker" ]; then
-    export C_FORCE_ROOT=True
-    exec celery -A pretix.celery_app worker -l info
-fi
-
-if [ "$1" == "shell" ]; then
-    exec python3 -m pretix shell
+    shift
+    exec celery -A pretix.celery_app worker -l info "$@"
 fi
 
 if [ "$1" == "upgrade" ]; then
     exec python3 -m pretix updatestyles
 fi
 
-echo "Specify argument: all|cron|webworker|taskworker|shell|upgrade"
-exit 1
+exec python3 -m pretix "$@"

deployment/docker/supervisord.all.conf

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

deployment/docker/supervisord.conf

@@ -1,44 +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
-
-[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

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

deployment/docker/supervisord/base.conf

@@ -0,0 +1,18 @@
+[unix_http_server]
+file=/tmp/supervisor.sock
+
+[supervisord]
+logfile=/dev/stderr
+logfile_maxbytes=0
+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

@@ -0,0 +1,11 @@
+[program:nginx]
+command=/usr/sbin/nginx
+autostart=true
+autorestart=true
+priority=10
+stdout_events_enabled=true
+stderr_events_enabled=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0

deployment/docker/supervisord/pretixtask.conf

@@ -0,0 +1,10 @@
+[program:pretixtask]
+command=/usr/local/bin/pretix taskworker
+autostart=true
+autorestart=true
+priority=5
+user=pretixuser
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0

deployment/docker/supervisord/pretixweb.conf

@@ -0,0 +1,11 @@
+[program:pretixweb]
+command=/usr/local/bin/pretix webworker
+autostart=true
+autorestart=true
+priority=5
+user=pretixuser
+environment=HOME=/pretix
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0

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

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

doc/admin/config.rst

@@ -23,6 +23,14 @@ 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
 ---------------
 
@@ -95,6 +103,11 @@ Example::
     proxy that actively removes and re-adds the header to make sure the correct value is set.
     Defaults to ``off``.
 
+``csp_log``
+    Log violations of the Content Security Policy (CSP). Defaults to ``on``.
+    
+``loglevel``
+    Set console and file log level (``DEBUG``, ``INFO``, ``WARNING``, ``ERROR`` or ``CRITICAL``). Defaults to ``INFO``.
 
 Locale settings
 ---------------
@@ -337,6 +350,15 @@ application. If you want to use sentry, you need to set a DSN in the configurati
     You will be given this value by your sentry installation.
 
 
+Caching
+-------
+
+You can adjust some caching settings to control how much storage pretix uses::
+
+    [cache]
+    tickets=48  ; Number of hours tickets (PDF, passbook, …) are cached
+
+
 Secret length
 -------------
 

doc/admin/index.rst

@@ -12,3 +12,4 @@ This documentation is for everyone who wants to install pretix on a server.
    config
    maintainance
    scaling
+   indexes

doc/admin/indexes.rst

@@ -0,0 +1,73 @@
+Additional database indices
+===========================
+
+If you have a large pretix database, some features such as search for orders or events might turn pretty slow.
+For PostgreSQL, we have compiled a list of additional database indexes that you can add to speed things up.
+Just like any index, they in turn make write operations insignificantly slower and cause the database to use
+more disk space.
+
+The indexes aren't automatically created by pretix since Django does not allow us to do so only on PostgreSQL
+(and they won't work on other databases). Also, they're really not necessary if you're not having tens of
+thousands of records in your database.
+
+However, this also means they won't automatically adapt if some of the referred fields change in future updates of pretix
+and you might need to re-check this page and change them manually.
+
+Here is the currently recommended set of commands::
+
+    CREATE EXTENSION pg_trgm;
+
+    CREATE INDEX CONCURRENTLY pretix_addidx_event_slug
+        ON pretixbase_event
+        USING gin (upper("slug") gin_trgm_ops);
+    CREATE INDEX CONCURRENTLY pretix_addidx_event_name
+        ON pretixbase_event
+        USING gin (upper("name") gin_trgm_ops);
+    CREATE INDEX CONCURRENTLY pretix_addidx_order_code
+        ON pretixbase_order
+        USING gin (upper("code") gin_trgm_ops);
+    CREATE INDEX CONCURRENTLY pretix_addidx_voucher_code
+        ON pretixbase_voucher
+        USING gin (upper("code") gin_trgm_ops);
+    CREATE INDEX CONCURRENTLY pretix_addidx_invoice_nu1
+        ON "pretixbase_invoice" (UPPER("invoice_no"));
+    CREATE INDEX CONCURRENTLY pretix_addidx_invoice_nu2
+        ON "pretixbase_invoice" (UPPER("full_invoice_no"));
+    CREATE INDEX CONCURRENTLY pretix_addidx_organizer_name
+        ON pretixbase_organizer
+        USING gin (upper("name") gin_trgm_ops);
+    CREATE INDEX CONCURRENTLY pretix_addidx_organizer_slug
+        ON pretixbase_organizer
+        USING gin (upper("slug") gin_trgm_ops);
+    CREATE INDEX CONCURRENTLY pretix_addidx_order_email
+        ON pretixbase_order
+        USING gin (upper("email") gin_trgm_ops);
+    CREATE INDEX CONCURRENTLY pretix_addidx_order_comment
+        ON pretixbase_order
+        USING gin (upper("comment") gin_trgm_ops);
+    CREATE INDEX CONCURRENTLY pretix_addidx_orderpos_name
+        ON pretixbase_orderposition
+        USING gin (upper("attendee_name_cached") gin_trgm_ops);
+    CREATE INDEX CONCURRENTLY pretix_addidx_orderpos_scret
+        ON pretixbase_orderposition
+        USING gin (upper("secret") gin_trgm_ops);
+    CREATE INDEX CONCURRENTLY pretix_addidx_orderpos_email
+        ON pretixbase_orderposition
+        USING gin (upper("attendee_email") gin_trgm_ops);
+    CREATE INDEX CONCURRENTLY pretix_addidx_ia_name
+        ON pretixbase_invoiceaddress
+        USING gin (upper("name_cached") gin_trgm_ops);
+    CREATE INDEX CONCURRENTLY pretix_addidx_ia_company
+        ON pretixbase_invoiceaddress
+        USING gin (upper("company") gin_trgm_ops);
+
+
+Also, if you use our ``pretix-shipping`` plugin::
+
+    CREATE INDEX CONCURRENTLY pretix_addidx_sa_name
+        ON pretix_shipping_shippingaddress
+        USING gin (upper("name") gin_trgm_ops);
+    CREATE INDEX CONCURRENTLY pretix_addidx_sa_company
+        ON pretix_shipping_shippingaddress
+        USING gin (upper("company") gin_trgm_ops);
+

doc/admin/installation/docker_smallscale.rst

@@ -26,7 +26,7 @@ installation guides):
 * `Docker`_
 * A SMTP server to send out mails, e.g. `Postfix`_ on your machine or some third-party server you have credentials for
 * A HTTP reverse proxy, e.g. `nginx`_ or Apache to allow HTTPS connections
-* A `PostgreSQL`_, `MySQL`_ 5.7+, or MariaDB 10.2.7+ database server
+* A `PostgreSQL`_ 9.5+, `MySQL`_ 5.7+, or MariaDB 10.2.7+ database server
 * A `redis`_ server
 
 We also recommend that you use a firewall, although this is not a pretix-specific recommendation. If you're new to
@@ -284,13 +284,31 @@ 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``).
+
+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/
 .. _Let's Encrypt: https://letsencrypt.org/
 .. _pretix.eu: https://pretix.eu/
 .. _MySQL: https://dev.mysql.com/doc/refman/5.7/en/linux-installation-apt-repo.html
-.. _PostgreSQL: https://www.digitalocean.com/community/tutorials/how-to-install-and-use-postgresql-9-4-on-debian-8
+.. _PostgreSQL: https://www.digitalocean.com/community/tutorials/how-to-install-and-use-postgresql-on-ubuntu-20-04
 .. _redis: https://blog.programster.org/debian-8-install-redis-server/
 .. _ufw: https://en.wikipedia.org/wiki/Uncomplicated_Firewall
 .. _redis website: https://redis.io/topics/security

doc/admin/installation/manual_smallscale.rst

@@ -23,7 +23,7 @@ installation guides):
 
 * A SMTP server to send out mails, e.g. `Postfix`_ on your machine or some third-party server you have credentials for
 * A HTTP reverse proxy, e.g. `nginx`_ or Apache to allow HTTPS connections
-* A `PostgreSQL`_, `MySQL`_ 5.7+, or MariaDB 10.2.7+ database server
+* A `PostgreSQL`_ 9.5+, `MySQL`_ 5.7+, or MariaDB 10.2.7+ database server
 * A `redis`_ server
 
 We also recommend that you use a firewall, although this is not a pretix-specific recommendation. If you're new to
@@ -308,7 +308,7 @@ example::
 .. _Let's Encrypt: https://letsencrypt.org/
 .. _pretix.eu: https://pretix.eu/
 .. _MySQL: https://dev.mysql.com/doc/refman/5.7/en/linux-installation-apt-repo.html
-.. _PostgreSQL: https://www.digitalocean.com/community/tutorials/how-to-install-and-use-postgresql-9-4-on-debian-8
+.. _PostgreSQL: https://www.digitalocean.com/community/tutorials/how-to-install-and-use-postgresql-on-ubuntu-20-04
 .. _redis: https://blog.programster.org/debian-8-install-redis-server/
 .. _ufw: https://en.wikipedia.org/wiki/Uncomplicated_Firewall
 .. _strong encryption settings: https://mozilla.github.io/server-side-tls/ssl-config-generator/

doc/admin/maintainance.rst

@@ -92,7 +92,8 @@ pretix_task_duration_seconds
 
 pretix_model_instances
     Gauge. Measures number of instances of a certain model within the database, labeled with
-    the ``model`` name.
+    the ``model`` name. Starting with pretix 3.11, these numbers might only be approximate for
+    most tables when running on PostgreSQL to mitigate performance impact.
 
 .. _metric types: https://prometheus.io/docs/concepts/metric_types/
 .. _Prometheus: https://prometheus.io/

doc/api/deviceauth.rst

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

doc/api/index.rst

@@ -7,9 +7,6 @@ This part of the documentation contains information about the REST-style API
 exposed by pretix since version 1.5 that can be used by third-party programs
 to interact with pretix and its data structures.
 
-Currently, the API provides mostly read-only capabilities, but it will be extended
-in functionality over time.
-
 .. toctree::
    :maxdepth: 2
 

doc/api/oauth.rst

@@ -25,7 +25,7 @@ Obtaining an authorization grant
 --------------------------------
 
 To authorize a new user, link or redirect them to the ``authorize`` endpoint, passing your client ID as a query
-parameter. Additionally, you can pass a scope (currently either ``read``, ``write``, or ``read write``)
+parameter. Additionally, you can pass a scope (currently either ``read``, ``write``, ``read write`` or ``profile``)
 and an URL the user should be redirected to after successful or failed authorization. You also need to pass the
 ``response_type`` parameter with a value of ``code``. Example::
 
@@ -47,11 +47,9 @@ You will need this ``code`` parameter to perform the next step.
 
 On a failed registration, a query string like ``?error=access_denied`` will be appended to the redirection URL.
 
-.. note:: In this step, the user is allowed to restrict your access to certain organizer accounts. If you try to
-          re-authenticate the user later, the user might be instantly redirected back to you if authorization is already
-          given and would therefore be unable to review their organizer restriction settings. You can append the
-          ``approval_prompt=force`` query parameter if you want to make sure the user actively needs to confirm the
-          authorization.
+.. note:: By default, the user is asked to give permission on every call to this URL. If you **only** request the
+          ``profile`` scope, i.e. no access to organizer data, you can pass the ``approval_prompt=auto`` parameter
+          to skip user interaction on subsequent calls.
 
 Getting an access token
 -----------------------
@@ -193,10 +191,11 @@ If you need the user's meta data, you can fetch it here:
       Content-Type: application/json
 
       {
-        email: "admin@localhost",
-        fullname: "John Doe",
-        locale: "de",
-        timezone: "Europe/Berlin"
+        "email": "admin@localhost",
+        "fullname": "John Doe",
+        "locale": "de",
+        "is_staff": false,
+        "timezone": "Europe/Berlin"
       }
 
    :statuscode 200: no error

doc/api/resources/checkinlists.rst

@@ -33,6 +33,7 @@ auto_checkin_sales_channels           list of strings            All items on th
 allow_multiple_entries                boolean                    If ``true``, subsequent scans of a ticket on this list should not show a warning but instead be stored as an additional check-in.
 allow_entry_after_exit                boolean                    If ``true``, subsequent scans of a ticket on this list are valid if the last scan of the ticket was an exit scan.
 rules                                 object                     Custom check-in logic. The contents of this field are currently not considered a stable API and modifications through the API are highly discouraged.
+exit_all_at                           datetime                   Automatically check out (i.e. perform an exit scan) at this point in time. After this happened, this property will automatically be set exactly one day into the future. Note that this field is considered "internal configuration" and if you pull the list with ``If-Modified-Since``, the daily change in this field will not trigger a response.
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.10
@@ -56,6 +57,14 @@ rules                                 object                     Custom check-in
     The ``subevent`` attribute may now be ``null`` inside event series. The ``allow_multiple_entries``,
     ``allow_entry_after_exit``, and ``rules`` attributes have been added.
 
+.. versionchanged:: 3.11
+
+    The ``subevent_match`` and ``exclude`` query parameters have been added.
+
+.. versionchanged:: 3.12
+
+    The ``exit_all_at`` attribute has been added.
+
 Endpoints
 ---------
 
@@ -99,6 +108,7 @@ Endpoints
             "subevent": null,
             "allow_multiple_entries": false,
             "allow_entry_after_exit": true,
+            "exit_all_at": null,
             "rules": {},
             "auto_checkin_sales_channels": [
               "pretixpos"
@@ -109,6 +119,8 @@ Endpoints
 
    :query integer page: The page number in case of a multi-page result set, default is 1
    :query integer subevent: Only return check-in lists of the sub-event with the given ID
+   :query integer subevent_match: Only return check-in lists that are valid for the sub-event with the given ID (i.e. also lists valid for all subevents)
+   :query string exclude: Exclude a field from the output, e.g. ``checkin_count``. Can be used as a performance optimization. Can be passed multiple times.
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
    :statuscode 200: no error
@@ -146,6 +158,7 @@ Endpoints
         "subevent": null,
         "allow_multiple_entries": false,
         "allow_entry_after_exit": true,
+        "exit_all_at": null,
         "rules": {},
         "auto_checkin_sales_channels": [
           "pretixpos"
@@ -182,6 +195,7 @@ Endpoints
       {
         "checkin_count": 17,
         "position_count": 42,
+        "inside_count": 12,
         "event": {
           "name": "Demo Conference"
         },
@@ -602,6 +616,7 @@ Order position endpoints
    :<json datetime datetime: Specifies the datetime of the check-in. If not supplied, the current time will be used.
    :<json boolean force: Specifies that the check-in should succeed regardless of previous check-ins or required
                          questions that have not been filled. Defaults to ``false``.
+   :<json string type: Send ``"exit"`` for an exit and ``"entry"`` (default) for an entry.
    :<json boolean ignore_unpaid: Specifies that the check-in should succeed even if the order is in pending state.
                                  Defaults to ``false`` and only works when ``include_pending`` is set on the check-in
                                  list.

doc/api/resources/devices.rst

@@ -0,0 +1,224 @@
+.. spelling:: fullname
+
+.. _`rest-devices`:
+
+Devices
+=======
+
+See also :ref:`rest-deviceauth`.
+
+Device resource
+----------------
+
+The device resource contains the following public fields:
+
+.. rst-class:: rest-resource-table
+
+===================================== ========================== =======================================================
+Field                                 Type                       Description
+===================================== ========================== =======================================================
+device_id                             integer                    Internal ID of the device within this organizer
+unique_serial                         string                     Unique identifier of this device
+name                                  string                     Device name
+all_events                            boolean                    Whether this device has access to all events
+limit_events                          list                       List of event slugs this device has access to
+hardware_brand                        string                     Device hardware manufacturer (read-only)
+hardware_model                        string                     Device hardware model (read-only)
+software_brand                        string                     Device software product (read-only)
+software_version                      string                     Device software version (read-only)
+created                               datetime                   Creation time
+initialized                           datetime                   Time of initialization (or ``null``)
+initialization_token                  string                     Token for initialization
+revoked                               boolean                    Whether this device no longer has access
+security_profile                      string                     The name of a supported security profile restricting API access
+===================================== ========================== =======================================================
+
+Device endpoints
+----------------
+
+.. http:get:: /api/v1/organizers/(organizer)/devices/
+
+   Returns a list of all devices within a given organizer.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/devices/ 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": [
+          {
+            "device_id": 1,
+            "unique_serial": "UOS3GNZ27O39V3QS",
+            "initialization_token": "frkso3m2w58zuw70",
+            "all_events": false,
+            "limit_events": [
+              "museum"
+            ],
+            "revoked": false,
+            "name": "Scanner",
+            "created": "2020-09-18T14:17:40.971519Z",
+            "initialized": "2020-09-18T14:17:44.190021Z",
+            "security_profile": "full",
+            "hardware_brand": "Zebra",
+            "hardware_model": "TC25",
+            "software_brand": "pretixSCAN",
+            "software_version": "1.5.1"
+          }
+        ]
+      }
+
+   :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 does not exist **or** you have no permission to view this resource.
+
+.. http:get:: /api/v1/organizers/(organizer)/devices/(device_id)/
+
+   Returns information on one device, identified by its ID.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/devices/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "device_id": 1,
+        "unique_serial": "UOS3GNZ27O39V3QS",
+        "initialization_token": "frkso3m2w58zuw70",
+        "all_events": false,
+        "limit_events": [
+          "museum"
+        ],
+        "revoked": false,
+        "name": "Scanner",
+        "created": "2020-09-18T14:17:40.971519Z",
+        "initialized": "2020-09-18T14:17:44.190021Z",
+        "security_profile": "full",
+        "hardware_brand": "Zebra",
+        "hardware_model": "TC25",
+        "software_brand": "pretixSCAN",
+        "software_version": "1.5.1"
+      }
+
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param device_id: The ``device_id`` field of the device to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer does not exist **or** you have no permission to view this resource.
+
+.. http:post:: /api/v1/organizers/(organizer)/devices/
+
+   Creates a new device
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      POST /api/v1/organizers/bigevents/devices/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+
+      {
+        "name": "Scanner",
+        "all_events": true,
+        "limit_events": [],
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 201 Created
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "device_id": 1,
+        "unique_serial": "UOS3GNZ27O39V3QS",
+        "initialization_token": "frkso3m2w58zuw70",
+        "all_events": true,
+        "limit_events": [],
+        "revoked": false,
+        "name": "Scanner",
+        "created": "2020-09-18T14:17:40.971519Z",
+        "security_profile": "full",
+        "initialized": null
+        "hardware_brand": null,
+        "hardware_model": null,
+        "software_brand": null,
+        "software_version": null
+      }
+
+   :param organizer: The ``slug`` field of the organizer to create a device for
+   :statuscode 201: no error
+   :statuscode 400: The device could not be created due to invalid submitted data.
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.
+
+.. http:patch:: /api/v1/organizers/(organizer)/devices/(device_id)/
+
+   Update a device.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      PATCH /api/v1/organizers/bigevents/devices/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+      Content-Length: 94
+
+      {
+        "name": "Foo"
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "name": "Foo",
+        ...
+      }
+
+   :param organizer: The ``slug`` field of the organizer to modify
+   :param device_id: The ``device_id`` field of the device to modify
+   :statuscode 200: no error
+   :statuscode 400: The device could not be modified due to invalid submitted data
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer does not exist **or** you have no permission to change this resource.
+

doc/api/resources/events.rst

@@ -44,6 +44,11 @@ seat_category_mapping                 object                     An object mappi
                                                                  (strings) to items in the event (integers or ``null``).
 timezone                              string                     Event timezone name
 item_meta_properties                  object                     Item-specific meta data parameters and default values.
+valid_keys                            object                     Cryptographic keys for non-default signature schemes.
+                                                                 For performance reason, value is omitted in lists and
+                                                                 only contained in detail views. Value can be cached.
+sales_channels                        list                       A list of sales channels this event is available for
+                                                                 sale on.
 ===================================== ========================== =======================================================
 
 
@@ -84,6 +89,15 @@ item_meta_properties                  object                     Item-specific m
 
    The attribute ``item_meta_properties`` has been added.
 
+.. versionchanged:: 3.12
+
+   The attribute ``valid_keys`` has been added.
+
+.. versionchanged:: 3.14
+
+    The attribute ``sales_channels`` has been added.
+
+
 Endpoints
 ---------
 
@@ -140,10 +154,15 @@ 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"
             ]
           }
         ]
@@ -163,6 +182,7 @@ 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
@@ -212,10 +232,20 @@ 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"
         ]
       }
 
@@ -267,6 +297,11 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
+        ],
+        "sales_channels": [
+          "web",
+          "pretixpos",
+          "resellers"
         ]
       }
 
@@ -302,6 +337,11 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
+        ],
+        "sales_channels": [
+          "web",
+          "pretixpos",
+          "resellers"
         ]
       }
 
@@ -357,6 +397,11 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
+        ],
+        "sales_channels": [
+          "web",
+          "pretixpos",
+          "resellers"
         ]
       }
 
@@ -392,6 +437,11 @@ Endpoints
         "plugins": [
           "pretix.plugins.stripe",
           "pretix.plugins.paypal"
+        ],
+        "sales_channels": [
+          "web",
+          "pretixpos",
+          "resellers"
         ]
       }
 
@@ -461,6 +511,11 @@ Endpoints
           "pretix.plugins.stripe",
           "pretix.plugins.paypal",
           "pretix.plugins.pretixdroid"
+        ],
+        "sales_channels": [
+          "web",
+          "pretixpos",
+          "resellers"
         ]
       }
 
@@ -472,7 +527,7 @@ Endpoints
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
 
 
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/items/(id)/
+.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/
 
    Delete an event. Note that events with orders cannot be deleted to ensure data integrity.
 
@@ -526,7 +581,7 @@ information about the properties.
 
    Get current values of event settings.
 
-   Permission required: "Can change event settings"
+   Permission required: "Can change event settings" (Exception: with device auth, *some* settings can always be *read*.)
 
    **Example request**:
 

doc/api/resources/exporters.rst

@@ -0,0 +1,215 @@
+.. 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,9 +22,28 @@ 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.
@@ -209,14 +228,15 @@ Endpoints
 
    .. sourcecode:: http
 
-      PATCH /api/v1/organizers/bigevents/giftcards/1/transact/ HTTP/1.1
+      POST /api/v1/organizers/bigevents/giftcards/1/transact/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
       Content-Type: application/json
-      Content-Length: 94
+      Content-Length: 79
 
       {
-        "value": "2.00"
+        "value": "2.00",
+        "text": "Optional value explaining the transaction"
       }
 
    **Example response**:
@@ -249,3 +269,45 @@ 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

@@ -24,7 +24,9 @@ Resources and endpoints
    giftcards
    carts
    teams
+   devices
    webhooks
    seatingplans
+   exporters
    billing_invoices
    billing_var

doc/api/resources/item_add-ons.rst

@@ -24,6 +24,7 @@ addon_category                        integer                    Internal ID of
 min_count                             integer                    The minimal number of add-ons that need to be chosen.
 max_count                             integer                    The maximal number of add-ons that can be chosen.
 position                              integer                    An integer, used for sorting
+multi_allowed                         boolean                    Adding the same item multiple times is allowed
 price_included                        boolean                    Adding this add-on to the item is free
 ===================================== ========================== =======================================================
 
@@ -65,6 +66,7 @@ Endpoints
             "min_count": 0,
             "max_count": 10,
             "position": 0,
+            "multi_allowed": false,
             "price_included": true
           },
           {
@@ -73,6 +75,7 @@ Endpoints
             "min_count": 0,
             "max_count": 10,
             "position": 1,
+            "multi_allowed": false,
             "price_included": true
           }
         ]
@@ -112,6 +115,7 @@ Endpoints
         "min_count": 0,
         "max_count": 10,
         "position": 1,
+        "multi_allowed": false,
         "price_included": true
       }
 
@@ -141,6 +145,7 @@ Endpoints
         "min_count": 0,
         "max_count": 10,
         "position": 1,
+        "multi_allowed": false,
         "price_included": true
       }
 
@@ -158,6 +163,7 @@ Endpoints
         "min_count": 0,
         "max_count": 10,
         "position": 1,
+        "multi_allowed": false,
         "price_included": true
       }
 
@@ -206,6 +212,7 @@ Endpoints
         "min_count": 0,
         "max_count": 10,
         "position": 1,
+        "multi_allowed": false,
         "price_included": true
       }
 

doc/api/resources/items.rst

@@ -104,6 +104,7 @@ addons                                list of objects            Definition of a
 ├ min_count                           integer                    The minimal number of add-ons that need to be chosen.
 ├ max_count                           integer                    The maximal number of add-ons that can be chosen.
 ├ position                            integer                    An integer, used for sorting
+├ multi_allowed                       boolean                    Adding the same item multiple times is allowed
 └ price_included                      boolean                    Adding this add-on to the item is free
 bundles                               list of objects            Definition of bundles that are included in this item.
                                                                  Only writable during creation,
@@ -159,6 +160,10 @@ meta_data                             object                     Values set for
 
    The attribute ``meta_data`` has been added.
 
+.. versionchanged:: 3.10
+
+   The attribute ``multi_allowed`` has been added to ``addons``.
+
 Notes
 -----
 

doc/api/resources/orders.rst

@@ -155,6 +155,18 @@ last_modified                         datetime                   Last modificati
 
    The ``reactivate`` operation has been added.
 
+.. versionchanged:: 3.10
+
+   The ``search`` query parameter has been added.
+
+.. versionchanged:: 3.11
+
+   The ``exclude`` and ``subevent_after`` query parameter has been added.
+
+.. versionchanged:: 3.13
+
+   The ``subevent_before`` query parameter has been added.
+
 
 .. _order-position-resource:
 
@@ -193,6 +205,7 @@ addon_to                              integer                    Internal ID of
 subevent                              integer                    ID of the date inside an event series this position belongs to (or ``null``).
 pseudonymization_id                   string                     A random ID, e.g. for use in lead scanning apps
 checkins                              list of objects            List of check-ins with this ticket
+├ id                                  integer                    Internal ID of the check-in event
 ├ list                                integer                    Internal ID of the check-in list
 ├ datetime                            datetime                   Time of check-in
 ├ type                                string                     Type of scan (defaults to ``entry``)
@@ -468,6 +481,7 @@ List of all orders
                            ``last_modified``, and ``status``. Default: ``datetime``
    :query string code: Only return orders that match the given order code
    :query string status: Only return orders in the given order status (see above)
+   :query string search: Only return orders matching a given search query
    :query boolean testmode: Only return orders with ``testmode`` set to ``true`` or ``false``
    :query boolean require_approval: If set to ``true`` or ``false``, only categories with this value for the field
                                     ``require_approval`` will be returned.
@@ -480,6 +494,9 @@ 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 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
    :resheader X-Page-Generated: The server time at the beginning of the operation. If you're using this API to fetch
@@ -923,8 +940,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_mail`` (optional). If set to ``true``, the same emails will be sent as for a regular order. Defaults to
-     ``false``.
+   * ``send_email`` (optional). If set to ``true``, the same emails will be sent as for a regular order, regardless of
+     whether these emails are enabled for certain sales channels. Defaults to
+     ``false``. Used to be ``send_mail`` before pretix 3.14.
 
    If you want to use add-on products, you need to set the ``positionid`` fields of all positions manually
    to incrementing integers starting with ``1``. Then, you can reference one of these
@@ -1017,6 +1035,10 @@ Creating orders
 Order state operations
 ----------------------
 
+.. versionchanged:: 3.12
+
+   The ``mark_paid`` operation now takes a ``send_email`` parameter.
+
 .. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/mark_paid/
 
    Marks a pending or expired order as successfully paid.
@@ -1028,6 +1050,11 @@ Order state operations
       POST /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/mark_paid/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
+      Content-Type: application/json
+
+      {
+          "send_email": true
+      }
 
    **Example response**:
 
@@ -1710,6 +1737,10 @@ Order payment endpoints
 
    Payments can now be created through the API.
 
+.. versionchanged:: 3.12
+
+   The ``confirm`` operation now takes a ``send_email`` parameter.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/payments/
 
    Returns a list of all payments for an order.
@@ -1810,7 +1841,10 @@ Order payment endpoints
       Accept: application/json, text/javascript
       Content-Type: application/json
 
-      {"force": false}
+      {
+          "send_email": true,
+          "force": false
+      }
 
    **Example response**:
 
@@ -1942,6 +1976,7 @@ Order payment endpoints
         "amount": "23.00",
         "payment_date": "2017-12-04T12:13:12Z",
         "info": {},
+        "send_email": false,
         "provider": "banktransfer"
       }
 
@@ -2234,3 +2269,57 @@ Order refund endpoints
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
    :statuscode 404: The requested order or refund does not exist.
+
+Revoked ticket secrets
+----------------------
+
+With some non-default ticket secret generation methods, a list of revoked ticket secrets is required for proper validation.
+
+.. versionchanged:: 3.12
+
+   Added revocation lists.
+
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/revokedsecrets/
+
+   Returns a list of all revoked secrets within a given event.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/events/sampleconf/revokedsecrets/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+      X-Page-Generated: 2017-12-01T10:00:00Z
+
+      {
+        "count": 1,
+        "next": null,
+        "previous": null,
+        "results": [
+          {
+            "id": 1234,
+            "secret": "k24fiuwvu8kxz3y1",
+            "created": "2017-12-01T10:00:00Z",
+          }
+        ]
+      }
+
+   :query integer page: The page number in case of a multi-page result set, default is 1
+   :query string ordering: Manually set the ordering of results. Valid fields to be used are ``secret`` and ``created``. Default: ``-created``
+   :query datetime created_since: Only return revocations that have been created since the given date.
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param event: The ``slug`` field of the event to fetch
+   :resheader X-Page-Generated: The server time at the beginning of the operation. If you're using this API to fetch
+                                differences, this is the value you want to use as ``created_since`` in your next call.
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.

doc/api/resources/organizers.rst

@@ -90,3 +90,120 @@ 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,4 +1,7 @@
-.. spelling:: checkin
+.. spelling::
+
+   checkin
+   datetime
 
 .. _rest-questions:
 
@@ -53,6 +56,12 @@ 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
@@ -92,6 +101,10 @@ dependency_value                      string                     An old version
 
   The attribute ``help_text`` has been added.
 
+.. versionchanged:: 3.14
+
+  The attributes ``valid_*`` have been added.
+
 Endpoints
 ---------
 
@@ -137,6 +150,12 @@ 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": [],
@@ -208,6 +227,12 @@ 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": [],
@@ -302,6 +327,12 @@ 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,
@@ -377,6 +408,12 @@ 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/quotas.rst

@@ -26,6 +26,8 @@ close_when_sold_out                   boolean                    If ``true``, th
                                                                  again.
 closed                                boolean                    Whether the quota is currently closed (see above
                                                                  field).
+release_after_exit                    boolean                    Whether the quota regains capacity as soon as some tickets
+                                                                 have been scanned at an exit.
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.10
@@ -36,6 +38,10 @@ closed                                boolean                    Whether the quo
 
    The attributes ``close_when_sold_out`` and ``closed`` have been added.
 
+.. versionchanged:: 3.10
+
+   The attribute ``release_after_exit`` has been added.
+
 
 Endpoints
 ---------
@@ -283,6 +289,7 @@ Endpoints
         "total_size": 1000,
         "pending_orders": 25,
         "paid_orders": 423,
+        "exited_orders": 0,
         "cart_positions": 7,
         "blocking_vouchers": 126,
         "waiting_list": 0

doc/api/resources/subevents.rst

@@ -39,16 +39,19 @@ geo_lon                               float                      Longitude of th
 item_price_overrides                  list of objects            List of items for which this sub-event overrides the
                                                                  default price
 ├ item                                integer                    The internal item ID
+├ disabled                            boolean                    If ``true``, item should not be available for this sub-event
 └ price                               money (string)             The price or ``null`` for the default price
 variation_price_overrides             list of objects            List of variations for which this sub-event overrides
                                                                  the default price
 ├ variation                           integer                    The internal variation ID
+├ disabled                            boolean                    If ``true``, variation should not be available for this sub-event
 └ price                               money (string)             The price or ``null`` for the default price
 meta_data                             object                     Values set for organizer-specific meta data parameters.
 seating_plan                          integer                    If reserved seating is in use, the ID of a seating
                                                                  plan. Otherwise ``null``.
 seat_category_mapping                 object                     An object mapping categories of the seating plan
                                                                  (strings) to items in the event (integers or ``null``).
+last_modified                         datetime                   Last modification of this object
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 1.7
@@ -74,6 +77,14 @@ seat_category_mapping                 object                     An object mappi
 
    The attributes ``geo_lat`` and ``geo_lon`` have been added.
 
+.. versionchanged:: 3.10
+
+   The ``disabled`` attribute has been added to ``item_price_overrides`` and ``variation_price_overrides``.
+
+.. versionchanged:: 3.12
+
+   The ``last_modified`` attribute has been added.
+
 Endpoints
 ---------
 
@@ -125,6 +136,7 @@ Endpoints
             "item_price_overrides": [
               {
                 "item": 2,
+                "disabled": false,
                 "price": "12.00"
               }
             ],
@@ -141,6 +153,8 @@ Endpoints
    :query ends_after: If set to a date and time, only events that happen during of after the given time are returned.
    :param organizer: The ``slug`` field of a valid organizer
    :param event: The ``slug`` field of the main event
+   :query datetime modified_since: Only return objects that have changed since the given date. Be careful: This does not
+       allow you to know if a subevent was deleted.
    :query array attr[meta_data_key]: By providing the key and value of a meta data attribute, the list of sub-events
         will only contain the sub-events matching the set criteria. Providing ``?attr[Format]=Seminar`` would return
         only those sub-events having set their ``Format`` meta data to ``Seminar``, ``?attr[Format]=`` only those, that
@@ -182,6 +196,7 @@ Endpoints
         "item_price_overrides": [
           {
             "item": 2,
+            "disabled": false,
             "price": "12.00"
           }
         ],
@@ -216,6 +231,7 @@ Endpoints
         "item_price_overrides": [
           {
             "item": 2,
+            "disabled": false,
             "price": "12.00"
           }
         ],
@@ -271,6 +287,7 @@ Endpoints
         "item_price_overrides": [
           {
             "item": 2,
+            "disabled": false,
             "price": "12.00"
           }
         ],
@@ -307,6 +324,7 @@ Endpoints
         "item_price_overrides": [
           {
             "item": 2,
+            "disabled": false,
             "price": "23.42"
           }
         ],
@@ -339,6 +357,7 @@ Endpoints
         "item_price_overrides": [
           {
             "item": 2,
+            "disabled": false,
             "price": "23.42"
           }
         ],
@@ -427,6 +446,7 @@ Endpoints
             "item_price_overrides": [
               {
                 "item": 2,
+                "disabled": false,
                 "price": "12.00"
               }
             ],

doc/api/resources/webhooks.rst

@@ -31,8 +31,10 @@ 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``
@@ -42,6 +44,12 @@ The following values for ``action_types`` are valid with pretix core:
     * ``pretix.event.order.denied``
     * ``pretix.event.checkin``
     * ``pretix.event.checkin.reverted``
+    * ``pretix.event.added``
+    * ``pretix.event.changed``
+    * ``pretix.event.deleted``
+    * ``pretix.subevent.added``
+    * ``pretix.subevent.changed``
+    * ``pretix.subevent.deleted``
 
 Installed plugins might register more valid values.
 

doc/conf.py

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

doc/development/api/exporter.rst

@@ -29,6 +29,22 @@ that we'll provide in this plugin::
         from .exporter import MyExporter
         return MyExporter
 
+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::
+
+    from django.dispatch import receiver
+
+    from pretix.base.signals import register_multievent_data_exporters
+
+
+    @receiver(register_multievent_data_exporters, dispatch_uid="multieventexporter_myexporter")
+    def register_multievent_data_exporter(sender, **kwargs):
+        from .exporter import MyExporter
+        return MyExporter
+
+If your exporter supports both event-level and multi-event level exports, you will need to listen for both
+signals.
 
 The exporter class
 ------------------

doc/development/api/general.rst

@@ -12,7 +12,8 @@ Core
 
 .. automodule:: pretix.base.signals
    :members: periodic_task, event_live_issues, event_copy_data, email_filter, register_notification_types,
-      item_copy_data, register_sales_channels, register_global_settings, quota_availability, global_email_filter
+      item_copy_data, register_sales_channels, register_global_settings, quota_availability, global_email_filter,
+      register_ticket_secret_generators
 
 Order events
 """"""""""""
@@ -33,7 +34,7 @@ Frontend
 --------
 
 .. automodule:: pretix.presale.signals
-   :members: html_head, html_footer, footer_link, front_page_top, front_page_bottom, front_page_bottom_widget, fee_calculation_for_cart, contact_form_fields, question_form_fields, checkout_confirm_messages, checkout_confirm_page_content, checkout_all_optional, html_page_header, sass_preamble, sass_postamble, render_seating_plan, checkout_flow_steps, position_info, position_info_top, item_description
+   :members: html_head, html_footer, footer_link, front_page_top, front_page_bottom, front_page_bottom_widget, fee_calculation_for_cart, contact_form_fields, question_form_fields, contact_form_fields_overrides, question_form_fields_overrides, checkout_confirm_messages, checkout_confirm_page_content, checkout_all_optional, html_page_header, sass_preamble, sass_postamble, render_seating_plan, checkout_flow_steps, position_info, position_info_top, item_description, global_html_head, global_html_footer, global_html_page_header
 
 
 .. automodule:: pretix.presale.signals
@@ -57,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
+             item_formsets, order_search_filter_q, order_search_forms
 
 .. automodule:: pretix.base.signals
    :members: logentry_display, logentry_object_link, requiredaction_display, timeline_events
@@ -66,19 +67,13 @@ Vouchers
 """"""""
 
 .. automodule:: pretix.control.signals
-   :members: item_forms
-
-Vouchers
-""""""""
-
-.. automodule:: pretix.control.signals
-   :members: voucher_form_class, voucher_form_html, voucher_form_validation
+   :members: item_forms, voucher_form_class, voucher_form_html, voucher_form_validation
 
 Dashboards
 """"""""""
 
 .. automodule:: pretix.control.signals
-   :members: event_dashboard_widgets, user_dashboard_widgets
+   :members: event_dashboard_widgets, user_dashboard_widgets, event_dashboard_top
 
 Ticket designs
 """"""""""""""

doc/development/api/payment.rst

@@ -126,6 +126,8 @@ The provider class
 
    .. autoattribute:: test_mode_message
 
+   .. autoattribute:: requires_invoice_immediately
+
 
 Additional views
 ----------------

doc/development/api/plugins.rst

@@ -136,7 +136,7 @@ in the ``installed`` method::
             pass  # Your code here
 
 
-Note that ``installed`` will *not* be called if the plugin in indirectly activated for an event
+Note that ``installed`` will *not* be called if the plugin is indirectly activated for an event
 because the event is created with settings copied from another event.
 
 Views
@@ -151,8 +151,8 @@ your Django app label.
    with checking that the calling user is logged in, has appropriate permissions,
    etc. We plan on providing native support for this in a later version.
 
-.. _Django app: https://docs.djangoproject.com/en/1.7/ref/applications/
-.. _signal dispatcher: https://docs.djangoproject.com/en/1.7/topics/signals/
-.. _namespace packages: http://legacy.python.org/dev/peps/pep-0420/
+.. _Django app: https://docs.djangoproject.com/en/3.0/ref/applications/
+.. _signal dispatcher: https://docs.djangoproject.com/en/3.0/topics/signals/
+.. _namespace packages: https://legacy.python.org/dev/peps/pep-0420/
 .. _entry point: https://setuptools.readthedocs.io/en/latest/pkg_resources.html#locating-plugins
 .. _cookiecutter: https://cookiecutter.readthedocs.io/en/latest/

doc/development/contribution/style.rst

@@ -7,7 +7,7 @@ Coding style and quality
   for more information. Use four spaces for indentation.
 
 * We sort our imports by a certain schema, but you don't have to do this by hand. Again, ``setup.cfg`` contains
-  some definitions that allow the command ``isort -rc <directory>`` to automatically sort the imports in your source
+  some definitions that allow the command ``isort <directory>`` to automatically sort the imports in your source
   files.
 
 * For templates and models, please take a look at the `Django Coding Style`_. We like Django's `class-based views`_ and

doc/development/setup.rst

@@ -98,7 +98,7 @@ pull request nevertheless and ask us for help, we are happy to assist you.
 Execute the following commands to check for code style errors::
 
     flake8 .
-    isort -c -rc .
+    isort -c .
     python manage.py check
 
 Execute the following command to run pretix' test suite (might take a couple of minutes)::
@@ -117,11 +117,11 @@ for example, to check for any errors in any staged files when committing::
     export GIT_WORK_TREE=../
     export GIT_DIR=../.git
     source ../env/bin/activate  # Adjust to however you activate your virtual environment
-    for file in $(git diff --cached --name-only | grep -E '\.py$' | grep -Ev "migrations|mt940\.py|pretix/settings\.py|make_testdata\.py|testutils/settings\.py|tests/settings\.py|pretix/base/models/__init__\.py")
+    for file in $(git diff --cached --name-only | grep -E '\.py$' | grep -Ev "migrations|mt940\.py|pretix/settings\.py|make_testdata\.py|testutils/settings\.py|tests/settings\.py|pretix/base/models/__init__\.py|.*_pb2\.py")
     do
       echo $file
       git show ":$file" | flake8 - --stdin-display-name="$file" || exit 1 # we only want to lint the staged changes, not any un-staged changes
-      git show ":$file" | isort -df --check-only - | grep ERROR && exit 1 || true
+      git show ":$file" | isort -c - | grep ERROR && exit 1 || true
     done
 
 

doc/plugins/banktransfer.rst

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

doc/plugins/digital.rst

@@ -1,12 +1,86 @@
 Digital content
 ===============
 
+URL interpolation and JWT authentication
+----------------------------------------
+
+In the simplest case, you can use the digital content module to point users to a specific piece of content on some
+platform after their ticket purchase, or show them an embedded video or live stream. However, the full power of the
+module can be utilized by passing additional information to the target system to automatically authenticate the user
+or pre-fill some fields with their data. For example, you could use an URL like this::
+
+    https://webinars.example.com/join?as={attendee_name}&userid={order_code}-{positionid}
+
+While this is already useful, it does not provide much security – anyone could guess a valid combination for that URL.
+Therefore, the module allows you to pass information as a `JSON Web Token`_, which isn't encrypted, but signed with a
+shared secret such that nobody can create their own tokens or modify the contents. To use a token, set up a URL like this::
+
+    https://webinars.example.com/join?with_token={token}
+
+Additionally, you will need to set a JWT secret and a token template, either through the pretix interface or through the
+API (see below). pretix currently only supports tokens signed with ``HMAC-SHA256`` (``HS256``). Your token template can contain
+whatever JSON you'd like to pass on based on the same variables, for example::
+
+    {
+        "iss": "pretix.eu",
+        "aud": "webinars.example.com",
+        "user": {
+            "id": "{order_code}-{positionid}",
+            "product": "{product_id}",
+            "variation": "{variation_id}",
+            "name": "{attendee_name}"
+        }
+    }
+
+Variables can only be used in strings inside the JSON structure.
+pretix will automatically add an ``iat`` claim with the current timestamp and an ``exp`` claim with an expiration timestamp
+based on your configuration.
+
+
+List of variables
+"""""""""""""""""
+
+The following variables are currently supported:
+
+.. rst-class:: rest-resource-table
+
+=================================== ====================================================================
+Variable                            Description
+=================================== ====================================================================
+``order_code``                      Order code (alphanumerical, unique per order, not per ticket)
+``positionid``                      ID of the ticket within the order (integer, starting at 1)
+``order_email``                     E-mail address of the ticket purchaser
+``product_id``                      Internal ID of the purchased product
+``product_variation``               Internal ID of the purchased product variation (or empty)
+``attendee_name``                   Full name of the ticket holder (or empty)
+``attendee_name_*``                 Name parts of the ticket holder, depending on configuration, e.g. ``attendee_name_given_name`` or ``attendee_name_family_name``
+``attendee_email``                  E-mail address of the ticket holder (or empty)
+``attendee_company``                Company of the ticket holder (or empty)
+``attendee_street``                 Street of the ticket holder's address (or empty)
+``attendee_zipcode``                ZIP code of the ticket holder's address (or empty)
+``attendee_city``                   City of the ticket holder's address (or empty)
+``attendee_country``                Country code of the ticket holder's address (or empty)
+``attendee_state``                  State of the ticket holder's address (or empty)
+``answer[XYZ]``                     Answer to the custom question with identifier ``XYZ``
+``invoice_name``                    Full name of the invoice address (or empty)
+``invoice_name_*``                  Name parts of the invoice address, depending on configuration, e.g. ``invoice_name_given_name`` or ``invoice_name_family_name``
+``invoice_company``                 Company of the invoice address (or empty)
+``invoice_street``                  Street of the invoice address (or empty)
+``invoice_zipcode``                 ZIP code of the invoice address (or empty)
+``invoice_city``                    City of the invoice address (or empty)
+``invoice_country``                 Country code of the invoice address (or empty)
+``invoice_state``                   State of the invoice address (or empty)
+``meta_XYZ``                        Value of the event's ``XYZ`` meta property
+``token``                           Signed JWT (only to be used in URLs, not in tokens)
+=================================== ====================================================================
+
+
+API Resource description
+-------------------------
+
 The digital content plugin provides a HTTP API that allows you to create new digital content for your ticket holders,
 such as live streams, videos, or material downloads.
 
-Resource description
---------------------
-
 The digital content resource contains the following public fields:
 
 .. rst-class:: rest-resource-table
@@ -28,10 +102,13 @@ all_products                          boolean                    If ``true``, th
 limit_products                        list of integers           List of product/item IDs. This content is only shown to buyers of these ticket types.
 position                              integer                    An integer, used for sorting
 subevent                              integer                    Date in an event series this content should be shown for. Should be ``null`` if this is not an event series or if this should be shown to all customers.
+jwt_template                          string                     Template for JWT token generation
+jwt_secret                            string                     Secret for JWT token generation
+jwt_validity                          integer                    JWT validity in days
 ===================================== ========================== =======================================================
 
-Endpoints
----------
+API Endpoints
+-------------
 
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/digitalcontents/
 
@@ -275,3 +352,5 @@ Endpoints
    :statuscode 204: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event/content does not exist **or** you have no permission to change it
+
+.. _JSON Web Token: https://en.wikipedia.org/wiki/JSON_Web_Token

doc/plugins/index.rst

@@ -16,3 +16,4 @@ If you want to **create** a plugin, please go to the
    badges
    campaigns
    digital
+   webinar

doc/plugins/webinar.rst

@@ -0,0 +1,43 @@
+pretix Webinar
+==============
+
+Fetch host URLs
+---------------
+
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/webinars/
+
+   Returns a list of all currently available webinar calls configured for an event.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/events/sampleconf/webinars/ 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
+
+      [
+        {
+          "name": "Webinar B – Sept. 8th, 2020",
+          "hosturl": "http://pretix.eu/demo/museum/webinar/host/a9aded3d7bd4df60/30611a34f9fee5d3/"
+        },
+        {
+          "name": "Webinar A – Sept. 8, 2020",
+          "hosturl": "http://pretix.eu/demo/museum/webinar/host/e714x7d4a4a36a04/b9cc444665xxx757/"
+        }
+      ]
+
+   :query subevent: Limit the result to the webinar(s) for a specific subevent.
+   :param organizer: The ``slug`` field of a valid organizer
+   :param event: The ``slug`` field of the event to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer or event does not exist **or** you have no permission to view it.

doc/requirements.txt

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

doc/spelling_wordlist.txt

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

doc/user/events/email.rst

@@ -26,6 +26,9 @@ Sender address
     we strongly recommend to use the SMTP settings below as well, otherwise your e-mails might be detected as spam
     due to the `Sender Policy Framework`_ and similar mechanisms.
 
+Sender name
+    This is the name associated with the sender address. By default, this is your event name.
+
 Signature
     This text will be appended to all e-mails in form of a signature. This might be useful e.g. to add your contact
     details or any legal information that needs to be included with the e-mails.
@@ -33,6 +36,15 @@ Signature
 Bcc address
     This email address will receive a copy of every event-related email.
 
+Attach calendar files
+    With this option, every order confirmation mail will include an ics file with name, date and location of
+    your event. It can be imported into many digital calendars.
+
+Sales Channels for Checkout Emails
+    When you are using multiple sales channel, you may want to decide that mails for order and payment confirmation
+    are only to be sent for some sales channels. For orders created through the default online shop, these emails
+    must always be send. A similar option is available for ticket download reminders.
+
 E-mail design
 -------------
 

doc/user/events/giftcards.rst

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

doc/user/events/structureguide.rst

@@ -292,6 +292,8 @@ Flexible group sizes
 
 If you want to give out discounted tickets to groups starting at a given size, but still billed per person, you can do so by creating a special **Group ticket** at the per-person price and set the **Minimum amount per order** option of the ticket to the minimal group size.
 
+For more complex use cases, you can also use add-on products that can be chosen multiple times.
+
 This way, your ticket can be bought an arbitrary number of times – but no less than the given minimal amount per order.
 
 Fixed group sizes

doc/user/events/ticket_secrets.rst

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

doc/user/events/tickets.rst

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

doc/user/events/widget.rst

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

doc/user/glossary.rst

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

doc/user/index.rst

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

src/MANIFEST.in

@@ -1,8 +1,10 @@
 include LICENSE
 include README.rst
+global-include *.proto
 recursive-include pretix/static *
 recursive-include pretix/static.dist *
 recursive-include pretix/locale *
+recursive-include pretix/helpers/locale *
 recursive-include pretix/base/templates *
 recursive-include pretix/control/templates *
 recursive-include pretix/presale/templates *

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 "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 "pretix/static/rrule/*" --ignore "build/*" $(LNGS)
 
 staticfiles: jsi18n
 	./manage.py collectstatic --noinput

src/pretix/__init__.py

@@ -1 +1 @@
-__version__ = "3.9.0"
+__version__ = "3.14.0.dev0"

src/pretix/api/auth/device.py

@@ -3,6 +3,9 @@ from django_scopes import scopes_disabled
 from rest_framework import exceptions
 from rest_framework.authentication import TokenAuthentication
 
+from pretix.api.auth.devicesecurity import (
+    DEVICE_SECURITY_PROFILES, FullAccessSecurityProfile,
+)
 from pretix.base.models import Device
 
 
@@ -25,3 +28,11 @@ class DeviceTokenAuthentication(TokenAuthentication):
             raise exceptions.AuthenticationFailed('Device access has been revoked.')
 
         return AnonymousUser(), device
+
+    def authenticate(self, request):
+        r = super().authenticate(request)
+        if r and isinstance(r[1], Device):
+            profile = DEVICE_SECURITY_PROFILES.get(r[1].security_profile, FullAccessSecurityProfile)
+            if not profile.is_allowed(request):
+                raise exceptions.PermissionDenied('Request denied by device security profile.')
+        return r

src/pretix/api/auth/devicesecurity.py

@@ -0,0 +1,126 @@
+from django.utils.translation import ugettext_lazy as _
+
+
+class FullAccessSecurityProfile:
+    identifier = 'full'
+    verbose_name = _('Full device access (reading and changing orders and gift cards, reading of products and settings)')
+
+    def is_allowed(self, request):
+        return True
+
+
+class AllowListSecurityProfile:
+    allowlist = tuple()
+
+    def is_allowed(self, request):
+        key = (request.method, f"{request.resolver_match.namespace}:{request.resolver_match.url_name}")
+        return key in self.allowlist
+
+
+class PretixScanSecurityProfile(AllowListSecurityProfile):
+    identifier = 'pretixscan'
+    verbose_name = _('pretixSCAN')
+    allowlist = (
+        ('GET', 'api-v1:version'),
+        ('GET', 'api-v1:device.eventselection'),
+        ('POST', 'api-v1:device.update'),
+        ('POST', 'api-v1:device.revoke'),
+        ('POST', 'api-v1:device.roll'),
+        ('GET', 'api-v1:event-list'),
+        ('GET', 'api-v1:event-detail'),
+        ('GET', 'api-v1:subevent-list'),
+        ('GET', 'api-v1:subevent-detail'),
+        ('GET', 'api-v1:itemcategory-list'),
+        ('GET', 'api-v1:item-list'),
+        ('GET', 'api-v1:question-list'),
+        ('GET', 'api-v1:badgelayout-list'),
+        ('GET', 'api-v1:badgeitem-list'),
+        ('GET', 'api-v1:checkinlist-list'),
+        ('GET', 'api-v1:checkinlist-status'),
+        ('GET', 'api-v1:checkinlistpos-list'),
+        ('POST', 'api-v1:checkinlistpos-redeem'),
+        ('GET', 'api-v1:revokedsecrets-list'),
+        ('GET', 'api-v1:order-list'),
+        ('GET', 'api-v1:event.settings'),
+    )
+
+
+class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
+    identifier = 'pretixscan_online_kiosk'
+    verbose_name = _('pretixSCAN (kiosk mode, online only)')
+    allowlist = (
+        ('GET', 'api-v1:version'),
+        ('GET', 'api-v1:device.eventselection'),
+        ('POST', 'api-v1:device.update'),
+        ('POST', 'api-v1:device.revoke'),
+        ('POST', 'api-v1:device.roll'),
+        ('GET', 'api-v1:event-list'),
+        ('GET', 'api-v1:event-detail'),
+        ('GET', 'api-v1:subevent-list'),
+        ('GET', 'api-v1:subevent-detail'),
+        ('GET', 'api-v1:itemcategory-list'),
+        ('GET', 'api-v1:item-list'),
+        ('GET', 'api-v1:question-list'),
+        ('GET', 'api-v1:badgelayout-list'),
+        ('GET', 'api-v1:badgeitem-list'),
+        ('GET', 'api-v1:checkinlist-list'),
+        ('GET', 'api-v1:checkinlist-status'),
+        ('POST', 'api-v1:checkinlistpos-redeem'),
+        ('GET', 'api-v1:revokedsecrets-list'),
+        ('GET', 'api-v1:event.settings'),
+    )
+
+
+class PretixPosSecurityProfile(AllowListSecurityProfile):
+    identifier = 'pretixpos'
+    verbose_name = _('pretixPOS')
+    allowlist = (
+        ('GET', 'api-v1:version'),
+        ('GET', 'api-v1:device.eventselection'),
+        ('POST', 'api-v1:device.update'),
+        ('POST', 'api-v1:device.revoke'),
+        ('POST', 'api-v1:device.roll'),
+        ('GET', 'api-v1:event-list'),
+        ('GET', 'api-v1:event-detail'),
+        ('GET', 'api-v1:subevent-list'),
+        ('GET', 'api-v1:subevent-detail'),
+        ('GET', 'api-v1:itemcategory-list'),
+        ('GET', 'api-v1:item-list'),
+        ('GET', 'api-v1:question-list'),
+        ('GET', 'api-v1:quota-list'),
+        ('GET', 'api-v1:taxrule-list'),
+        ('GET', 'api-v1:ticketlayout-list'),
+        ('GET', 'api-v1:ticketlayoutitem-list'),
+        ('GET', 'api-v1:order-list'),
+        ('POST', 'api-v1:order-list'),
+        ('GET', 'api-v1:order-detail'),
+        ('DELETE', 'api-v1:orderposition-detail'),
+        ('POST', 'api-v1:order-mark_canceled'),
+        ('POST', 'api-v1:orderrefund-list'),
+        ('POST', 'api-v1:orderrefund-done'),
+        ('POST', 'api-v1:cartposition-list'),
+        ('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'),
+    )
+
+
+DEVICE_SECURITY_PROFILES = {
+    k.identifier: k() for k in (
+        FullAccessSecurityProfile,
+        PretixScanSecurityProfile,
+        PretixScanNoSyncSecurityProfile,
+        PretixPosSecurityProfile,
+    )
+}

src/pretix/api/auth/permission.py

@@ -84,3 +84,15 @@ class EventCRUDPermission(EventPermission):
             return False
 
         return True
+
+
+class ProfilePermission(BasePermission):
+
+    def has_permission(self, request, view):
+        if not request.user.is_authenticated:
+            return False
+
+        if isinstance(request.auth, OAuthAccessToken):
+            if not (request.auth.allow_scopes(['read']) or request.auth.allow_scopes(['profile'])) and request.method in SAFE_METHODS:
+                return False
+        return True

src/pretix/api/oauth.py

@@ -9,7 +9,7 @@ from oauth2_provider.settings import oauth2_settings
 class Validator(OAuth2Validator):
 
     def save_authorization_code(self, client_id, code, request, *args, **kwargs):
-        if not getattr(request, 'organizers', None):
+        if not getattr(request, 'organizers', None) and request.scopes != ['profile']:
             raise FatalClientError('No organizers selected.')
 
         expires = timezone.now() + timedelta(
@@ -18,7 +18,8 @@ class Validator(OAuth2Validator):
                   expires=expires, redirect_uri=request.redirect_uri,
                   scope=" ".join(request.scopes))
         g.save()
-        g.organizers.add(*request.organizers.all())
+        if request.scopes != ['profile']:
+            g.organizers.add(*request.organizers.all())
 
     def validate_code(self, client_id, code, client, request, *args, **kwargs):
         try:
@@ -34,12 +35,14 @@ class Validator(OAuth2Validator):
             return False
 
     def _create_access_token(self, expires, request, token, source_refresh_token=None):
-        if not getattr(request, 'organizers', None) and not getattr(source_refresh_token, 'access_token'):
+        if not getattr(request, 'organizers', None) and not getattr(source_refresh_token, 'access_token', None) and token["scope"] != 'profile':
             raise FatalClientError('No organizers selected.')
-        if hasattr(request, 'organizers'):
-            orgs = list(request.organizers.all())
-        else:
-            orgs = list(source_refresh_token.access_token.organizers.all())
+        if token['scope'] != 'profile':
+            if hasattr(request, 'organizers'):
+                orgs = list(request.organizers.all())
+            else:
+                orgs = list(source_refresh_token.access_token.organizers.all())
         access_token = super()._create_access_token(expires, request, token, source_refresh_token=None)
-        access_token.organizers.add(*orgs)
+        if token['scope'] != 'profile':
+            access_token.organizers.add(*orgs)
         return access_token

src/pretix/api/serializers/cart.py

@@ -87,7 +87,10 @@ 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')):
+                    if not seat.is_available(
+                        sales_channel=validated_data.get('sales_channel', 'web'),
+                        distance_ignore_cart_id=validated_data['cart_id'],
+                    ):
                         raise ValidationError(gettext_lazy('The selected seat "{seat}" is not available.').format(seat=seat.name))
             elif seated:
                 raise ValidationError('The specified product requires to choose a seat.')
@@ -104,6 +107,7 @@ class CartPositionCreateSerializer(I18nAwareModelSerializer):
     def validate_cart_id(self, cid):
         if cid and not cid.endswith('@api'):
             raise ValidationError('Cart ID should end in @api or be empty.')
+        return cid
 
     def validate_item(self, item):
         if item.event != self.context['event']:

src/pretix/api/serializers/checkin.py

@@ -15,7 +15,18 @@ class CheckinListSerializer(I18nAwareModelSerializer):
         model = CheckinList
         fields = ('id', 'name', 'all_products', 'limit_products', 'subevent', 'checkin_count', 'position_count',
                   'include_pending', 'auto_checkin_sales_channels', 'allow_multiple_entries', 'allow_entry_after_exit',
-                  'rules')
+                  'rules', 'exit_all_at')
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        for exclude_field in self.context['request'].query_params.getlist('exclude'):
+            p = exclude_field.split('.')
+            if p[0] in self.fields:
+                if len(p) == 1:
+                    del self.fields[p[0]]
+                elif len(p) == 2:
+                    self.fields[p[0]].child.fields.pop(p[1])
 
     def validate(self, data):
         data = super().validate(data)

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_settings
+from pretix.base.settings import DEFAULTS, validate_event_settings
 from pretix.base.signals import api_event_settings_fields
 
 
@@ -29,6 +29,9 @@ class MetaDataField(Field):
         }
 
     def to_internal_value(self, data):
+        if not isinstance(data, dict) or not all(isinstance(k, str) for k in data.keys()):
+            raise ValidationError('meta_data needs to be an object (str -> str).')
+
         return {
             'meta_data': data
         }
@@ -42,6 +45,8 @@ class MetaPropertyField(Field):
         }
 
     def to_internal_value(self, data):
+        if not isinstance(data, dict) or not all(isinstance(k, str) for k in data.keys()) or not all(isinstance(k, str) for k in data.values()):
+            raise ValidationError('item_meta_properties needs to be an object (str -> str).')
         return {
             'item_meta_properties': data
         }
@@ -58,6 +63,8 @@ class SeatCategoryMappingField(Field):
         }
 
     def to_internal_value(self, data):
+        if not isinstance(data, dict) or not all(isinstance(k, str) for k in data.keys()) or not all(isinstance(k, int) for k in data.values()):
+            raise ValidationError('seat_category_mapping needs to be an object (str -> int).')
         return {
             'seat_category_mapping': data or {}
         }
@@ -88,19 +95,42 @@ class TimeZoneField(ChoiceField):
         )
 
 
+class ValidKeysField(Field):
+    def to_representation(self, value):
+        return value.cache.get_or_set(
+            'ticket_secret_valid_keys',
+            lambda: self._get(value),
+            120
+        )
+
+    def _get(self, value):
+        return {
+            'pretix_sig1': [
+                value.settings.ticket_secrets_pretix_sig1_pubkey
+            ] if value.settings.ticket_secrets_pretix_sig1_pubkey else []
+        }
+
+
 class EventSerializer(I18nAwareModelSerializer):
     meta_data = MetaDataField(required=False, source='*')
     item_meta_properties = MetaPropertyField(required=False, source='*')
     plugins = PluginsField(required=False, source='*')
     seat_category_mapping = SeatCategoryMappingField(source='*', required=False)
     timezone = TimeZoneField(required=False, choices=[(a, a) for a in common_timezones])
+    valid_keys = ValidKeysField(source='*', read_only=True)
 
     class Meta:
         model = Event
         fields = ('name', 'slug', 'live', 'testmode', 'currency', 'date_from',
                   'date_to', 'date_admission', 'is_public', 'presale_start',
                   'presale_end', 'location', 'geo_lat', 'geo_lon', 'has_subevents', 'meta_data', 'seating_plan',
-                  'plugins', 'seat_category_mapping', 'timezone', 'item_meta_properties')
+                  'plugins', 'seat_category_mapping', 'timezone', 'item_meta_properties', 'valid_keys',
+                  'sales_channels')
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if not hasattr(self.context['request'], 'event'):
+            self.fields.pop('valid_keys')
 
     def validate(self, data):
         data = super().validate(data)
@@ -341,13 +371,13 @@ class CloneEventSerializer(EventSerializer):
 class SubEventItemSerializer(I18nAwareModelSerializer):
     class Meta:
         model = SubEventItem
-        fields = ('item', 'price')
+        fields = ('item', 'price', 'disabled')
 
 
 class SubEventItemVariationSerializer(I18nAwareModelSerializer):
     class Meta:
         model = SubEventItemVariation
-        fields = ('variation', 'price')
+        fields = ('variation', 'price', 'disabled')
 
 
 class SubEventSerializer(I18nAwareModelSerializer):
@@ -362,7 +392,7 @@ class SubEventSerializer(I18nAwareModelSerializer):
         fields = ('id', 'name', 'date_from', 'date_to', 'active', 'date_admission',
                   'presale_start', 'presale_end', 'location', 'geo_lat', 'geo_lon', 'event', 'is_public',
                   'seating_plan', 'item_price_overrides', 'variation_price_overrides', 'meta_data',
-                  'seat_category_mapping')
+                  'seat_category_mapping', 'last_modified')
 
     def validate(self, data):
         data = super().validate(data)
@@ -452,27 +482,29 @@ class SubEventSerializer(I18nAwareModelSerializer):
 
     @transaction.atomic
     def update(self, instance, validated_data):
-        item_price_overrides_data = validated_data.pop('subeventitem_set') if 'subeventitem_set' in validated_data else {}
-        variation_price_overrides_data = validated_data.pop('subeventitemvariation_set') if 'subeventitemvariation_set' in validated_data else {}
+        item_price_overrides_data = validated_data.pop('subeventitem_set', None)
+        variation_price_overrides_data = validated_data.pop('subeventitemvariation_set', None)
         meta_data = validated_data.pop('meta_data', None)
         seat_category_mapping = validated_data.pop('seat_category_mapping', None)
         subevent = super().update(instance, validated_data)
 
-        existing_item_overrides = {item.item: item.id for item in SubEventItem.objects.filter(subevent=subevent)}
+        if item_price_overrides_data is not None:
+            existing_item_overrides = {item.item: item.id for item in SubEventItem.objects.filter(subevent=subevent)}
 
-        for item_price_override_data in item_price_overrides_data:
-            id = existing_item_overrides.pop(item_price_override_data['item'], None)
-            SubEventItem(id=id, subevent=subevent, **item_price_override_data).save()
+            for item_price_override_data in item_price_overrides_data:
+                id = existing_item_overrides.pop(item_price_override_data['item'], None)
+                SubEventItem(id=id, subevent=subevent, **item_price_override_data).save()
 
-        SubEventItem.objects.filter(id__in=existing_item_overrides.values()).delete()
+            SubEventItem.objects.filter(id__in=existing_item_overrides.values()).delete()
 
-        existing_variation_overrides = {item.variation: item.id for item in SubEventItemVariation.objects.filter(subevent=subevent)}
+        if variation_price_overrides_data is not None:
+            existing_variation_overrides = {item.variation: item.id for item in SubEventItemVariation.objects.filter(subevent=subevent)}
 
-        for variation_price_override_data in variation_price_overrides_data:
-            id = existing_variation_overrides.pop(variation_price_override_data['variation'], None)
-            SubEventItemVariation(id=id, subevent=subevent, **variation_price_override_data).save()
+            for variation_price_override_data in variation_price_overrides_data:
+                id = existing_variation_overrides.pop(variation_price_override_data['variation'], None)
+                SubEventItemVariation(id=id, subevent=subevent, **variation_price_override_data).save()
 
-        SubEventItemVariation.objects.filter(id__in=existing_variation_overrides.values()).delete()
+            SubEventItemVariation.objects.filter(id__in=existing_variation_overrides.values()).delete()
 
         # Meta data
         if meta_data is not None:
@@ -565,19 +597,24 @@ class EventSettingsSerializer(serializers.Serializer):
         'attendee_addresses_required',
         'attendee_company_asked',
         'attendee_company_required',
-        'confirm_text',
+        'attendee_data_explanation_text',
+        'confirm_texts',
         'order_email_asked_twice',
+        'payment_term_mode',
         'payment_term_days',
-        'payment_term_last',
         'payment_term_weekdays',
+        'payment_term_minutes',
+        'payment_term_last',
         'payment_term_expire_automatically',
         'payment_term_accept_late',
         'payment_explanation',
+        'payment_pending_hidden',
         'ticket_download',
         'ticket_download_date',
         'ticket_download_addons',
         'ticket_download_nonadm',
         'ticket_download_pending',
+        'ticket_download_require_validated_email',
         'mail_prefix',
         'mail_from',
         'mail_from_name',
@@ -597,6 +634,7 @@ class EventSettingsSerializer(serializers.Serializer):
         'invoice_numbers_consecutive',
         'invoice_numbers_prefix',
         'invoice_numbers_prefix_cancellations',
+        'invoice_numbers_counter_length',
         'invoice_attendee_name',
         'invoice_include_expire_date',
         'invoice_address_explanation_text',
@@ -611,6 +649,7 @@ class EventSettingsSerializer(serializers.Serializer):
         'invoice_introductory_text',
         'invoice_additional_text',
         'invoice_footer_text',
+        'invoice_eu_currencies',
         'cancel_allow_user',
         'cancel_allow_user_until',
         'cancel_allow_user_paid',
@@ -622,16 +661,30 @@ class EventSettingsSerializer(serializers.Serializer):
         'cancel_allow_user_paid_adjust_fees_explanation',
         'cancel_allow_user_paid_refund_as_giftcard',
         'cancel_allow_user_paid_require_approval',
+        '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', {})
+            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'](
@@ -650,13 +703,52 @@ 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_settings(self.event, settings_dict)
+        validate_event_settings(self.event, settings_dict)
         return data
+
+
+class DeviceEventSettingsSerializer(EventSettingsSerializer):
+    default_fields = [
+        'locales',
+        'locale',
+        'last_order_modification_date',
+        'show_quota_left',
+        'max_items_per_order',
+        'attendee_names_asked',
+        'attendee_names_required',
+        'attendee_emails_asked',
+        'attendee_emails_required',
+        'attendee_addresses_asked',
+        'attendee_addresses_required',
+        'attendee_company_asked',
+        'attendee_company_required',
+        'ticket_download',
+        'ticket_download_addons',
+        'ticket_download_nonadm',
+        'ticket_download_pending',
+        'invoice_address_asked',
+        'invoice_address_required',
+        'invoice_address_vatid',
+        'invoice_address_company_required',
+        'invoice_address_beneficiary',
+        'invoice_address_custom_field',
+        'invoice_name_required',
+        'invoice_address_not_asked_free',
+        'invoice_address_from_name',
+        'invoice_address_from',
+        'invoice_address_from_zipcode',
+        'invoice_address_from_city',
+        'invoice_address_from_country',
+        'invoice_address_from_tax_id',
+        'invoice_address_from_vat_id',
+    ]

src/pretix/api/serializers/exporters.py

@@ -0,0 +1,127 @@
+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

@@ -45,7 +45,7 @@ class InlineItemAddOnSerializer(serializers.ModelSerializer):
     class Meta:
         model = ItemAddOn
         fields = ('addon_category', 'min_count', 'max_count',
-                  'position', 'price_included')
+                  'position', 'price_included', 'multi_allowed')
 
 
 class ItemBundleSerializer(serializers.ModelSerializer):
@@ -77,7 +77,7 @@ class ItemAddOnSerializer(serializers.ModelSerializer):
     class Meta:
         model = ItemAddOn
         fields = ('id', 'addon_category', 'min_count', 'max_count',
-                  'position', 'price_included')
+                  'position', 'price_included', 'multi_allowed')
 
     def validate(self, data):
         data = super().validate(data)
@@ -277,7 +277,9 @@ 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')
+                  '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'
+                  )
 
     def validate_identifier(self, value):
         Question._clean_identifier(self.context['event'], value, self.instance)
@@ -349,7 +351,7 @@ class QuotaSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = Quota
-        fields = ('id', 'name', 'size', 'items', 'variations', 'subevent', 'closed', 'close_when_sold_out')
+        fields = ('id', 'name', 'size', 'items', 'variations', 'subevent', 'closed', 'close_when_sold_out', 'release_after_exit')
 
     def validate(self, data):
         data = super().validate(data)

src/pretix/api/serializers/order.py

@@ -21,7 +21,7 @@ from pretix.base.models import (
     OrderPosition, Question, QuestionAnswer, Seat, SubEvent, TaxRule, Voucher,
 )
 from pretix.base.models.orders import (
-    CartPosition, OrderFee, OrderPayment, OrderRefund,
+    CartPosition, OrderFee, OrderPayment, OrderRefund, RevokedTicketSecret,
 )
 from pretix.base.pdf import get_variables
 from pretix.base.services.cart import error_messages
@@ -68,7 +68,7 @@ class InvoiceAddressSerializer(I18nAwareModelSerializer):
             data['name_parts']['_scheme'] = self.context['request'].event.settings.name_scheme
 
         if data.get('country'):
-            if not pycountry.countries.get(alpha_2=data.get('country')):
+            if not pycountry.countries.get(alpha_2=data.get('country').code):
                 raise ValidationError(
                     {'country': ['Invalid country code.']}
                 )
@@ -122,7 +122,7 @@ class AnswerSerializer(I18nAwareModelSerializer):
 class CheckinSerializer(I18nAwareModelSerializer):
     class Meta:
         model = Checkin
-        fields = ('datetime', 'list', 'auto_checked_in', 'type')
+        fields = ('id', 'datetime', 'list', 'auto_checked_in', 'type')
 
 
 class OrderDownloadsField(serializers.Field):
@@ -270,8 +270,9 @@ class CheckinListOrderPositionSerializer(OrderPositionSerializer):
     class Meta:
         model = OrderPosition
         fields = ('id', 'order', 'positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
+                  'company', 'street', 'zipcode', 'city', 'country', 'state',
                   'attendee_email', 'voucher', 'tax_rate', 'tax_value', 'secret', 'addon_to', 'subevent', 'checkins',
-                  'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'require_attention',
+                  'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat', 'require_attention',
                   'order__status')
 
 
@@ -376,6 +377,14 @@ class OrderSerializer(I18nAwareModelSerializer):
         if not self.context['request'].query_params.get('pdf_data', 'false') == 'true':
             self.fields['positions'].child.fields.pop('pdf_data')
 
+        for exclude_field in self.context['request'].query_params.getlist('exclude'):
+            p = exclude_field.split('.')
+            if p[0] in self.fields:
+                if len(p) == 1:
+                    del self.fields[p[0]]
+                elif len(p) == 2:
+                    self.fields[p[0]].child.fields.pop(p[1])
+
     def validate_locale(self, l):
         if l not in set(k for k in self.instance.event.settings.locales):
             raise ValidationError('"{}" is not a supported locale for this event.'.format(l))
@@ -416,16 +425,26 @@ class OrderSerializer(I18nAwareModelSerializer):
         return instance
 
 
+class SimulatedOrderPositionSerializer(OrderPositionSerializer):
+    addon_to = serializers.SlugRelatedField(read_only=True, slug_field='positionid')
+
+
+class SimulatedOrderSerializer(OrderSerializer):
+    positions = SimulatedOrderPositionSerializer(many=True, read_only=True)
+
+
 class PriceCalcSerializer(serializers.Serializer):
     item = serializers.PrimaryKeyRelatedField(queryset=Item.objects.none(), required=False, allow_null=True)
     variation = serializers.PrimaryKeyRelatedField(queryset=ItemVariation.objects.none(), required=False, allow_null=True)
     subevent = serializers.PrimaryKeyRelatedField(queryset=SubEvent.objects.none(), required=False, allow_null=True)
+    tax_rule = serializers.PrimaryKeyRelatedField(queryset=TaxRule.objects.none(), required=False, allow_null=True)
     locale = serializers.CharField(allow_null=True, required=False)
 
     def __init__(self, *args, **kwargs):
         event = kwargs.pop('event')
         super().__init__(*args, **kwargs)
         self.fields['item'].queryset = event.items.all()
+        self.fields['tax_rule'].queryset = event.tax_rules.all()
         self.fields['variation'].queryset = ItemVariation.objects.filter(item__event=event)
         if event.has_subevents:
             self.fields['subevent'].queryset = event.subevents.all()
@@ -590,7 +609,7 @@ class OrderPositionCreateSerializer(I18nAwareModelSerializer):
             data['attendee_name_parts']['_scheme'] = self.context['request'].event.settings.name_scheme
 
         if data.get('country'):
-            if not pycountry.countries.get(alpha_2=data.get('country')):
+            if not pycountry.countries.get(alpha_2=data.get('country').code):
                 raise ValidationError(
                     {'country': ['Invalid country code.']}
                 )
@@ -663,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_mail = serializers.BooleanField(default=False, required=False)
+    send_email = serializers.BooleanField(default=False, required=False)
     simulate = serializers.BooleanField(default=False, required=False)
 
     def __init__(self, *args, **kwargs):
@@ -674,7 +693,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         model = Order
         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_mail', 'simulate')
+                  'force', 'send_email', 'simulate')
 
     def validate_payment_provider(self, pp):
         if pp is None:
@@ -767,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_mail', False)
+        self._send_mail = validated_data.pop('send_email', False)
 
         if 'invoice_address' in validated_data:
             iadata = validated_data.pop('invoice_address')
@@ -903,6 +922,19 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                         if pos_data['voucher'].allow_ignore_quota or pos_data['voucher'].block_quota:
                             continue
 
+                    if pos_data.get('subevent'):
+                        if pos_data.get('item').pk in pos_data['subevent'].item_overrides and pos_data['subevent'].item_overrides[pos_data['item'].pk].disabled:
+                            errs[i]['item'] = [gettext_lazy('The product "{}" is not available on this date.').format(
+                                str(pos_data.get('item'))
+                            )]
+                        if (
+                                pos_data.get('variation') and pos_data['variation'].pk in pos_data['subevent'].var_overrides and
+                                pos_data['subevent'].var_overrides[pos_data['variation'].pk].disabled
+                        ):
+                            errs[i]['item'] = [gettext_lazy('The product "{}" is not available on this date.').format(
+                                str(pos_data.get('item'))
+                            )]
+
                     new_quotas = (pos_data.get('variation').quotas.filter(subevent=pos_data.get('subevent'))
                                   if pos_data.get('variation')
                                   else pos_data.get('item').quotas.filter(subevent=pos_data.get('subevent')))
@@ -963,7 +995,10 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                 else:
                     pos.order = order
                 if addon_to:
-                    pos.addon_to = pos_map[addon_to]
+                    if simulate:
+                        pos.addon_to = pos_map[addon_to]._wrapped
+                    else:
+                        pos.addon_to = pos_map[addon_to]
 
                 if pos.price is None:
                     price = get_price(
@@ -1174,3 +1209,10 @@ class OrderRefundCreateSerializer(I18nAwareModelSerializer):
         order = OrderRefund(order=self.context['order'], payment=p, **validated_data)
         order.save()
         return order
+
+
+class RevokedTicketSecretSerializer(I18nAwareModelSerializer):
+
+    class Meta:
+        model = RevokedTicketSecret
+        fields = ('id', 'secret', 'created')

src/pretix/api/serializers/organizer.py

@@ -2,6 +2,7 @@ from decimal import Decimal
 
 from django.db.models import Q
 from django.utils.translation import get_language, gettext_lazy as _
+from hierarkey.proxy import HierarkeyProxy
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
@@ -9,10 +10,12 @@ 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.models import (
-    GiftCard, Organizer, SeatingPlan, Team, TeamAPIToken, TeamInvite, User,
+    Device, GiftCard, GiftCardTransaction, 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
 
 
@@ -58,6 +61,21 @@ 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()
@@ -66,9 +84,6 @@ class EventSlugField(serializers.SlugRelatedField):
 class TeamSerializer(serializers.ModelSerializer):
     limit_events = EventSlugField(slug_field='slug', many=True)
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
     class Meta:
         model = Team
         fields = (
@@ -86,6 +101,28 @@ class TeamSerializer(serializers.ModelSerializer):
         return data
 
 
+class DeviceSerializer(serializers.ModelSerializer):
+    limit_events = EventSlugField(slug_field='slug', many=True)
+    device_id = serializers.IntegerField(read_only=True)
+    unique_serial = serializers.CharField(read_only=True)
+    hardware_brand = serializers.CharField(read_only=True)
+    hardware_model = serializers.CharField(read_only=True)
+    software_brand = serializers.CharField(read_only=True)
+    software_version = serializers.CharField(read_only=True)
+    created = serializers.DateTimeField(read_only=True)
+    revoked = serializers.BooleanField(read_only=True)
+    initialized = serializers.DateTimeField(read_only=True)
+    initialization_token = serializers.DateTimeField(read_only=True)
+
+    class Meta:
+        model = Device
+        fields = (
+            'device_id', 'unique_serial', 'initialization_token', 'all_events', 'limit_events',
+            'revoked', 'name', 'created', 'initialized', 'hardware_brand', 'hardware_model',
+            'software_brand', 'software_version', 'security_profile'
+        )
+
+
 class TeamInviteSerializer(serializers.ModelSerializer):
     class Meta:
         model = TeamInvite
@@ -167,3 +204,63 @@ 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',
+        '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/signals.py

@@ -6,6 +6,7 @@ from django_scopes import scopes_disabled
 
 from pretix.api.models import ApiCall, WebHookCall
 from pretix.base.signals import periodic_task
+from pretix.helpers.periodic import minimum_interval
 
 register_webhook_events = Signal(
     providing_args=[]
@@ -19,11 +20,13 @@ instances.
 
 @receiver(periodic_task)
 @scopes_disabled()
+@minimum_interval(minutes_after_success=12 * 60)
 def cleanup_webhook_logs(sender, **kwargs):
     WebHookCall.objects.filter(datetime__lte=now() - timedelta(days=30)).delete()
 
 
 @receiver(periodic_task)
 @scopes_disabled()
+@minimum_interval(minutes_after_success=12 * 60)
 def cleanup_api_logs(sender, **kwargs):
     ApiCall.objects.filter(created__lte=now() - timedelta(hours=24)).delete()

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, item, oauth, order, organizer, user, version,
-    voucher, waitinglist, webhooks,
+    checkin, device, event, exporters, item, oauth, order, organizer, user,
+    version, voucher, waitinglist, webhooks,
 )
 
 router = routers.DefaultRouter()
@@ -21,6 +21,8 @@ orga_router.register(r'webhooks', webhooks.WebHookViewSet)
 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)
@@ -38,13 +40,15 @@ event_router.register(r'vouchers', voucher.VoucherViewSet)
 event_router.register(r'orders', order.OrderViewSet)
 event_router.register(r'orderpositions', order.OrderPositionViewSet)
 event_router.register(r'invoices', order.InvoiceViewSet)
+event_router.register(r'revokedsecrets', order.RevokedSecretViewSet, basename='revokedsecrets')
 event_router.register(r'taxrules', event.TaxRuleViewSet)
 event_router.register(r'waitinglistentries', waitinglist.WaitingListViewSet)
 event_router.register(r'checkinlists', checkin.CheckinListViewSet)
 event_router.register(r'cartpositions', cart.CartPositionViewSet)
+event_router.register(r'exporters', exporters.EventExportersViewSet, basename='exporters')
 
 checkinlist_router = routers.DefaultRouter()
-checkinlist_router.register(r'positions', checkin.CheckinListPositionViewSet)
+checkinlist_router.register(r'positions', checkin.CheckinListPositionViewSet, basename='checkinlistpos')
 
 question_router = routers.DefaultRouter()
 question_router.register(r'options', item.QuestionOptionViewSet)
@@ -58,6 +62,9 @@ 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'):
@@ -67,6 +74,9 @@ 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)),
@@ -84,6 +94,7 @@ urlpatterns = [
     url(r"^device/update$", device.UpdateView.as_view(), name="device.update"),
     url(r"^device/roll$", device.RollKeyView.as_view(), name="device.roll"),
     url(r"^device/revoke$", device.RevokeKeyView.as_view(), name="device.revoke"),
+    url(r"^device/eventselection$", device.EventSelectionView.as_view(), name="device.eventselection"),
     url(r"^me$", user.MeView.as_view(), name="user.me"),
     url(r"^version$", version.VersionView.as_view(), name="version"),
 ]

src/pretix/api/views/checkin.py

@@ -1,5 +1,8 @@
+import django_filters
 from django.core.exceptions import ValidationError
-from django.db.models import Count, F, Max, OuterRef, Prefetch, Q, Subquery
+from django.db.models import (
+    Count, Exists, F, Max, OuterRef, Prefetch, Q, Subquery,
+)
 from django.db.models.functions import Coalesce
 from django.http import Http404
 from django.shortcuts import get_object_or_404
@@ -17,6 +20,7 @@ from pretix.api.serializers.item import QuestionSerializer
 from pretix.api.serializers.order import CheckinListOrderPositionSerializer
 from pretix.api.views import RichOrderingFilter
 from pretix.api.views.order import OrderPositionFilter
+from pretix.base.i18n import language
 from pretix.base.models import (
     Checkin, CheckinList, Event, Order, OrderPosition,
 )
@@ -27,10 +31,17 @@ from pretix.helpers.database import FixedOrderBy
 
 with scopes_disabled():
     class CheckinListFilter(FilterSet):
+        subevent_match = django_filters.NumberFilter(method='subevent_match_qs')
+
         class Meta:
             model = CheckinList
             fields = ['subevent']
 
+        def subevent_match_qs(self, qs, name, value):
+            return qs.filter(
+                Q(subevent_id=value) | Q(subevent_id__isnull=True)
+            )
+
 
 class CheckinListViewSet(viewsets.ModelViewSet):
     serializer_class = CheckinListSerializer
@@ -79,73 +90,67 @@ class CheckinListViewSet(viewsets.ModelViewSet):
 
     @action(detail=True, methods=['GET'])
     def status(self, *args, **kwargs):
-        clist = self.get_object()
-        cqs = Checkin.objects.filter(
-            position__order__event=clist.event,
-            position__order__status__in=[Order.STATUS_PAID] + ([Order.STATUS_PENDING] if clist.include_pending else []),
-            list=clist
-        )
-        pqs = OrderPosition.objects.filter(
-            order__event=clist.event,
-            order__status__in=[Order.STATUS_PAID] + ([Order.STATUS_PENDING] if clist.include_pending else []),
-        )
-        if clist.subevent:
-            pqs = pqs.filter(subevent=clist.subevent)
-        if not clist.all_products:
-            pqs = pqs.filter(item__in=clist.limit_products.values_list('id', flat=True))
-            cqs = cqs.filter(position__item__in=clist.limit_products.values_list('id', flat=True))
+        with language(self.request.event.settings.locale):
+            clist = self.get_object()
+            cqs = clist.positions.annotate(
+                checkedin=Exists(Checkin.objects.filter(list_id=clist.pk, position=OuterRef('pk'), type=Checkin.TYPE_ENTRY))
+            ).filter(
+                checkedin=True,
+            )
+            pqs = clist.positions
 
-        ev = clist.subevent or clist.event
-        response = {
-            'event': {
-                'name': str(ev.name),
-            },
-            'checkin_count': cqs.count(),
-            'position_count': pqs.count()
-        }
-
-        op_by_item = {
-            p['item']: p['cnt']
-            for p in pqs.order_by().values('item').annotate(cnt=Count('id'))
-        }
-        op_by_variation = {
-            p['variation']: p['cnt']
-            for p in pqs.order_by().values('variation').annotate(cnt=Count('id'))
-        }
-        c_by_item = {
-            p['position__item']: p['cnt']
-            for p in cqs.order_by().values('position__item').annotate(cnt=Count('id'))
-        }
-        c_by_variation = {
-            p['position__variation']: p['cnt']
-            for p in cqs.order_by().values('position__variation').annotate(cnt=Count('id'))
-        }
-
-        if not clist.all_products:
-            items = clist.limit_products
-        else:
-            items = clist.event.items
-
-        response['items'] = []
-        for item in items.order_by('category__position', 'position', 'pk').prefetch_related('variations'):
-            i = {
-                'id': item.pk,
-                'name': str(item),
-                'admission': item.admission,
-                'checkin_count': c_by_item.get(item.pk, 0),
-                'position_count': op_by_item.get(item.pk, 0),
-                'variations': []
+            ev = clist.subevent or clist.event
+            response = {
+                'event': {
+                    'name': str(ev.name),
+                },
+                'checkin_count': cqs.count(),
+                'position_count': pqs.count(),
+                'inside_count': clist.inside_count,
             }
-            for var in item.variations.all():
-                i['variations'].append({
-                    'id': var.pk,
-                    'value': str(var),
-                    'checkin_count': c_by_variation.get(var.pk, 0),
-                    'position_count': op_by_variation.get(var.pk, 0),
-                })
-            response['items'].append(i)
 
-        return Response(response)
+            op_by_item = {
+                p['item']: p['cnt']
+                for p in pqs.order_by().values('item').annotate(cnt=Count('id'))
+            }
+            op_by_variation = {
+                p['variation']: p['cnt']
+                for p in pqs.order_by().values('variation').annotate(cnt=Count('id'))
+            }
+            c_by_item = {
+                p['item']: p['cnt']
+                for p in cqs.order_by().values('item').annotate(cnt=Count('id'))
+            }
+            c_by_variation = {
+                p['variation']: p['cnt']
+                for p in cqs.order_by().values('variation').annotate(cnt=Count('id'))
+            }
+
+            if not clist.all_products:
+                items = clist.limit_products
+            else:
+                items = clist.event.items
+
+            response['items'] = []
+            for item in items.order_by('category__position', 'position', 'pk').prefetch_related('variations'):
+                i = {
+                    'id': item.pk,
+                    'name': str(item),
+                    'admission': item.admission,
+                    'checkin_count': c_by_item.get(item.pk, 0),
+                    'position_count': op_by_item.get(item.pk, 0),
+                    'variations': []
+                }
+                for var in item.variations.all():
+                    i['variations'].append({
+                        'id': var.pk,
+                        'value': str(var),
+                        'checkin_count': c_by_variation.get(var.pk, 0),
+                        'position_count': op_by_variation.get(var.pk, 0),
+                    })
+                response['items'].append(i)
+
+            return Response(response)
 
 
 with scopes_disabled():
@@ -192,7 +197,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
         except ValueError:
             raise Http404()
 
-    def get_queryset(self, ignore_status=False):
+    def get_queryset(self, ignore_status=False, ignore_products=False):
         cqs = Checkin.objects.filter(
             position_id=OuterRef('pk'),
             list_id=self.checkinlist.pk
@@ -247,12 +252,12 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                 Prefetch('addons', OrderPosition.objects.select_related('item', 'variation'))
             ).select_related('item', 'variation', 'order', 'addon_to', 'order__invoice_address', 'order', 'seat')
 
-        if not self.checkinlist.all_products:
+        if not self.checkinlist.all_products and not ignore_products:
             qs = qs.filter(item__in=self.checkinlist.limit_products.values_list('id', flat=True))
 
         return qs
 
-    @action(detail=True, methods=['POST'])
+    @action(detail=False, methods=['POST'], url_name='redeem', url_path='(?P<pk>.*)/redeem')
     def redeem(self, *args, **kwargs):
         force = bool(self.request.data.get('force', False))
         type = self.request.data.get('type', None) or Checkin.TYPE_ENTRY
@@ -260,13 +265,37 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
             raise ValidationError("Invalid check-in type.")
         ignore_unpaid = bool(self.request.data.get('ignore_unpaid', False))
         nonce = self.request.data.get('nonce')
-        op = self.get_object(ignore_status=True)
 
         if 'datetime' in self.request.data:
             dt = DateTimeField().to_internal_value(self.request.data.get('datetime'))
         else:
             dt = now()
 
+        try:
+            queryset = self.get_queryset(ignore_status=True, ignore_products=True)
+            if self.kwargs['pk'].isnumeric():
+                op = queryset.get(Q(pk=self.kwargs['pk']) | Q(secret=self.kwargs['pk']))
+            else:
+                op = queryset.get(secret=self.kwargs['pk'])
+        except OrderPosition.DoesNotExist:
+            revoked_matches = list(self.request.event.revoked_secrets.filter(secret=self.kwargs['pk']))
+            if len(revoked_matches) == 0 or not force:
+                self.request.event.log_action('pretix.event.checkin.unknown', data={
+                    'datetime': dt,
+                    'type': type,
+                    'list': self.checkinlist.pk,
+                    'barcode': self.kwargs['pk']
+                }, user=self.request.user, auth=self.request.auth)
+                raise Http404()
+
+            op = revoked_matches[0].position
+            op.order.log_action('pretix.event.checkin.revoked', data={
+                'datetime': dt,
+                'type': type,
+                'list': self.checkinlist.pk,
+                'barcode': self.kwargs['pk']
+            }, user=self.request.user, auth=self.request.auth)
+
         given_answers = {}
         if 'answers' in self.request.data:
             aws = self.request.data.get('answers')
@@ -302,6 +331,15 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                 ]
             }, status=400)
         except CheckInError as e:
+            op.order.log_action('pretix.event.checkin.denied', data={
+                'position': op.id,
+                'positionid': op.positionid,
+                'errorcode': e.code,
+                'force': force,
+                'datetime': dt,
+                'type': type,
+                'list': self.checkinlist.pk
+            }, user=self.request.user, auth=self.request.auth)
             return Response({
                 'status': 'error',
                 'reason': e.code,
@@ -314,11 +352,3 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                 'require_attention': op.item.checkin_attention or op.order.checkin_attention,
                 'position': CheckinListOrderPositionSerializer(op, context=self.get_serializer_context()).data
             }, status=201)
-
-    def get_object(self, ignore_status=False):
-        queryset = self.filter_queryset(self.get_queryset(ignore_status=ignore_status))
-        if self.kwargs['pk'].isnumeric():
-            obj = get_object_or_404(queryset, Q(pk=self.kwargs['pk']) | Q(secret=self.kwargs['pk']))
-        else:
-            obj = get_object_or_404(queryset, secret=self.kwargs['pk'])
-        return obj

src/pretix/api/views/device.py

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

src/pretix/api/views/event.py

@@ -4,21 +4,23 @@ from django.db.models import ProtectedError, Q
 from django.utils.timezone import now
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
 from django_scopes import scopes_disabled
-from rest_framework import filters, views, viewsets
+from rest_framework import filters, serializers, views, viewsets
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
 
 from pretix.api.auth.permission import EventCRUDPermission
 from pretix.api.serializers.event import (
-    CloneEventSerializer, EventSerializer, EventSettingsSerializer,
-    SubEventSerializer, TaxRuleSerializer,
+    CloneEventSerializer, DeviceEventSettingsSerializer, EventSerializer,
+    EventSettingsSerializer, SubEventSerializer, TaxRuleSerializer,
 )
 from pretix.api.views import ConditionalListView
 from pretix.base.models import (
-    CartPosition, Device, Event, ItemCategory, TaxRule, TeamAPIToken,
+    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():
@@ -26,6 +28,7 @@ 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
@@ -67,12 +70,16 @@ 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
     queryset = Event.objects.none()
     lookup_field = 'slug'
     lookup_url_kwarg = 'event'
+    lookup_value_regex = '[^/]+'
     permission_classes = (EventCRUDPermission,)
     filter_backends = (DjangoFilterBackend, filters.OrderingFilter)
     ordering = ('slug',)
@@ -88,7 +95,6 @@ class EventViewSet(viewsets.ModelViewSet):
             )
 
         qs = filter_qs_by_attr(qs, self.request)
-
         return qs.prefetch_related(
             'meta_values', 'meta_values__property', 'seat_category_mappings'
         )
@@ -193,6 +199,7 @@ with scopes_disabled():
         is_past = django_filters.rest_framework.BooleanFilter(method='is_past_qs')
         is_future = django_filters.rest_framework.BooleanFilter(method='is_future_qs')
         ends_after = django_filters.rest_framework.IsoDateTimeFilter(method='ends_after_qs')
+        modified_since = django_filters.IsoDateTimeFilter(field_name='last_modified', lookup_expr='gte')
 
         class Meta:
             model = SubEvent
@@ -228,10 +235,12 @@ with scopes_disabled():
 
 class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
     serializer_class = SubEventSerializer
-    queryset = ItemCategory.objects.none()
+    queryset = SubEvent.objects.none()
     write_permission = 'can_change_event_settings'
     filter_backends = (DjangoFilterBackend, filters.OrderingFilter)
     filterset_class = SubEventFilter
+    ordering = ('date_from',)
+    ordering_fields = ('id', 'date_from', 'last_modified')
 
     def get_queryset(self):
         if getattr(self.request, 'event', None):
@@ -253,6 +262,20 @@ class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
             'subeventitem_set', 'subeventitemvariation_set', 'seat_category_mappings'
         )
 
+    def list(self, request, **kwargs):
+        date = serializers.DateTimeField().to_representation(now())
+        queryset = self.filter_queryset(self.get_queryset())
+
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+            resp = self.get_paginated_response(serializer.data)
+            resp['X-Page-Generated'] = date
+            return resp
+
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data, headers={'X-Page-Generated': date})
+
     def perform_update(self, serializer):
         original_data = self.get_serializer(instance=serializer.instance).data
         super().perform_update(serializer)
@@ -337,10 +360,16 @@ class TaxRuleViewSet(ConditionalListView, viewsets.ModelViewSet):
 
 
 class EventSettingsView(views.APIView):
-    permission = 'can_change_event_settings'
+    permission = None
+    write_permission = 'can_change_event_settings'
 
     def get(self, request, *args, **kwargs):
-        s = EventSettingsSerializer(instance=request.event.settings, event=request.event)
+        if isinstance(request.auth, Device):
+            s = DeviceEventSettingsSerializer(instance=request.event.settings, event=request.event)
+        elif 'can_change_event_settings' in request.eventpermset:
+            s = EventSettingsSerializer(instance=request.event.settings, event=request.event)
+        else:
+            raise PermissionDenied()
         if 'explain' in request.GET:
             return Response({
                 fname: {
@@ -362,5 +391,7 @@ 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

@@ -0,0 +1,154 @@
+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()
+        cf.date = now()
+        cf.expires = now() + timedelta(days=3)
+        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/item.py

@@ -542,6 +542,7 @@ class QuotaViewSet(ConditionalListView, viewsets.ModelViewSet):
         data = {
             'paid_orders': qa.count_paid_orders[quota],
             'pending_orders': qa.count_pending_orders[quota],
+            'exited_orders': qa.count_exited_orders[quota],
             'blocking_vouchers': qa.count_vouchers[quota],
             'cart_positions': qa.count_cart[quota],
             'waiting_list': qa.count_pending_orders[quota],

src/pretix/api/views/oauth.py

@@ -3,8 +3,9 @@ import logging
 from django import forms
 from django.conf import settings
 from django.utils.translation import gettext as _
-from oauth2_provider.exceptions import OAuthToolkitError
+from oauth2_provider.exceptions import FatalClientError, OAuthToolkitError
 from oauth2_provider.forms import AllowForm
+from oauth2_provider.settings import oauth2_settings
 from oauth2_provider.views import (
     AuthorizationView as BaseAuthorizationView,
     RevokeTokenView as BaseRevokeTokenView, TokenView as BaseTokenView,
@@ -24,9 +25,12 @@ class OAuthAllowForm(AllowForm):
 
     def __init__(self, *args, **kwargs):
         user = kwargs.pop('user')
+        scope = kwargs.pop('scope')
         super().__init__(*args, **kwargs)
         self.fields['organizers'].queryset = Organizer.objects.filter(
             pk__in=user.teams.values_list('organizer', flat=True))
+        if scope == 'profile':
+            del self.fields['organizers']
 
 
 class AuthorizationView(BaseAuthorizationView):
@@ -36,6 +40,7 @@ class AuthorizationView(BaseAuthorizationView):
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
         kwargs['user'] = self.request.user
+        kwargs['scope'] = self.request.GET.get('scope')
         return kwargs
 
     def get_context_data(self, **kwargs):
@@ -43,8 +48,14 @@ class AuthorizationView(BaseAuthorizationView):
         ctx['settings'] = settings
         return ctx
 
-    def create_authorization_response(self, request, scopes, credentials, allow, organizers):
-        credentials["organizers"] = organizers
+    def validate_authorization_request(self, request):
+        require_approval = request.GET.get("approval_prompt", oauth2_settings.REQUEST_APPROVAL_PROMPT)
+        if require_approval != 'force' and request.GET.get('scope') != 'profile':
+            raise FatalClientError('Combnination of require_approval and scope values not allowed.')
+        return super().validate_authorization_request(request)
+
+    def create_authorization_response(self, request, scopes, credentials, allow, organizers=None):
+        credentials["organizers"] = organizers or []
         return super().create_authorization_response(request, scopes, credentials, allow)
 
     def form_valid(self, form):

src/pretix/api/views/order.py

@@ -4,7 +4,7 @@ from decimal import Decimal
 import django_filters
 import pytz
 from django.db import transaction
-from django.db.models import F, Prefetch, Q
+from django.db.models import Exists, F, OuterRef, Prefetch, Q
 from django.db.models.functions import Coalesce, Concat
 from django.http import FileResponse, HttpResponse
 from django.shortcuts import get_object_or_404
@@ -26,15 +26,18 @@ from pretix.api.serializers.order import (
     InvoiceSerializer, OrderCreateSerializer, OrderPaymentCreateSerializer,
     OrderPaymentSerializer, OrderPositionSerializer,
     OrderRefundCreateSerializer, OrderRefundSerializer, OrderSerializer,
-    PriceCalcSerializer,
+    PriceCalcSerializer, RevokedTicketSecretSerializer,
+    SimulatedOrderSerializer,
 )
 from pretix.base.i18n import language
 from pretix.base.models import (
     CachedCombinedTicket, CachedTicket, Device, Event, Invoice, InvoiceAddress,
-    Order, OrderFee, OrderPayment, OrderPosition, OrderRefund, Quota,
-    TeamAPIToken, generate_position_secret, generate_secret,
+    Order, OrderFee, OrderPayment, OrderPosition, OrderRefund, Quota, SubEvent,
+    TaxRule, TeamAPIToken, generate_secret,
 )
+from pretix.base.models.orders import RevokedTicketSecret
 from pretix.base.payment import PaymentException
+from pretix.base.secrets import assign_ticket_secret
 from pretix.base.services import tickets
 from pretix.base.services.invoices import (
     generate_cancellation, generate_invoice, invoice_pdf, invoice_qualified,
@@ -52,6 +55,7 @@ from pretix.base.signals import (
     order_modified, order_paid, order_placed, register_ticket_outputs,
 )
 from pretix.base.templatetags.money import money_filter
+from pretix.control.signals import order_search_filter_q
 
 with scopes_disabled():
     class OrderFilter(FilterSet):
@@ -60,11 +64,76 @@ with scopes_disabled():
         status = django_filters.CharFilter(field_name='status', lookup_expr='iexact')
         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:
             model = Order
             fields = ['code', 'status', 'email', 'locale', 'testmode', 'require_approval']
 
+        def subevent_after_qs(self, qs, name, value):
+            qs = qs.annotate(
+                has_se_after=Exists(
+                    OrderPosition.all.filter(
+                        subevent_id__in=SubEvent.objects.filter(
+                            Q(date_to__gt=value) | Q(date_from__gt=value, date_to__isnull=True), event=OuterRef(OuterRef('event_id'))
+                        ).values_list('id'),
+                        order_id=OuterRef('pk'),
+                    )
+                )
+            ).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:
+                code = (Q(event__slug__icontains=u.rsplit("-", 1)[0])
+                        & Q(code__icontains=Order.normalize_code(u.rsplit("-", 1)[1])))
+            else:
+                code = Q(code__icontains=Order.normalize_code(u))
+
+            matching_invoices = Invoice.objects.filter(
+                Q(invoice_no__iexact=u)
+                | Q(invoice_no__iexact=u.zfill(5))
+                | Q(full_invoice_no__iexact=u)
+            ).values_list('order_id', flat=True)
+
+            matching_positions = OrderPosition.objects.filter(
+                Q(order=OuterRef('pk')) & Q(
+                    Q(attendee_name_cached__icontains=u) | Q(attendee_email__icontains=u)
+                    | Q(secret__istartswith=u) | Q(voucher__code__icontains=u)
+                )
+            ).values('id')
+
+            mainq = (
+                code
+                | Q(email__icontains=u)
+                | Q(invoice_address__name_cached__icontains=u)
+                | Q(invoice_address__company__icontains=u)
+                | Q(pk__in=matching_invoices)
+                | Q(comment__icontains=u)
+                | Q(has_pos=True)
+            )
+            for recv, q in order_search_filter_q.send(sender=getattr(self, 'event', None), query=u):
+                mainq = mainq | q
+            return qs.annotate(has_pos=Exists(matching_positions)).filter(
+                mainq
+            )
+
 
 class OrderViewSet(viewsets.ModelViewSet):
     serializer_class = OrderSerializer
@@ -83,16 +152,19 @@ class OrderViewSet(viewsets.ModelViewSet):
         return ctx
 
     def get_queryset(self):
-        if self.request.query_params.get('include_canceled_fees', 'false') == 'true':
-            fqs = OrderFee.all
-        else:
-            fqs = OrderFee.objects
-        qs = self.request.event.orders.prefetch_related(
-            Prefetch('fees', queryset=fqs.all()),
-            'payments', 'refunds', 'refunds__payment'
-        ).select_related(
-            'invoice_address'
-        )
+        qs = self.request.event.orders
+        if 'fees' not in self.request.GET.getlist('exclude'):
+            if self.request.query_params.get('include_canceled_fees', 'false') == 'true':
+                fqs = OrderFee.all
+            else:
+                fqs = OrderFee.objects
+            qs = qs.prefetch_related(Prefetch('fees', queryset=fqs.all()))
+        if 'payments' not in self.request.GET.getlist('exclude'):
+            qs = qs.prefetch_related('payments')
+        if 'refunds' not in self.request.GET.getlist('exclude'):
+            qs = qs.prefetch_related('refunds', 'refunds__payment')
+        if 'invoice_address' not in self.request.GET.getlist('exclude'):
+            qs = qs.select_related('invoice_address')
 
         if self.request.query_params.get('include_canceled_positions', 'false') == 'true':
             opq = OrderPosition.all
@@ -129,6 +201,7 @@ class OrderViewSet(viewsets.ModelViewSet):
                 return prov
         raise NotFound('Unknown output provider.')
 
+    @scopes_disabled()  # we are sure enough that get_queryset() is correct, so we save some perforamnce
     def list(self, request, **kwargs):
         date = serializers.DateTimeField().to_representation(now())
         queryset = self.filter_queryset(self.get_queryset())
@@ -172,6 +245,7 @@ class OrderViewSet(viewsets.ModelViewSet):
     @action(detail=True, methods=['POST'])
     def mark_paid(self, request, **kwargs):
         order = self.get_object()
+        send_mail = request.data.get('send_email', True)
 
         if order.status in (Order.STATUS_PENDING, Order.STATUS_EXPIRED):
 
@@ -213,6 +287,7 @@ class OrderViewSet(viewsets.ModelViewSet):
             try:
                 p.confirm(auth=self.request.auth,
                           user=self.request.user if request.user.is_authenticated else None,
+                          send_mail=send_mail,
                           count_waitinglist=False)
             except Quota.QuotaExceededException as e:
                 return Response({'detail': str(e)}, status=status.HTTP_400_BAD_REQUEST)
@@ -425,8 +500,9 @@ class OrderViewSet(viewsets.ModelViewSet):
         order = self.get_object()
         order.secret = generate_secret()
         for op in order.all_positions.all():
-            op.secret = generate_position_secret()
-            op.save()
+            assign_ticket_secret(
+                request.event, op, force_invalidate=True, save=True
+            )
         order.save(update_fields=['secret'])
         CachedTicket.objects.filter(order_position__order=order).delete()
         CachedCombinedTicket.objects.filter(order=order).delete()
@@ -482,16 +558,23 @@ 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():
-            self.perform_create(serializer)
+            try:
+                self.perform_create(serializer)
+            except TaxRule.SaleNotAllowed:
+                raise ValidationError(_('One of the selected products is not available in the selected country.'))
             send_mail = serializer._send_mail
             order = serializer.instance
-            serializer = OrderSerializer(order, context=serializer.context)
             if not order.pk:
                 # Simulation
+                serializer = SimulatedOrderSerializer(order, context=serializer.context)
                 return Response(serializer.data, status=status.HTTP_201_CREATED)
+            else:
+                serializer = OrderSerializer(order, context=serializer.context)
 
             order.log_action(
                 'pretix.event.order.placed',
@@ -743,7 +826,8 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, viewsets.ReadOnlyModelViewS
         {
             "item": 2,
             "variation": null,
-            "subevent": 3
+            "subevent": 3,
+            "tax_rule": 4,
         }
 
         Sample output:
@@ -797,7 +881,11 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, viewsets.ReadOnlyModelViewS
         if data.get('subevent'):
             kwargs['subevent'] = data.get('subevent')
 
+        if data.get('tax_rule'):
+            kwargs['tax_rule'] = data.get('tax_rule')
+
         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):
             return Response({
                 'gross': price.gross,
@@ -806,6 +894,7 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, viewsets.ReadOnlyModelViewS
                 'rate': price.rate,
                 'name': str(price.name),
                 'tax': price.tax,
+                'tax_rule': tr.pk if tr else None,
             })
 
     @action(detail=True, url_name='download', url_path='download/(?P<output>[^/]+)')
@@ -862,6 +951,7 @@ 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):
@@ -869,6 +959,7 @@ 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():
@@ -884,7 +975,8 @@ 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)
+                        force=request.data.get('force', False),
+                        send_mail=send_mail,
                     )
                 except Quota.QuotaExceededException:
                     pass
@@ -912,6 +1004,7 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
     def confirm(self, request, **kwargs):
         payment = self.get_object()
         force = request.data.get('force', False)
+        send_mail = request.data.get('send_email', True)
 
         if payment.state not in (OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED):
             return Response({'detail': 'Invalid state of payment'}, status=status.HTTP_400_BAD_REQUEST)
@@ -920,6 +1013,7 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
             payment.confirm(user=self.request.user if self.request.user.is_authenticated else None,
                             auth=self.request.auth,
                             count_waitinglist=False,
+                            send_mail=send_mail,
                             force=force)
         except Quota.QuotaExceededException as e:
             return Response({'detail': str(e)}, status=status.HTTP_400_BAD_REQUEST)
@@ -1230,3 +1324,26 @@ class InvoiceViewSet(viewsets.ReadOnlyModelViewSet):
                 auth=self.request.auth,
             )
             return Response(status=204)
+
+
+with scopes_disabled():
+    class RevokedSecretFilter(FilterSet):
+        created_since = django_filters.IsoDateTimeFilter(field_name='created', lookup_expr='gte')
+
+        class Meta:
+            model = RevokedTicketSecret
+            fields = []
+
+
+class RevokedSecretViewSet(viewsets.ReadOnlyModelViewSet):
+    serializer_class = RevokedTicketSecretSerializer
+    queryset = RevokedTicketSecret.objects.none()
+    filter_backends = (DjangoFilterBackend, OrderingFilter)
+    ordering = ('-created',)
+    ordering_fields = ('created', 'secret')
+    filterset_class = RevokedSecretFilter
+    permission = 'can_view_orders'
+    write_permission = 'can_change_orders'
+
+    def get_queryset(self):
+        return RevokedTicketSecret.objects.filter(event=self.request.event)

src/pretix/api/views/organizer.py

@@ -6,22 +6,29 @@ 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, serializers, status, viewsets
+from rest_framework import (
+    filters, mixins, serializers, status, views, viewsets,
+)
 from rest_framework.decorators import action
 from rest_framework.exceptions import MethodNotAllowed, PermissionDenied
 from rest_framework.mixins import CreateModelMixin, DestroyModelMixin
 from rest_framework.response import Response
+from rest_framework.viewsets import GenericViewSet
 
 from pretix.api.models import OAuthAccessToken
 from pretix.api.serializers.organizer import (
-    GiftCardSerializer, OrganizerSerializer, SeatingPlanSerializer,
+    DeviceSerializer, GiftCardSerializer, GiftCardTransactionSerializer,
+    OrganizerSerializer, OrganizerSettingsSerializer, SeatingPlanSerializer,
     TeamAPITokenSerializer, TeamInviteSerializer, TeamMemberSerializer,
     TeamSerializer,
 )
 from pretix.base.models import (
-    GiftCard, Organizer, SeatingPlan, Team, TeamAPIToken, TeamInvite, User,
+    Device, GiftCard, GiftCardTransaction, 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):
@@ -29,6 +36,7 @@ class OrganizerViewSet(viewsets.ReadOnlyModelViewSet):
     queryset = Organizer.objects.none()
     lookup_field = 'slug'
     lookup_url_kwarg = 'organizer'
+    lookup_value_regex = '[^/]+'
     filter_backends = (filters.OrderingFilter,)
     ordering = ('slug',)
     ordering_fields = ('name', 'slug')
@@ -188,6 +196,24 @@ 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()
@@ -352,3 +378,78 @@ class TeamAPITokenViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnly
         serializer = self.get_serializer_class()(instance)
         headers = self.get_success_headers(serializer.data)
         return Response(serializer.data, status=status.HTTP_200_OK, headers=headers)
+
+
+class DeviceViewSet(mixins.CreateModelMixin,
+                    mixins.RetrieveModelMixin,
+                    mixins.UpdateModelMixin,
+                    mixins.ListModelMixin,
+                    GenericViewSet):
+    serializer_class = DeviceSerializer
+    queryset = Device.objects.none()
+    permission = 'can_change_organizer_settings'
+    write_permission = 'can_change_organizer_settings'
+    lookup_field = 'device_id'
+
+    def get_queryset(self):
+        return self.request.organizer.devices.order_by('pk')
+
+    def get_serializer_context(self):
+        ctx = super().get_serializer_context()
+        ctx['organizer'] = self.request.organizer
+        return ctx
+
+    @transaction.atomic()
+    def perform_create(self, serializer):
+        inst = serializer.save(organizer=self.request.organizer)
+        inst.log_action(
+            'pretix.device.created',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=merge_dicts(self.request.data, {'id': inst.pk})
+        )
+
+    @transaction.atomic()
+    def perform_update(self, serializer):
+        inst = serializer.save()
+        inst.log_action(
+            'pretix.device.changed',
+            user=self.request.user,
+            auth=self.request.auth,
+            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/views/user.py

@@ -3,14 +3,18 @@ from rest_framework.authentication import SessionAuthentication
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
+from pretix.api.auth.permission import ProfilePermission
+
 
 class MeView(APIView):
     authentication_classes = (SessionAuthentication, OAuth2Authentication)
+    permission_classes = (ProfilePermission,)
 
     def get(self, request, format=None):
         return Response({
             'email': request.user.email,
             'fullname': request.user.fullname,
             'locale': request.user.locale,
+            'is_staff': request.user.is_staff,
             'timezone': request.user.timezone
         })

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 _
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import scope, scopes_disabled
 from requests import RequestException
 
@@ -85,6 +85,8 @@ class ParametrizedOrderWebhookEvent(WebhookEvent):
 
     def build_payload(self, logentry: LogEntry):
         order = logentry.content_object
+        if not order:
+            return None
 
         return {
             'notification_id': logentry.pk,
@@ -95,10 +97,73 @@ 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):
         d = super().build_payload(logentry)
+        if d is None:
+            return None
         d['orderposition_id'] = logentry.parsed_data.get('position')
         d['orderposition_positionid'] = logentry.parsed_data.get('positionid')
         d['checkin_list'] = logentry.parsed_data.get('list')
@@ -165,44 +230,69 @@ 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_id: int):
-    logentry = LogEntry.all.select_related('event', 'event__organizer').get(id=logentry_id)
+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
 
-    if not logentry.organizer:
-        return  # We need to know the organizer
+        notification_type = logentry.webhook_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 not notification_type:
+            break  # Ignore, no webhooks for this event type
 
-    if not notification_type:
-        return  # Ignore, no webhooks for this event type
+        if _org != logentry.organizer or _at != logentry.action_type or webhooks is None:
+            _org = logentry.organizer
+            _at = logentry.action_type
 
-    # All webhooks that registered for this notification
-    event_listener = WebHookEventListener.objects.filter(
-        webhook=OuterRef('pk'),
-        action_type=notification_type.action_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)
+                )
 
-    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))
+        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)
@@ -218,6 +308,10 @@ def send_webhook(self, logentry_id: int, action_type: str, webhook_id: int):
             return  # Ignore, e.g. plugin not installed
 
         payload = event_type.build_payload(logentry)
+        if payload is None:
+            # Content object deleted?
+            return
+
         t = time.time()
 
         try:
@@ -242,7 +336,7 @@ def send_webhook(self, logentry_id: int, action_type: str, webhook_id: int):
                     webhook.enabled = False
                     webhook.save()
                 elif resp.status_code > 299:
-                    raise self.retry(countdown=2 ** (self.request.retries * 2))
+                    raise self.retry(countdown=2 ** (self.request.retries * 2))  # max is 2 ** (8*2) = 65536 seconds = ~18 hours
             except RequestException as e:
                 WebHookCall.objects.create(
                     webhook=webhook,
@@ -254,6 +348,6 @@ def send_webhook(self, logentry_id: int, action_type: str, webhook_id: int):
                     payload=json.dumps(payload),
                     response_body=str(e)[:1024 * 1024]
                 )
-                raise self.retry(countdown=2 ** (self.request.retries * 2))
+                raise self.retry(countdown=2 ** (self.request.retries * 2))  # max is 2 ** (8*2) = 65536 seconds = ~18 hours
         except MaxRetriesExceededError:
             pass

src/pretix/base/auth.py

@@ -98,7 +98,10 @@ class BaseAuthBackend:
 
 class NativeAuthBackend(BaseAuthBackend):
     identifier = 'native'
-    verbose_name = _('pretix User')
+
+    @property
+    def verbose_name(self):
+        return _('{system} User').format(system=settings.PRETIX_INSTANCE_NAME)
 
     @property
     def login_form_fields(self) -> dict:

src/pretix/base/banlist.py

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

src/pretix/base/email.py

@@ -12,7 +12,9 @@ from django.utils.timezone import now
 from django.utils.translation import get_language, gettext_lazy as _
 from inlinestyler.utils import inline_css
 
-from pretix.base.i18n import LazyCurrencyNumber, LazyDate, LazyNumber
+from pretix.base.i18n import (
+    LazyCurrencyNumber, LazyDate, LazyExpiresDate, LazyNumber,
+)
 from pretix.base.models import Event
 from pretix.base.settings import PERSON_NAME_SCHEMES
 from pretix.base.signals import (
@@ -112,7 +114,7 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
             'site_url': settings.SITE_URL,
             'body': body_md,
             'subject': str(subject),
-            'color': '#8E44B3',
+            'color': settings.PRETIX_PRIMARY_COLOR,
             'rtl': get_language() in settings.LANGUAGES_RTL
         }
         if self.event:
@@ -220,6 +222,7 @@ class SimpleFunctionalMailTextPlaceholder(BaseMailTextPlaceholder):
 def get_available_placeholders(event, base_parameters):
     if 'order' in base_parameters:
         base_parameters.append('invoice_address')
+        base_parameters.append('position_or_address')
     params = {}
     for r, val in register_mail_placeholders.send(sender=event):
         if not isinstance(val, (list, tuple)):
@@ -238,7 +241,9 @@ def get_email_context(**kwargs):
         try:
             kwargs['invoice_address'] = kwargs['order'].invoice_address
         except InvoiceAddress.DoesNotExist:
-            kwargs['invoice_address'] = InvoiceAddress()
+            kwargs['invoice_address'] = InvoiceAddress(order=kwargs['order'])
+        finally:
+            kwargs.setdefault("position_or_address", kwargs['invoice_address'])
     ctx = {}
     for r, val in register_mail_placeholders.send(sender=event):
         if not isinstance(val, (list, tuple)):
@@ -258,9 +263,31 @@ def _placeholder_payment(order, payment):
         return str(payment.payment_provider.order_pending_mail_render(order))
 
 
+def get_best_name(position_or_address, parts=False):
+    """
+    Return the best name we got for either an invoice address or an order position, falling back to the respective other
+    """
+    from pretix.base.models import InvoiceAddress, OrderPosition
+    if isinstance(position_or_address, InvoiceAddress):
+        if position_or_address.name:
+            return position_or_address.name_parts if parts else position_or_address.name
+        elif position_or_address.order:
+            position_or_address = position_or_address.order.positions.exclude(attendee_name_cached="").exclude(attendee_name_cached__isnull=True).first()
+
+    if isinstance(position_or_address, OrderPosition):
+        if position_or_address.attendee_name:
+            return position_or_address.attendee_name_parts if parts else position_or_address.attendee_name
+        elif position_or_address.order:
+            try:
+                return position_or_address.order.invoice_address.name_parts if parts else position_or_address.order.invoice_address.name
+            except InvoiceAddress.DoesNotExist:
+                pass
+
+    return {} if parts else ""
+
+
 @receiver(register_mail_placeholders, dispatch_uid="pretixbase_register_mail_placeholders")
 def base_placeholders(sender, **kwargs):
-    from pretix.base.models import InvoiceAddress
     from pretix.multidomain.urlreverse import build_absolute_uri
 
     ph = [
@@ -294,9 +321,8 @@ def base_placeholders(sender, **kwargs):
             lambda event: LazyCurrencyNumber(Decimal('42.23'), event.currency)
         ),
         SimpleFunctionalMailTextPlaceholder(
-            'expire_date', ['event', 'order'], lambda event, order: LazyDate(order.expires.astimezone(event.timezone)),
+            'expire_date', ['event', 'order'], lambda event, order: LazyExpiresDate(order.expires.astimezone(event.timezone)),
             lambda event: LazyDate(now() + timedelta(days=15))
-            # TODO: This used to be "date" in some placeholders, add a migration!
         ),
         SimpleFunctionalMailTextPlaceholder(
             'url', ['order', 'event'], lambda order, event: build_absolute_uri(
@@ -315,6 +341,51 @@ def base_placeholders(sender, **kwargs):
                 }
             ),
         ),
+        SimpleFunctionalMailTextPlaceholder(
+            'url_info_change', ['order', 'event'], lambda order, event: build_absolute_uri(
+                event,
+                'presale:event.order.modify', kwargs={
+                    'order': order.code,
+                    'secret': order.secret,
+                }
+            ), lambda event: build_absolute_uri(
+                event,
+                'presale:event.order.modify', kwargs={
+                    'order': 'F8VVL',
+                    'secret': '6zzjnumtsx136ddy',
+                }
+            ),
+        ),
+        SimpleFunctionalMailTextPlaceholder(
+            'url_products_change', ['order', 'event'], lambda order, event: build_absolute_uri(
+                event,
+                'presale:event.order.change', kwargs={
+                    'order': order.code,
+                    'secret': order.secret,
+                }
+            ), lambda event: build_absolute_uri(
+                event,
+                'presale:event.order.change', kwargs={
+                    'order': 'F8VVL',
+                    'secret': '6zzjnumtsx136ddy',
+                }
+            ),
+        ),
+        SimpleFunctionalMailTextPlaceholder(
+            'url_cancel', ['order', 'event'], lambda order, event: build_absolute_uri(
+                event,
+                'presale:event.order.cancel', kwargs={
+                    'order': order.code,
+                    'secret': order.secret,
+                }
+            ), lambda event: build_absolute_uri(
+                event,
+                'presale:event.order.cancel', kwargs={
+                    'order': 'F8VVL',
+                    'secret': '6zzjnumtsx136ddy',
+                }
+            ),
+        ),
         SimpleFunctionalMailTextPlaceholder(
             'url', ['event', 'position'], lambda event, position: build_absolute_uri(
                 event,
@@ -429,11 +500,7 @@ def base_placeholders(sender, **kwargs):
         ),
         SimpleFunctionalMailTextPlaceholder(
             'name', ['position_or_address'],
-            lambda position_or_address: (
-                position_or_address.name
-                if isinstance(position_or_address, InvoiceAddress)
-                else position_or_address.attendee_name
-            ),
+            get_best_name,
             _('John Doe'),
         ),
     ]
@@ -448,11 +515,7 @@ def base_placeholders(sender, **kwargs):
         ))
         ph.append(SimpleFunctionalMailTextPlaceholder(
             'name_%s' % f, ['position_or_address'],
-            lambda position_or_address, f=f: (
-                position_or_address.name_parts.get(f, '')
-                if isinstance(position_or_address, InvoiceAddress)
-                else position_or_address.attendee_name_parts.get(f, '')
-            ),
+            lambda position_or_address, f=f: get_best_name(position_or_address, parts=True).get(f, ''),
             name_scheme['sample'][f]
         ))
 

src/pretix/base/exporter.py

@@ -1,24 +1,34 @@
 import io
 import tempfile
-from collections import OrderedDict
+from collections import OrderedDict, namedtuple
 from decimal import Decimal
 from typing import Tuple
 
 from defusedcsv import csv
 from django import forms
+from django.db.models import QuerySet
 from django.utils.formats import localize
 from django.utils.translation import gettext, gettext_lazy as _
 from openpyxl import Workbook
 from openpyxl.cell.cell import KNOWN_TYPES
 
+from pretix.base.models import Event
+
 
 class BaseExporter:
     """
     This is the base class for all data exporters
     """
 
-    def __init__(self, event):
+    def __init__(self, event, progress_callback=lambda v: None):
         self.event = event
+        self.progress_callback = progress_callback
+        self.is_multievent = isinstance(event, QuerySet)
+        if isinstance(event, QuerySet):
+            self.events = event
+            self.event = None
+        else:
+            self.events = Event.objects.filter(pk=event.pk)
 
     def __str__(self):
         return self.identifier
@@ -85,6 +95,7 @@ class BaseExporter:
 
 
 class ListExporter(BaseExporter):
+    ProgressSetTotal = namedtuple('ProgressSetTotal', 'total')
 
     @property
     def export_form_fields(self) -> dict:
@@ -117,35 +128,66 @@ class ListExporter(BaseExporter):
 
     def _render_csv(self, form_data, output_file=None, **kwargs):
         if output_file:
+            if 'b' in output_file.mode:
+                output_file = io.TextIOWrapper(output_file, encoding='utf-8', newline='')
             writer = csv.writer(output_file, **kwargs)
+            total = 0
+            counter = 0
             for line in self.iterate_list(form_data):
+                if isinstance(line, self.ProgressSetTotal):
+                    total = line.total
+                    continue
                 line = [
                     localize(f) if isinstance(f, Decimal) else f
                     for f in line
                 ]
+                if total:
+                    counter += 1
+                    if counter % max(10, total // 100) == 0:
+                        self.progress_callback(counter / total * 100)
                 writer.writerow(line)
             return self.get_filename() + '.csv', 'text/csv', None
         else:
             output = io.StringIO()
             writer = csv.writer(output, **kwargs)
+            total = 0
+            counter = 0
             for line in self.iterate_list(form_data):
+                if isinstance(line, self.ProgressSetTotal):
+                    total = line.total
+                    continue
                 line = [
                     localize(f) if isinstance(f, Decimal) else f
                     for f in line
                 ]
+                if total:
+                    counter += 1
+                    if counter % max(10, total // 100) == 0:
+                        self.progress_callback(counter / total * 100)
                 writer.writerow(line)
             return self.get_filename() + '.csv', 'text/csv', output.getvalue().encode("utf-8")
 
     def _render_xlsx(self, form_data, output_file=None):
-        wb = Workbook()
-        ws = wb.active
+        wb = Workbook(write_only=True)
+        ws = wb.create_sheet()
         try:
             ws.title = str(self.verbose_name)
         except:
             pass
+        total = 0
+        counter = 0
         for i, line in enumerate(self.iterate_list(form_data)):
-            for j, val in enumerate(line):
-                ws.cell(row=i + 1, column=j + 1).value = str(val) if not isinstance(val, KNOWN_TYPES) else val
+            if isinstance(line, self.ProgressSetTotal):
+                total = line.total
+                continue
+            ws.append([
+                str(val) if not isinstance(val, KNOWN_TYPES) else val
+                for val in line
+            ])
+            if total:
+                counter += 1
+                if counter % max(10, total // 100) == 0:
+                    self.progress_callback(counter / total * 100)
 
         if output_file:
             wb.save(output_file)
@@ -203,35 +245,63 @@ class MultiSheetListExporter(ListExporter):
         raise NotImplementedError()  # noqa
 
     def _render_sheet_csv(self, form_data, sheet, output_file=None, **kwargs):
+        total = 0
+        counter = 0
         if output_file:
+            if 'b' in output_file.mode:
+                output_file = io.TextIOWrapper(output_file, encoding='utf-8', newline='')
             writer = csv.writer(output_file, **kwargs)
             for line in self.iterate_sheet(form_data, sheet):
+                if isinstance(line, self.ProgressSetTotal):
+                    total = line.total
+                    continue
                 line = [
                     localize(f) if isinstance(f, Decimal) else f
                     for f in line
                 ]
                 writer.writerow(line)
+                if total:
+                    counter += 1
+                    if counter % max(10, total // 100) == 0:
+                        self.progress_callback(counter / total * 100)
             return self.get_filename() + '.csv', 'text/csv', None
         else:
             output = io.StringIO()
             writer = csv.writer(output, **kwargs)
             for line in self.iterate_sheet(form_data, sheet):
+                if isinstance(line, self.ProgressSetTotal):
+                    total = line.total
+                    continue
                 line = [
                     localize(f) if isinstance(f, Decimal) else f
                     for f in line
                 ]
                 writer.writerow(line)
+                if total:
+                    counter += 1
+                    if counter % max(10, total // 100) == 0:
+                        self.progress_callback(counter / total * 100)
             return self.get_filename() + '.csv', 'text/csv', output.getvalue().encode("utf-8")
 
     def _render_xlsx(self, form_data, output_file=None):
-        wb = Workbook()
-        ws = wb.active
-        wb.remove(ws)
-        for s, l in self.sheets:
+        wb = Workbook(write_only=True)
+        n_sheets = len(self.sheets)
+        for i_sheet, (s, l) in enumerate(self.sheets):
             ws = wb.create_sheet(str(l))
+            total = 0
+            counter = 0
             for i, line in enumerate(self.iterate_sheet(form_data, sheet=s)):
-                for j, val in enumerate(line):
-                    ws.cell(row=i + 1, column=j + 1).value = str(val) if not isinstance(val, KNOWN_TYPES) else val
+                if isinstance(line, self.ProgressSetTotal):
+                    total = line.total
+                    continue
+                ws.append([
+                    str(val) if not isinstance(val, KNOWN_TYPES) else val
+                    for val in line
+                ])
+                if total:
+                    counter += 1
+                    if counter % max(10, total // 100) == 0:
+                        self.progress_callback(counter / total * 100 / n_sheets + 100 / n_sheets * i_sheet)
 
         if output_file:
             wb.save(output_file)

src/pretix/base/exporters/__init__.py

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

src/pretix/base/exporters/invoices.py

@@ -1,81 +1,33 @@
 import os
 import tempfile
 from collections import OrderedDict
+from decimal import Decimal
 from zipfile import ZipFile
 
 import dateutil.parser
 from django import forms
-from django.db.models import Exists, OuterRef, Q
+from django.db.models import CharField, Exists, F, OuterRef, Q, Subquery, Sum
 from django.dispatch import receiver
-from django.utils.translation import gettext_lazy as _
+from django.utils.formats import date_format
+from django.utils.functional import cached_property
+from django.utils.translation import gettext, gettext_lazy as _, pgettext
 
-from pretix.base.models import OrderPayment
+from pretix.base.models import Invoice, InvoiceLine, OrderPayment
 
-from ..exporter import BaseExporter
+from ...control.forms.filter import get_all_payment_providers
+from ...helpers import GroupConcat
+from ...helpers.iter import chunked_iterable
+from ..exporter import BaseExporter, MultiSheetListExporter
 from ..services.invoices import invoice_pdf_task
-from ..signals import register_data_exporters
+from ..signals import (
+    register_data_exporters, register_multievent_data_exporters,
+)
 
 
-class InvoiceExporter(BaseExporter):
-    identifier = 'invoices'
-    verbose_name = _('All invoices')
-
-    def render(self, form_data: dict, output_file=None):
-        qs = self.event.invoices.filter(shredded=False)
-
-        if form_data.get('payment_provider'):
-            qs = qs.annotate(
-                has_payment_with_provider=Exists(
-                    OrderPayment.objects.filter(
-                        Q(order=OuterRef('order_id')) & Q(provider=form_data.get('payment_provider'))
-                    )
-                )
-            )
-            qs = qs.filter(has_payment_with_provider=1)
-
-        if form_data.get('date_from'):
-            date_value = form_data.get('date_from')
-            if isinstance(date_value, str):
-                date_value = dateutil.parser.parse(date_value).date()
-            qs = qs.filter(date__gte=date_value)
-
-        if form_data.get('date_to'):
-            date_value = form_data.get('date_to')
-            if isinstance(date_value, str):
-                date_value = dateutil.parser.parse(date_value).date()
-            qs = qs.filter(date__lte=date_value)
-
-        with tempfile.TemporaryDirectory() as d:
-            any = False
-            with ZipFile(output_file or os.path.join(d, 'tmp.zip'), 'w') as zipf:
-                for i in qs:
-                    try:
-                        if not i.file:
-                            invoice_pdf_task.apply(args=(i.pk,))
-                            i.refresh_from_db()
-                        i.file.open('rb')
-                        zipf.writestr('{}.pdf'.format(i.number), i.file.read())
-                        any = True
-                        i.file.close()
-                    except FileNotFoundError:
-                        invoice_pdf_task.apply(args=(i.pk,))
-                        i.refresh_from_db()
-                        i.file.open('rb')
-                        zipf.writestr('{}.pdf'.format(i.number), i.file.read())
-                        any = True
-                        i.file.close()
-
-            if not any:
-                return None
-
-            if output_file:
-                return '{}_invoices.zip'.format(self.event.slug), 'application/zip', None
-            else:
-                with open(os.path.join(d, 'tmp.zip'), 'rb') as zipf:
-                    return '{}_invoices.zip'.format(self.event.slug), 'application/zip', zipf.read()
+class InvoiceExporterMixin:
 
     @property
-    def export_form_fields(self):
+    def invoice_exporter_form_fields(self):
         return OrderedDict(
             [
                 ('date_from',
@@ -99,6 +51,8 @@ class InvoiceExporter(BaseExporter):
                      label=_('Payment provider'),
                      choices=[
                          ('', _('All payment providers')),
+                     ] + get_all_payment_providers() if self.is_multievent else [
+                         ('', _('All payment providers')),
                      ] + [
                          (k, v.verbose_name) for k, v in self.event.get_payment_providers().items()
                      ],
@@ -111,7 +65,339 @@ class InvoiceExporter(BaseExporter):
             ]
         )
 
+    def invoices_queryset(self, form_data: dict):
+        qs = Invoice.objects.filter(event__in=self.events)
+
+        if form_data.get('payment_provider'):
+            qs = qs.annotate(
+                has_payment_with_provider=Exists(
+                    OrderPayment.objects.filter(
+                        Q(order=OuterRef('order_id')) & Q(provider=form_data.get('payment_provider'))
+                    )
+                )
+            )
+            qs = qs.filter(has_payment_with_provider=1)
+        if form_data.get('date_from'):
+            date_value = form_data.get('date_from')
+            if isinstance(date_value, str):
+                date_value = dateutil.parser.parse(date_value).date()
+            qs = qs.filter(date__gte=date_value)
+        if form_data.get('date_to'):
+            date_value = form_data.get('date_to')
+            if isinstance(date_value, str):
+                date_value = dateutil.parser.parse(date_value).date()
+            qs = qs.filter(date__lte=date_value)
+
+        return qs
+
+
+class InvoiceExporter(InvoiceExporterMixin, BaseExporter):
+    identifier = 'invoices'
+    verbose_name = _('All invoices')
+
+    def render(self, form_data: dict, output_file=None):
+        qs = self.invoices_queryset(form_data).filter(shredded=False)
+
+        with tempfile.TemporaryDirectory() as d:
+            total = qs.count()
+
+            if not total:
+                return None
+
+            counter = 0
+            with ZipFile(output_file or os.path.join(d, 'tmp.zip'), 'w') as zipf:
+                for i in qs.iterator():
+                    try:
+                        if not i.file:
+                            invoice_pdf_task.apply(args=(i.pk,))
+                            i.refresh_from_db()
+                        i.file.open('rb')
+                        zipf.writestr('{}.pdf'.format(i.number), i.file.read())
+                        i.file.close()
+                    except FileNotFoundError:
+                        invoice_pdf_task.apply(args=(i.pk,))
+                        i.refresh_from_db()
+                        i.file.open('rb')
+                        zipf.writestr('{}.pdf'.format(i.number), i.file.read())
+                        i.file.close()
+                    counter += 1
+                    if total and counter % max(10, total // 100) == 0:
+                        self.progress_callback(counter / total * 100)
+
+            if self.is_multievent:
+                filename = '{}_invoices.zip'.format(self.events.first().organizer.slug)
+            else:
+                filename = '{}_invoices.zip'.format(self.event.slug)
+
+            if output_file:
+                return filename, 'application/zip', None
+            else:
+                with open(os.path.join(d, 'tmp.zip'), 'rb') as zipf:
+                    return filename, 'application/zip', zipf.read()
+
+    @property
+    def export_form_fields(self):
+        return self.invoice_exporter_form_fields
+
+
+class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
+    identifier = 'invoicedata'
+    verbose_name = _('Invoice data')
+
+    @property
+    def additional_form_fields(self):
+        return self.invoice_exporter_form_fields
+
+    @property
+    def sheets(self):
+        return (
+            ('invoices', _('Invoices')),
+            ('lines', _('Invoice lines')),
+        )
+
+    def iterate_sheet(self, form_data, sheet):
+        _ = gettext
+        if sheet == 'invoices':
+            yield [
+                _('Invoice number'),
+                _('Date'),
+                _('Order code'),
+                _('E-mail address'),
+                _('Invoice type'),
+                _('Cancellation of'),
+                _('Language'),
+                _('Invoice sender:') + ' ' + _('Name'),
+                _('Invoice sender:') + ' ' + _('Address'),
+                _('Invoice sender:') + ' ' + _('ZIP code'),
+                _('Invoice sender:') + ' ' + _('City'),
+                _('Invoice sender:') + ' ' + _('Country'),
+                _('Invoice sender:') + ' ' + _('Tax ID'),
+                _('Invoice sender:') + ' ' + _('VAT ID'),
+                _('Invoice recipient:') + ' ' + _('Company'),
+                _('Invoice recipient:') + ' ' + _('Name'),
+                _('Invoice recipient:') + ' ' + _('Street address'),
+                _('Invoice recipient:') + ' ' + _('ZIP code'),
+                _('Invoice recipient:') + ' ' + _('City'),
+                _('Invoice recipient:') + ' ' + _('Country'),
+                _('Invoice recipient:') + ' ' + pgettext('address', 'State'),
+                _('Invoice recipient:') + ' ' + _('VAT ID'),
+                _('Invoice recipient:') + ' ' + _('Beneficiary'),
+                _('Invoice recipient:') + ' ' + _('Internal reference'),
+                _('Reverse charge'),
+                _('Shown foreign currency'),
+                _('Foreign currency rate'),
+                _('Total value (with taxes)'),
+                _('Total value (without taxes)'),
+                _('Payment matching IDs'),
+                _('Payment providers'),
+            ]
+
+            p_providers = OrderPayment.objects.filter(
+                order=OuterRef('order'),
+                state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED,
+                           OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED),
+            ).values('order').annotate(
+                m=GroupConcat('provider', delimiter=',')
+            ).values(
+                'm'
+            ).order_by()
+
+            base_qs = self.invoices_queryset(form_data)\
+
+            qs = base_qs.select_related(
+                'order', 'refers'
+            ).prefetch_related('order__payments').annotate(
+                payment_providers=Subquery(p_providers, output_field=CharField()),
+                total_gross=Subquery(
+                    InvoiceLine.objects.filter(
+                        invoice=OuterRef('pk')
+                    ).order_by().values('invoice').annotate(
+                        s=Sum('gross_value')
+                    ).values('s')
+                ),
+                total_net=Subquery(
+                    InvoiceLine.objects.filter(
+                        invoice=OuterRef('pk')
+                    ).order_by().values('invoice').annotate(
+                        s=Sum(F('gross_value') - F('tax_value'))
+                    ).values('s')
+                )
+            )
+
+            all_ids = base_qs.order_by('full_invoice_no').values_list('pk', flat=True)
+            yield self.ProgressSetTotal(total=len(all_ids))
+            for ids in chunked_iterable(all_ids, 1000):
+                invs = sorted(qs.filter(id__in=ids), key=lambda k: ids.index(k.pk))
+
+                for i in invs:
+                    pmis = []
+                    for p in i.order.payments.all():
+                        if p.state in (OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_CREATED,
+                                       OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_REFUNDED):
+                            pprov = p.payment_provider
+                            if pprov:
+                                mid = pprov.matching_id(p)
+                                if mid:
+                                    pmis.append(mid)
+                    pmi = '\n'.join(pmis)
+                    yield [
+                        i.full_invoice_no,
+                        date_format(i.date, "SHORT_DATE_FORMAT"),
+                        i.order.code,
+                        i.order.email,
+                        _('Cancellation') if i.is_cancellation else _('Invoice'),
+                        i.refers.full_invoice_no if i.refers else '',
+                        i.locale,
+                        i.invoice_from_name,
+                        i.invoice_from,
+                        i.invoice_from_zipcode,
+                        i.invoice_from_city,
+                        i.invoice_from_country,
+                        i.invoice_from_tax_id,
+                        i.invoice_from_vat_id,
+                        i.invoice_to_company,
+                        i.invoice_to_name,
+                        i.invoice_to_street or i.invoice_to,
+                        i.invoice_to_zipcode,
+                        i.invoice_to_city,
+                        i.invoice_to_country,
+                        i.invoice_to_state,
+                        i.invoice_to_vat_id,
+                        i.invoice_to_beneficiary,
+                        i.internal_reference,
+                        _('Yes') if i.reverse_charge else _('No'),
+                        i.foreign_currency_display,
+                        i.foreign_currency_rate,
+                        i.total_gross if i.total_gross else Decimal('0.00'),
+                        Decimal(i.total_net if i.total_net else '0.00').quantize(Decimal('0.01')),
+                        pmi,
+                        ', '.join([
+                            str(self.providers.get(p, p)) for p in sorted(set((i.payment_providers or '').split(',')))
+                            if p and p != 'free'
+                        ])
+                    ]
+        elif sheet == 'lines':
+            yield [
+                _('Invoice number'),
+                _('Line number'),
+                _('Description'),
+                _('Gross price'),
+                _('Net price'),
+                _('Tax value'),
+                _('Tax rate'),
+                _('Tax name'),
+                _('Event start date'),
+
+                _('Date'),
+                _('Order code'),
+                _('E-mail address'),
+                _('Invoice type'),
+                _('Cancellation of'),
+                _('Invoice sender:') + ' ' + _('Name'),
+                _('Invoice sender:') + ' ' + _('Address'),
+                _('Invoice sender:') + ' ' + _('ZIP code'),
+                _('Invoice sender:') + ' ' + _('City'),
+                _('Invoice sender:') + ' ' + _('Country'),
+                _('Invoice sender:') + ' ' + _('Tax ID'),
+                _('Invoice sender:') + ' ' + _('VAT ID'),
+                _('Invoice recipient:') + ' ' + _('Company'),
+                _('Invoice recipient:') + ' ' + _('Name'),
+                _('Invoice recipient:') + ' ' + _('Street address'),
+                _('Invoice recipient:') + ' ' + _('ZIP code'),
+                _('Invoice recipient:') + ' ' + _('City'),
+                _('Invoice recipient:') + ' ' + _('Country'),
+                _('Invoice recipient:') + ' ' + pgettext('address', 'State'),
+                _('Invoice recipient:') + ' ' + _('VAT ID'),
+                _('Invoice recipient:') + ' ' + _('Beneficiary'),
+                _('Invoice recipient:') + ' ' + _('Internal reference'),
+                _('Payment providers'),
+            ]
+
+            p_providers = OrderPayment.objects.filter(
+                order=OuterRef('invoice__order'),
+                state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED,
+                           OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED),
+            ).values('order').annotate(
+                m=GroupConcat('provider', delimiter=',')
+            ).values(
+                'm'
+            ).order_by()
+
+            qs = InvoiceLine.objects.annotate(
+                payment_providers=Subquery(p_providers, output_field=CharField()),
+            ).filter(
+                invoice__in=self.invoices_queryset(form_data)
+            ).order_by('invoice__full_invoice_no', 'position').select_related(
+                'invoice', 'invoice__order', 'invoice__refers'
+            )
+            yield self.ProgressSetTotal(total=qs.count())
+
+            for l in qs.iterator():
+                i = l.invoice
+                yield [
+                    i.full_invoice_no,
+                    l.position + 1,
+                    l.description.replace("<br />", " - "),
+                    l.gross_value,
+                    l.net_value,
+                    l.tax_value,
+                    l.tax_rate,
+                    l.tax_name,
+                    date_format(l.event_date_from, "SHORT_DATE_FORMAT") if l.event_date_from else "",
+                    date_format(i.date, "SHORT_DATE_FORMAT"),
+                    i.order.code,
+                    i.order.email,
+                    _('Cancellation') if i.is_cancellation else _('Invoice'),
+                    i.refers.full_invoice_no if i.refers else '',
+                    i.invoice_from_name,
+                    i.invoice_from,
+                    i.invoice_from_zipcode,
+                    i.invoice_from_city,
+                    i.invoice_from_country,
+                    i.invoice_from_tax_id,
+                    i.invoice_from_vat_id,
+                    i.invoice_to_company,
+                    i.invoice_to_name,
+                    i.invoice_to_street or i.invoice_to,
+                    i.invoice_to_zipcode,
+                    i.invoice_to_city,
+                    i.invoice_to_country,
+                    i.invoice_to_state,
+                    i.invoice_to_vat_id,
+                    i.invoice_to_beneficiary,
+                    i.internal_reference,
+                    ', '.join([
+                        str(self.providers.get(p, p)) for p in sorted(set((l.payment_providers or '').split(',')))
+                        if p and p != 'free'
+                    ])
+                ]
+
+    @cached_property
+    def providers(self):
+        return dict(get_all_payment_providers())
+
+    def get_filename(self):
+        if self.is_multievent:
+            return '{}_invoices'.format(self.events.first().organizer.slug)
+        else:
+            return '{}_invoices'.format(self.event.slug)
+
 
 @receiver(register_data_exporters, dispatch_uid="exporter_invoices")
 def register_invoice_export(sender, **kwargs):
     return InvoiceExporter
+
+
+@receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_invoices")
+def register_multievent_invoice_export(sender, **kwargs):
+    return InvoiceExporter
+
+
+@receiver(register_data_exporters, dispatch_uid="exporter_invoicedata")
+def register_invoicedata_exporter(sender, **kwargs):
+    return InvoiceDataExporter
+
+
+@receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_invoicedata")
+def register_multievent_invoicedatae_xporter(sender, **kwargs):
+    return InvoiceDataExporter

src/pretix/base/exporters/mail.py

@@ -8,7 +8,9 @@ from pretix.base.models import OrderPosition
 
 from ..exporter import BaseExporter
 from ..models import Order
-from ..signals import register_data_exporters
+from ..signals import (
+    register_data_exporters, register_multievent_data_exporters,
+)
 
 
 class MailExporter(BaseExporter):
@@ -16,14 +18,18 @@ class MailExporter(BaseExporter):
     verbose_name = _('Email addresses (text file)')
 
     def render(self, form_data: dict):
-        qs = self.event.orders.filter(status__in=form_data['status'])
+        qs = Order.objects.filter(event__in=self.events, status__in=form_data['status']).prefetch_related('event')
         addrs = qs.values('email')
         pos = OrderPosition.objects.filter(
-            order__event=self.event, order__status__in=form_data['status']
+            order__event__in=self.events, order__status__in=form_data['status']
         ).values('attendee_email')
         data = "\r\n".join(set(a['email'] for a in addrs if a['email'])
                            | set(a['attendee_email'] for a in pos if a['attendee_email']))
-        return '{}_pretixemails.txt'.format(self.event.slug), 'text/plain', data.encode("utf-8")
+
+        if self.is_multievent:
+            return '{}_pretixemails.txt'.format(self.events.first().organizer.slug), 'text/plain', data.encode("utf-8")
+        else:
+            return '{}_pretixemails.txt'.format(self.event.slug), 'text/plain', data.encode("utf-8")
 
     @property
     def export_form_fields(self):
@@ -35,7 +41,7 @@ class MailExporter(BaseExporter):
                      initial=[Order.STATUS_PENDING, Order.STATUS_PAID],
                      choices=Order.STATUS_CHOICE,
                      widget=forms.CheckboxSelectMultiple,
-                     required=False
+                     required=True
                  )),
             ]
         )
@@ -44,3 +50,8 @@ class MailExporter(BaseExporter):
 @receiver(register_data_exporters, dispatch_uid="exporter_mail")
 def register_mail_export(sender, **kwargs):
     return MailExporter
+
+
+@receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_mail")
+def register_multievent_mail_export(sender, **kwargs):
+    return MailExporter

src/pretix/base/exporters/orderlist.py

@@ -4,27 +4,37 @@ from decimal import Decimal
 import pytz
 from django import forms
 from django.db.models import (
-    Count, DateTimeField, F, IntegerField, Max, OuterRef, Subquery, Sum,
+    CharField, Count, DateTimeField, IntegerField, Max, OuterRef, Subquery,
+    Sum,
 )
 from django.dispatch import receiver
-from django.utils.formats import date_format
+from django.utils.functional import cached_property
 from django.utils.translation import gettext as _, gettext_lazy, pgettext
 
 from pretix.base.models import (
-    GiftCard, InvoiceAddress, InvoiceLine, Order, OrderPosition, Question,
+    GiftCard, Invoice, InvoiceAddress, Order, OrderPosition, Question,
 )
 from pretix.base.models.orders import OrderFee, OrderPayment, OrderRefund
 from pretix.base.services.quotas import QuotaAvailability
 from pretix.base.settings import PERSON_NAME_SCHEMES
 
+from ...control.forms.filter import get_all_payment_providers
+from ...helpers import GroupConcat
+from ...helpers.iter import chunked_iterable
 from ..exporter import ListExporter, MultiSheetListExporter
-from ..signals import register_data_exporters
+from ..signals import (
+    register_data_exporters, register_multievent_data_exporters,
+)
 
 
 class OrderListExporter(MultiSheetListExporter):
     identifier = 'orderlist'
     verbose_name = gettext_lazy('Order data')
 
+    @cached_property
+    def providers(self):
+        return dict(get_all_payment_providers())
+
     @property
     def sheets(self):
         return (
@@ -43,20 +53,34 @@ 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
             in OrderFee.objects.filter(
-                order__event=self.event
+                order__event__in=self.events
             ).values_list('tax_rate', flat=True).distinct().order_by()
         )
         tax_rates |= set(
             a for a
             in OrderPosition.objects.filter(
-                order__event=self.event
+                order__event__in=self.events
             ).values_list('tax_rate', flat=True).distinct().order_by()
         )
         tax_rates = sorted(tax_rates)
@@ -70,9 +94,11 @@ class OrderListExporter(MultiSheetListExporter):
         elif sheet == 'fees':
             return self.iterate_fees(form_data)
 
-    def iterate_orders(self, form_data: dict):
-        tz = pytz.timezone(self.event.settings.timezone)
+    @cached_property
+    def event_object_cache(self):
+        return {e.pk: e for e in self.events}
 
+    def iterate_orders(self, form_data: dict):
         p_date = OrderPayment.objects.filter(
             order=OuterRef('pk'),
             state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED),
@@ -82,29 +108,47 @@ class OrderListExporter(MultiSheetListExporter):
         ).values(
             'm'
         ).order_by()
+        p_providers = OrderPayment.objects.filter(
+            order=OuterRef('pk'),
+            state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED,
+                       OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED),
+        ).values('order').annotate(
+            m=GroupConcat('provider', delimiter=',')
+        ).values(
+            'm'
+        ).order_by()
+        i_numbers = Invoice.objects.filter(
+            order=OuterRef('pk'),
+        ).values('order').annotate(
+            m=GroupConcat('full_invoice_no', delimiter=', ')
+        ).values(
+            'm'
+        ).order_by()
 
         s = OrderPosition.objects.filter(
             order=OuterRef('pk')
         ).order_by().values('order').annotate(k=Count('id')).values('k')
-        qs = self.event.orders.annotate(
+        qs = Order.objects.filter(event__in=self.events).annotate(
             payment_date=Subquery(p_date, output_field=DateTimeField()),
+            payment_providers=Subquery(p_providers, output_field=CharField()),
+            invoice_numbers=Subquery(i_numbers, output_field=CharField()),
             pcnt=Subquery(s, output_field=IntegerField())
-        ).select_related('invoice_address').prefetch_related('invoices')
+        ).select_related('invoice_address')
         if form_data['paid_only']:
             qs = qs.filter(status=Order.STATUS_PAID)
         tax_rates = self._get_all_tax_rates(qs)
 
         headers = [
-            _('Order code'), _('Order total'), _('Status'), _('Email'), _('Order date'),
-            _('Company'), _('Name'),
+            _('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 len(name_scheme['fields']) > 1:
+        name_scheme = PERSON_NAME_SCHEMES[self.event.settings.name_scheme] if not self.is_multievent else None
+        if name_scheme and len(name_scheme['fields']) > 1:
             for k, label, w in name_scheme['fields']:
                 headers.append(label)
         headers += [
-            _('Address'), _('ZIP code'), _('City'), _('Country'), pgettext('address', 'State'), _('VAT ID'),
-            _('Date of last payment'), _('Fees'), _('Order locale')
+            _('Address'), _('ZIP code'), _('City'), _('Country'), pgettext('address', 'State'),
+            _('Custom address field'), _('VAT ID'), _('Date of last payment'), _('Fees'), _('Order locale')
         ]
 
         for tr in tax_rates:
@@ -119,6 +163,11 @@ class OrderListExporter(MultiSheetListExporter):
         headers.append(_('Requires special attention'))
         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
 
@@ -132,6 +181,23 @@ 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(
@@ -139,20 +205,25 @@ class OrderListExporter(MultiSheetListExporter):
             )
         }
 
-        for order in qs.order_by('datetime'):
+        yield self.ProgressSetTotal(total=qs.count())
+        for order in qs.order_by('datetime').iterator():
+            tz = pytz.timezone(self.event_object_cache[order.event_id].settings.timezone)
+
             row = [
+                self.event_object_cache[order.event_id].slug,
                 order.code,
                 order.total,
                 order.get_status_display(),
                 order.email,
                 order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
+                order.datetime.astimezone(tz).strftime('%H:%M:%S'),
             ]
             try:
                 row += [
                     order.invoice_address.company,
                     order.invoice_address.name,
                 ]
-                if len(name_scheme['fields']) > 1:
+                if name_scheme and len(name_scheme['fields']) > 1:
                     for k, label, w in name_scheme['fields']:
                         row.append(
                             order.invoice_address.name_parts.get(k, '')
@@ -164,10 +235,11 @@ 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 += [''] * (8 + (len(name_scheme['fields']) if len(name_scheme['fields']) > 1 else 0))
+                row += [''] * (9 + (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 '',
@@ -189,27 +261,50 @@ class OrderListExporter(MultiSheetListExporter):
                     taxrate_values['taxsum'] + fee_taxrate_values['taxsum'],
                 ]
 
-            row.append(', '.join([i.number for i in order.invoices.all()]))
+            row.append(order.invoice_numbers)
             row.append(order.sales_channel)
             row.append(_('Yes') if order.checkin_attention else _('No'))
             row.append(order.comment or "")
             row.append(order.pcnt)
+            row.append(', '.join([
+                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):
-        tz = pytz.timezone(self.event.settings.timezone)
-
+        p_providers = OrderPayment.objects.filter(
+            order=OuterRef('order'),
+            state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED,
+                       OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED),
+        ).values('order').annotate(
+            m=GroupConcat('provider', delimiter=',')
+        ).values(
+            'm'
+        ).order_by()
         qs = OrderFee.objects.filter(
-            order__event=self.event,
+            order__event__in=self.events,
+        ).annotate(
+            payment_providers=Subquery(p_providers, output_field=CharField()),
         ).select_related('order', 'order__invoice_address', 'tax_rule')
         if form_data['paid_only']:
             qs = qs.filter(order__status=Order.STATUS_PAID)
 
         headers = [
+            _('Event slug'),
             _('Order code'),
             _('Status'),
             _('Email'),
             _('Order date'),
+            _('Order time'),
             _('Fee type'),
             _('Description'),
             _('Price'),
@@ -219,23 +314,28 @@ class OrderListExporter(MultiSheetListExporter):
             _('Company'),
             _('Invoice address name'),
         ]
-        name_scheme = PERSON_NAME_SCHEMES[self.event.settings.name_scheme]
-        if len(name_scheme['fields']) > 1:
+        name_scheme = PERSON_NAME_SCHEMES[self.event.settings.name_scheme] if not self.is_multievent else None
+        if name_scheme and len(name_scheme['fields']) > 1:
             for k, label, w in name_scheme['fields']:
                 headers.append(_('Invoice address name') + ': ' + str(label))
         headers += [
             _('Address'), _('ZIP code'), _('City'), _('Country'), pgettext('address', 'State'), _('VAT ID'),
         ]
 
+        headers.append(_('Payment providers'))
         yield headers
 
-        for op in qs.order_by('order__datetime'):
+        yield self.ProgressSetTotal(total=qs.count())
+        for op in qs.order_by('order__datetime').iterator():
             order = op.order
+            tz = pytz.timezone(order.event.settings.timezone)
             row = [
+                self.event_object_cache[order.event_id].slug,
                 order.code,
                 order.get_status_display(),
                 order.email,
                 order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
+                order.datetime.astimezone(tz).strftime('%H:%M:%S'),
                 op.get_fee_type_display(),
                 op.description,
                 op.value,
@@ -248,7 +348,7 @@ class OrderListExporter(MultiSheetListExporter):
                     order.invoice_address.company,
                     order.invoice_address.name,
                 ]
-                if len(name_scheme['fields']) > 1:
+                if name_scheme and len(name_scheme['fields']) > 1:
                     for k, label, w in name_scheme['fields']:
                         row.append(
                             order.invoice_address.name_parts.get(k, '')
@@ -263,14 +363,28 @@ class OrderListExporter(MultiSheetListExporter):
                     order.invoice_address.vat_id,
                 ]
             except InvoiceAddress.DoesNotExist:
-                row += [''] * (8 + (len(name_scheme['fields']) if 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.append(', '.join([
+                str(self.providers.get(p, p)) for p in sorted(set((op.payment_providers or '').split(',')))
+                if p and p != 'free'
+            ]))
             yield row
 
     def iterate_positions(self, form_data: dict):
-        tz = pytz.timezone(self.event.settings.timezone)
-
-        qs = OrderPosition.objects.filter(
-            order__event=self.event,
+        p_providers = OrderPayment.objects.filter(
+            order=OuterRef('order'),
+            state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED,
+                       OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED),
+        ).values('order').annotate(
+            m=GroupConcat('provider', delimiter=',')
+        ).values(
+            'm'
+        ).order_by()
+        base_qs = OrderPosition.objects.filter(
+            order__event__in=self.events,
+        )
+        qs = base_qs.annotate(
+            payment_providers=Subquery(p_providers, output_field=CharField()),
         ).select_related(
             'order', 'order__invoice_address', 'item', 'variation',
             'voucher', 'tax_rule'
@@ -280,14 +394,18 @@ class OrderListExporter(MultiSheetListExporter):
         if form_data['paid_only']:
             qs = qs.filter(order__status=Order.STATUS_PAID)
 
+        has_subevents = self.events.filter(has_subevents=True).exists()
+
         headers = [
+            _('Event slug'),
             _('Order code'),
             _('Position ID'),
             _('Status'),
             _('Email'),
             _('Order date'),
+            _('Order time'),
         ]
-        if self.event.has_subevents:
+        if has_subevents:
             headers.append(pgettext('subevent', 'Date'))
             headers.append(_('Start date'))
             headers.append(_('End date'))
@@ -300,8 +418,8 @@ class OrderListExporter(MultiSheetListExporter):
             _('Tax value'),
             _('Attendee name'),
         ]
-        name_scheme = PERSON_NAME_SCHEMES[self.event.settings.name_scheme]
-        if len(name_scheme['fields']) > 1:
+        name_scheme = PERSON_NAME_SCHEMES[self.event.settings.name_scheme] if not self.is_multievent else None
+        if name_scheme and len(name_scheme['fields']) > 1:
             for k, label, w in name_scheme['fields']:
                 headers.append(_('Attendee name') + ': ' + str(label))
         headers += [
@@ -314,8 +432,15 @@ class OrderListExporter(MultiSheetListExporter):
             pgettext('address', 'State'),
             _('Voucher'),
             _('Pseudonymization ID'),
+            _('Seat ID'),
+            _('Seat name'),
+            _('Seat zone'),
+            _('Seat row'),
+            _('Seat number'),
+            _('Order comment'),
         ]
-        questions = list(self.event.questions.all())
+
+        questions = list(Question.objects.filter(event__in=self.events))
         options = {}
         for q in questions:
             if q.type == Question.TYPE_CHOICE_MULTIPLE:
@@ -329,7 +454,7 @@ class OrderListExporter(MultiSheetListExporter):
             _('Company'),
             _('Invoice address name'),
         ]
-        if len(name_scheme['fields']) > 1:
+        if name_scheme and len(name_scheme['fields']) > 1:
             for k, label, w in name_scheme['fields']:
                 headers.append(_('Invoice address name') + ': ' + str(label))
         headers += [
@@ -337,97 +462,131 @@ class OrderListExporter(MultiSheetListExporter):
         ]
         headers += [
             _('Sales channel'), _('Order locale'),
+            _('Payment providers'),
         ]
 
         yield headers
 
-        for op in qs.order_by('order__datetime', 'positionid'):
-            order = op.order
-            row = [
-                order.code,
-                op.positionid,
-                order.get_status_display(),
-                order.email,
-                order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
-            ]
-            if self.event.has_subevents:
-                row.append(op.subevent.name)
-                row.append(op.subevent.date_from.astimezone(self.event.timezone).strftime('%Y-%m-%d %H:%M:%S'))
-                if op.subevent.date_to:
-                    row.append(op.subevent.date_to.astimezone(self.event.timezone).strftime('%Y-%m-%d %H:%M:%S'))
-                else:
-                    row.append('')
-            row += [
-                str(op.item),
-                str(op.variation) if op.variation else '',
-                op.price,
-                op.tax_rate,
-                str(op.tax_rule) if op.tax_rule else '',
-                op.tax_value,
-                op.attendee_name,
-            ]
-            if len(name_scheme['fields']) > 1:
-                for k, label, w in name_scheme['fields']:
-                    row.append(
-                        op.attendee_name_parts.get(k, '')
-                    )
-            row += [
-                op.attendee_email,
-                op.company or '',
-                op.street or '',
-                op.zipcode or '',
-                op.city or '',
-                op.country if op.country else '',
-                op.state or '',
-                op.voucher.code if op.voucher else '',
-                op.pseudonymization_id,
-            ]
-            acache = {}
-            for a in op.answers.all():
-                # We do not want to localize Date, Time and Datetime question answers, as those can lead
-                # to difficulties parsing the data (for example 2019-02-01 may become Février, 2019 01 in French).
-                if a.question.type == Question.TYPE_CHOICE_MULTIPLE:
-                    acache[a.question_id] = set(o.pk for o in a.options.all())
-                elif a.question.type in Question.UNLOCALIZED_TYPES:
-                    acache[a.question_id] = a.answer
-                else:
-                    acache[a.question_id] = str(a)
-            for q in questions:
-                if q.type == Question.TYPE_CHOICE_MULTIPLE:
-                    for o in options[q.pk]:
-                        row.append(_('Yes') if o.pk in acache.get(q.pk, set()) else _('No'))
-                else:
-                    row.append(acache.get(q.pk, ''))
+        all_ids = list(base_qs.order_by('order__datetime', 'positionid').values_list('pk', flat=True))
+        yield self.ProgressSetTotal(total=len(all_ids))
+        for ids in chunked_iterable(all_ids, 1000):
+            ops = sorted(qs.filter(id__in=ids), key=lambda k: ids.index(k.pk))
 
-            try:
-                row += [
-                    order.invoice_address.company,
-                    order.invoice_address.name,
+            for op in ops:
+                order = op.order
+                tz = pytz.timezone(self.event_object_cache[order.event_id].settings.timezone)
+                row = [
+                    self.event_object_cache[order.event_id].slug,
+                    order.code,
+                    op.positionid,
+                    order.get_status_display(),
+                    order.email,
+                    order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
+                    order.datetime.astimezone(tz).strftime('%H:%M:%S'),
                 ]
-                if len(name_scheme['fields']) > 1:
+                if has_subevents:
+                    if op.subevent:
+                        row.append(op.subevent.name)
+                        row.append(op.subevent.date_from.astimezone(self.event_object_cache[order.event_id].timezone).strftime('%Y-%m-%d %H:%M:%S'))
+                        if op.subevent.date_to:
+                            row.append(op.subevent.date_to.astimezone(self.event_object_cache[order.event_id].timezone).strftime('%Y-%m-%d %H:%M:%S'))
+                        else:
+                            row.append('')
+                    else:
+                        row.append('')
+                        row.append('')
+                        row.append('')
+                row += [
+                    str(op.item),
+                    str(op.variation) if op.variation else '',
+                    op.price,
+                    op.tax_rate,
+                    str(op.tax_rule) if op.tax_rule else '',
+                    op.tax_value,
+                    op.attendee_name,
+                ]
+                if name_scheme and len(name_scheme['fields']) > 1:
                     for k, label, w in name_scheme['fields']:
                         row.append(
-                            order.invoice_address.name_parts.get(k, '')
+                            op.attendee_name_parts.get(k, '')
                         )
                 row += [
-                    order.invoice_address.street,
-                    order.invoice_address.zipcode,
-                    order.invoice_address.city,
-                    order.invoice_address.country if order.invoice_address.country else
-                    order.invoice_address.country_old,
-                    order.invoice_address.state,
-                    order.invoice_address.vat_id,
+                    op.attendee_email,
+                    op.company or '',
+                    op.street or '',
+                    op.zipcode or '',
+                    op.city or '',
+                    op.country if op.country else '',
+                    op.state or '',
+                    op.voucher.code if op.voucher else '',
+                    op.pseudonymization_id,
                 ]
-            except InvoiceAddress.DoesNotExist:
-                row += [''] * (8 + (len(name_scheme['fields']) if len(name_scheme['fields']) > 1 else 0))
-            row += [
-                order.sales_channel,
-                order.locale
-            ]
-            yield row
+
+                if op.seat:
+                    row += [
+                        op.seat.seat_guid,
+                        str(op.seat),
+                        op.seat.zone_name,
+                        op.seat.row_name,
+                        op.seat.seat_number,
+                    ]
+                else:
+                    row += ['', '', '', '', '']
+
+                row.append(order.comment)
+                acache = {}
+                for a in op.answers.all():
+                    # We do not want to localize Date, Time and Datetime question answers, as those can lead
+                    # to difficulties parsing the data (for example 2019-02-01 may become Février, 2019 01 in French).
+                    if a.question.type == Question.TYPE_CHOICE_MULTIPLE:
+                        acache[a.question_id] = set(o.pk for o in a.options.all())
+                    elif a.question.type in Question.UNLOCALIZED_TYPES:
+                        acache[a.question_id] = a.answer
+                    else:
+                        acache[a.question_id] = str(a)
+                for q in questions:
+                    if q.type == Question.TYPE_CHOICE_MULTIPLE:
+                        for o in options[q.pk]:
+                            row.append(_('Yes') if o.pk in acache.get(q.pk, set()) else _('No'))
+                    else:
+                        row.append(acache.get(q.pk, ''))
+
+                try:
+                    row += [
+                        order.invoice_address.company,
+                        order.invoice_address.name,
+                    ]
+                    if name_scheme and len(name_scheme['fields']) > 1:
+                        for k, label, w in name_scheme['fields']:
+                            row.append(
+                                order.invoice_address.name_parts.get(k, '')
+                            )
+                    row += [
+                        order.invoice_address.street,
+                        order.invoice_address.zipcode,
+                        order.invoice_address.city,
+                        order.invoice_address.country if order.invoice_address.country else
+                        order.invoice_address.country_old,
+                        order.invoice_address.state,
+                        order.invoice_address.vat_id,
+                    ]
+                except InvoiceAddress.DoesNotExist:
+                    row += [''] * (8 + (len(name_scheme['fields']) if name_scheme and len(name_scheme['fields']) > 1 else 0))
+                row += [
+                    order.sales_channel,
+                    order.locale,
+                ]
+                row.append(', '.join([
+                    str(self.providers.get(p, p)) for p in sorted(set((op.payment_providers or '').split(',')))
+                    if p and p != 'free'
+                ]))
+                yield row
 
     def get_filename(self):
-        return '{}_orders'.format(self.event.slug)
+        if self.is_multievent:
+            return '{}_orders'.format(self.events.first().organizer.slug)
+        else:
+            return '{}_orders'.format(self.event.slug)
 
 
 class PaymentListExporter(ListExporter):
@@ -459,31 +618,28 @@ class PaymentListExporter(ListExporter):
         )
 
     def iterate_list(self, form_data):
-        tz = pytz.timezone(self.event.settings.timezone)
-
-        provider_names = {
-            k: v.verbose_name
-            for k, v in self.event.get_payment_providers().items()
-        }
+        provider_names = dict(get_all_payment_providers())
 
         payments = OrderPayment.objects.filter(
-            order__event=self.event,
+            order__event__in=self.events,
             state__in=form_data.get('payment_states', [])
         ).order_by('created')
         refunds = OrderRefund.objects.filter(
-            order__event=self.event,
+            order__event__in=self.events,
             state__in=form_data.get('refund_states', [])
         ).order_by('created')
 
         objs = sorted(list(payments) + list(refunds), key=lambda o: o.created)
 
         headers = [
-            _('Order'), _('Payment ID'), _('Creation date'), _('Completion date'), _('Status'),
+            _('Event slug'), _('Order'), _('Payment ID'), _('Creation date'), _('Completion date'), _('Status'),
             _('Status code'), _('Amount'), _('Payment method')
         ]
         yield headers
 
+        yield self.ProgressSetTotal(total=len(objs))
         for obj in objs:
+            tz = pytz.timezone(obj.order.event.settings.timezone)
             if isinstance(obj, OrderPayment) and obj.payment_date:
                 d2 = obj.payment_date.astimezone(tz).date().strftime('%Y-%m-%d')
             elif isinstance(obj, OrderRefund) and obj.execution_date:
@@ -491,6 +647,7 @@ class PaymentListExporter(ListExporter):
             else:
                 d2 = ''
             row = [
+                obj.order.event.slug,
                 obj.order.code,
                 obj.full_id,
                 obj.created.astimezone(tz).date().strftime('%Y-%m-%d'),
@@ -503,7 +660,10 @@ class PaymentListExporter(ListExporter):
             yield row
 
     def get_filename(self):
-        return '{}_payments'.format(self.event.slug)
+        if self.is_multievent:
+            return '{}_payments'.format(self.events.first().organizer.slug)
+        else:
+            return '{}_payments'.format(self.event.slug)
 
 
 class QuotaListExporter(ListExporter):
@@ -513,7 +673,7 @@ class QuotaListExporter(ListExporter):
     def iterate_list(self, form_data):
         headers = [
             _('Quota name'), _('Total quota'), _('Paid orders'), _('Pending orders'), _('Blocking vouchers'),
-            _('Current user\'s carts'), _('Waiting list'), _('Current availability')
+            _('Current user\'s carts'), _('Waiting list'), _('Exited orders'), _('Current availability')
         ]
         yield headers
 
@@ -532,6 +692,7 @@ class QuotaListExporter(ListExporter):
                 qa.count_vouchers[quota],
                 qa.count_cart[quota],
                 qa.count_waitinglist[quota],
+                qa.count_exited_orders[quota],
                 _('Infinite') if avail[1] is None else avail[1]
             ]
             yield row
@@ -540,218 +701,34 @@ class QuotaListExporter(ListExporter):
         return '{}_quotas'.format(self.event.slug)
 
 
-class InvoiceDataExporter(MultiSheetListExporter):
-    identifier = 'invoicedata'
-    verbose_name = gettext_lazy('Invoice data')
-
-    @property
-    def sheets(self):
-        return (
-            ('invoices', _('Invoices')),
-            ('lines', _('Invoice lines')),
-        )
-
-    def iterate_sheet(self, form_data, sheet):
-        if sheet == 'invoices':
-            yield [
-                _('Invoice number'),
-                _('Date'),
-                _('Order code'),
-                _('E-mail address'),
-                _('Invoice type'),
-                _('Cancellation of'),
-                _('Language'),
-                _('Invoice sender:') + ' ' + _('Name'),
-                _('Invoice sender:') + ' ' + _('Address'),
-                _('Invoice sender:') + ' ' + _('ZIP code'),
-                _('Invoice sender:') + ' ' + _('City'),
-                _('Invoice sender:') + ' ' + _('Country'),
-                _('Invoice sender:') + ' ' + _('Tax ID'),
-                _('Invoice sender:') + ' ' + _('VAT ID'),
-                _('Invoice recipient:') + ' ' + _('Company'),
-                _('Invoice recipient:') + ' ' + _('Name'),
-                _('Invoice recipient:') + ' ' + _('Street address'),
-                _('Invoice recipient:') + ' ' + _('ZIP code'),
-                _('Invoice recipient:') + ' ' + _('City'),
-                _('Invoice recipient:') + ' ' + _('Country'),
-                _('Invoice recipient:') + ' ' + pgettext('address', 'State'),
-                _('Invoice recipient:') + ' ' + _('VAT ID'),
-                _('Invoice recipient:') + ' ' + _('Beneficiary'),
-                _('Invoice recipient:') + ' ' + _('Internal reference'),
-                _('Reverse charge'),
-                _('Shown foreign currency'),
-                _('Foreign currency rate'),
-                _('Total value (with taxes)'),
-                _('Total value (without taxes)'),
-                _('Payment matching IDs'),
-            ]
-            qs = self.event.invoices.order_by('full_invoice_no').select_related(
-                'order', 'refers'
-            ).prefetch_related('order__payments').annotate(
-                total_gross=Subquery(
-                    InvoiceLine.objects.filter(
-                        invoice=OuterRef('pk')
-                    ).order_by().values('invoice').annotate(
-                        s=Sum('gross_value')
-                    ).values('s')
-                ),
-                total_net=Subquery(
-                    InvoiceLine.objects.filter(
-                        invoice=OuterRef('pk')
-                    ).order_by().values('invoice').annotate(
-                        s=Sum(F('gross_value') - F('tax_value'))
-                    ).values('s')
-                )
-            )
-            for i in qs:
-                pmis = []
-                for p in i.order.payments.all():
-                    if p.state in (OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_CREATED,
-                                   OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_REFUNDED):
-                        pprov = p.payment_provider
-                        if pprov:
-                            mid = pprov.matching_id(p)
-                            if mid:
-                                pmis.append(mid)
-                pmi = '\n'.join(pmis)
-                yield [
-                    i.full_invoice_no,
-                    date_format(i.date, "SHORT_DATE_FORMAT"),
-                    i.order.code,
-                    i.order.email,
-                    _('Cancellation') if i.is_cancellation else _('Invoice'),
-                    i.refers.full_invoice_no if i.refers else '',
-                    i.locale,
-                    i.invoice_from_name,
-                    i.invoice_from,
-                    i.invoice_from_zipcode,
-                    i.invoice_from_city,
-                    i.invoice_from_country,
-                    i.invoice_from_tax_id,
-                    i.invoice_from_vat_id,
-                    i.invoice_to_company,
-                    i.invoice_to_name,
-                    i.invoice_to_street or i.invoice_to,
-                    i.invoice_to_zipcode,
-                    i.invoice_to_city,
-                    i.invoice_to_country,
-                    i.invoice_to_state,
-                    i.invoice_to_vat_id,
-                    i.invoice_to_beneficiary,
-                    i.internal_reference,
-                    _('Yes') if i.reverse_charge else _('No'),
-                    i.foreign_currency_display,
-                    i.foreign_currency_rate,
-                    i.total_gross if i.total_gross else Decimal('0.00'),
-                    Decimal(i.total_net if i.total_net else '0.00').quantize(Decimal('0.01')),
-                    pmi
-                ]
-        elif sheet == 'lines':
-            yield [
-                _('Invoice number'),
-                _('Line number'),
-                _('Description'),
-                _('Gross price'),
-                _('Net price'),
-                _('Tax value'),
-                _('Tax rate'),
-                _('Tax name'),
-                _('Event start date'),
-
-                _('Date'),
-                _('Order code'),
-                _('E-mail address'),
-                _('Invoice type'),
-                _('Cancellation of'),
-                _('Invoice sender:') + ' ' + _('Name'),
-                _('Invoice sender:') + ' ' + _('Address'),
-                _('Invoice sender:') + ' ' + _('ZIP code'),
-                _('Invoice sender:') + ' ' + _('City'),
-                _('Invoice sender:') + ' ' + _('Country'),
-                _('Invoice sender:') + ' ' + _('Tax ID'),
-                _('Invoice sender:') + ' ' + _('VAT ID'),
-                _('Invoice recipient:') + ' ' + _('Company'),
-                _('Invoice recipient:') + ' ' + _('Name'),
-                _('Invoice recipient:') + ' ' + _('Street address'),
-                _('Invoice recipient:') + ' ' + _('ZIP code'),
-                _('Invoice recipient:') + ' ' + _('City'),
-                _('Invoice recipient:') + ' ' + _('Country'),
-                _('Invoice recipient:') + ' ' + pgettext('address', 'State'),
-                _('Invoice recipient:') + ' ' + _('VAT ID'),
-                _('Invoice recipient:') + ' ' + _('Beneficiary'),
-                _('Invoice recipient:') + ' ' + _('Internal reference'),
-            ]
-            qs = InvoiceLine.objects.filter(
-                invoice__event=self.event
-            ).order_by('invoice__full_invoice_no', 'position').select_related(
-                'invoice', 'invoice__order', 'invoice__refers'
-            )
-            for l in qs:
-                i = l.invoice
-                yield [
-                    i.full_invoice_no,
-                    l.position + 1,
-                    l.description.replace("<br />", " - "),
-                    l.gross_value,
-                    l.net_value,
-                    l.tax_value,
-                    l.tax_rate,
-                    l.tax_name,
-                    date_format(l.event_date_from, "SHORT_DATE_FORMAT") if l.event_date_from else "",
-                    date_format(i.date, "SHORT_DATE_FORMAT"),
-                    i.order.code,
-                    i.order.email,
-                    _('Cancellation') if i.is_cancellation else _('Invoice'),
-                    i.refers.full_invoice_no if i.refers else '',
-                    i.invoice_from_name,
-                    i.invoice_from,
-                    i.invoice_from_zipcode,
-                    i.invoice_from_city,
-                    i.invoice_from_country,
-                    i.invoice_from_tax_id,
-                    i.invoice_from_vat_id,
-                    i.invoice_to_company,
-                    i.invoice_to_name,
-                    i.invoice_to_street or i.invoice_to,
-                    i.invoice_to_zipcode,
-                    i.invoice_to_city,
-                    i.invoice_to_country,
-                    i.invoice_to_state,
-                    i.invoice_to_vat_id,
-                    i.invoice_to_beneficiary,
-                    i.internal_reference,
-                ]
-
-    def get_filename(self):
-        return '{}_invoices'.format(self.event.slug)
-
-
 class GiftcardRedemptionListExporter(ListExporter):
     identifier = 'giftcardredemptionlist'
     verbose_name = gettext_lazy('Gift card redemptions')
 
     def iterate_list(self, form_data):
-        tz = pytz.timezone(self.event.settings.timezone)
-
         payments = OrderPayment.objects.filter(
-            order__event=self.event,
-            provider='giftcard'
+            order__event__in=self.events,
+            provider='giftcard',
+            state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED),
         ).order_by('created')
         refunds = OrderRefund.objects.filter(
-            order__event=self.event,
-            provider='giftcard'
+            order__event__in=self.events,
+            provider='giftcard',
+            state=OrderRefund.REFUND_STATE_DONE
         ).order_by('created')
 
         objs = sorted(list(payments) + list(refunds), key=lambda o: (o.order.code, o.created))
 
         headers = [
-            _('Order'), _('Payment ID'), _('Date'), _('Gift card code'), _('Amount'), _('Issuer')
+            _('Event slug'), _('Order'), _('Payment ID'), _('Date'), _('Gift card code'), _('Amount'), _('Issuer')
         ]
         yield headers
 
         for obj in objs:
+            tz = pytz.timezone(obj.order.event.settings.timezone)
             gc = GiftCard.objects.get(pk=obj.info_data.get('gift_card'))
             row = [
+                obj.order.event.slug,
                 obj.order.code,
                 obj.full_id,
                 obj.created.astimezone(tz).date().strftime('%Y-%m-%d'),
@@ -762,7 +739,10 @@ class GiftcardRedemptionListExporter(ListExporter):
             yield row
 
     def get_filename(self):
-        return '{}_giftcardredemptions'.format(self.event.slug)
+        if self.is_multievent:
+            return '{}_giftcardredemptions'.format(self.events.first().organizer.slug)
+        else:
+            return '{}_giftcardredemptions'.format(self.event.slug)
 
 
 @receiver(register_data_exporters, dispatch_uid="exporter_orderlist")
@@ -770,21 +750,31 @@ def register_orderlist_exporter(sender, **kwargs):
     return OrderListExporter
 
 
+@receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_orderlist")
+def register_multievent_orderlist_exporter(sender, **kwargs):
+    return OrderListExporter
+
+
 @receiver(register_data_exporters, dispatch_uid="exporter_paymentlist")
 def register_paymentlist_exporter(sender, **kwargs):
     return PaymentListExporter
 
 
+@receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_paymentlist")
+def register_multievent_paymentlist_exporter(sender, **kwargs):
+    return PaymentListExporter
+
+
 @receiver(register_data_exporters, dispatch_uid="exporter_quotalist")
 def register_quotalist_exporter(sender, **kwargs):
     return QuotaListExporter
 
 
-@receiver(register_data_exporters, dispatch_uid="exporter_invoicedata")
-def register_invoicedata_exporter(sender, **kwargs):
-    return InvoiceDataExporter
-
-
 @receiver(register_data_exporters, dispatch_uid="exporter_giftcardredemptionlist")
 def register_giftcardredemptionlist_exporter(sender, **kwargs):
     return GiftcardRedemptionListExporter
+
+
+@receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_giftcardredemptionlist")
+def register_multievent_i_giftcardredemptionlist_exporter(sender, **kwargs):
+    return GiftcardRedemptionListExporter

src/pretix/base/exporters/waitinglist.py

@@ -0,0 +1,165 @@
+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/__init__.py

@@ -65,6 +65,8 @@ class SettingsForm(i18nfield.forms.I18nFormMixin, HierarkeyForm):
         super().__init__(*args, **kwargs)
         for fname in self.auto_fields:
             kwargs = DEFAULTS[fname].get('form_kwargs', {})
+            if callable(kwargs):
+                kwargs = kwargs()
             kwargs.setdefault('required', False)
             field = DEFAULTS[fname]['form_class'](
                 **kwargs

src/pretix/base/forms/questions.py

@@ -13,10 +13,13 @@ 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 (
     get_language, gettext_lazy as _, pgettext_lazy,
 )
@@ -34,10 +37,12 @@ from pretix.base.forms.widgets import (
 )
 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
+from pretix.base.models.tax import (
+    EU_COUNTRIES, cc_to_vat_prefix, is_eu_country,
+)
 from pretix.base.settings import (
-    COUNTRIES_WITH_STATE_IN_ADDRESS, PERSON_NAME_SCHEMES,
-    PERSON_NAME_TITLE_GROUPS,
+    COUNTRIES_WITH_STATE_IN_ADDRESS, PERSON_NAME_SALUTATIONS,
+    PERSON_NAME_SCHEMES, PERSON_NAME_TITLE_GROUPS,
 )
 from pretix.base.templatetags.rich_text import rich_text
 from pretix.control.forms import ExtFileField, SplitDateTimeField
@@ -49,7 +54,7 @@ from pretix.presale.signals import question_form_fields
 logger = logging.getLogger(__name__)
 
 
-REQUIRED_NAME_PARTS = ['given_name', 'family_name', 'full_name']
+REQUIRED_NAME_PARTS = ['salutation', 'given_name', 'family_name', 'full_name']
 
 
 class NamePartsWidget(forms.MultiWidget):
@@ -73,6 +78,8 @@ class NamePartsWidget(forms.MultiWidget):
             a['data-fname'] = fname
             if fname == 'title' and self.titles:
                 widgets.append(Select(attrs=a, choices=[('', '')] + [(d, d) for d in self.titles[1]]))
+            elif fname == 'salutation':
+                widgets.append(Select(attrs=a, choices=[('', '---')] + [(s, s) for s in PERSON_NAME_SALUTATIONS]))
             else:
                 widgets.append(self.widget(attrs=a))
         super().__init__(widgets, attrs)
@@ -162,12 +169,18 @@ class NamePartsFormField(forms.MultiValueField):
                     **d,
                     choices=[('', '')] + [(d, d) for d in self.scheme_titles[1]]
                 )
-                field.part_name = fname
-                fields.append(field)
+
+            elif fname == 'salutation':
+                d = dict(defaults)
+                d.pop('max_length', None)
+                field = forms.ChoiceField(
+                    **d,
+                    choices=[('', '---')] + [(s, s) for s in PERSON_NAME_SALUTATIONS]
+                )
             else:
                 field = forms.CharField(**defaults)
-                field.part_name = fname
-                fields.append(field)
+            field.part_name = fname
+            fields.append(field)
         super().__init__(
             fields=fields, require_all_fields=False, *args, **kwargs
         )
@@ -184,6 +197,10 @@ class NamePartsFormField(forms.MultiValueField):
                     raise forms.ValidationError(self.error_messages['required'], code='required')
         if self.require_all_fields and not all(v for v in value):
             raise forms.ValidationError(self.error_messages['incomplete'], code='required')
+
+        if sum(len(v) for v in value if v) > 250:
+            raise forms.ValidationError(_('Please enter a shorter name.'), code='max_length')
+
         return value
 
 
@@ -220,6 +237,43 @@ 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
@@ -244,8 +298,10 @@ class BaseQuestionsForm(forms.Form):
 
         super().__init__(*args, **kwargs)
 
+        add_fields = {}
+
         if item.admission and event.settings.attendee_names_asked:
-            self.fields['attendee_name_parts'] = NamePartsFormField(
+            add_fields['attendee_name_parts'] = NamePartsFormField(
                 max_length=255,
                 required=event.settings.attendee_names_required and not self.all_optional,
                 scheme=event.settings.name_scheme,
@@ -254,7 +310,7 @@ class BaseQuestionsForm(forms.Form):
                 initial=(cartpos.attendee_name_parts if cartpos else orderpos.attendee_name_parts),
             )
         if item.admission and event.settings.attendee_emails_asked:
-            self.fields['attendee_email'] = forms.EmailField(
+            add_fields['attendee_email'] = forms.EmailField(
                 required=event.settings.attendee_emails_required and not self.all_optional,
                 label=_('Attendee email'),
                 initial=(cartpos.attendee_email if cartpos else orderpos.attendee_email),
@@ -265,14 +321,15 @@ class BaseQuestionsForm(forms.Form):
                 )
             )
         if item.admission and event.settings.attendee_company_asked:
-            self.fields['company'] = forms.CharField(
+            add_fields['company'] = forms.CharField(
                 required=event.settings.attendee_company_required and not self.all_optional,
                 label=_('Company'),
+                max_length=255,
                 initial=(cartpos.company if cartpos else orderpos.company),
             )
 
         if item.admission and event.settings.attendee_addresses_asked:
-            self.fields['street'] = forms.CharField(
+            add_fields['street'] = forms.CharField(
                 required=event.settings.attendee_addresses_required and not self.all_optional,
                 label=_('Address'),
                 widget=forms.Textarea(attrs={
@@ -282,24 +339,26 @@ class BaseQuestionsForm(forms.Form):
                 }),
                 initial=(cartpos.street if cartpos else orderpos.street),
             )
-            self.fields['zipcode'] = forms.CharField(
+            add_fields['zipcode'] = forms.CharField(
                 required=event.settings.attendee_addresses_required and not self.all_optional,
+                max_length=30,
                 label=_('ZIP code'),
                 initial=(cartpos.zipcode if cartpos else orderpos.zipcode),
                 widget=forms.TextInput(attrs={
                     'autocomplete': 'postal-code',
                 }),
             )
-            self.fields['city'] = forms.CharField(
+            add_fields['city'] = forms.CharField(
                 required=event.settings.attendee_addresses_required and not self.all_optional,
                 label=_('City'),
+                max_length=255,
                 initial=(cartpos.city if cartpos else orderpos.city),
                 widget=forms.TextInput(attrs={
                     'autocomplete': 'address-level2',
                 }),
             )
             country = (cartpos.country if cartpos else orderpos.country) or guess_country(event)
-            self.fields['country'] = CountryField(
+            add_fields['country'] = CountryField(
                 countries=CachedCountries
             ).formfield(
                 required=event.settings.attendee_addresses_required and not self.all_optional,
@@ -324,7 +383,7 @@ class BaseQuestionsForm(forms.Form):
                 self.data = self.data.copy()
                 del self.data[fprefix + 'state']
 
-            self.fields['state'] = forms.ChoiceField(
+            add_fields['state'] = forms.ChoiceField(
                 label=pgettext_lazy('address', 'State'),
                 required=False,
                 choices=c,
@@ -332,7 +391,14 @@ class BaseQuestionsForm(forms.Form):
                     'autocomplete': 'address-level1',
                 }),
             )
-            self.fields['state'].widget.is_required = True
+            add_fields['state'].widget.is_required = True
+
+        field_positions = list(
+            [
+                (n, event.settings.system_question_order.get(n if n != 'state' else 'country', 0))
+                for n in add_fields.keys()
+            ]
+        )
 
         for q in questions:
             # Do we already have an answer? Provide it as the initial value
@@ -366,9 +432,10 @@ 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(
@@ -385,13 +452,14 @@ class BaseQuestionsForm(forms.Form):
                 )
             elif q.type == Question.TYPE_COUNTRYCODE:
                 field = CountryField(
-                    countries=CachedCountries
+                    countries=CachedCountries,
+                    blank=True, null=True, blank_label=' ',
                 ).formfield(
                     label=label, required=required,
                     help_text=help_text,
                     widget=forms.Select,
-                    empty_label='',
-                    initial=initial.answer if initial else guess_country(event),
+                    empty_label=' ',
+                    initial=initial.answer if initial else (guess_country(event) if required else None),
                 )
             elif q.type == Question.TYPE_CHOICE:
                 field = forms.ModelChoiceField(
@@ -426,12 +494,21 @@ 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(),
+                    widget=DatePickerWidget(attrs),
                 )
+                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,
@@ -444,8 +521,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')),
+                    widget=SplitDateTimePickerWidget(
+                        time_format=get_format_without_seconds('TIME_INPUT_FORMATS'),
+                        min_date=q.valid_datetime_min,
+                        max_date=q.valid_datetime_max
+                    ),
                 )
+                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:
                 babel_locale = 'en'
                 # Babel, and therefore django-phonenumberfield, do not support our custom locales such das de_Informal
@@ -485,7 +570,12 @@ class BaseQuestionsForm(forms.Form):
                     field._required = q.required and not self.all_optional
                 field.required = False
 
-            self.fields['question_%s' % q.id] = field
+            add_fields['question_%s' % q.id] = field
+            field_positions.append(('question_%s' % q.id, q.position))
+
+        field_positions.sort(key=lambda e: e[1])
+        for fname, p in field_positions:
+            self.fields[fname] = add_fields[fname]
 
         responses = question_form_fields.send(sender=event, position=pos)
         data = pos.meta_info_data
@@ -532,7 +622,8 @@ class BaseQuestionsForm(forms.Form):
 
         if not self.all_optional:
             for q in question_cache.values():
-                if question_is_required(q) and not d.get('question_%d' % q.pk):
+                answer = d.get('question_%d' % q.pk)
+                if question_is_required(q) and not answer and answer != 0:
                     raise ValidationError({'question_%d' % q.pk: [_('This field is required')]})
 
         return d
@@ -566,7 +657,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
                 'data-display-dependency': '#id_is_business_1',
                 'autocomplete': 'organization',
             }),
-            'vat_id': forms.TextInput(attrs={'data-display-dependency': '#id_is_business_1'}),
+            'vat_id': forms.TextInput(attrs={'data-display-dependency': '#id_is_business_1', 'data-countries-in-eu': ','.join(EU_COUNTRIES)}),
             'internal_reference': forms.TextInput,
         }
         labels = {
@@ -616,6 +707,11 @@ 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:
+            self.data = self.data.copy()
+            del self.data[fprefix + 'vat_id']
+
         if not event.settings.invoice_address_required or self.all_optional:
             for k, f in self.fields.items():
                 f.required = False
@@ -630,8 +726,6 @@ class BaseInvoiceAddressForm(forms.ModelForm):
             self.fields['company'].widget.is_required = True
             self.fields['company'].widget.attrs['required'] = 'required'
             del self.fields['company'].widget.attrs['data-display-dependency']
-            if 'vat_id' in self.fields:
-                del self.fields['vat_id'].widget.attrs['data-display-dependency']
 
         self.fields['name_parts'] = NamePartsFormField(
             max_length=255,
@@ -663,6 +757,9 @@ class BaseInvoiceAddressForm(forms.ModelForm):
         data = self.cleaned_data
         if not data.get('is_business'):
             data['company'] = ''
+            data['vat_id'] = ''
+        if data.get('is_business') and not is_eu_country(data.get('country')):
+            data['vat_id'] = ''
         if self.event.settings.invoice_address_required:
             if data.get('is_business') and not data.get('company'):
                 raise ValidationError(_('You need to provide a company name.'))
@@ -683,10 +780,9 @@ class BaseInvoiceAddressForm(forms.ModelForm):
         ) and len(data.get('name_parts', {})) == 1:
             # Do not save the country if it is the only field set -- we don't know the user even checked it!
             self.cleaned_data['country'] = ''
-
         if 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 data.get('country') in EU_COUNTRIES and data.get('vat_id'):
+        elif self.validate_vat_id and data.get('is_business') and is_eu_country(data.get('country')) and data.get('vat_id'):
             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/widgets.py

@@ -1,9 +1,10 @@
 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 now
+from django.utils.timezone import get_current_timezone, now
 from django.utils.translation import gettext_lazy as _
 
 
@@ -15,6 +16,7 @@ class DatePickerWidget(forms.DateInput):
         date_attrs = dict(attrs)
         date_attrs.setdefault('class', 'form-control')
         date_attrs['class'] += ' datepickerfield'
+        date_attrs['autocomplete'] = 'date-picker-do-not-autofill'
 
         df = date_format or get_format('DATE_INPUT_FORMATS')[0]
         date_attrs['placeholder'] = now().replace(
@@ -32,6 +34,7 @@ class TimePickerWidget(forms.TimeInput):
         time_attrs = dict(attrs)
         time_attrs.setdefault('class', 'form-control')
         time_attrs['class'] += ' timepickerfield'
+        time_attrs['autocomplete'] = 'time-picker-do-not-autofill'
 
         tf = time_format or get_format('TIME_INPUT_FORMATS')[0]
         time_attrs['placeholder'] = now().replace(
@@ -90,7 +93,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):
+    def __init__(self, attrs=None, date_format=None, time_format=None, min_date=None, max_date=None):
         attrs = attrs or {}
         if 'placeholder' in attrs:
             del attrs['placeholder']
@@ -102,6 +105,16 @@ class SplitDateTimePickerWidget(forms.SplitDateTimeWidget):
         time_attrs.setdefault('autocomplete', 'off')
         date_attrs['class'] += ' datepickerfield'
         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

@@ -4,6 +4,9 @@ from django.conf import settings
 from django.utils import translation
 from django.utils.formats import date_format, number_format
 from django.utils.translation import gettext
+
+from pretix.base.templatetags.money import money_filter
+
 from i18nfield.fields import (  # noqa
     I18nCharField, I18nTextarea, I18nTextField, I18nTextInput,
 )
@@ -12,8 +15,6 @@ from i18nfield.forms import I18nFormField  # noqa
 from i18nfield.strings import LazyI18nString  # noqa
 from i18nfield.utils import I18nJSONEncoder  # noqa
 
-from pretix.base.templatetags.money import money_filter
-
 
 class LazyDate:
     def __init__(self, value):
@@ -26,6 +27,21 @@ class LazyDate:
         return date_format(self.value, "SHORT_DATE_FORMAT")
 
 
+class LazyExpiresDate:
+    def __init__(self, expires):
+        self.value = expires
+
+    def __format__(self, format_spec):
+        return self.__str__()
+
+    def __str__(self):
+        at_end_of_day = self.value.hour == 23 and self.value.minute == 59 and self.value.second >= 59
+        if at_end_of_day:
+            return date_format(self.value, "SHORT_DATE_FORMAT")
+        else:
+            return date_format(self.value, "SHORT_DATETIME_FORMAT")
+
+
 class LazyCurrencyNumber:
     def __init__(self, value, currency):
         self.value = value