Bump to 4.2.0

Currently translated at 100.0% (4364 of 4364 strings)

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

powered by weblate

.github/workflows/docs.yml

@@ -33,7 +33,8 @@ jobs:
       - name: Install system packages
         run: sudo apt update && sudo apt install enchant hunspell aspell-en
       - name: Install Dependencies
-        run: pip3 install -Ur doc/requirements.txt
+        run: pip3 install -Ur requirements.txt
+        working-directory: ./doc
       - name: Spellcheck docs
         run: make spelling
         working-directory: ./doc

.github/workflows/strings.yml

@@ -31,7 +31,8 @@ jobs:
       - name: Install system packages
         run: sudo apt update && sudo apt install gettext
       - name: Install Dependencies
-        run: pip3 install -Ur src/requirements.txt
+        run: pip3 install -e ".[dev]"
+        working-directory: ./src
       - name: Compile messages
         run: python manage.py compilemessages
         working-directory: ./src
@@ -56,7 +57,8 @@ jobs:
       - name: Install system packages
         run: sudo apt update && sudo apt install enchant hunspell hunspell-de-de aspell-en aspell-de
       - name: Install Dependencies
-        run: pip3 install -Ur src/requirements/dev.txt
+        run: pip3 install -e ".[dev]"
+        working-directory: ./src
       - name: Spellcheck translations
         run: potypo
         working-directory: ./src

.github/workflows/style.yml

@@ -29,7 +29,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install Dependencies
-        run: pip3 install -Ur src/requirements/dev.txt
+        run: pip3 install -e ".[dev]" mysqlclient psycopg2-binary
+        working-directory: ./src
       - name: Run isort
         run: isort -c .
         working-directory: ./src
@@ -49,7 +50,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install Dependencies
-        run: pip3 install -r src/requirements.txt -Ur src/requirements/dev.txt
+        run: pip3 install -e ".[dev]" mysqlclient psycopg2-binary
+        working-directory: ./src
       - name: Run flake8
         run: flake8 .
         working-directory: ./src

.github/workflows/tests.yml

@@ -57,7 +57,8 @@ jobs:
       - name: Install system dependencies
         run: sudo apt update && sudo apt install gettext mysql-client
       - name: Install Python dependencies
-        run: pip3 install -r src/requirements.txt -Ur src/requirements/dev.txt mysqlclient psycopg2-binary
+        run: pip3 install -e ".[dev]" mysqlclient psycopg2-binary
+        working-directory: ./src
       - name: Run checks
         run: python manage.py check
         working-directory: ./src

.gitlab-ci.yml

@@ -5,8 +5,8 @@ tests:
         - virtualenv env
         - source env/bin/activate
         - pip install -U pip wheel setuptools
-        - XDG_CACHE_HOME=/cache pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt
         - cd src
+        - XDG_CACHE_HOME=/cache pip3 install -e ".[dev]"
         - python manage.py check
         - make all compress
         - py.test --reruns 3 -n 3 tests
@@ -21,8 +21,8 @@ pypi:
         - virtualenv env
         - source env/bin/activate
         - 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
+        - XDG_CACHE_HOME=/cache pip3 install -e ".[dev]"
         - python setup.py sdist
         - pip install dist/pretix-*.tar.gz
         - python -m pretix migrate

Dockerfile

@@ -41,17 +41,14 @@ ENV LC_ALL=C.UTF-8 \
     DJANGO_SETTINGS_MODULE=production_settings
 
 # To copy only the requirements files needed to install from PIP
-COPY src/requirements /pretix/src/requirements
-COPY src/requirements.txt /pretix/src
+COPY src/setup.py /pretix/src/setup.py
 RUN pip3 install -U \
         pip \
         setuptools \
         wheel && \
     cd /pretix/src && \
-    pip3 install \
-        -r requirements.txt \
-        -r requirements/memcached.txt \
-        -r requirements/mysql.txt \
+    PRETIX_DOCKER_BUILD=TRUE pip3 install \
+        -e ".[memcached,mysql]" \
         gunicorn django-extensions ipython && \
     rm -rf ~/.cache/pip
 
@@ -63,7 +60,7 @@ COPY deployment/docker/nginx.conf /etc/nginx/nginx.conf
 COPY deployment/docker/production_settings.py /pretix/src/production_settings.py
 COPY src /pretix/src
 
-RUN cd /pretix/src && pip3 install .
+RUN cd /pretix/src && python setup.py install
 
 RUN chmod +x /usr/local/bin/pretix && \
     rm /etc/nginx/sites-enabled/default && \

deployment/docker/nginx.conf

@@ -68,7 +68,14 @@ http {
             add_header Cache-Control "public";
         }
         location / {
-            proxy_pass http://unix:/tmp/pretix.sock:/;
+            # Very important:
+            #   proxy_pass http://unix:/tmp/pretix.sock:;
+            # is not the same as
+            #   proxy_pass http://unix:/tmp/pretix.sock:/;
+            # In the latter case, nginx will apply its URL parsing, in the former it doesn't.
+            # There are situations in which pretix' API will deal with "file names" containing %2F%2F, which
+            # nginx will normalize to %2F, which can break ticket validation.
+            proxy_pass http://unix:/tmp/pretix.sock:;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         	proxy_set_header Host $http_host;
         }

doc/admin/config.rst

@@ -297,6 +297,12 @@ to speed up various operations::
     [redis]
     location=redis://127.0.0.1:6379/1
     sessions=false
+    sentinels=[
+            ["sentinel_host_1", 26379],
+            ["sentinel_host_2", 26379],
+            ["sentinel_host_3", 26379]
+        ]
+    password=password
 
 ``location``
     The location of redis, as a URL of the form ``redis://[:password]@localhost:6379/0``
@@ -305,13 +311,34 @@ to speed up various operations::
 ``session``
     When this is set to ``True``, redis will be used as the session storage.
 
+``sentinels``
+    Configures redis sentinels to use.
+    If you don't want to use redis sentinels, you should omit this option.
+    If this is set, redis via sentinels will be used instead of plain redis.
+    In this case the location should be of the form ``redis://my_master/0``.
+    The ``sentinels`` variable should be a json serialized list of sentinels,
+    each being a list with the two elements hostname and port.
+    You cannot provide a password within the location when using sentinels.
+    Note that the configuration format requires you to either place the entire
+    value on one line or make sure all values are indented by at least one space.
+
+``password``
+    If your redis setup doesn't require a password or you already specified it in the location you can omit this option.
+    If this is set it will be passed to redis as the connection option PASSWORD.
+
 If redis is not configured, pretix will store sessions and locks in the database. If memcached
 is configured, memcached will be used for caching instead of redis.
 
 Translations
 ------------
 
-pretix comes with a number of translations. Some of them are marked as "incubating", which means
+pretix comes with a number of translations. All languages are enabled by default. If you want to limit
+the languages available in your installation, you can enable a set of languages like this::
+
+    [languages]
+    enabled=en,de
+
+Some of the languages them are marked as "incubating", which means
 they can usually only be selected in development mode. If you want to use them nevertheless, you
 can activate them like this::
 
@@ -337,11 +364,22 @@ an AMQP server (e.g. RabbitMQ) as a broker and redis or your database as a resul
     [celery]
     broker=amqp://guest:guest@localhost:5672//
     backend=redis://localhost/0
+    broker_transport_options="{}"
+    backend_transport_options="{}"
 
 RabbitMQ might be the better choice if you have a complex, multi-server, high-performance setup,
 but as you already should have a redis instance ready for session and lock storage, we recommend
 redis for convenience. See the `Celery documentation`_ for more details.
 
+The two ``transport_options`` entries can be omitted in most cases.
+If they are present they need to be a valid JSON dictionary.
+For possible entries in that dictionary see the `Celery documentation`_.
+
+To use redis with sentinels set the broker or backend to ``sentinel://sentinel_host_1:26379;sentinal_host_2:26379/0``
+and the respective transport_options to ``{"master_name":"mymaster"}``.
+If your redis instances behind the sentinel have a password use ``sentinel://:my_password@sentinel_host_1:26379;sentinal_host_2:26379/0``.
+If your redis sentinels themselves have a password set the transport_options to ``{"master_name":"mymaster","sentinel_kwargs":{"password":"my_password"}}``.
+
 Sentry
 ------
 

doc/admin/installation/docker_smallscale.rst

@@ -39,6 +39,10 @@ Linux and firewalls, we recommend that you start with `ufw`_.
 .. warning:: We recommend **PostgreSQL**. If you go for MySQL, make sure you run **MySQL 5.7 or newer** or
              **MariaDB 10.2.7 or newer**.
 
+.. warning:: By default, using `ufw` in conjunction will not have any effect. Please make sure to either bind the exposed
+             ports of your docker container explicitly to 127.0.0.1 or configure docker to respect any set up firewall
+             rules.
+
 On this guide
 -------------
 
@@ -58,7 +62,12 @@ Database
 --------
 
 Next, we need a database and a database user. We can create these with any kind of database managing tool or directly on
-our database's shell. For PostgreSQL, we would do::
+our database's shell. Please make sure that UTF8 is used as encoding for the best compatibility. You can check this with
+the following command::
+
+    # sudo -u postgres psql -c 'SHOW SERVER_ENCODING'
+
+For PostgreSQL database creation, we would do::
 
     # sudo -u postgres createuser -P pretix
     # sudo -u postgres createdb -O pretix pretix
@@ -178,7 +187,7 @@ named ``/etc/systemd/system/pretix.service`` with the following content::
     TimeoutStartSec=0
     ExecStartPre=-/usr/bin/docker kill %n
     ExecStartPre=-/usr/bin/docker rm %n
-    ExecStart=/usr/bin/docker run --name %n -p 8345:80 \
+    ExecStart=/usr/bin/docker run --name %n -p 127.0.0.1:8345:80 \
         -v /var/pretix-data:/data \
         -v /etc/pretix:/etc/pretix \
         -v /var/run/redis:/var/run/redis \
@@ -228,7 +237,7 @@ The following snippet is an example on how to configure a nginx proxy for pretix
         ssl_certificate_key /path/to/key.pem;
 
         location / {
-            proxy_pass http://localhost:8345/;
+            proxy_pass http://localhost:8345;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto https;
             proxy_set_header Host $http_host;

doc/admin/installation/manual_smallscale.rst

@@ -25,7 +25,7 @@ installation guides):
 * A HTTP reverse proxy, e.g. `nginx`_ or Apache to allow HTTPS connections
 * A `PostgreSQL`_ 9.6+, `MySQL`_ 5.7+, or MariaDB 10.2.7+ database server
 * A `redis`_ server
-* A `nodejs_` installation
+* A `nodejs`_ installation
 
 We also recommend that you use a firewall, although this is not a pretix-specific recommendation. If you're new to
 Linux and firewalls, we recommend that you start with `ufw`_.
@@ -51,7 +51,12 @@ Database
 --------
 
 Having the database server installed, we still need a database and a database user. We can create these with any kind
-of database managing tool or directly on our database's shell. For PostgreSQL, we would do::
+of database managing tool or directly on our database's shell. Please make sure that UTF8 is used as encoding for the
+best compatibility. You can check this with the following command::
+
+    # sudo -u postgres psql -c 'SHOW SERVER_ENCODING'
+
+For PostgreSQL database creation, we would do::
 
     # sudo -u postgres createuser pretix
     # sudo -u postgres createdb -O pretix pretix
@@ -129,10 +134,13 @@ python installation::
     $ source /var/pretix/venv/bin/activate
     (venv)$ pip3 install -U pip setuptools wheel
 
-We now install pretix, its direct dependencies and gunicorn. Replace ``postgres`` with ``mysql`` in the following
-command if you're running MySQL::
+We now install pretix, its direct dependencies and gunicorn::
 
-    (venv)$ pip3 install "pretix[postgres]" gunicorn
+    (venv)$ pip3 install pretix gunicorn
+
+If you're running MySQL, also install the client library::
+
+    (venv)$ pip3 install mysqlclient
 
 Note that you need Python 3.6 or newer. You can find out your Python version using ``python -V``.
 
@@ -229,7 +237,7 @@ The following snippet is an example on how to configure a nginx proxy for pretix
         add_header X-Content-Type-Options nosniff;
 
         location / {
-            proxy_pass http://localhost:8345/;
+            proxy_pass http://localhost:8345;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto https;
             proxy_set_header Host $http_host;
@@ -251,14 +259,14 @@ The following snippet is an example on how to configure a nginx proxy for pretix
         }
 
         location /static/ {
-            alias /var/pretix/venv/lib/python3.5/site-packages/pretix/static.dist/;
+            alias /var/pretix/venv/lib/python3.7/site-packages/pretix/static.dist/;
             access_log off;
             expires 365d;
             add_header Cache-Control "public";
         }
     }
 
-.. note:: Remember to replace the ``python3.5`` in the ``/static/`` path in the config 
+.. note:: Remember to replace the ``python3.7`` in the ``/static/`` path in the config 
           above with your python version.
 
 We recommend reading about setting `strong encryption settings`_ for your web server.
@@ -277,11 +285,10 @@ Updates
 
 .. warning:: While we try hard not to break things, **please perform a backup before every upgrade**.
 
-To upgrade to a new pretix release, pull the latest code changes and run the following commands (again, replace
-``postgres`` with ``mysql`` if necessary)::
+To upgrade to a new pretix release, pull the latest code changes and run the following commands::
 
     $ source /var/pretix/venv/bin/activate
-    (venv)$ pip3 install -U pretix[postgres] gunicorn
+    (venv)$ pip3 install -U --upgrade-strategy eager pretix gunicorn
     (venv)$ python -m pretix migrate
     (venv)$ python -m pretix rebuild
     (venv)$ python -m pretix updatestyles

doc/api/fundamentals.rst

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

doc/api/resources/carts.rst

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

doc/api/resources/checkinlists.rst

@@ -362,6 +362,42 @@ Endpoints
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.
 
+.. http:post:: /api/v1/organizers/(organizer)/events/(event)/checkinlists/(list)/failed_checkins/
+
+   Stores a failed check-in. Only necessary for statistical purposes if you perform scan validation offline.
+
+   :<json boolean error_reason: One of ``canceled``, ``invalid``, ``unpaid``, ``product``, ``rules``, ``revoked``,
+                                ``incomplete``, ``already_redeemed``, or ``error``. Required.
+   :<json raw_barcode: The raw barcode you scanned. Required.
+   :<json datetime: Date and time of the scan. Optional.
+   :<json type: Type of scan, defaults to ``"entry"``.
+   :<json position: Internal ID of an order position you matched. Optional.
+   :<json raw_item: Internal ID of an item you matched. Optional.
+   :<json raw_variation: Internal ID of an item variation you matched. Optional.
+   :<json raw_subevent: Internal ID of an event series date you matched. Optional.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      POST /api/v1/organizers/bigevents/events/sampleconf/checkinlists/1/failed_checkins/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+      {
+        "raw_barcode": "Pvrk50vUzQd0DhdpNRL4I4OcXsvg70uA",
+        "error_reason": "canceled"
+      }
+
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param event: The ``slug`` field of the event to fetch
+   :param list: The ID of the check-in list to save for
+   :statuscode 201: no error
+   :statuscode 400: Invalid request
+   :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 position or check-in list does not exist.
+
 
 Order position endpoints
 ------------------------
@@ -424,6 +460,9 @@ Order position endpoints
             "checkins": [
               {
                 "list": 1,
+                "type": "entry",
+                "gate": null,
+                "device": 2,
                 "datetime": "2017-12-25T12:45:23Z",
                 "auto_checked_in": true
               }
@@ -535,6 +574,9 @@ Order position endpoints
           {
             "list": 1,
             "datetime": "2017-12-25T12:45:23Z",
+            "type": "entry",
+            "gate": null,
+            "device": 2,
             "auto_checked_in": true
           }
         ],
@@ -562,6 +604,8 @@ Order position endpoints
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
    :statuscode 404: The requested order position or check-in list does not exist.
 
+.. _`rest-checkin-redeem`:
+
 .. http:post:: /api/v1/organizers/(organizer)/events/(event)/checkinlists/(list)/positions/(id)/redeem/
 
    Tries to redeem an order position, identified by its internal ID, i.e. checks the attendee in. This endpoint
@@ -576,8 +620,9 @@ Order position endpoints
    :<json boolean canceled_supported: When this parameter is set to ``true``, the response code ``canceled`` may be
                                       returned. Otherwise, canceled orders will return ``unpaid``.
    :<json datetime datetime: Specifies the datetime of the check-in. If not supplied, the current time will be used.
-   :<json boolean force: Specifies that the check-in should succeed regardless of previous check-ins or required
-                         questions that have not been filled. Defaults to ``false``.
+   :<json boolean force: Specifies that the check-in should succeed regardless of revoked barcode, previous check-ins or required
+                         questions that have not been filled. This is usually used to upload offline scans that already happened,
+                         because there's no point in validating them since they happened whether they are valid or not. Defaults to ``false``.
    :<json string type: Send ``"exit"`` for an exit and ``"entry"`` (default) for an entry.
    :<json boolean ignore_unpaid: Specifies that the check-in should succeed even if the order is in pending state.
                                  Defaults to ``false`` and only works when ``include_pending`` is set on the check-in

doc/api/resources/events.rst

@@ -84,6 +84,12 @@ Endpoints
 
     The ``clone_from`` parameter has been added to the event creation endpoint.
 
+.. versionchanged:: 4.1
+
+    The ``with_availability_for`` parameter has been added.
+
+    The ``search`` query parameter has been added to filter events by their slug, name, or location in any language.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/
 
    Returns a list of all events within a given organizer the authenticated user/token has access to.
@@ -162,6 +168,11 @@ Endpoints
         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.
+   :query with_availability_for: If set to a sales channel identifier, the response will contain a special ``best_availability_state``
+                                 attribute with values of 100 for "tickets available", values less than 100 for "tickets sold out or reserved",
+                                 and ``null`` for "status unknown". These values might be served from a cache. This parameter can make the response
+                                 slow.
+   :query search: Only return events matching a given search query.
    :param organizer: The ``slug`` field of a valid organizer
    :statuscode 200: no error
    :statuscode 401: Authentication failure

doc/api/resources/invoices.rst

@@ -58,6 +58,15 @@ lines                                 list of objects            The actual invo
                                                                  created before this field was introduced as well as for
                                                                  all lines not created by a product (e.g. a shipping or
                                                                  cancellation fee).
+├ fee_type                            string                     Fee type, e.g. ``shipping``, ``service``, ``payment``,
+                                                                 ``cancellation``, ``giftcard``, or ``other. Can be ``null`` for
+                                                                 all invoice lines
+                                                                 created before this field was introduced as well as for
+                                                                 all lines not created by a fee (e.g. a product).
+├ fee_internal_type                   string                     Additional fee type, e.g. type of payment provider. Can be ``null``
+                                                                 for all invoice lines
+                                                                 created before this field was introduced as well as for
+                                                                 all lines not created by a fee (e.g. a product).
 ├ event_date_from                     datetime                   Start date of the (sub)event this line was created for as it
                                                                  was set during invoice creation. Can be ``null`` for all invoice
                                                                  lines created before this was introduced as well as for lines in
@@ -97,6 +106,10 @@ internal_reference                    string                     Customer's refe
    ``lines.event_date_to``, and ``lines.attendee_name`` have been added.
    ``refers`` now returns an invoice number including the prefix.
 
+.. versionchanged:: 4.1
+
+   The attributes ``fee_type`` and ``fee_internal_type`` have been added.
+
 
 Endpoints
 ---------
@@ -162,6 +175,8 @@ Endpoints
                 "description": "Budget Ticket",
                 "item": 1234,
                 "variation": 245,
+                "fee_type": null,
+                "fee_internal_type": null,
                 "event_date_from": "2017-12-27T10:00:00Z",
                 "event_date_to": null,
                 "attendee_name": null,
@@ -248,6 +263,8 @@ Endpoints
             "description": "Budget Ticket",
             "item": 1234,
             "variation": 245,
+            "fee_type": null,
+            "fee_internal_type": null,
             "event_date_from": "2017-12-27T10:00:00Z",
             "event_date_to": null,
             "attendee_name": null,

doc/api/resources/orders.rst

@@ -41,6 +41,7 @@ payment_date                          date                       **DEPRECATED AN
 payment_provider                      string                     **DEPRECATED AND INACCURATE** Payment provider used for this order
 total                                 money (string)             Total value of this order
 comment                               string                     Internal comment on this order
+custom_followup_at                    date                       Internal date for a custom follow-up action
 checkin_attention                     boolean                    If ``true``, the check-in app should show a warning
                                                                  that this ticket requires special attention if a ticket
                                                                  of this order is scanned.
@@ -123,6 +124,10 @@ last_modified                         datetime                   Last modificati
 
    The ``customer`` attribute has been added.
 
+.. versionchanged:: 4.1
+
+   The ``custom_followup_at`` attribute has been added.
+
 
 .. _order-position-resource:
 
@@ -160,11 +165,13 @@ secret                                string                     Secret code pri
 addon_to                              integer                    Internal ID of the position this position is an add-on for (or ``null``)
 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
+checkins                              list of objects            List of **successful** 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``)
+├ gate                                integer                    Internal ID of the gate. Can be ``null``.
+├ device                              integer                    Internal ID of the device. Can be ``null``.
 └ auto_checked_in                     boolean                    Indicates if this check-in been performed automatically by the system
 downloads                             list of objects            List of ticket download options
 ├ output                              string                     Ticket output provider (e.g. ``pdf``, ``passbook``)
@@ -305,6 +312,7 @@ List of all orders
             "fees": [],
             "total": "23.00",
             "comment": "",
+            "custom_followup_at": null,
             "checkin_attention": false,
             "require_approval": false,
             "invoice_address": {
@@ -355,6 +363,8 @@ List of all orders
                   {
                     "list": 44,
                     "type": "entry",
+                    "gate": null,
+                    "device": 2,
                     "datetime": "2017-12-25T12:45:23Z",
                     "auto_checked_in": false
                   }
@@ -474,6 +484,7 @@ Fetching individual orders
         "fees": [],
         "total": "23.00",
         "comment": "",
+        "custom_followup_at": null,
         "checkin_attention": false,
         "require_approval": false,
         "invoice_address": {
@@ -524,6 +535,8 @@ Fetching individual orders
               {
                 "list": 44,
                 "type": "entry",
+                "gate": null,
+                "device": 2,
                 "datetime": "2017-12-25T12:45:23Z",
                 "auto_checked_in": false
               }
@@ -638,6 +651,8 @@ Updating order fields
 
    * ``comment``
 
+   * ``custom_followup_at``
+
    * ``invoice_address`` (you always need to supply the full object, or ``null`` to delete the current address)
 
    **Example request**:
@@ -811,6 +826,7 @@ Creating orders
      charge will be created), this is just informative in case you *handled the payment already*.
    * ``payment_date`` (optional) – Date and time of the completion of the payment.
    * ``comment`` (optional)
+   * ``custom_followup_at`` (optional)
    * ``checkin_attention`` (optional)
    * ``invoice_address`` (optional)
 
@@ -1421,6 +1437,8 @@ List of all order positions
               {
                 "list": 44,
                 "type": "entry",
+                "gate": null,
+                "device": 2,
                 "datetime": "2017-12-25T12:45:23Z",
                 "auto_checked_in": false
               }
@@ -1527,6 +1545,8 @@ Fetching individual positions
           {
             "list": 44,
             "type": "entry",
+            "gate": null,
+            "device": 2,
             "datetime": "2017-12-25T12:45:23Z",
             "auto_checked_in": false
           }

doc/api/resources/quotas.rst

@@ -28,12 +28,22 @@ closed                                boolean                    Whether the quo
                                                                  field).
 release_after_exit                    boolean                    Whether the quota regains capacity as soon as some tickets
                                                                  have been scanned at an exit.
+available                             boolean                    Whether this quota is available. Only returned if ``with_availability=true``
+                                                                 is set on the request. Do not rely on this value for critical operations, it may be
+                                                                 slightly out of date.
+available_number                      integer                    Number of available tickets. Only returned if ``with_availability=true``
+                                                                 is set on the request. Do not rely on this value for critical operations, it may be
+                                                                 slightly out of date. ``null`` means unlimited.
 ===================================== ========================== =======================================================
 
 .. versionchanged:: 3.10
 
    The attribute ``release_after_exit`` has been added.
 
+.. versionchanged:: 4.1
+
+    The ``with_availability`` query parameter has been added.
+
 
 Endpoints
 ---------
@@ -80,6 +90,7 @@ Endpoints
    :query string ordering: Manually set the ordering of results. Valid fields to be used are ``id`` and ``position``.
                            Default: ``position``
    :query integer subevent: Only return quotas of the sub-event with the given ID
+   :query string with_availability: Set to ``true`` to get availability information. Can lead to increased answer 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
@@ -120,6 +131,7 @@ Endpoints
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
    :param id: The ``id`` field of the quota to fetch
+   :query string with_availability: Set to ``true`` to get availability information. Can lead to increased answer times.
    :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/subevents.rst

@@ -82,6 +82,10 @@ Endpoints
 
     The sub-events resource can now be filtered by meta data attributes.
 
+.. versionchanged:: 4.1
+
+    The ``with_availability_for`` parameter has been added.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/subevents/
 
    Returns a list of all sub-events of an event.
@@ -152,6 +156,10 @@ Endpoints
         only those sub-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 or event level.
+   :query with_availability_for: If set to a sales channel identifier, the response will contain a special ``best_availability_state``
+                                 attribute with values of 100 for "tickets available", values less than 100 for "tickets sold out or reserved",
+                                 and ``null`` for "status unknown". These values might be served from a cache. This parameter can make the response
+                                 slow.
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer does not exist **or** you have no permission to view it.

doc/development/algorithms/checkin.rst

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

doc/development/algorithms/index.rst

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

doc/development/algorithms/layouts.rst

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

doc/development/index.rst

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

doc/development/setup.rst

@@ -54,7 +54,7 @@ Working with the code
 The first thing you need are all the main application's dependencies::
 
     cd src/
-    pip3 install -r requirements.txt -r requirements/dev.txt
+    pip3 install -e ".[dev]"
 
 Next, you need to copy the SCSS files from the source folder to the STATIC_ROOT directory::
 

doc/images/checkin_offline.puml

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

doc/images/checkin_online.puml

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

doc/images/ticket_layouts.puml

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

doc/plugins/certificates.rst

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

doc/plugins/index.rst

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

doc/requirements.txt

@@ -1,4 +1,4 @@
--r ../src/requirements.txt
+-e ../src/
 sphinx==2.3.*
 sphinx-rtd-theme
 sphinxcontrib-httpdomain

doc/spelling_wordlist.txt

@@ -21,6 +21,7 @@ cancelled
 casted
 Ceph
 checkbox
+checkins
 checksum
 config
 contenttypes

src/.gitignore

@@ -9,4 +9,4 @@ dist/
 *.bak
 pretix/static/jsi18n/
 node_modules/
-
+.eggs/

src/pretix/__init__.py

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

src/pretix/api/auth/devicesecurity.py

@@ -59,6 +59,7 @@ class PretixScanSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:badgeitem-list'),
         ('GET', 'api-v1:checkinlist-list'),
         ('GET', 'api-v1:checkinlist-status'),
+        ('POST', 'api-v1:checkinlist-failed_checkins'),
         ('GET', 'api-v1:checkinlistpos-list'),
         ('POST', 'api-v1:checkinlistpos-redeem'),
         ('GET', 'api-v1:revokedsecrets-list'),
@@ -69,9 +70,9 @@ class PretixScanSecurityProfile(AllowListSecurityProfile):
     )
 
 
-class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
+class PretixScanNoSyncNoSearchSecurityProfile(AllowListSecurityProfile):
     identifier = 'pretixscan_online_kiosk'
-    verbose_name = _('pretixSCAN (kiosk mode, online only)')
+    verbose_name = _('pretixSCAN (kiosk mode, no order sync, no search)')
     allowlist = (
         ('GET', 'api-v1:version'),
         ('GET', 'api-v1:device.eventselection'),
@@ -89,6 +90,37 @@ class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:badgeitem-list'),
         ('GET', 'api-v1:checkinlist-list'),
         ('GET', 'api-v1:checkinlist-status'),
+        ('POST', 'api-v1:checkinlist-failed_checkins'),
+        ('POST', 'api-v1:checkinlistpos-redeem'),
+        ('GET', 'api-v1:revokedsecrets-list'),
+        ('GET', 'api-v1:orderposition-pdf_image'),
+        ('GET', 'api-v1:event.settings'),
+        ('POST', 'api-v1:upload'),
+    )
+
+
+class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
+    identifier = 'pretixscan_online_noorders'
+    verbose_name = _('pretixSCAN (online only, no order sync)')
+    allowlist = (
+        ('GET', 'api-v1:version'),
+        ('GET', 'api-v1:device.eventselection'),
+        ('POST', 'api-v1:device.update'),
+        ('POST', 'api-v1:device.revoke'),
+        ('POST', 'api-v1:device.roll'),
+        ('GET', 'api-v1:event-list'),
+        ('GET', 'api-v1:event-detail'),
+        ('GET', 'api-v1:subevent-list'),
+        ('GET', 'api-v1:subevent-detail'),
+        ('GET', 'api-v1:itemcategory-list'),
+        ('GET', 'api-v1:item-list'),
+        ('GET', 'api-v1:question-list'),
+        ('GET', 'api-v1:badgelayout-list'),
+        ('GET', 'api-v1:badgeitem-list'),
+        ('GET', 'api-v1:checkinlist-list'),
+        ('GET', 'api-v1:checkinlist-status'),
+        ('POST', 'api-v1:checkinlist-failed_checkins'),
+        ('GET', 'api-v1:checkinlistpos-list'),
         ('POST', 'api-v1:checkinlistpos-redeem'),
         ('GET', 'api-v1:revokedsecrets-list'),
         ('GET', 'api-v1:orderposition-pdf_image'),
@@ -131,6 +163,7 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
         ('POST', 'api-v1:orderrefund-list'),
         ('POST', 'api-v1:orderrefund-done'),
         ('POST', 'api-v1:cartposition-list'),
+        ('POST', 'api-v1:cartposition-bulk-create'),
         ('GET', 'api-v1:checkinlist-list'),
         ('POST', 'api-v1:checkinlistpos-redeem'),
         ('POST', 'plugins:pretix_posbackend:order.posprintlog'),
@@ -158,6 +191,7 @@ DEVICE_SECURITY_PROFILES = {
         FullAccessSecurityProfile,
         PretixScanSecurityProfile,
         PretixScanNoSyncSecurityProfile,
+        PretixScanNoSyncNoSearchSecurityProfile,
         PretixPosSecurityProfile,
     )
 }

src/pretix/api/auth/permission.py

@@ -49,7 +49,9 @@ class EventPermission(BasePermission):
         if not request.user.is_authenticated and not isinstance(request.auth, (Device, TeamAPIToken)):
             return False
 
-        if request.method not in SAFE_METHODS and hasattr(view, 'write_permission'):
+        if hasattr(view, '_get_permission_name'):
+            required_permission = getattr(view, '_get_permission_name')(request)
+        elif request.method not in SAFE_METHODS and hasattr(view, 'write_permission'):
             required_permission = getattr(view, 'write_permission')
         elif hasattr(view, 'permission'):
             required_permission = getattr(view, 'permission')

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

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

src/pretix/api/models.py

@@ -95,7 +95,7 @@ class OAuthRefreshToken(AbstractRefreshToken):
 class WebHook(models.Model):
     organizer = models.ForeignKey('pretixbase.Organizer', on_delete=models.CASCADE, related_name='webhooks')
     enabled = models.BooleanField(default=True, verbose_name=_("Enable webhook"))
-    target_url = models.URLField(verbose_name=_("Target URL"))
+    target_url = models.URLField(verbose_name=_("Target URL"), max_length=255)
     all_events = models.BooleanField(default=True, verbose_name=_("All events (including newly created ones)"))
     limit_events = models.ManyToManyField('pretixbase.Event', verbose_name=_("Limit to events"), blank=True)
 

src/pretix/api/pagination.py

@@ -0,0 +1,27 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from rest_framework.pagination import PageNumberPagination
+
+
+class Pagination(PageNumberPagination):
+    page_size_query_param = 'page_size'
+    max_page_size = 50

src/pretix/api/serializers/cart.py

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

src/pretix/api/serializers/event.py

@@ -42,6 +42,7 @@ from django.utils.functional import cached_property
 from django.utils.translation import gettext as _
 from django_countries.serializers import CountryFieldMixin
 from pytz import common_timezones
+from rest_framework import serializers
 from rest_framework.fields import ChoiceField, Field
 from rest_framework.relations import SlugRelatedField
 
@@ -93,9 +94,12 @@ class MetaPropertyField(Field):
 class SeatCategoryMappingField(Field):
 
     def to_representation(self, value):
-        qs = value.seat_category_mappings.all()
-        if isinstance(value, Event):
-            qs = qs.filter(subevent=None)
+        if hasattr(value, '_seat_category_mappings'):
+            qs = value._seat_category_mappings
+        else:
+            qs = value.seat_category_mappings.all()
+            if isinstance(value, Event):
+                qs = qs.filter(subevent=None)
         return {
             v.layout_category: v.product_id for v in qs
         }
@@ -156,6 +160,7 @@ class EventSerializer(I18nAwareModelSerializer):
     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)
+    best_availability_state = serializers.IntegerField(allow_null=True, read_only=True)
 
     class Meta:
         model = Event
@@ -163,12 +168,14 @@ class EventSerializer(I18nAwareModelSerializer):
                   'date_to', 'date_admission', 'is_public', 'presale_start',
                   'presale_end', 'location', 'geo_lat', 'geo_lon', 'has_subevents', 'meta_data', 'seating_plan',
                   'plugins', 'seat_category_mapping', 'timezone', 'item_meta_properties', 'valid_keys',
-                  'sales_channels')
+                  'sales_channels', 'best_availability_state')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if not hasattr(self.context['request'], 'event'):
             self.fields.pop('valid_keys')
+        if not self.context.get('request') or 'with_availability_for' not in self.context['request'].GET:
+            self.fields.pop('best_availability_state')
 
     def validate(self, data):
         data = super().validate(data)
@@ -441,13 +448,19 @@ class SubEventSerializer(I18nAwareModelSerializer):
     seat_category_mapping = SeatCategoryMappingField(source='*', required=False)
     event = SlugRelatedField(slug_field='slug', read_only=True)
     meta_data = MetaDataField(source='*')
+    best_availability_state = serializers.IntegerField(allow_null=True, read_only=True)
 
     class Meta:
         model = SubEvent
         fields = ('id', 'name', 'date_from', 'date_to', 'active', 'date_admission',
                   'presale_start', 'presale_end', 'location', 'geo_lat', 'geo_lon', 'event', 'is_public',
                   'frontpage_text', 'seating_plan', 'item_price_overrides', 'variation_price_overrides',
-                  'meta_data', 'seat_category_mapping', 'last_modified')
+                  'meta_data', 'seat_category_mapping', 'last_modified', 'best_availability_state')
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if not self.context.get('request') or 'with_availability_for' not in self.context['request'].GET:
+            self.fields.pop('best_availability_state')
 
     def validate(self, data):
         data = super().validate(data)

src/pretix/api/serializers/item.py

@@ -408,10 +408,19 @@ class QuestionSerializer(I18nAwareModelSerializer):
 
 
 class QuotaSerializer(I18nAwareModelSerializer):
+    available = serializers.BooleanField(read_only=True)
+    available_number = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = Quota
-        fields = ('id', 'name', 'size', 'items', 'variations', 'subevent', 'closed', 'close_when_sold_out', 'release_after_exit')
+        fields = ('id', 'name', 'size', 'items', 'variations', 'subevent', 'closed', 'close_when_sold_out',
+                  'release_after_exit', 'available', 'available_number')
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if 'request' not in self.context or self.context['request'].GET.get('with_availability') != 'true':
+            del self.fields['available']
+            del self.fields['available_number']
 
     def validate(self, data):
         data = super().validate(data)

src/pretix/api/serializers/order.py

@@ -199,7 +199,9 @@ class AnswerSerializer(I18nAwareModelSerializer):
         return data
 
     def validate(self, data):
-        if data.get('question').type == Question.TYPE_FILE:
+        if not data.get('question'):
+            raise ValidationError('Question not specified.')
+        elif data.get('question').type == Question.TYPE_FILE:
             return self._handle_file_upload(data)
         elif data.get('question').type in (Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE):
             if not data.get('options'):
@@ -250,7 +252,30 @@ class AnswerSerializer(I18nAwareModelSerializer):
 class CheckinSerializer(I18nAwareModelSerializer):
     class Meta:
         model = Checkin
-        fields = ('id', 'datetime', 'list', 'auto_checked_in', 'type')
+        fields = ('id', 'datetime', 'list', 'auto_checked_in', 'gate', 'device', 'type')
+
+
+class FailedCheckinSerializer(I18nAwareModelSerializer):
+    error_reason = serializers.ChoiceField(choices=Checkin.REASONS, required=True, allow_null=False)
+    raw_barcode = serializers.CharField(required=True, allow_null=False)
+    position = serializers.PrimaryKeyRelatedField(queryset=OrderPosition.all.none(), required=False, allow_null=True)
+    raw_item = serializers.PrimaryKeyRelatedField(queryset=Item.objects.none(), required=False, allow_null=True)
+    raw_variation = serializers.PrimaryKeyRelatedField(queryset=ItemVariation.objects.none(), required=False, allow_null=True)
+    raw_subevent = serializers.PrimaryKeyRelatedField(queryset=SubEvent.objects.none(), required=False, allow_null=True)
+
+    class Meta:
+        model = Checkin
+        fields = ('error_reason', 'error_explanation', 'raw_barcode', 'raw_item', 'raw_variation',
+                  'raw_subevent', 'datetime', 'type', 'position')
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        event = self.context['event']
+        self.fields['raw_item'].queryset = event.items.all()
+        self.fields['raw_variation'].queryset = ItemVariation.objects.filter(item__event=event)
+        self.fields['position'].queryset = OrderPosition.all.filter(order__event=event)
+        if event.has_subevents:
+            self.fields['raw_subevent'].queryset = event.subevents.all()
 
 
 class OrderDownloadsField(serializers.Field):
@@ -631,7 +656,7 @@ class OrderSerializer(I18nAwareModelSerializer):
         model = Order
         fields = (
             'code', 'status', 'testmode', 'secret', 'email', 'phone', 'locale', 'datetime', 'expires', 'payment_date',
-            'payment_provider', 'fees', 'total', 'comment', 'invoice_address', 'positions', 'downloads',
+            'payment_provider', 'fees', 'total', 'comment', 'custom_followup_at', 'invoice_address', 'positions', 'downloads',
             'checkin_attention', 'last_modified', 'payments', 'refunds', 'require_approval', 'sales_channel',
             'url', 'customer'
         )
@@ -662,7 +687,7 @@ class OrderSerializer(I18nAwareModelSerializer):
     def update(self, instance, validated_data):
         # Even though all fields that shouldn't be edited are marked as read_only in the serializer
         # (hopefully), we'll be extra careful here and be explicit about the model fields we update.
-        update_fields = ['comment', 'checkin_attention', 'email', 'locale', 'phone']
+        update_fields = ['comment', 'custom_followup_at', 'checkin_attention', 'email', 'locale', 'phone']
 
         if 'invoice_address' in validated_data:
             iadata = validated_data.pop('invoice_address')
@@ -902,6 +927,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         min_length=5
     )
     comment = serializers.CharField(required=False, allow_blank=True)
+    custom_followup_at = serializers.DateField(required=False, allow_null=True)
     payment_provider = serializers.CharField(required=False, allow_null=True)
     payment_info = CompatibleJSONField(required=False)
     consume_carts = serializers.ListField(child=serializers.CharField(), required=False)
@@ -920,7 +946,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         model = Order
         fields = ('code', 'status', 'testmode', 'email', 'phone', 'locale', 'payment_provider', 'fees', 'comment', 'sales_channel',
                   'invoice_address', 'positions', 'checkin_attention', 'payment_info', 'payment_date', 'consume_carts',
-                  'force', 'send_email', 'simulate', 'customer')
+                  'force', 'send_email', 'simulate', 'customer', 'custom_followup_at')
 
     def validate_payment_provider(self, pp):
         if pp is None:
@@ -1269,7 +1295,13 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                     if pos.voucher:
                         Voucher.objects.filter(pk=pos.voucher.pk).update(redeemed=F('redeemed') + 1)
                     pos.save()
+                    seen_answers = set()
                     for answ_data in answers_data:
+                        # Workaround for a pretixPOS bug :-(
+                        if answ_data.get('question') in seen_answers:
+                            continue
+                        seen_answers.add(answ_data.get('question'))
+
                         options = answ_data.pop('options', [])
 
                         if isinstance(answ_data['answer'], File):
@@ -1393,7 +1425,8 @@ class InlineInvoiceLineSerializer(I18nAwareModelSerializer):
     class Meta:
         model = InvoiceLine
         fields = ('position', 'description', 'item', 'variation', 'attendee_name', 'event_date_from',
-                  'event_date_to', 'gross_value', 'tax_value', 'tax_rate', 'tax_name')
+                  'event_date_to', 'gross_value', 'tax_value', 'tax_rate', 'tax_name', 'fee_type',
+                  'fee_internal_type')
 
 
 class InvoiceSerializer(I18nAwareModelSerializer):

src/pretix/api/serializers/organizer.py

@@ -275,6 +275,7 @@ class OrganizerSettingsSerializer(SettingsSerializer):
     default_fields = [
         'customer_accounts',
         'customer_accounts_link_by_email',
+        'invoice_regenerate_allowed',
         'contact_mail',
         'imprint_url',
         'organizer_info_text',

src/pretix/api/serializers/settings.py

@@ -54,8 +54,8 @@ class SettingsSerializer(serializers.Serializer):
             f = DEFAULTS[fname]['serializer_class'](
                 **kwargs
             )
-            f._label = form_kwargs.get('label', fname)
-            f._help_text = form_kwargs.get('help_text')
+            f._label = str(form_kwargs.get('label', fname))
+            f._help_text = str(form_kwargs.get('help_text'))
             f.parent = self
             self.fields[fname] = f
 

src/pretix/api/views/cart.py

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

src/pretix/api/views/checkin.py

@@ -21,6 +21,7 @@
 #
 import django_filters
 from django.core.exceptions import ValidationError
+from django.db import transaction
 from django.db.models import (
     Count, Exists, F, Max, OrderBy, OuterRef, Prefetch, Q, Subquery,
 )
@@ -31,19 +32,24 @@ from django.utils.functional import cached_property
 from django.utils.timezone import now
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
 from django_scopes import scopes_disabled
+from packaging.version import parse
 from rest_framework import viewsets
 from rest_framework.decorators import action
 from rest_framework.fields import DateTimeField
+from rest_framework.permissions import SAFE_METHODS
 from rest_framework.response import Response
 
 from pretix.api.serializers.checkin import CheckinListSerializer
 from pretix.api.serializers.item import QuestionSerializer
-from pretix.api.serializers.order import CheckinListOrderPositionSerializer
+from pretix.api.serializers.order import (
+    CheckinListOrderPositionSerializer, FailedCheckinSerializer,
+)
 from pretix.api.views import RichOrderingFilter
 from pretix.api.views.order import OrderPositionFilter
 from pretix.base.i18n import language
 from pretix.base.models import (
-    CachedFile, Checkin, CheckinList, Event, Order, OrderPosition, Question,
+    CachedFile, Checkin, CheckinList, Device, Event, Order, OrderPosition,
+    Question,
 )
 from pretix.base.services.checkin import (
     CheckInError, RequiredQuestionsError, SQLLogic, perform_checkin,
@@ -79,8 +85,14 @@ class CheckinListViewSet(viewsets.ModelViewSet):
     queryset = CheckinList.objects.none()
     filter_backends = (DjangoFilterBackend,)
     filterset_class = CheckinListFilter
-    permission = ('can_view_orders', 'can_checkin_orders',)
-    write_permission = 'can_change_event_settings'
+
+    def _get_permission_name(self, request):
+        if request.path.endswith('/failed_checkins/'):
+            return 'can_checkin_orders', 'can_change_orders'
+        elif request.method in SAFE_METHODS:
+            return 'can_view_orders', 'can_checkin_orders',
+        else:
+            return 'can_change_event_settings'
 
     def get_queryset(self):
         qs = self.request.event.checkin_lists.prefetch_related(
@@ -125,6 +137,49 @@ class CheckinListViewSet(viewsets.ModelViewSet):
         )
         super().perform_destroy(instance)
 
+    @action(detail=True, methods=['POST'], url_name='failed_checkins')
+    @transaction.atomic()
+    def failed_checkins(self, *args, **kwargs):
+        serializer = FailedCheckinSerializer(
+            data=self.request.data,
+            context={'event': self.request.event}
+        )
+        serializer.is_valid(raise_exception=True)
+        kwargs = {}
+
+        if not serializer.validated_data.get('position'):
+            kwargs['position'] = OrderPosition.all.filter(
+                secret=serializer.validated_data['raw_barcode']
+            ).first()
+
+        c = serializer.save(
+            list=self.get_object(),
+            successful=False,
+            forced=True,
+            device=self.request.auth if isinstance(self.request.auth, Device) else None,
+            gate=self.request.auth.gate if isinstance(self.request.auth, Device) else None,
+            **kwargs,
+        )
+        if c.position:
+            c.position.order.log_action('pretix.event.checkin.denied', data={
+                'position': c.position.id,
+                'positionid': c.position.positionid,
+                'errorcode': c.error_reason,
+                'reason_explanation': c.error_explanation,
+                'datetime': c.datetime,
+                'type': c.type,
+                'list': c.list.pk
+            }, user=self.request.user, auth=self.request.auth)
+        else:
+            self.request.event.log_action('pretix.event.checkin.unknown', data={
+                'datetime': c.datetime,
+                'type': c.type,
+                'list': c.list.pk,
+                'barcode': c.raw_barcode
+            }, user=self.request.user, auth=self.request.auth)
+
+        return Response(serializer.data, status=201)
+
     @action(detail=True, methods=['GET'])
     def status(self, *args, **kwargs):
         with language(self.request.event.settings.locale):
@@ -294,7 +349,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                     lookup='checkins',
                     queryset=Checkin.objects.filter(list_id=self.checkinlist.pk)
                 ),
-                'checkins', 'answers', 'answers__options', 'answers__question',
+                'answers', 'answers__options', 'answers__question',
                 Prefetch('addons', OrderPosition.objects.select_related('item', 'variation')),
                 Prefetch('order', Order.objects.select_related('invoice_address').prefetch_related(
                     Prefetch(
@@ -304,7 +359,8 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                     Prefetch(
                         'positions',
                         OrderPosition.objects.prefetch_related(
-                            'checkins', 'item', 'variation', 'answers', 'answers__options', 'answers__question',
+                            Prefetch('checkins', queryset=Checkin.objects.all()),
+                            'item', 'variation', 'answers', 'answers__options', 'answers__question',
                         )
                     )
                 ))
@@ -356,6 +412,18 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
         else:
             dt = now()
 
+        common_checkin_args = dict(
+            raw_barcode=self.kwargs['pk'],
+            type=type,
+            list=self.checkinlist,
+            datetime=dt,
+            device=self.request.auth if isinstance(self.request.auth, Device) else None,
+            gate=self.request.auth.gate if isinstance(self.request.auth, Device) else None,
+            nonce=nonce,
+            forced=force,
+        )
+        raw_barcode_for_checkin = None
+
         try:
             queryset = self.get_queryset(ignore_status=True, ignore_products=True)
             if self.kwargs['pk'].isnumeric():
@@ -364,22 +432,87 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                 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:
+            if len(revoked_matches) == 0:
                 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)
+                for k, s in self.request.event.ticket_secret_generators.items():
+                    try:
+                        parsed = s.parse_secret(self.kwargs['pk'])
+                        common_checkin_args.update({
+                            'raw_item': parsed.item,
+                            'raw_variation': parsed.variation,
+                            'raw_subevent': parsed.subevent,
+                        })
+                    except:
+                        pass
+
+                Checkin.objects.create(
+                    position=None,
+                    successful=False,
+                    error_reason=Checkin.REASON_INVALID,
+                    **common_checkin_args,
+                )
+
+                if force and isinstance(self.request.auth, Device):
+                    # There was a bug in libpretixsync: If you scanned a ticket in offline mode that was
+                    # valid at the time but no longer exists at time of upload, the device would retry to
+                    # upload the same scan over and over again. Since we can't update all devices quickly,
+                    # here's a dirty workaround to make it stop.
+                    try:
+                        brand = self.request.auth.software_brand
+                        ver = parse(self.request.auth.software_version)
+                        legacy_mode = (
+                            (brand == 'pretixSCANPROXY' and ver < parse('0.0.3')) or
+                            (brand == 'pretixSCAN Android' and ver < parse('1.11.2')) or
+                            (brand == 'pretixSCAN' and ver < parse('1.11.2'))
+                        )
+                        if legacy_mode:
+                            return Response({
+                                'status': 'error',
+                                'reason': Checkin.REASON_ALREADY_REDEEMED,
+                                'reason_explanation': None,
+                                'require_attention': False,
+                                '__warning': 'Compatibility hack active due to detected old pretixSCAN version',
+                            }, status=400)
+                    except:  # we don't care e.g. about invalid version numbers
+                        pass
+
+                return Response({
+                    'detail': 'Not found.',  # for backwards compatibility
+                    'status': 'error',
+                    'reason': Checkin.REASON_INVALID,
+                    'reason_explanation': None,
+                    'require_attention': False,
+                }, status=404)
+            elif revoked_matches and force:
+                op = revoked_matches[0].position
+                raw_barcode_for_checkin = self.kwargs['pk']
+            else:
+                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)
+                Checkin.objects.create(
+                    position=op,
+                    successful=False,
+                    error_reason=Checkin.REASON_REVOKED,
+                    **common_checkin_args
+                )
+                return Response({
+                    'status': 'error',
+                    'reason': Checkin.REASON_REVOKED,
+                    'reason_explanation': None,
+                    'require_attention': False,
+                    'position': CheckinListOrderPositionSerializer(op, context=self.get_serializer_context()).data
+                }, status=400)
 
         given_answers = {}
         if 'answers' in self.request.data:
@@ -409,6 +542,8 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                     user=self.request.user,
                     auth=self.request.auth,
                     type=type,
+                    raw_barcode=raw_barcode_for_checkin,
+                    from_revoked_secret=True,
                 )
             except RequiredQuestionsError as e:
                 return Response({
@@ -424,11 +559,19 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                     'position': op.id,
                     'positionid': op.positionid,
                     'errorcode': e.code,
+                    'reason_explanation': e.reason,
                     'force': force,
                     'datetime': dt,
                     'type': type,
                     'list': self.checkinlist.pk
                 }, user=self.request.user, auth=self.request.auth)
+                Checkin.objects.create(
+                    position=op,
+                    successful=False,
+                    error_reason=e.code,
+                    error_explanation=e.reason,
+                    **common_checkin_args,
+                )
                 return Response({
                     'status': 'error',
                     'reason': e.code,

src/pretix/api/views/event.py

@@ -34,7 +34,7 @@
 
 import django_filters
 from django.db import transaction
-from django.db.models import ProtectedError, Q
+from django.db.models import Prefetch, ProtectedError, Q
 from django.utils.timezone import now
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
 from django_scopes import scopes_disabled
@@ -49,20 +49,24 @@ from pretix.api.serializers.event import (
 )
 from pretix.api.views import ConditionalListView
 from pretix.base.models import (
-    CartPosition, Device, Event, TaxRule, TeamAPIToken,
+    CartPosition, Device, Event, SeatCategoryMapping, TaxRule, TeamAPIToken,
 )
 from pretix.base.models.event import SubEvent
+from pretix.base.services.quotas import QuotaAvailability
 from pretix.base.settings import SETTINGS_AFFECTING_CSS
 from pretix.helpers.dicts import merge_dicts
+from pretix.helpers.i18n import i18ncomp
 from pretix.presale.style import regenerate_css
 from pretix.presale.views.organizer import filter_qs_by_attr
 
 with scopes_disabled():
     class EventFilter(FilterSet):
+
         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')
+        search = django_filters.rest_framework.CharFilter(method='search_qs')
 
         class Meta:
             model = Event
@@ -107,6 +111,13 @@ with scopes_disabled():
         def sales_channel_qs(self, queryset, name, value):
             return queryset.filter(sales_channels__contains=value)
 
+        def search_qs(self, queryset, name, value):
+            return queryset.filter(
+                Q(name__icontains=i18ncomp(value))
+                | Q(slug__icontains=value)
+                | Q(location__icontains=i18ncomp(value))
+            )
+
 
 class EventViewSet(viewsets.ModelViewSet):
     serializer_class = EventSerializer
@@ -136,10 +147,43 @@ class EventViewSet(viewsets.ModelViewSet):
             )
 
         qs = filter_qs_by_attr(qs, self.request)
+
+        if 'with_availability_for' in self.request.GET:
+            qs = Event.annotated(qs, channel=self.request.GET.get('with_availability_for'))
+
         return qs.prefetch_related(
-            'meta_values', 'meta_values__property', 'seat_category_mappings'
+            'organizer',
+            'meta_values',
+            'meta_values__property',
+            'item_meta_properties',
+            Prefetch(
+                'seat_category_mappings',
+                to_attr='_seat_category_mappings',
+                queryset=SeatCategoryMapping.objects.filter(subevent=None)
+            ),
         )
 
+    def list(self, request, *args, **kwargs):
+        queryset = self.filter_queryset(self.get_queryset())
+
+        page = self.paginate_queryset(queryset)
+
+        if 'with_availability_for' in self.request.GET:
+            quotas_to_compute = []
+            qcache = {}
+            for se in page:
+                se._quota_cache = qcache
+                quotas_to_compute += se.active_quotas
+
+            if quotas_to_compute:
+                qa = QuotaAvailability()
+                qa.queue(*quotas_to_compute)
+                qa.compute(allow_cache=True)
+                qcache.update(qa.results)
+
+        serializer = self.get_serializer(page, many=True)
+        return self.get_paginated_response(serializer.data)
+
     def perform_update(self, serializer):
         current_live_value = serializer.instance.live
         updated_live_value = serializer.validated_data.get('live', None)
@@ -197,7 +241,6 @@ class EventViewSet(viewsets.ModelViewSet):
             except Event.DoesNotExist:
                 raise ValidationError('Event to copy from was not found')
 
-        print(copy_from, self.request.GET)
         new_event = serializer.save(organizer=self.request.organizer)
 
         if copy_from:
@@ -336,8 +379,18 @@ class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
 
         qs = filter_qs_by_attr(qs, self.request)
 
+        if 'with_availability_for' in self.request.GET:
+            qs = SubEvent.annotated(qs, channel=self.request.GET.get('with_availability_for'))
+
         return qs.prefetch_related(
-            'subeventitem_set', 'subeventitemvariation_set', 'seat_category_mappings', 'meta_values'
+            'event',
+            'subeventitem_set',
+            'subeventitemvariation_set',
+            'meta_values',
+            Prefetch(
+                'seat_category_mappings',
+                to_attr='_seat_category_mappings',
+            ),
         )
 
     def list(self, request, **kwargs):
@@ -345,14 +398,24 @@ class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
         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})
+        if 'with_availability_for' in self.request.GET:
+            quotas_to_compute = []
+            qcache = {}
+            for se in page:
+                se._quota_cache = qcache
+                quotas_to_compute += se.active_quotas
+
+            if quotas_to_compute:
+                qa = QuotaAvailability()
+                qa.queue(*quotas_to_compute)
+                qa.compute(allow_cache=True)
+                qcache.update(qa.results)
+
+        serializer = self.get_serializer(page, many=True)
+        resp = self.get_paginated_response(serializer.data)
+        resp['X-Page-Generated'] = date
+        return resp
 
     def perform_update(self, serializer):
         original_data = self.get_serializer(instance=serializer.instance).data

src/pretix/api/views/exporters.py

@@ -132,7 +132,7 @@ class EventExportersViewSet(ExportersMixin, viewsets.ViewSet):
     def exporters(self):
         exporters = []
         responses = register_data_exporters.send(self.request.event)
-        for ex in sorted([response(self.request.event) for r, response in responses], key=lambda ex: str(ex.verbose_name)):
+        for ex in sorted([response(self.request.event, self.request.organizer) for r, response in responses], key=lambda ex: str(ex.verbose_name)):
             ex._serializer = JobRunSerializer(exporter=ex)
             exporters.append(ex)
         return exporters
@@ -151,7 +151,7 @@ class OrganizerExportersViewSet(ExportersMixin, viewsets.ViewSet):
             organizer=self.request.organizer
         )
         responses = register_multievent_data_exporters.send(self.request.organizer)
-        for ex in sorted([response(events) for r, response in responses if response], key=lambda ex: str(ex.verbose_name)):
+        for ex in sorted([response(events, self.request.organizer) for r, response in responses if response], key=lambda ex: str(ex.verbose_name)):
             ex._serializer = JobRunSerializer(exporter=ex, events=events)
             exporters.append(ex)
         return exporters

src/pretix/api/views/item.py

@@ -477,6 +477,23 @@ class QuotaViewSet(ConditionalListView, viewsets.ModelViewSet):
     def get_queryset(self):
         return self.request.event.quotas.all()
 
+    def list(self, request, *args, **kwargs):
+        queryset = self.filter_queryset(self.get_queryset())
+
+        page = self.paginate_queryset(queryset)
+
+        if self.request.GET.get('with_availability') == 'true':
+            if page:
+                qa = QuotaAvailability()
+                qa.queue(*page)
+                qa.compute(allow_cache=False)
+                for q in page:
+                    q.available = qa.results[q][0] == Quota.AVAILABILITY_OK
+                    q.available_number = qa.results[q][1]
+
+        serializer = self.get_serializer(page, many=True)
+        return self.get_paginated_response(serializer.data)
+
     def perform_create(self, serializer):
         serializer.save(event=self.request.event)
         serializer.instance.log_action(
@@ -496,6 +513,7 @@ class QuotaViewSet(ConditionalListView, viewsets.ModelViewSet):
     def get_serializer_context(self):
         ctx = super().get_serializer_context()
         ctx['event'] = self.request.event
+        ctx['request'] = self.request
         return ctx
 
     def perform_update(self, serializer):

src/pretix/api/views/order.py

@@ -55,9 +55,9 @@ from pretix.api.serializers.order import (
 )
 from pretix.base.i18n import language
 from pretix.base.models import (
-    CachedCombinedTicket, CachedTicket, Device, Event, Invoice, InvoiceAddress,
-    Order, OrderFee, OrderPayment, OrderPosition, OrderRefund, Quota, SubEvent,
-    TaxRule, TeamAPIToken, generate_secret,
+    CachedCombinedTicket, CachedTicket, Checkin, Device, Event, Invoice,
+    InvoiceAddress, Order, OrderFee, OrderPayment, OrderPosition, OrderRefund,
+    Quota, SubEvent, TaxRule, TeamAPIToken, generate_secret,
 )
 from pretix.base.models.orders import QuestionAnswer, RevokedTicketSecret
 from pretix.base.payment import PaymentException
@@ -201,7 +201,8 @@ class OrderViewSet(viewsets.ModelViewSet):
                 Prefetch(
                     'positions',
                     opq.all().prefetch_related(
-                        'checkins', 'item', 'variation', 'answers', 'answers__options', 'answers__question',
+                        Prefetch('checkins', queryset=Checkin.objects.all()),
+                        'item', 'variation', 'answers', 'answers__options', 'answers__question',
                         'item__category', 'addon_to', 'seat',
                         Prefetch('addons', opq.select_related('item', 'variation', 'seat'))
                     )
@@ -212,7 +213,8 @@ class OrderViewSet(viewsets.ModelViewSet):
                 Prefetch(
                     'positions',
                     opq.all().prefetch_related(
-                        'checkins', 'item', 'variation', 'answers', 'answers__options', 'answers__question', 'seat',
+                        Prefetch('checkins', queryset=Checkin.objects.all()),
+                        'item', 'variation', 'answers', 'answers__options', 'answers__question', 'seat',
                     )
                 )
             )
@@ -690,6 +692,16 @@ class OrderViewSet(viewsets.ModelViewSet):
                     }
                 )
 
+            if 'custom_followup_at' in self.request.data and serializer.instance.custom_followup_at != self.request.data.get('custom_followup_at'):
+                serializer.instance.log_action(
+                    'pretix.event.order.custom_followup_at',
+                    user=self.request.user,
+                    auth=self.request.auth,
+                    data={
+                        'new_custom_followup_at': self.request.data.get('custom_followup_at')
+                    }
+                )
+
             if 'checkin_attention' in self.request.data and serializer.instance.checkin_attention != self.request.data.get('checkin_attention'):
                 serializer.instance.log_action(
                     'pretix.event.order.checkin_attention',
@@ -781,7 +793,7 @@ with scopes_disabled():
             )
 
         def has_checkin_qs(self, queryset, name, value):
-            return queryset.filter(checkins__isnull=not value)
+            return queryset.alias(ce=Exists(Checkin.objects.filter(position=OuterRef('pk')))).filter(ce=value)
 
         def attendee_name_qs(self, queryset, name, value):
             return queryset.filter(Q(attendee_name_cached__iexact=value) | Q(addon_to__attendee_name_cached__iexact=value))
@@ -835,7 +847,8 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, mixins.UpdateModelMixin, vi
         qs = qs.filter(order__event=self.request.event)
         if self.request.query_params.get('pdf_data', 'false') == 'true':
             qs = qs.prefetch_related(
-                'checkins', 'answers', 'answers__options', 'answers__question',
+                Prefetch('checkins', queryset=Checkin.objects.all()),
+                'answers', 'answers__options', 'answers__question',
                 Prefetch('addons', qs.select_related('item', 'variation')),
                 Prefetch('order', Order.objects.select_related('invoice_address').prefetch_related(
                     Prefetch(
@@ -845,7 +858,8 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, mixins.UpdateModelMixin, vi
                     Prefetch(
                         'positions',
                         qs.prefetch_related(
-                            'checkins', 'item', 'variation', 'answers', 'answers__options', 'answers__question',
+                            'item', 'variation', 'answers', 'answers__options', 'answers__question',
+                            Prefetch('checkins', queryset=Checkin.objects.all()),
                         )
                     )
                 ))
@@ -854,7 +868,8 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, mixins.UpdateModelMixin, vi
             )
         else:
             qs = qs.prefetch_related(
-                'checkins', 'answers', 'answers__options', 'answers__question',
+                Prefetch('checkins', queryset=Checkin.objects.all()),
+                'answers', 'answers__options', 'answers__question',
             ).select_related(
                 'item', 'order', 'order__event', 'order__event__organizer', 'seat'
             )
@@ -1436,8 +1451,14 @@ class InvoiceViewSet(viewsets.ReadOnlyModelViewSet):
         inv = self.get_object()
         if inv.canceled:
             raise ValidationError('The invoice has already been canceled.')
+        if not inv.event.settings.invoice_regenerate_allowed:
+            raise PermissionDenied('Invoices may not be changed after they are created.')
         elif inv.shredded:
             raise PermissionDenied('The invoice file is no longer stored on the server.')
+        elif inv.sent_to_organizer:
+            raise PermissionDenied('The invoice file has already been exported.')
+        elif now().astimezone(self.request.event.timezone).date() - inv.date > datetime.timedelta(days=1):
+            raise PermissionDenied('The invoice file is too old to be regenerated.')
         else:
             inv = regenerate_invoice(inv)
             inv.order.log_action(

src/pretix/api/webhooks.py

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

src/pretix/base/context.py

@@ -30,7 +30,7 @@ from pretix.base.settings import GlobalSettingsObject
 from pretix.base.templatetags.safelink import safelink as sl
 
 
-def get_powered_by(safelink=True):
+def get_powered_by(request, safelink=True):
     gs = GlobalSettingsObject()
     d = gs.settings.license_check_input
     if d.get('poweredby_name'):
@@ -57,7 +57,7 @@ def get_powered_by(safelink=True):
 
     if d.get('base_license') == 'agpl':
         msg += ' (<a href="{}" target="_blank" rel="noopener">{}</a>)'.format(
-            reverse('source'),
+            request.build_absolute_uri(reverse('source')),
             gettext('source code')
         )
 
@@ -69,7 +69,7 @@ def contextprocessor(request):
         'rtl': getattr(request, 'LANGUAGE_CODE', 'en') in settings.LANGUAGES_RTL,
     }
     try:
-        ctx['poweredby'] = get_powered_by(safelink=True)
+        ctx['poweredby'] = get_powered_by(request, safelink=True)
     except Exception:
         ctx['poweredby'] = 'powered by <a href="https://pretix.eu/" target="_blank" rel="noopener">pretix</a>'
     if settings.DEBUG and 'runserver' not in sys.argv:

src/pretix/base/email.py

@@ -26,6 +26,7 @@ from decimal import Decimal
 from itertools import groupby
 from smtplib import SMTPResponseException
 
+import css_inline
 from django.conf import settings
 from django.core.mail.backends.smtp import EmailBackend
 from django.db.models import Count
@@ -35,7 +36,6 @@ from django.utils.timezone import now
 from django.utils.translation import (
     get_language, gettext_lazy as _, pgettext_lazy,
 )
-from inlinestyler.utils import inline_css
 
 from pretix.base.i18n import (
     LazyCurrencyNumber, LazyDate, LazyExpiresDate, LazyNumber,
@@ -174,7 +174,11 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
             htmlctx['ev'] = position.subevent or self.event
 
         tpl = get_template(self.template_name)
-        body_html = inline_css(tpl.render(htmlctx))
+        body_html = tpl.render(htmlctx)
+
+        inliner = css_inline.CSSInliner(remove_style_tags=True)
+        body_html = inliner.inline(body_html)
+
         return body_html
 
 
@@ -448,6 +452,16 @@ def base_placeholders(sender, **kwargs):
                 }
             ),
         ),
+        SimpleFunctionalMailTextPlaceholder(
+            'subevent', ['waiting_list_entry', 'event'],
+            lambda waiting_list_entry, event: str(waiting_list_entry.subevent or event),
+            lambda event: str(event if not event.has_subevents or not event.subevents.exists() else event.subevents.first())
+        ),
+        SimpleFunctionalMailTextPlaceholder(
+            'subevent_date_from', ['waiting_list_entry', 'event'],
+            lambda waiting_list_entry, event: (waiting_list_entry.subevent or event).get_date_from_display(),
+            lambda event: (event if not event.has_subevents or not event.subevents.exists() else event.subevents.first()).get_date_from_display()
+        ),
         SimpleFunctionalMailTextPlaceholder(
             'url', ['waiting_list_entry', 'event'],
             lambda waiting_list_entry, event: build_absolute_uri(

src/pretix/base/exporter.py

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

src/pretix/base/exporters/orderlist.py

@@ -288,6 +288,7 @@ class OrderListExporter(MultiSheetListExporter):
         headers.append(_('Sales channel'))
         headers.append(_('Requires special attention'))
         headers.append(_('Comment'))
+        headers.append(_('Follow-up date'))
         headers.append(_('Positions'))
         headers.append(_('E-mail address verified'))
         headers.append(_('Payment providers'))
@@ -393,6 +394,7 @@ class OrderListExporter(MultiSheetListExporter):
             row.append(order.sales_channel)
             row.append(_('Yes') if order.checkin_attention else _('No'))
             row.append(order.comment or "")
+            row.append(order.custom_followup_at.strftime("%Y-%m-%d") if order.custom_followup_at else "")
             row.append(order.pcnt)
             row.append(_('Yes') if order.email_known_to_work else _('No'))
             row.append(', '.join([
@@ -574,6 +576,7 @@ class OrderListExporter(MultiSheetListExporter):
             _('Seat row'),
             _('Seat number'),
             _('Order comment'),
+            _('Follow-up date'),
         ]
 
         questions = list(Question.objects.filter(event__in=self.events))
@@ -677,6 +680,7 @@ class OrderListExporter(MultiSheetListExporter):
                     row += ['', '', '', '', '']
 
                 row.append(order.comment)
+                row.append(order.custom_followup_at.strftime("%Y-%m-%d") if order.custom_followup_at else "")
                 acache = {}
                 for a in op.answers.all():
                     # We do not want to localize Date, Time and Datetime question answers, as those can lead
@@ -721,7 +725,7 @@ class OrderListExporter(MultiSheetListExporter):
                 row += [
                     order.sales_channel,
                     order.locale,
-                    row.append(_('Yes') if order.email_known_to_work else _('No'))
+                    _('Yes') if order.email_known_to_work else _('No')
                 ]
                 row.append(', '.join([
                     str(self.providers.get(p, p)) for p in sorted(set((op.payment_providers or '').split(',')))
@@ -780,7 +784,7 @@ class PaymentListExporter(ListExporter):
 
         headers = [
             _('Event slug'), _('Order'), _('Payment ID'), _('Creation date'), _('Completion date'), _('Status'),
-            _('Status code'), _('Amount'), _('Payment method'), _('Comment')
+            _('Status code'), _('Amount'), _('Payment method'), _('Comment'),
         ]
         yield headers
 

src/pretix/base/invoice.py

@@ -769,44 +769,55 @@ class Modern1Renderer(ClassicInvoiceRenderer):
         ]
 
     def _draw_metadata(self, canvas):
+        # Draws the "invoice number -- date" line. This has gotten a little more complicated since we
+        # encountered some events with very long invoice numbers. In this case, we automatically reduce
+        # the font size until it fits.
         begin_top = 100 * mm
 
-        textobject = canvas.beginText(self.left_margin, self.pagesize[1] - begin_top)
-        textobject.setFont(self.font_regular, 8)
-        textobject.textLine(pgettext('invoice', 'Order code'))
-        textobject.moveCursor(0, 5)
-        textobject.setFont(self.font_regular, 10)
-        textobject.textLine(self.invoice.order.full_code)
-        canvas.drawText(textobject)
-
-        if self.invoice.is_cancellation:
-            textobject = canvas.beginText(self.left_margin + 50 * mm, self.pagesize[1] - begin_top)
+        def _draw(label, value, value_size, x, width):
+            if canvas.stringWidth(value, self.font_regular, value_size) > width and value_size > 6:
+                return False
+            textobject = canvas.beginText(x, self.pagesize[1] - begin_top)
             textobject.setFont(self.font_regular, 8)
-            textobject.textLine(pgettext('invoice', 'Cancellation number'))
+            textobject.textLine(label)
             textobject.moveCursor(0, 5)
-            textobject.setFont(self.font_regular, 10)
-            textobject.textLine(self.invoice.number)
-            canvas.drawText(textobject)
+            textobject.setFont(self.font_regular, value_size)
+            textobject.textLine(value)
+            return textobject
 
-            textobject = canvas.beginText(self.left_margin + 100 * mm, self.pagesize[1] - begin_top)
-            textobject.setFont(self.font_regular, 8)
-            textobject.textLine(pgettext('invoice', 'Original invoice'))
-            textobject.moveCursor(0, 5)
-            textobject.setFont(self.font_regular, 10)
-            textobject.textLine(self.invoice.refers.number)
-            canvas.drawText(textobject)
-        else:
-            textobject = canvas.beginText(self.left_margin + 70 * mm, self.pagesize[1] - begin_top)
-            textobject.textLine(pgettext('invoice', 'Invoice number'))
-            textobject.moveCursor(0, 5)
-            textobject.setFont(self.font_regular, 10)
-            textobject.textLine(self.invoice.number)
-            canvas.drawText(textobject)
+        value_size = 10
+        while value_size >= 5:
+            objects = [
+                _draw(pgettext('invoice', 'Order code'), self.invoice.order.full_code, value_size, self.left_margin, 45 * mm)
+            ]
+
+            p = Paragraph(
+                date_format(self.invoice.date, "DATE_FORMAT"),
+                style=ParagraphStyle(name=f'Normal{value_size}', fontName=self.font_regular, fontSize=value_size, leading=value_size * 1.2)
+            )
+            w = stringWidth(p.text, p.frags[0].fontName, p.frags[0].fontSize)
+            p.wrapOn(canvas, w, 15 * mm)
+            date_x = self.pagesize[0] - w - self.right_margin
+
+            if self.invoice.is_cancellation:
+                objects += [
+                    _draw(pgettext('invoice', 'Cancellation number'), self.invoice.number,
+                          value_size, self.left_margin + 50 * mm, 45 * mm),
+                    _draw(pgettext('invoice', 'Original invoice'), self.invoice.number,
+                          value_size, self.left_margin + 100 * mm, date_x - self.left_margin - 100 * mm - 5 * mm),
+                ]
+            else:
+                objects += [
+                    _draw(pgettext('invoice', 'Invoice number'), self.invoice.number,
+                          value_size, self.left_margin + 70 * mm, date_x - self.left_margin - 70 * mm - 5 * mm),
+                ]
+
+            if all(objects):
+                for o in objects:
+                    canvas.drawText(o)
+                break
+            value_size -= 1
 
-        p = Paragraph(date_format(self.invoice.date, "DATE_FORMAT"), style=self.stylesheet['Normal'])
-        w = stringWidth(p.text, p.frags[0].fontName, p.frags[0].fontSize)
-        p.wrapOn(canvas, w, 15 * mm)
-        date_x = self.pagesize[0] - w - self.right_margin
         p.drawOn(canvas, date_x, self.pagesize[1] - begin_top - 10 - 6)
 
         textobject = canvas.beginText(date_x, self.pagesize[1] - begin_top)

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

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

src/pretix/base/middleware.py

@@ -214,7 +214,7 @@ def _render_csp(h):
 def _merge_csp(a, b):
     for k, v in a.items():
         if k in b:
-            a[k] += b[k]
+            a[k] += [i for i in b[k] if i not in a[k]]
 
     for k, v in b.items():
         if k not in a:

src/pretix/base/migrations/0191_event_last_modified.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.2 on 2021-05-24 12:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0190_quota_ignore_for_event_availability'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='last_modified',
+            field=models.DateTimeField(auto_now=True, db_index=True),
+        ),
+    ]

src/pretix/base/migrations/0192_checkin_more_fields.py

@@ -0,0 +1,60 @@
+# Generated by Django 3.2.2 on 2021-05-11 16:13
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0191_event_last_modified'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='checkin',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='checkin',
+            name='error_explanation',
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name='checkin',
+            name='error_reason',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='checkin',
+            name='raw_barcode',
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name='checkin',
+            name='raw_item',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='checkins', to='pretixbase.item'),
+        ),
+        migrations.AddField(
+            model_name='checkin',
+            name='raw_subevent',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='checkins', to='pretixbase.subevent'),
+        ),
+        migrations.AddField(
+            model_name='checkin',
+            name='raw_variation',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='checkins', to='pretixbase.itemvariation'),
+        ),
+        migrations.AddField(
+            model_name='checkin',
+
+            name='successful',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AlterField(
+            model_name='checkin',
+            name='position',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='all_checkins', to='pretixbase.orderposition'),
+        ),
+    ]

src/pretix/base/migrations/0193_auto_20210611_1355.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.2.3 on 2021-06-11 13:55
+
+import django.db.models.manager
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0192_checkin_more_fields'),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name='checkin',
+            managers=[
+                ('all', django.db.models.manager.Manager()),
+            ],
+        ),
+        migrations.AddField(
+            model_name='order',
+            name='custom_followup_at',
+            field=models.DateField(blank=True, null=True),
+        ),
+    ]

src/pretix/base/migrations/0194_membership_canceled.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.3 on 2021-06-17 10:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0193_auto_20210611_1355'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='membership',
+            name='canceled',
+            field=models.BooleanField(default=False),
+        ),
+    ]

src/pretix/base/migrations/0195_auto_20210622_1457.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.3 on 2021-06-22 14:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0194_membership_canceled'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='invoiceline',
+            name='fee_internal_type',
+            field=models.CharField(max_length=190, null=True),
+        ),
+        migrations.AddField(
+            model_name='invoiceline',
+            name='fee_type',
+            field=models.CharField(max_length=190, null=True),
+        ),
+    ]

src/pretix/base/models/checkin.py

@@ -31,6 +31,7 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
+from datetime import timedelta
 
 from django.conf import settings
 from django.core.exceptions import ValidationError
@@ -231,9 +232,14 @@ class CheckinList(LoggedModel):
         return rules
 
 
+class SuccessfulCheckinManager(ScopedManager(organizer='list__event__organizer').__class__):
+    def get_queryset(self):
+        return super().get_queryset().filter(successful=True)
+
+
 class Checkin(models.Model):
     """
-    A check-in object is created when a person enters or exits the event.
+    A check-in object is created when a ticket is scanned with our scanning apps.
     """
     TYPE_ENTRY = 'entry'
     TYPE_EXIT = 'exit'
@@ -241,13 +247,83 @@ class Checkin(models.Model):
         (TYPE_ENTRY, _('Entry')),
         (TYPE_EXIT, _('Exit')),
     )
-    position = models.ForeignKey('pretixbase.OrderPosition', related_name='checkins', on_delete=models.CASCADE)
+
+    REASON_CANCELED = 'canceled'
+    REASON_INVALID = 'invalid'
+    REASON_UNPAID = 'unpaid'
+    REASON_PRODUCT = 'product'
+    REASON_RULES = 'rules'
+    REASON_REVOKED = 'revoked'
+    REASON_INCOMPLETE = 'incomplete'
+    REASON_ALREADY_REDEEMED = 'already_redeemed'
+    REASON_ERROR = 'error'
+    REASONS = (
+        (REASON_CANCELED, _('Order canceled')),
+        (REASON_INVALID, _('Unknown ticket')),
+        (REASON_UNPAID, _('Ticket not paid')),
+        (REASON_RULES, _('Forbidden by custom rule')),
+        (REASON_REVOKED, _('Ticket code revoked/changed')),
+        (REASON_INCOMPLETE, _('Information required')),
+        (REASON_ALREADY_REDEEMED, _('Ticket already used')),
+        (REASON_PRODUCT, _('Ticket type not allowed here')),
+        (REASON_ERROR, _('Server error')),
+    )
+
+    successful = models.BooleanField(
+        default=True,
+    )
+    error_reason = models.CharField(
+        max_length=100,
+        choices=REASONS,
+        null=True,
+        blank=True,
+    )
+    error_explanation = models.TextField(
+        null=True,
+        blank=True,
+    )
+
+    position = models.ForeignKey(
+        'pretixbase.OrderPosition',
+        related_name='all_checkins',
+        on_delete=models.CASCADE,
+        null=True, blank=True,
+    )
+
+    # For "raw" scans where we do not know which position they belong to (e.g. scan of signed
+    # barcode that is not in database).
+    raw_barcode = models.TextField(null=True, blank=True)
+    raw_item = models.ForeignKey(
+        'pretixbase.Item',
+        related_name='checkins',
+        on_delete=models.SET_NULL,
+        null=True, blank=True,
+    )
+    raw_variation = models.ForeignKey(
+        'pretixbase.ItemVariation',
+        related_name='checkins',
+        on_delete=models.SET_NULL,
+        null=True, blank=True,
+    )
+    raw_subevent = models.ForeignKey(
+        'pretixbase.SubEvent',
+        related_name='checkins',
+        on_delete=models.SET_NULL,
+        null=True, blank=True,
+    )
+
+    # Datetime of checkin, might be different from created if past scans are uploaded
     datetime = models.DateTimeField(default=now)
-    nonce = models.CharField(max_length=190, null=True, blank=True)
+
+    # Datetime of creation on server
+    created = models.DateTimeField(auto_now_add=True, null=True, blank=True)
+
     list = models.ForeignKey(
         'pretixbase.CheckinList', related_name='checkins', on_delete=models.PROTECT,
     )
     type = models.CharField(max_length=100, choices=CHECKIN_TYPES, default=TYPE_ENTRY)
+
+    nonce = models.CharField(max_length=190, null=True, blank=True)
     forced = models.BooleanField(default=False)
     device = models.ForeignKey(
         'pretixbase.Device', related_name='checkins', on_delete=models.PROTECT, null=True, blank=True
@@ -257,7 +333,8 @@ class Checkin(models.Model):
     )
     auto_checked_in = models.BooleanField(default=False)
 
-    objects = ScopedManager(organizer='position__order__event__organizer')
+    all = ScopedManager(organizer='list__event__organizer')
+    objects = SuccessfulCheckinManager()
 
     class Meta:
         ordering = (('-datetime'),)
@@ -269,7 +346,8 @@ class Checkin(models.Model):
 
     def save(self, **kwargs):
         super().save(**kwargs)
-        self.position.order.touch()
+        if self.position:
+            self.position.order.touch()
         self.list.event.cache.delete('checkin_count')
         self.list.touch()
 
@@ -277,3 +355,7 @@ class Checkin(models.Model):
         super().delete(**kwargs)
         self.position.order.touch()
         self.list.touch()
+
+    @property
+    def is_late_upload(self):
+        return self.created and abs(self.created - self.datetime) > timedelta(minutes=2)

src/pretix/base/models/event.py

@@ -20,6 +20,7 @@
 # <https://www.gnu.org/licenses/>.
 #
 
+import logging
 # This file is based on an earlier version of pretix which was released under the Apache License 2.0. The full text of
 # the Apache License 2.0 can be obtained at <http://www.apache.org/licenses/LICENSE-2.0>.
 #
@@ -73,9 +74,10 @@ from pretix.helpers.thumb import get_thumbnail
 from ..settings import settings_hierarkey
 from .organizer import Organizer, Team
 
+logger = logging.getLogger(__name__)
+
 
 class EventMixin:
-
     def clean(self):
         if self.presale_start and self.presale_end and self.presale_start > self.presale_end:
             raise ValidationError({'presale_end': _('The end of the presale period has to be later than its start.')})
@@ -493,12 +495,18 @@ class Event(EventMixin, LoggedModel):
         default=False
     )
     seating_plan = models.ForeignKey('SeatingPlan', on_delete=models.PROTECT, null=True, blank=True,
-                                     related_name='events')
+                                     related_name='events', verbose_name=_('Seating plan'))
+
+    last_modified = models.DateTimeField(
+        auto_now=True, db_index=True
+    )
+
     sales_channels = MultiStringField(
         verbose_name=_('Restrict to specific sales channels'),
         help_text=_('Only sell tickets for this event on the following sales channels.'),
         default=default_sales_channels,
     )
+
     objects = ScopedManager(organizer='organizer')
 
     class Meta:
@@ -529,9 +537,17 @@ class Event(EventMixin, LoggedModel):
         logo_file = self.settings.get('logo_image', as_type=str, default='')[7:]
         og_file = self.settings.get('og_image', as_type=str, default='')[7:]
         if og_file:
-            img = get_thumbnail(og_file, '1200').thumb.url
+            try:
+                img = get_thumbnail(og_file, '1200').thumb.url
+            except:
+                logger.exception(f'Failed to create thumbnail of {og_file}')
+                img = default_storage.url(og_file)
         elif logo_file:
-            img = get_thumbnail(logo_file, '5000x120').thumb.url
+            try:
+                img = get_thumbnail(logo_file, '5000x1200').thumb.url
+            except:
+                logger.exception(f'Failed to create thumbnail of {logo_file}')
+                img = default_storage.url(logo_file)
         if img:
             return urljoin(build_absolute_uri(self, 'presale:event.index'), img)
 
@@ -736,7 +752,9 @@ class Event(EventMixin, LoggedModel):
                 ia.bundled_variation = variation_map[ia.bundled_variation.pk]
             ia.save()
 
+        quota_map = {}
         for q in Quota.objects.filter(event=other, subevent__isnull=True).prefetch_related('items', 'variations'):
+            quota_map[q.pk] = q
             items = list(q.items.all())
             vars = list(q.variations.all())
             oldid = q.pk
@@ -860,7 +878,7 @@ class Event(EventMixin, LoggedModel):
         event_copy_data.send(
             sender=self, other=other,
             tax_map=tax_map, category_map=category_map, item_map=item_map, variation_map=variation_map,
-            question_map=question_map, checkin_list_map=checkin_list_map
+            question_map=question_map, checkin_list_map=checkin_list_map, quota_map=quota_map,
         )
 
         if has_custom_style:
@@ -999,6 +1017,11 @@ class Event(EventMixin, LoggedModel):
                 | Q(date_to__gte=now() - timedelta(hours=24))
             )
         )  # order_by doesn't make sense with I18nField
+        if ordering in ("date_ascending", "date_descending"):
+            # if primary order is by date, then order in database
+            # this allows to limit/slice results
+            return subevs.order_by(*orderfields)
+
         for f in reversed(orderfields):
             if f.startswith('-'):
                 subevs = sorted(subevs, key=attrgetter(f[1:]), reverse=True)
@@ -1108,15 +1131,18 @@ class Event(EventMixin, LoggedModel):
         self.items.all().delete()
         self.subevents.all().delete()
 
-    def set_active_plugins(self, modules, allow_restricted=False):
+    def get_available_plugins(self):
         from pretix.base.plugins import get_all_plugins
 
-        plugins_active = self.get_plugins()
-        plugins_available = {
+        return {
             p.module: p for p in get_all_plugins(self)
             if not p.name.startswith('.') and getattr(p, 'visible', True)
         }
 
+    def set_active_plugins(self, modules, allow_restricted=False):
+        plugins_active = self.get_plugins()
+        plugins_available = self.get_available_plugins()
+
         enable = [m for m in modules if m not in plugins_active and m in plugins_available]
 
         for module in enable:
@@ -1145,6 +1171,10 @@ class Event(EventMixin, LoggedModel):
             plugins_active.remove(module)
             self.set_active_plugins(plugins_active)
 
+            plugins_available = self.get_available_plugins()
+            if hasattr(plugins_available[module].app, 'uninstalled'):
+                getattr(plugins_available[module].app, 'uninstalled')(self)
+
         regenerate_css.apply_async(args=(self.pk,))
 
     @staticmethod
@@ -1255,13 +1285,14 @@ class SubEvent(EventMixin, LoggedModel):
     )
     seating_plan = models.ForeignKey('SeatingPlan', on_delete=models.PROTECT, null=True, blank=True,
                                      related_name='subevents')
-    last_modified = models.DateTimeField(
-        auto_now=True, db_index=True
-    )
 
     items = models.ManyToManyField('Item', through='SubEventItem')
     variations = models.ManyToManyField('ItemVariation', through='SubEventItemVariation')
 
+    last_modified = models.DateTimeField(
+        auto_now=True, db_index=True
+    )
+
     objects = ScopedManager(organizer='event__organizer')
 
     class Meta:

src/pretix/base/models/invoices.py

@@ -343,6 +343,8 @@ class InvoiceLine(models.Model):
     item = models.ForeignKey('Item', null=True, blank=True, on_delete=models.PROTECT)
     variation = models.ForeignKey('ItemVariation', null=True, blank=True, on_delete=models.PROTECT)
     attendee_name = models.TextField(null=True, blank=True)
+    fee_type = models.CharField(max_length=190, null=True, blank=True)
+    fee_internal_type = models.CharField(max_length=190, null=True, blank=True)
 
     @property
     def net_value(self):

src/pretix/base/models/items.py

@@ -1051,7 +1051,7 @@ class ItemBundle(models.Model):
     )
     count = models.PositiveIntegerField(
         default=1,
-        verbose_name=_('Number')
+        verbose_name=_('Quantity')
     )
     designated_price = models.DecimalField(
         default=Decimal('0.00'), blank=True,

src/pretix/base/models/memberships.py

@@ -118,6 +118,10 @@ class Membership(models.Model):
         verbose_name=_('Test mode'),
         default=False
     )
+    canceled = models.BooleanField(
+        verbose_name=_('Canceled'),
+        default=False
+    )
     customer = models.ForeignKey(
         Customer,
         related_name='memberships',

src/pretix/base/models/orders.py

@@ -60,7 +60,7 @@ from django.utils.crypto import get_random_string
 from django.utils.encoding import escape_uri_path
 from django.utils.formats import date_format
 from django.utils.functional import cached_property
-from django.utils.timezone import make_aware, now
+from django.utils.timezone import get_current_timezone, make_aware, now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_countries.fields import Country
 from django_scopes import ScopedManager, scopes_disabled
@@ -217,6 +217,11 @@ class Order(LockModel, LoggedModel):
         help_text=_("The text entered in this field will not be visible to the user and is available for your "
                     "convenience.")
     )
+    custom_followup_at = models.DateField(
+        verbose_name=_("Follow-up date"),
+        help_text=_('We\'ll show you this order to be due for a follow-up on this day.'),
+        null=True, blank=True
+    )
     checkin_attention = models.BooleanField(
         verbose_name=_('Requires special attention'),
         default=False,
@@ -300,6 +305,10 @@ class Order(LockModel, LoggedModel):
         """
         return self.all_fees(manager='objects')
 
+    @property
+    def custom_followup_due(self):
+        return self.custom_followup_at and self.custom_followup_at <= now().astimezone(get_current_timezone()).date()
+
     @cached_property
     @scopes_disabled()
     def count_positions(self):
@@ -410,6 +419,8 @@ class Order(LockModel, LoggedModel):
                 is_underpaid=Case(
                     When(Q(status=Order.STATUS_PAID) & Q(pending_sum_t__gt=1e-8),
                          then=Value(1)),
+                    When(Q(status=Order.STATUS_CANCELED) & Q(pending_sum_rc__gt=1e-8),
+                         then=Value(1)),
                     default=Value(0),
                     output_field=models.IntegerField()
                 )
@@ -532,7 +543,7 @@ class Order(LockModel, LoggedModel):
             fee += self.event.settings.cancel_allow_user_paid_keep_percentage / Decimal('100.0') * (self.total - fee)
         if self.event.settings.cancel_allow_user_paid_keep:
             fee += self.event.settings.cancel_allow_user_paid_keep
-        return round_decimal(fee, self.event.currency)
+        return round_decimal(min(fee, self.total), self.event.currency)
 
     @property
     @scopes_disabled()
@@ -590,6 +601,8 @@ class Order(LockModel, LoggedModel):
             for gc in op.issued_gift_cards.all():
                 if gc.value != op.price:
                     return False
+            if op.granted_memberships.with_usages().filter(usages__gt=0):
+                return False
         if self.user_cancel_deadline and now() > self.user_cancel_deadline:
             return False
         if self.status == Order.STATUS_PENDING:
@@ -772,6 +785,7 @@ class Order(LockModel, LoggedModel):
     def ticket_download_available(self):
         return self.event.settings.ticket_download and (
             self.event.settings.ticket_download_date is None
+            or self.ticket_download_date is None
             or now() > self.ticket_download_date
         ) and (
             self.status == Order.STATUS_PAID
@@ -899,7 +913,7 @@ class Order(LockModel, LoggedModel):
             return str(e)
         return True
 
-    def send_mail(self, subject: str, template: Union[str, LazyI18nString],
+    def send_mail(self, subject: Union[str, LazyI18nString], template: Union[str, LazyI18nString],
                   context: Dict[str, Any]=None, log_entry_type: str='pretix.event.order.email.sent',
                   user: User=None, headers: dict=None, sender: str=None, invoices: list=None,
                   auth=None, attach_tickets=False, position: 'OrderPosition'=None, auto_email=True,
@@ -942,7 +956,7 @@ class Order(LockModel, LoggedModel):
 
             try:
                 email_content = render_mail(template, context)
-                subject = subject.format_map(TolerantDict(context))
+                subject = str(subject).format_map(TolerantDict(context))
                 mail(
                     recipient, subject, template, context,
                     self.event, self.locale, self, headers=headers, sender=sender,
@@ -1689,7 +1703,7 @@ class OrderPayment(models.Model):
         })
 
         if self.order.pending_sum + r.amount == Decimal('0.00'):
-            self.refund.done()
+            r.done()
 
         return r
 
@@ -1894,6 +1908,7 @@ class OrderFee(models.Model):
     FEE_TYPE_SHIPPING = "shipping"
     FEE_TYPE_SERVICE = "service"
     FEE_TYPE_CANCELLATION = "cancellation"
+    FEE_TYPE_INSURANCE = "insurance"
     FEE_TYPE_OTHER = "other"
     FEE_TYPE_GIFTCARD = "giftcard"
     FEE_TYPES = (
@@ -1901,6 +1916,7 @@ class OrderFee(models.Model):
         (FEE_TYPE_SHIPPING, _("Shipping fee")),
         (FEE_TYPE_SERVICE, _("Service fee")),
         (FEE_TYPE_CANCELLATION, _("Cancellation fee")),
+        (FEE_TYPE_INSURANCE, _("Insurance fee")),
         (FEE_TYPE_OTHER, _("Other fees")),
         (FEE_TYPE_GIFTCARD, _("Gift card")),
     )
@@ -2054,6 +2070,14 @@ class OrderPosition(AbstractPosition):
     def sort_key(self):
         return self.addon_to.positionid if self.addon_to else self.positionid, self.addon_to_id or 0
 
+    @property
+    def checkins(self):
+        """
+        Related manager for all successful checkins. Use ``all_checkins`` instead if you want
+        canceled positions as well.
+        """
+        return self.all_checkins(manager='objects')
+
     @property
     def generate_ticket(self):
         if self.item.generate_tickets is not None:
@@ -2168,7 +2192,7 @@ class OrderPosition(AbstractPosition):
     def send_mail(self, subject: str, template: Union[str, LazyI18nString],
                   context: Dict[str, Any]=None, log_entry_type: str='pretix.event.order.email.sent',
                   user: User=None, headers: dict=None, sender: str=None, invoices: list=None,
-                  auth=None, attach_tickets=False):
+                  auth=None, attach_tickets=False, attach_ical=False):
         """
         Sends an email to the attendee. Basically, this method does two things:
 
@@ -2185,6 +2209,7 @@ class OrderPosition(AbstractPosition):
         :param headers: Dictionary with additional mail headers
         :param sender: Custom email sender.
         :param attach_tickets: Attach tickets of this order, if they are existing and ready to download
+        :param attach_ical: Attach relevant ICS files
         """
         from pretix.base.services.mail import (
             SendMailException, mail, render_mail,
@@ -2204,7 +2229,9 @@ class OrderPosition(AbstractPosition):
                     recipient, subject, template, context,
                     self.event, self.order.locale, order=self.order, headers=headers, sender=sender,
                     position=self,
-                    invoices=invoices, attach_tickets=attach_tickets
+                    invoices=invoices,
+                    attach_tickets=attach_tickets,
+                    attach_ical=attach_ical,
                 )
             except SendMailException:
                 raise
@@ -2219,6 +2246,7 @@ class OrderPosition(AbstractPosition):
                         'recipient': recipient,
                         'invoices': [i.pk for i in invoices] if invoices else [],
                         'attach_tickets': attach_tickets,
+                        'attach_ical': attach_ical,
                     }
                 )
 

src/pretix/base/models/vouchers.py

@@ -38,7 +38,7 @@ from decimal import ROUND_HALF_UP, Decimal
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.validators import MinLengthValidator
-from django.db import models
+from django.db import connection, models
 from django.db.models import F, OuterRef, Q, Subquery, Sum
 from django.db.models.functions import Coalesce
 from django.utils.crypto import get_random_string
@@ -74,6 +74,55 @@ def generate_code(prefix=None):
             return code
 
 
+def generate_codes(organizer, num=1, prefix=None):
+    codes = set()
+    batch_size = 500
+    if 'postgres' in settings.DATABASES['default']['ENGINE']:
+        batch_size = 5_000
+
+    """
+    We're trying to check if any of the requested codes already exists in the database. Generally, this is a
+
+        SELECT code FROM voucher WHERE code IN (…)
+
+    query. However, it turns out that this query get's rather slow if an organizer has lots of vouchers, even
+    with a organizer with just over 50_000 vouchers, we've seen that creating 20_000 new voucher codes took
+    just over 30 seconds. There's another way of doing this query on PostgreSQL, which is joining with a
+    temporary table
+
+        SELECT code FROM voucher INNER JOIN (VALUES …) vals(v) ON (code = v)
+
+    This is significantly faster, inserting 20_000 vouchers now takes 2-3s instead of 31s on the same dataset.
+    It's still slow, and removing the JOIN to the event table doesn't significantly speed it up. We might need
+    an entirely different approach at some point.
+    """
+
+    while len(codes) < num:
+        new_codes = set()
+        for i in range(min(num - len(codes), batch_size)):  # Work around SQLite's SQLITE_MAX_VARIABLE_NUMBER
+            new_codes.add(_generate_random_code(prefix=prefix))
+
+        if 'postgres' in settings.DATABASES['default']['ENGINE']:
+            with connection.cursor() as cursor:
+                args = list(new_codes) + [organizer.pk]
+                tmptable = "VALUES " + (", ".join(['(%s)'] * len(new_codes)))
+                cursor.execute(
+                    f'SELECT code '
+                    f'FROM "{Voucher._meta.db_table}" '
+                    f'INNER JOIN ({tmptable}) vals(v) ON ("{Voucher._meta.db_table}"."code" = "v")'
+                    f'INNER JOIN "{Event._meta.db_table}" ON ("{Voucher._meta.db_table}"."event_id" = "{Event._meta.db_table}"."id") '
+                    f'WHERE "{Event._meta.db_table}"."organizer_id" = %s',
+                    args
+                )
+                for row in cursor.fetchall():
+                    new_codes.remove(row[0])
+        else:
+            new_codes -= set([v['code'] for v in Voucher.objects.filter(code__in=new_codes).values('code')])
+
+        codes |= new_codes
+    return list(codes)
+
+
 class Voucher(LoggedModel):
     """
     A Voucher can reserve ticket quota or allow special prices.

src/pretix/base/orderimport.py

@@ -19,6 +19,7 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
+import datetime
 import re
 from collections import defaultdict
 from decimal import Decimal, DecimalException
@@ -35,12 +36,14 @@ from django.utils.translation import (
 from django_countries import countries
 from django_countries.fields import Country
 from i18nfield.strings import LazyI18nString
+from phonenumber_field.phonenumber import to_python
+from phonenumbers import SUPPORTED_REGIONS
 
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.forms.questions import guess_country
 from pretix.base.models import (
     ItemVariation, OrderPosition, Question, QuestionAnswer, QuestionOption,
-    Seat,
+    Seat, SubEvent,
 )
 from pretix.base.services.pricing import get_price
 from pretix.base.settings import (
@@ -155,11 +158,38 @@ class EmailColumn(ImportColumn):
         order.email = value
 
 
+class PhoneColumn(ImportColumn):
+    identifier = 'phone'
+    verbose_name = gettext_lazy('Phone number')
+
+    def clean(self, value, previous_values):
+        if value:
+            if self.event.settings.region in SUPPORTED_REGIONS:
+                region = self.event.settings.region
+            elif self.event.settings.locale[:2].upper() in SUPPORTED_REGIONS:
+                region = self.event.settings.locale[:2].upper()
+            else:
+                region = None
+
+            phone_number = to_python(value, region)
+            if not phone_number or not phone_number.is_valid():
+                raise ValidationError(_('Enter a valid phone number.'))
+            return phone_number
+        return value
+
+    def assign(self, value, order, position, invoice_address, **kwargs):
+        order.phone = value
+
+
 class SubeventColumn(ImportColumn):
     identifier = 'subevent'
     verbose_name = pgettext_lazy('subevents', 'Date')
     default_value = None
 
+    def __init__(self, *args, **kwargs):
+        self._subevent_cache = {}
+        super().__init__(*args, **kwargs)
+
     @cached_property
     def subevents(self):
         return list(self.event.subevents.filter(active=True).order_by('date_from'))
@@ -172,6 +202,30 @@ class SubeventColumn(ImportColumn):
     def clean(self, value, previous_values):
         if not value:
             raise ValidationError(pgettext("subevent", "You need to select a date."))
+
+        if value in self._subevent_cache:
+            return self._subevent_cache[value]
+
+        input_formats = formats.get_format('DATETIME_INPUT_FORMATS', use_l10n=True)
+        for format in input_formats:
+            try:
+                d = datetime.datetime.strptime(value, format)
+                d = self.event.timezone.localize(d)
+                try:
+                    se = self.event.subevents.get(
+                        active=True,
+                        date_from__gt=d - datetime.timedelta(seconds=1),
+                        date_from__lt=d + datetime.timedelta(seconds=1),
+                    )
+                    self._subevent_cache[value] = se
+                    return se
+                except SubEvent.DoesNotExist:
+                    raise ValidationError(pgettext("subevent", "No matching date was found."))
+                except SubEvent.MultipleObjectsReturned:
+                    raise ValidationError(pgettext("subevent", "Multiple matching dates were found."))
+            except (ValueError, TypeError):
+                continue
+
         matches = [
             p for p in self.subevents
             if str(p.pk) == value or any(
@@ -181,6 +235,8 @@ class SubeventColumn(ImportColumn):
             raise ValidationError(pgettext("subevent", "No matching date was found."))
         if len(matches) > 1:
             raise ValidationError(pgettext("subevent", "Multiple matching dates were found."))
+
+        self._subevent_cache[value] = matches[0]
         return matches[0]
 
     def assign(self, value, order, position, invoice_address, **kwargs):
@@ -725,6 +781,7 @@ def get_all_columns(event):
         default.append(SubeventColumn(event))
     default += [
         EmailColumn(event),
+        PhoneColumn(event),
         ItemColumn(event),
         Variation(event),
         InvoiceAddressCompany(event),

src/pretix/base/payment.py

@@ -703,7 +703,7 @@ class BasePaymentProvider:
             try:
                 ia = order.invoice_address
             except InvoiceAddress.DoesNotExist:
-                return True
+                pass
             else:
                 if str(ia.country) not in restricted_countries:
                     return False

src/pretix/base/pdf.py

@@ -50,6 +50,7 @@ from django.conf import settings
 from django.contrib.staticfiles import finders
 from django.dispatch import receiver
 from django.utils.formats import date_format
+from django.utils.functional import SimpleLazyObject
 from django.utils.html import conditional_escape
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
@@ -98,6 +99,11 @@ DEFAULT_VARIABLES = OrderedDict((
         "editor_sample": "1",
         "evaluate": lambda orderposition, order, event: str(orderposition.positionid)
     }),
+    ("order_positionid", {
+        "label": _("Order code and position number"),
+        "editor_sample": "A1B2C-1",
+        "evaluate": lambda orderposition, order, event: f"{orderposition.order.code}-{orderposition.positionid}"
+    }),
     ("item", {
         "label": _("Product name"),
         "editor_sample": _("Sample product"),
@@ -428,7 +434,7 @@ def images_from_questions(sender, *args, **kwargs):
             except IndexError:
                 pass
         else:
-            a = op.answers.filter(question_id=question_id).first()
+            a = op.answers.filter(question_id=question_id).first() or a
 
         if not a or not a.file or not any(a.file.name.lower().endswith(e) for e in (".jpg", ".jpeg", ".png", ".gif", ".bmp", ".tif", ".tiff")):
             return None
@@ -468,7 +474,7 @@ def variables_from_questions(sender, *args, **kwargs):
             except IndexError:
                 pass
         else:
-            a = op.answers.filter(question_id=question_id).first()
+            a = op.answers.filter(question_id=question_id).first() or a
 
         if not a:
             return ""
@@ -551,6 +557,12 @@ def get_first_scan(op: OrderPosition):
     return ""
 
 
+reshaper = SimpleLazyObject(lambda: ArabicReshaper(configuration={
+    'delete_harakat': True,
+    'support_ligatures': False,
+}))
+
+
 class Renderer:
 
     def __init__(self, event, layout, background_file):
@@ -568,6 +580,8 @@ class Renderer:
 
     @classmethod
     def _register_fonts(cls):
+        if hasattr(cls, '_fonts_registered'):
+            return
         pdfmetrics.registerFont(TTFont('Open Sans', finders.find('fonts/OpenSans-Regular.ttf')))
         pdfmetrics.registerFont(TTFont('Open Sans I', finders.find('fonts/OpenSans-Italic.ttf')))
         pdfmetrics.registerFont(TTFont('Open Sans B', finders.find('fonts/OpenSans-Bold.ttf')))
@@ -582,6 +596,8 @@ class Renderer:
             if 'bolditalic' in styles:
                 pdfmetrics.registerFont(TTFont(family + ' B I', finders.find(styles['bolditalic']['truetype'])))
 
+        cls._fonts_registered = True
+
     def _draw_poweredby(self, canvas: Canvas, op: OrderPosition, o: dict):
         content = o.get('content', 'dark')
         if content not in ('dark', 'white'):
@@ -716,11 +732,6 @@ class Renderer:
 
         # reportlab does not support RTL, ligature-heavy scripts like Arabic. Therefore, we use ArabicReshaper
         # to resolve all ligatures and python-bidi to switch RTL texts.
-        configuration = {
-            'delete_harakat': True,
-            'support_ligatures': False,
-        }
-        reshaper = ArabicReshaper(configuration=configuration)
         try:
             text = "<br/>".join(get_display(reshaper.reshape(l)) for l in text.split("<br/>"))
         except:

src/pretix/base/secrets.py

@@ -22,6 +22,8 @@
 import base64
 import inspect
 import struct
+from collections import namedtuple
+from typing import Optional
 
 from cryptography.hazmat.backends.openssl.backend import Backend
 from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
@@ -37,6 +39,8 @@ from pretix.base.models import Item, ItemVariation, SubEvent
 from pretix.base.secretgenerators import pretix_sig1_pb2
 from pretix.base.signals import register_ticket_secret_generators
 
+ParsedSecret = namedtuple('AnalyzedSecret', 'item variation subevent attendee_name opaque_id')
+
 
 class BaseTicketSecretGenerator:
     """
@@ -72,6 +76,14 @@ class BaseTicketSecretGenerator:
         """
         return False
 
+    def parse_secret(self, secret: str) -> Optional[ParsedSecret]:
+        """
+        Given a ``secret``, return an ``ParsedSecret`` with the information decoded from the secret, if possible.
+        Any value of ``ParsedSecret`` may be ``None``, and if parsing is not possible at all, you can ``None`` (as
+        the default implementation does).
+        """
+        return None
+
     def generate_secret(self, item: Item, variation: ItemVariation = None, subevent: SubEvent = None,
                         attendee_name: str = None, current_secret: str = None, force_invalidate=False) -> str:
         """
@@ -181,6 +193,15 @@ class Sig1TicketSecretGenerator(BaseTicketSecretGenerator):
         except:
             return None
 
+    def parse_secret(self, secret: str) -> Optional[ParsedSecret]:
+        ticket = self._parse(secret)
+        if ticket:
+            item = self.event.items.filter(pk=ticket.item).first() if ticket.item else None
+            subevent = self.event.subevents.filter(pk=ticket.subevent).first() if ticket.subevent else None
+            variation = item.variations.filter(pk=ticket.variation).first() if item and ticket.subevent else None
+            opaque_id = ticket.seed
+            return self.ParsedSecret(item=item, subevent=subevent, variation=variation, opaque_id=opaque_id, attendee_name=None)
+
     def generate_secret(self, item: Item, variation: ItemVariation = None, subevent: SubEvent = None,
                         current_secret: str = None, force_invalidate=False):
         if current_secret and not force_invalidate:

src/pretix/base/services/cancelevent.py

@@ -227,7 +227,7 @@ def cancel_event(self, event: Event, subevent: int, auto_refund: bool,
             if not self.request.called_directly and counter % max(10, total // 100) == 0:
                 self.update_state(
                     state='PROGRESS',
-                    meta={'value': round(counter / total * 100, 2)}
+                    meta={'value': round(counter / total * 100 if total else 0, 2)}
                 )
         except LockTimeoutException:
             logger.exception("Could not cancel order")
@@ -285,7 +285,7 @@ def cancel_event(self, event: Event, subevent: int, auto_refund: bool,
             if not self.request.called_directly and counter % max(10, total // 100) == 0:
                 self.update_state(
                     state='PROGRESS',
-                    meta={'value': round(counter / total * 100, 2)}
+                    meta={'value': round(counter / total * 100 if total else 0, 2)}
                 )
 
     if send_waitinglist:
@@ -296,6 +296,6 @@ def cancel_event(self, event: Event, subevent: int, auto_refund: bool,
             if not self.request.called_directly and counter % max(10, total // 100) == 0:
                 self.update_state(
                     state='PROGRESS',
-                    meta={'value': round(counter / total * 100, 2)}
+                    meta={'value': round(counter / total * 100 if total else 0, 2)}
                 )
     return failed

src/pretix/base/services/checkin.py

@@ -39,7 +39,7 @@ import dateutil
 import dateutil.parser
 import pytz
 from django.core.files import File
-from django.db import transaction
+from django.db import IntegrityError, transaction
 from django.db.models import (
     BooleanField, Count, ExpressionWrapper, F, IntegerField, OuterRef, Q,
     Subquery, Value,
@@ -512,6 +512,21 @@ class RequiredQuestionsError(Exception):
 
 
 def _save_answers(op, answers, given_answers):
+    def _create_answer(question, answer):
+        try:
+            return op.answers.create(question=question, answer=answer)
+        except IntegrityError:
+            # Since we prefill ``field.answer`` at form creation time, there's a possible race condition
+            # here if the user submits their scan a second time while the first one is still running,
+            # thus leading to duplicate QuestionAnswer objects. Since Django doesn't support UPSERT, the "proper"
+            # fix would be a transaction with select_for_update(), or at least fetching using get_or_create here
+            # again. However, both of these approaches have a significant performance overhead for *all* requests,
+            # while the issue happens very very rarely. So we opt for just catching the error and retrying properly.
+            qa = op.answers.get(question=question)
+            qa.answer = answer
+            qa.save(update_fields=['answer'])
+            qa.options.clear()
+
     written = False
     for q, a in given_answers.items():
         if not a:
@@ -528,7 +543,7 @@ def _save_answers(op, answers, given_answers):
                 written = True
                 qa.options.clear()
             else:
-                qa = op.answers.create(question=q, answer=str(a.answer))
+                qa = _create_answer(question=q, answer=str(a.answer))
             qa.options.add(a)
         elif isinstance(a, list):
             if q in answers:
@@ -538,13 +553,13 @@ def _save_answers(op, answers, given_answers):
                 written = True
                 qa.options.clear()
             else:
-                qa = op.answers.create(question=q, answer=", ".join([str(o) for o in a]))
+                qa = _create_answer(question=q, answer=", ".join([str(o) for o in a]))
             qa.options.add(*a)
         elif isinstance(a, File):
             if q in answers:
                 qa = answers[q]
             else:
-                qa = op.answers.create(question=q, answer=str(a))
+                qa = _create_answer(question=q, answer=str(a))
             qa.file.save(os.path.basename(a.name), a, save=False)
             qa.answer = 'file://' + qa.file.name
             qa.save()
@@ -555,7 +570,7 @@ def _save_answers(op, answers, given_answers):
                 qa.answer = str(a)
                 qa.save()
             else:
-                op.answers.create(question=q, answer=str(a))
+                _create_answer(question=q, answer=str(a))
             written = True
 
     if written:
@@ -566,7 +581,8 @@ def _save_answers(op, answers, given_answers):
 
 def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict, force=False,
                     ignore_unpaid=False, nonce=None, datetime=None, questions_supported=True,
-                    user=None, auth=None, canceled_supported=False, type=Checkin.TYPE_ENTRY):
+                    user=None, auth=None, canceled_supported=False, type=Checkin.TYPE_ENTRY,
+                    raw_barcode=None, from_revoked_secret=False):
     """
     Create a checkin for this particular order position and check-in list. Fails with CheckInError if the check in is
     not valid at this time.
@@ -581,6 +597,11 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
     :param nonce: A random nonce to prevent race conditions.
     :param datetime: The datetime of the checkin, defaults to now.
     """
+
+    # !!!!!!!!!
+    # Update doc/images/checkin_online.puml if you make substantial changes here!
+    # !!!!!!!!!
+
     dt = datetime or now()
 
     if op.canceled or op.order.status not in (Order.STATUS_PAID, Order.STATUS_PENDING):
@@ -623,12 +644,6 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
                 _('This order is not marked as paid.'),
                 'unpaid'
             )
-        elif require_answers and not force and questions_supported:
-            raise RequiredQuestionsError(
-                _('You need to answer questions to complete this check-in.'),
-                'incomplete',
-                require_answers
-            )
 
         if type == Checkin.TYPE_ENTRY and clist.rules and not force:
             rule_data = LazyRuleVars(op, clist, dt)
@@ -643,19 +658,27 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
                     reason=reason
                 )
 
+        if require_answers and not force and questions_supported:
+            raise RequiredQuestionsError(
+                _('You need to answer questions to complete this check-in.'),
+                'incomplete',
+                require_answers
+            )
+
         device = None
         if isinstance(auth, Device):
             device = auth
 
-        last_ci = op.checkins.order_by('-datetime').filter(list=clist).only('type', 'nonce').first()
+        last_cis = list(op.checkins.order_by('-datetime').filter(list=clist).only('type', 'nonce'))
         entry_allowed = (
             type == Checkin.TYPE_EXIT or
             clist.allow_multiple_entries or
-            last_ci is None or
-            (clist.allow_entry_after_exit and last_ci.type == Checkin.TYPE_EXIT)
+            not last_cis or
+            all(c.type == Checkin.TYPE_EXIT for c in last_cis) or
+            (clist.allow_entry_after_exit and last_cis[0].type == Checkin.TYPE_EXIT)
         )
 
-        if nonce and ((last_ci and last_ci.nonce == nonce) or op.checkins.filter(type=type, list=clist, device=device, nonce=nonce).exists()):
+        if nonce and ((last_cis and last_cis[0].nonce == nonce) or op.checkins.filter(type=type, list=clist, device=device, nonce=nonce).exists()):
             return
 
         if entry_allowed or force:
@@ -667,7 +690,8 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
                 device=device,
                 gate=device.gate if device else None,
                 nonce=nonce,
-                forced=force and not entry_allowed,
+                forced=force and (not entry_allowed or from_revoked_secret),
+                raw_barcode=raw_barcode,
             )
             op.order.log_action('pretix.event.checkin', data={
                 'position': op.id,
@@ -676,6 +700,7 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
                 'forced': force or op.order.status != Order.STATUS_PAID,
                 'datetime': dt,
                 'type': type,
+                'answers': {k.pk: str(v) for k, v in given_answers.items()},
                 'list': clist.pk
             }, user=user, auth=auth)
             checkin_created.send(op.order.event, checkin=ci)

src/pretix/base/services/export.py

@@ -56,7 +56,7 @@ def export(self, event: Event, fileid: str, provider: str, form_data: Dict[str,
     with language(event.settings.locale, event.settings.region), override(event.settings.timezone):
         responses = register_data_exporters.send(event)
         for receiver, response in responses:
-            ex = response(event, set_progress)
+            ex = response(event, event.organizer, set_progress)
             if ex.identifier == provider:
                 d = ex.render(form_data)
                 if d is None:
@@ -70,12 +70,15 @@ def export(self, event: Event, fileid: str, provider: str, form_data: Dict[str,
 
 
 @app.task(base=ProfiledOrganizerUserTask, throws=(ExportError,), bind=True)
-def multiexport(self, organizer: Organizer, user: User, device: int, token: int, fileid: str, provider: str, form_data: Dict[str, Any]) -> None:
+def multiexport(self, organizer: Organizer, user: User, device: int, token: int, fileid: str, provider: str,
+                form_data: Dict[str, Any], staff_session=False) -> None:
     if device:
         device = Device.objects.get(pk=device)
     if token:
         device = TeamAPIToken.objects.get(pk=token)
     allowed_events = (device or token or user).get_events_with_permission('can_view_orders')
+    if user and staff_session:
+        allowed_events = organizer.events.all()
 
     def set_progress(val):
         if not self.request.called_directly:
@@ -100,16 +103,19 @@ def multiexport(self, organizer: Organizer, user: User, device: int, token: int,
             timezone = settings.TIME_ZONE
             region = None
     with language(locale, region), override(timezone):
-        if isinstance(form_data['events'][0], str):
-            events = allowed_events.filter(slug__in=form_data.get('events'), organizer=organizer)
+        if form_data.get('events') is not None:
+            if isinstance(form_data['events'][0], str):
+                events = allowed_events.filter(slug__in=form_data.get('events'), organizer=organizer)
+            else:
+                events = allowed_events.filter(pk__in=form_data.get('events'))
         else:
-            events = allowed_events.filter(pk__in=form_data.get('events'))
+            events = allowed_events
         responses = register_multievent_data_exporters.send(organizer)
 
         for receiver, response in responses:
             if not response:
                 continue
-            ex = response(events, set_progress)
+            ex = response(events, organizer, set_progress)
             if ex.identifier == provider:
                 d = ex.render(form_data)
                 if d is None:

src/pretix/base/services/invoices.py

@@ -244,7 +244,9 @@ def build_invoice(invoice: Invoice) -> Invoice:
                 event_date_to=None if invoice.event.has_subevents else invoice.event.date_to,
                 tax_value=fee.tax_value,
                 tax_rate=fee.tax_rate,
-                tax_name=fee.tax_rule.name if fee.tax_rule else ''
+                tax_name=fee.tax_rule.name if fee.tax_rule else '',
+                fee_type=fee.fee_type,
+                fee_internal_type=fee.internal_type or None,
             )
 
             if fee.tax_rule and fee.tax_rule.is_reverse_charge(ia) and fee.value and not fee.tax_value:
@@ -321,7 +323,7 @@ def generate_invoice(order: Order, trigger_pdf=True):
         order=order,
         event=order.event,
         organizer=order.event.organizer,
-        date=timezone.now().date(),
+        date=timezone.now().astimezone(order.event.timezone).date(),
     )
     invoice = build_invoice(invoice)
     if trigger_pdf:

src/pretix/base/services/mail.py

@@ -45,7 +45,6 @@ from email.utils import formataddr
 from typing import Any, Dict, List, Sequence, Union
 from urllib.parse import urljoin, urlparse
 
-import cssutils
 import pytz
 import requests
 from bs4 import BeautifulSoup
@@ -79,7 +78,6 @@ from pretix.presale.ical import get_ical
 
 logger = logging.getLogger('pretix.base.mail')
 INVALID_ADDRESS = 'invalid-pretix-mail-address'
-cssutils.log.setLevel(logging.CRITICAL)
 
 
 class TolerantDict(dict):
@@ -176,8 +174,8 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
         subject = str(subject).format_map(TolerantDict(context))
         sender = (
             sender or
-            (event.settings.get('mail_from') if event else settings.MAIL_FROM) or
-            (organizer.settings.get('mail_from') if organizer else settings.MAIL_FROM) or
+            (event.settings.get('mail_from') if event else None) or
+            (organizer.settings.get('mail_from') if organizer else None) or
             settings.MAIL_FROM
         )
         if event:
@@ -628,6 +626,7 @@ def encoder_linelength(msg):
 
 
 def convert_image_to_cid(image_src, cid_id, verify_ssl=True):
+    image_src = image_src.strip()
     try:
         if image_src.startswith('data:image/'):
             image_type, image_content = image_src.split(',', 1)
@@ -641,13 +640,14 @@ def convert_image_to_cid(image_src, cid_id, verify_ssl=True):
             image_src = normalize_image_url(image_src)
 
             path = urlparse(image_src).path
-            guess_subtype = os.path.splitext(path)[1][1:]
+            image_type = os.path.splitext(path)[1][1:]
 
             response = requests.get(image_src, verify=verify_ssl)
             mime_image = MIMEImage(
-                response.content, _subtype=guess_subtype)
+                response.content, _subtype=image_type)
 
         mime_image.add_header('Content-ID', '<%s>' % cid_id)
+        mime_image.add_header('Content-Disposition', 'inline;\n filename="{}.{}"'.format(cid_id, image_type))
 
         return mime_image
     except:

src/pretix/base/services/memberships.py

@@ -141,6 +141,11 @@ def validate_memberships_in_order(customer: Customer, positions: List[AbstractPo
                 _('You selected a membership that is connected to a different customer account.')
             )
 
+        if m.canceled:
+            raise ValidationError(
+                _('You selected membership that has been canceled.')
+            )
+
         if m.testmode != testmode:
             raise ValidationError(
                 _('You can only use a test mode membership for test mode tickets.')

src/pretix/base/services/notifications.py

@@ -19,11 +19,11 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
+import css_inline
 from django.conf import settings
 from django.template.loader import get_template
 from django.utils.timezone import override
 from django_scopes import scope, scopes_disabled
-from inlinestyler.utils import inline_css
 
 from pretix.base.i18n import language
 from pretix.base.models import LogEntry, NotificationSetting, User
@@ -131,7 +131,11 @@ def send_notification_mail(notification: Notification, user: User):
     }
 
     tpl_html = get_template('pretixbase/email/notification.html')
-    body_html = inline_css(tpl_html.render(ctx))
+
+    body_html = tpl_html.render(ctx)
+    inliner = css_inline.CSSInliner(remove_style_tags=True)
+    body_html = inliner.inline(body_html)
+
     tpl_plain = get_template('pretixbase/email/notification.txt')
     body_plain = tpl_plain.render(ctx)
 

src/pretix/base/services/orderimport.py

@@ -52,14 +52,15 @@ class DataImportError(LazyLocaleException):
         super().__init__(msg)
 
 
-def parse_csv(file, length=None):
+def parse_csv(file, length=None, mode="strict"):
+    file.seek(0)
     data = file.read(length)
     try:
         import chardet
         charset = chardet.detect(data)['encoding']
     except ImportError:
         charset = file.charset
-    data = data.decode(charset or 'utf-8')
+    data = data.decode(charset or "utf-8", mode)
     # If the file was modified on a Mac, it only contains \r as line breaks
     if '\r' in data and '\n' not in data:
         data = data.replace('\r', '\n')
@@ -95,6 +96,8 @@ def import_orders(event: Event, fileid: str, settings: dict, locale: str, user)
 
         # Run validation
         for i, record in enumerate(parsed):
+            if not any(record.values()):
+                continue
             values = {}
             for c in cols:
                 val = c.resolve(settings, record)

src/pretix/base/services/orders.py

@@ -149,8 +149,8 @@ def reactivate_order(order: Order, force: bool=False, user: User=None, auth=None
         raise OrderError('The order was not canceled.')
 
     with order.event.lock() as now_dt:
-        is_available = force or order._is_still_available(now_dt, count_waitinglist=False, check_voucher_usage=True,
-                                                          check_memberships=True)
+        is_available = order._is_still_available(now_dt, count_waitinglist=False, check_voucher_usage=True,
+                                                 check_memberships=True, force=force)
         if is_available is True:
             if order.payment_refund_sum >= order.total:
                 order.status = Order.STATUS_PAID
@@ -177,6 +177,10 @@ def reactivate_order(order: Order, force: bool=False, user: User=None, auth=None
                         gc = GiftCard.objects.select_for_update().get(pk=gc.pk)
                         gc.transactions.create(value=position.price, order=order)
                         break
+
+                    for m in position.granted_memberships.all():
+                        m.canceled = False
+                        m.save()
         else:
             raise OrderError(is_available)
 
@@ -222,8 +226,8 @@ def extend_order(order: Order, new_date: datetime, force: bool=False, user: User
         change(was_expired=False)
     else:
         with order.event.lock() as now_dt:
-            is_available = order._is_still_available(now_dt, count_waitinglist=False)
-            if is_available is True or force is True:
+            is_available = order._is_still_available(now_dt, count_waitinglist=False, force=force)
+            if is_available is True:
                 change(was_expired=True)
             else:
                 raise OrderError(is_available)
@@ -410,6 +414,10 @@ def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device
                 else:
                     gc.transactions.create(value=-position.price, order=order)
 
+            for m in position.granted_memberships.all():
+                m.canceled = True
+                m.save()
+
         if cancellation_fee:
             with order.event.lock():
                 for position in order.positions.all():
@@ -1768,7 +1776,26 @@ class OrderChangeManager:
                     else:
                         gc.transactions.create(value=-op.position.price, order=self.order)
 
+                for m in op.position.granted_memberships.with_usages().all():
+                    m.canceled = True
+                    m.save()
+
                 for opa in op.position.addons.all():
+                    for gc in opa.issued_gift_cards.all():
+                        gc = GiftCard.objects.select_for_update().get(pk=gc.pk)
+                        if gc.value < opa.position.price:
+                            raise OrderError(_(
+                                'A position can not be canceled since the gift card {card} purchased in this order has '
+                                'already been redeemed.').format(
+                                card=gc.secret
+                            ))
+                        else:
+                            gc.transactions.create(value=-opa.position.price, order=self.order)
+
+                    for m in opa.granted_memberships.with_usages().all():
+                        m.canceled = True
+                        m.save()
+
                     self.order.log_action('pretix.event.order.changed.cancel', user=self.user, auth=self.auth, data={
                         'position': opa.pk,
                         'positionid': opa.positionid,

src/pretix/base/services/seating.py

@@ -19,11 +19,11 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.db.models import Count, Q
+from django.db.models import Count, Exists, OuterRef, Q
 from django.utils.translation import gettext_lazy as _
 
 from pretix.base.i18n import LazyLocaleException
-from pretix.base.models import CartPosition, Seat
+from pretix.base.models import CartPosition, Order, OrderPosition, Seat
 
 
 class SeatProtected(LazyLocaleException):
@@ -41,7 +41,12 @@ class SeatProtected(LazyLocaleException):
 def validate_plan_change(event, subevent, plan):
     current_taken_seats = set(
         event.seats.select_related('product').annotate(
-            has_op=Count('orderposition')
+            has_op=Exists(OrderPosition.all.filter(
+                seat=OuterRef('pk'),
+                canceled=False,
+            ).exclude(
+                order__status=(Order.STATUS_CANCELED, Order.STATUS_EXPIRED)
+            ))
         ).annotate(has_v=Count('vouchers')).filter(
             subevent=subevent,
         ).filter(
@@ -60,7 +65,13 @@ def validate_plan_change(event, subevent, plan):
 def generate_seats(event, subevent, plan, mapping, blocked_guids=None):
     current_seats = {}
     for s in event.seats.select_related('product').annotate(
-            has_op=Count('orderposition'), has_v=Count('vouchers')
+        has_op=Exists(OrderPosition.all.filter(
+            seat=OuterRef('pk'),
+            canceled=False,
+        ).exclude(
+            order__status=Order.STATUS_CANCELED
+        )),
+        has_v=Count('vouchers')
     ).filter(subevent=subevent).order_by():
         if s.seat_guid in current_seats:
             s.delete()  # Duplicates should not exist
@@ -122,4 +133,8 @@ def generate_seats(event, subevent, plan, mapping, blocked_guids=None):
 
     Seat.objects.bulk_create(create_seats)
     CartPosition.objects.filter(seat__in=[s.pk for s in current_seats.values()]).delete()
+    OrderPosition.all.filter(
+        Q(canceled=True) | Q(order__status=Order.STATUS_CANCELED),
+        seat__in=[s.pk for s in current_seats.values()],
+    ).update(seat=None)
     Seat.objects.filter(pk__in=[s.pk for s in current_seats.values()]).delete()

src/pretix/base/services/stats.py

@@ -37,7 +37,8 @@ from decimal import Decimal
 from typing import Any, Dict, Iterable, List, Tuple
 
 from django.db.models import (
-    Case, Count, DateTimeField, F, Max, OuterRef, Subquery, Sum, Value, When,
+    Case, Count, DateTimeField, F, Max, OuterRef, QuerySet, Subquery, Sum,
+    Value, When,
 )
 from django.utils.timezone import make_aware
 from django.utils.translation import gettext_lazy as _
@@ -120,7 +121,9 @@ def order_overview(
     ).order_by('category__position', 'category_id', 'position', 'name')
 
     qs = OrderPosition.all
-    if subevent:
+    if isinstance(subevent, (list, QuerySet)):
+        qs = qs.filter(subevent__in=subevent)
+    elif subevent:
         qs = qs.filter(subevent=subevent)
     if admission_only:
         qs = qs.filter(item__admission=True)
@@ -229,7 +232,7 @@ def order_overview(
     payment_cat_obj.name = _('Fees')
     payment_items = []
 
-    if not subevent and fees:
+    if subevent is None and fees:
         qs = OrderFee.all.filter(
             order__event=event
         ).annotate(

src/pretix/base/settings.py

@@ -503,7 +503,7 @@ DEFAULTS = {
         'type': int,
         'form_class': forms.IntegerField,
         'serializer_class': serializers.IntegerField,
-        'form_kwags': dict(
+        'form_kwargs': dict(
             min_value=0,
             label=_("Reservation period"),
             help_text=_("The number of minutes the items in a user's cart are reserved for this user."),
@@ -744,6 +744,18 @@ DEFAULTS = {
                         "changes made through the backend."),
         )
     },
+    'invoice_regenerate_allowed': {
+        'default': 'False',
+        'type': bool,
+        'form_class': forms.BooleanField,
+        'serializer_class': serializers.BooleanField,
+        'form_kwargs': dict(
+            label=_("Allow to update existing invoices"),
+            help_text=_("By default, invoices can never again be changed once they are issued. In most countries, we "
+                        "recommend to leave this option turned off and always issue a new invoice if a change needs "
+                        "to be made."),
+        )
+    },
     'invoice_generate_sales_channels': {
         'default': json.dumps(['web']),
         'type': list

src/pretix/base/signals.py

@@ -454,7 +454,9 @@ Arguments: ``checkin``
 
 This signal is sent out every time a check-in is created (i.e. an order position is marked as
 checked in). It is not send if the position was already checked in and is force-checked-in a second time.
-The check-in object is given as the first argument
+The check-in object is given as the first argument.
+
+For backwards compatibility reasons, this signal is only sent when a **successful** scan is saved.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
@@ -507,7 +509,7 @@ requiredaction_display = EventPluginSignal()
 
 event_copy_data = EventPluginSignal()
 """
-Arguments: "other", ``tax_map``, ``category_map``, ``item_map``, ``question_map``, ``variation_map``, ``checkin_list_map``
+Arguments: "other", ``tax_map``, ``category_map``, ``item_map``, ``question_map``, ``variation_map``, ``checkin_list_map``, ``quota_map``
 
 This signal is sent out when a new event is created as a clone of an existing event, i.e.
 the settings from the older event are copied to the newer one. You can listen to this
@@ -518,7 +520,7 @@ but you might need to modify that data.
 
 The ``sender`` keyword argument will contain the event of the **new** event. The ``other``
 keyword argument will contain the event to **copy from**. The keyword arguments
-``tax_map``, ``category_map``, ``item_map``, ``question_map``, ``variation_map`` and
+``tax_map``, ``category_map``, ``item_map``, ``question_map``, ``quota_map``, ``variation_map`` and
 ``checkin_list_map`` contain mappings from object IDs in the original event to objects
 in the new event of the respective types.
 """

src/pretix/base/templates/500.html

@@ -22,6 +22,5 @@
             <a id='goback' href='#'>{% trans "Take a step back" %}</a>
             &middot; <a id='reload' href='#'>{% trans "Try again" %}</a>
         </p>
-        <img src="{% static "pretixbase/img/pretix-logo.svg" %}" class="logo"/>
     </div>
 {% endblock %}

src/pretix/base/templates/pretixbase/email/base.html

@@ -11,19 +11,23 @@
             background-position: top;
             background-repeat: repeat-x;
             font-family: "Open Sans", "OpenSans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-            font-size: 14px;
-            line-height: 20px;
+            font-size: 16px;
+            line-height: 22px;
             color: #333;
             margin: 0;
             padding-top: 20px;
         }
 
-        table.layout > tr > td {
+        table.layout > tr > td,
+        table.layout > tbody > tr > td,
+        table.layout > thead > tr > td {
             background-color: white;
             padding: 0;
         }
 
-        table.layout > tr > td.header {
+        table.layout > tr > td.header,
+        table.layout > tbody > tr > td.header,
+        table.layout > thead > tr > td.header {
             padding: 0 20px;
             text-align: center;
         }
@@ -151,10 +155,14 @@
             font-size: 12px;
         }
 
-        .cart-table > tr > td:first-child {
+        .cart-table > tr > td:first-child,
+        .cart-table > tbody > tr > td:first-child,
+        .cart-table > thead > tr > td:first-child {
             width: 40px;
         }
-        .order-details > tr > td:first-child {
+        .order-details > tr > td:first-child,
+        .order-details > tbody > tr > td:first-child,
+        .order-details > thead > tr > td:first-child {
             width: 20%;
         }
         .order-details td {

src/pretix/base/templates/pretixbase/email/simple_logo.html

@@ -1,35 +1,47 @@
 {% load eventurl %}
 {% load i18n %}
 {% load thumb %}
-
-<!DOCTYPE html>
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, user-scalable=false">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>{{subject}}</title>
+<!--[if gte mso 9]><xml>
+<o:OfficeDocumentSettings>
+<o:AllowPNG/>
+<o:PixelsPerInch>96</o:PixelsPerInch>
+</o:OfficeDocumentSettings>
+</xml><![endif]-->
     <style type="text/css">
         body {
             background-color: #eee;
             background-position: top;
             background-repeat: repeat-x;
             font-family: "Open Sans", "OpenSans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-            font-size: 14px;
-            line-height: 20px;
+            font-size: 16px;
+            line-height: 1.4;
             color: #333;
             margin: 0;
             padding-top: 20px;
         }
 
-        table.layout > tr > td {
+        table.layout > tr > td,
+        table.layout > tbody > tr > td,
+        table.layout > thead > tr > td {
             background-color: white;
             padding: 0;
         }
 
-        table.layout > tr > td.logo {
+        table.layout > tr > td.logo,
+        table.layout > tbody > tr > td.logo,
+        table.layout > thead > tr > td.logo {
             padding: 20px 0 0 0;
         }
 
-        table.layout > tr > td.header {
+        table.layout > tr > td.header,
+        table.layout > tbody > tr > td.header,
+        table.layout > thead > tr > td.header {
             padding: 0 20px;
             text-align: center;
         }
@@ -130,7 +142,9 @@
             vertical-align: top;
             text-align: left;
         }
-        table.layout > tr > td.containertd {
+        table.layout > tr > td.containertd,
+        table.layout > tbody > tr > td.containertd,
+        table.layout > thead > tr > td.containertd {
             padding: 15px 0;
         }
 
@@ -162,10 +176,14 @@
             font-size: 12px;
         }
 
-        .cart-table > tr > td:first-child {
+        .cart-table > tr > td:first-child,
+        .cart-table > tbody > tr > td:first-child,
+        .cart-table > thead > tr > td:first-child {
             width: 40px;
         }
-        .order-details > tr > td:first-child {
+        .order-details > tr > td:first-child,
+        .order-details > tbody > tr > td:first-child,
+        .order-details > thead > tr > td:first-child {
             width: 20%;
         }
         .order-details td {
@@ -196,21 +214,17 @@
     <table width="100%"><tr><td align="center">
     <table width="600"><tr><td align="center"
     <![endif]-->
-    <table class="layout" width="600" border="0" cellspacing="0">
+    <table class="layout" style="max-width:600px" border="0" cellspacing="0">
         {% if event.settings.logo_image %}
-            <!--[if !mso]><!-- -->
             <tr>
                 <td style="line-height: 0; {% if event.settings.logo_image_large %}padding: 0;{% endif %}" align="center" class="logo">
                     {% if event.settings.logo_image_large %}
-                        <img src="{% if event.settings.logo_image|thumb:'1170x5000'|first == '/' %}{{ site_url }}{% endif %}{{ event.settings.logo_image|thumb:'1170x5000' }}" alt="{{ event.name }}"
-                             style="height: auto; max-width: 100%;" />
+                        <img src="{% if event.settings.logo_image|thumb:'600_x5000'|first == '/' %}{{ site_url }}{% endif %}{{ event.settings.logo_image|thumb:'600_x5000' }}" alt="{{ event.name }}" style="width:100%" />
                     {% else %}
-                        <img src="{% if event.settings.logo_image|thumb:'5000x120'|first == '/' %}{{ site_url }}{% endif %}{{ event.settings.logo_image|thumb:'5000x120' }}" alt="{{ event.name }}"
-                                style="height: auto; max-width: 100%;" />
+                        <img src="{% if event.settings.logo_image|thumb:'600_x120'|first == '/' %}{{ site_url }}{% endif %}{{ event.settings.logo_image|thumb:'600_x120' }}" alt="{{ event.name }}" style="width:100%" />
                     {% endif %}
                 </td>
             </tr>
-            <!--<![endif]-->
         {% endif %}
         <tr>
             <td class="header" align="center">

src/pretix/base/templatetags/cache_large.py

@@ -0,0 +1,56 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from django.conf import settings
+from django.template import Library, Node, TemplateSyntaxError, Variable
+from django.templatetags.cache import CacheNode
+
+register = Library()
+
+
+class DummyNode(Node):
+    def __init__(self, nodelist, *args):
+        self.nodelist = nodelist
+
+    def render(self, context):
+        value = self.nodelist.render(context)
+        return value
+
+
+@register.tag('cache_large')
+def do_cache(parser, token):
+    nodelist = parser.parse(('endcache_large',))
+    parser.delete_first_token()
+    tokens = token.split_contents()
+    if len(tokens) < 3:
+        raise TemplateSyntaxError("'%r' tag requires at least 2 arguments." % tokens[0])
+
+    if not settings.CACHE_LARGE_VALUES_ALLOWED:
+        return DummyNode(
+            nodelist,
+        )
+
+    return CacheNode(
+        nodelist, parser.compile_filter(tokens[1]),
+        tokens[2],  # fragment_name can't be a variable.
+        [parser.compile_filter(t) for t in tokens[3:]],
+        Variable(repr(settings.CACHE_LARGE_VALUES_ALIAS)),
+    )

src/pretix/base/templatetags/rich_text.py

@@ -43,6 +43,7 @@ from django import template
 from django.conf import settings
 from django.core import signing
 from django.urls import reverse
+from django.utils.functional import SimpleLazyObject
 from django.utils.http import url_has_allowed_host_and_scheme
 from django.utils.safestring import mark_safe
 from tlds import tld_set
@@ -100,9 +101,9 @@ ALLOWED_ATTRIBUTES = {
 
 ALLOWED_PROTOCOLS = ['http', 'https', 'mailto', 'tel']
 
-URL_RE = build_url_re(tlds=sorted(tld_set, key=len, reverse=True))
+URL_RE = SimpleLazyObject(lambda: build_url_re(tlds=sorted(tld_set, key=len, reverse=True)))
 
-EMAIL_RE = build_email_re(tlds=sorted(tld_set, key=len, reverse=True))
+EMAIL_RE = SimpleLazyObject(lambda: build_email_re(tlds=sorted(tld_set, key=len, reverse=True)))
 
 
 def safelink_callback(attrs, new=False):

src/pretix/base/views/mixins.py

@@ -93,21 +93,21 @@ class BaseQuestionsViewMixin:
             for overrides in override_sets:
                 for question_name, question_field in form.fields.items():
                     if hasattr(question_field, 'question'):
-                        if question_field.question.identifier in overrides:
-                            if 'initial' in overrides[question_field.question.identifier]:
-                                question_field.initial = overrides[question_field.question.identifier]['initial']
-                            if 'disabled' in overrides[question_field.question.identifier]:
-                                question_field.disabled = overrides[question_field.question.identifier]['disabled']
-                            if 'validators' in overrides[question_field.question.identifier]:
-                                question_field.validators += overrides[question_field.question.identifier]['validators']
+                        src = overrides.get(question_field.question.identifier)
                     else:
-                        if question_name in overrides:
-                            if 'initial' in overrides[question_name]:
-                                question_field.initial = overrides[question_name]['initial']
-                            if 'disabled' in overrides[question_name]:
-                                question_field.disabled = overrides[question_name]['disabled']
-                            if 'validators' in overrides[question_name]:
-                                question_field.validators += overrides[question_name]['validators']
+                        src = overrides.get(question_name)
+                    if not src:
+                        continue
+
+                    if 'disabled' in src:
+                        question_field.disabled = src['disabled']
+                    if 'initial' in src:
+                        if question_field.disabled:
+                            question_field.initial = src['initial']
+                        else:
+                            question_field.initial = getattr(question_field, 'initial', None) or src['initial']
+                    if 'validators' in src:
+                        question_field.validators += src['validators']
 
             if len(form.fields) > 0:
                 formlist.append(form)

src/pretix/base/views/tasks.py

@@ -24,6 +24,7 @@ from importlib import import_module
 
 import celery.exceptions
 import pytz
+from celery import states
 from celery.result import AsyncResult
 from django.conf import settings
 from django.contrib import messages
@@ -61,7 +62,8 @@ class AsyncMixin:
         return {}
 
     def _return_ajax_result(self, res, timeout=.5):
-        if not res.ready():
+        ready = res.ready()
+        if not ready:
             try:
                 res.get(timeout=timeout, propagate=False)
             except celery.exceptions.TimeoutError:
@@ -75,7 +77,7 @@ class AsyncMixin:
                 })
                 return data
 
-        ready = res.ready()
+        state, info = res.state, res.info
         data = self._ajax_response_data()
         data.update({
             'async_id': res.id,
@@ -83,32 +85,32 @@ class AsyncMixin:
             'started': False,
         })
         if ready:
-            if res.successful() and not isinstance(res.info, Exception):
-                smes = self.get_success_message(res.info)
+            if state == states.SUCCESS and not isinstance(info, Exception):
+                smes = self.get_success_message(info)
                 if smes:
                     messages.success(self.request, smes)
                 # TODO: Do not store message if the ajax client states that it will not redirect
                 # but handle the message itself
                 data.update({
-                    'redirect': self.get_success_url(res.info),
+                    'redirect': self.get_success_url(info),
                     'success': True,
-                    'message': str(self.get_success_message(res.info))
+                    'message': str(self.get_success_message(info))
                 })
             else:
-                messages.error(self.request, self.get_error_message(res.info))
+                messages.error(self.request, self.get_error_message(info))
                 # TODO: Do not store message if the ajax client states that it will not redirect
                 # but handle the message itself
                 data.update({
                     'redirect': self.get_error_url(),
                     'success': False,
-                    'message': str(self.get_error_message(res.info))
+                    'message': str(self.get_error_message(info))
                 })
-        elif res.state == 'PROGRESS':
+        elif state == 'PROGRESS':
             data.update({
                 'started': True,
-                'percentage': res.result.get('value', 0)
+                'percentage': info.get('value', 0) if isinstance(info, dict) else 0
             })
-        elif res.state == 'STARTED':
+        elif state == 'STARTED':
             data.update({
                 'started': True,
             })
@@ -205,11 +207,11 @@ class AsyncFormView(AsyncMixin, FormView):
     known_errortypes = ['ValidationError']
 
     def __init_subclass__(cls):
-        def async_execute(self, *, request_path, form_kwargs, locale, tz, organizer=None, event=None, user=None, session_key=None):
+        def async_execute(self, *, request_path, query_string, form_kwargs, locale, tz, organizer=None, event=None, user=None, session_key=None):
             view_instance = cls()
             form_kwargs['data'] = QueryDict(form_kwargs['data'])
             req = RequestFactory().post(
-                request_path,
+                request_path + '?' + query_string,
                 data=form_kwargs['data'].urlencode(),
                 content_type='application/x-www-form-urlencoded'
             )
@@ -271,6 +273,7 @@ class AsyncFormView(AsyncMixin, FormView):
         form_kwargs.pop('event', None)
         kwargs = {
             'request_path': self.request.path,
+            'query_string': self.request.GET.urlencode(),
             'form_kwargs': form_kwargs,
             'locale': get_language(),
             'tz': get_current_timezone().zone,

src/pretix/control/forms/__init__.py

@@ -153,7 +153,7 @@ class CachedFileInput(forms.ClearableFileInput):
 
         @property
         def is_img(self):
-            return any(self.file.filename.lower().endswith(e) for e in ('.jpg', '.jpeg', '.png', '.gif'))
+            return False  # thumbnailing doesn't work since the file isn't available publicly
 
         def __str__(self):
             return self.file.filename

src/pretix/control/forms/event.py

@@ -110,7 +110,9 @@ class EventWizardFoundationForm(forms.Form):
         self.fields['organizer'].widget.choices = self.fields['organizer'].choices
 
         if len(self.fields['organizer'].choices) == 1:
-            self.fields['organizer'].initial = self.fields['organizer'].queryset.first()
+            organizer = self.fields['organizer'].queryset.first()
+            self.fields['organizer'].initial = organizer
+            self.fields['locales'].initial = organizer.settings.locales
 
 
 class EventWizardBasicsForm(I18nModelForm):
@@ -176,7 +178,7 @@ class EventWizardBasicsForm(I18nModelForm):
         self.locales = kwargs.get('locales')
         self.has_subevents = kwargs.pop('has_subevents')
         self.user = kwargs.pop('user')
-        kwargs.pop('session')
+        self.session = kwargs.pop('session')
         super().__init__(*args, **kwargs)
         if 'timezone' not in self.initial:
             self.initial['timezone'] = get_current_timezone_name()
@@ -191,7 +193,7 @@ class EventWizardBasicsForm(I18nModelForm):
             del self.fields['presale_end']
             del self.fields['date_to']
 
-        if self.has_control_rights(self.user, self.organizer):
+        if self.has_control_rights(self.user, self.organizer, self.session):
             del self.fields['team']
         else:
             self.fields['team'].queryset = self.user.teams.filter(organizer=self.organizer)
@@ -233,11 +235,11 @@ class EventWizardBasicsForm(I18nModelForm):
         return slug
 
     @staticmethod
-    def has_control_rights(user, organizer):
+    def has_control_rights(user, organizer, session):
         return user.teams.filter(
             organizer=organizer, all_events=True, can_change_event_settings=True, can_change_items=True,
             can_change_orders=True, can_change_vouchers=True
-        ).exists() or user.is_staff
+        ).exists() or user.has_active_staff_session(session.session_key)
 
 
 class EventChoiceMixin:

src/pretix/control/forms/filter.py

@@ -42,21 +42,23 @@ from django.conf import settings
 from django.db.models import (
     Count, Exists, F, Max, Model, OrderBy, OuterRef, Q, QuerySet,
 )
-from django.db.models.functions import Coalesce, ExtractWeekDay
+from django.db.models.functions import Coalesce, ExtractWeekDay, Upper
 from django.urls import reverse, reverse_lazy
 from django.utils.formats import date_format, localize
 from django.utils.functional import cached_property
 from django.utils.timezone import get_current_timezone, make_aware, now
 from django.utils.translation import gettext, gettext_lazy as _, pgettext_lazy
+from django_scopes.forms import SafeModelChoiceField
 
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.forms.widgets import (
-    DatePickerWidget, SplitDateTimePickerWidget,
+    DatePickerWidget, SplitDateTimePickerWidget, TimePickerWidget,
 )
 from pretix.base.models import (
-    Checkin, Event, EventMetaProperty, EventMetaValue, Invoice, InvoiceAddress,
-    Item, Order, OrderPayment, OrderPosition, OrderRefund, Organizer, Question,
-    QuestionAnswer, SubEvent,
+    Checkin, CheckinList, Device, Event, EventMetaProperty, EventMetaValue,
+    Gate, Invoice, InvoiceAddress, Item, Order, OrderPayment, OrderPosition,
+    OrderRefund, Organizer, Question, QuestionAnswer, SubEvent, Team,
+    TeamAPIToken, TeamInvite,
 )
 from pretix.base.signals import register_payment_providers
 from pretix.control.forms.widgets import Select2
@@ -204,6 +206,10 @@ class OrderFilterForm(FilterForm):
                 ('na', _('Approved, payment pending')),
                 ('pa', _('Approval pending')),
             )),
+            (_('Follow-up date'), (
+                ('custom_followup_at', _('Follow-up configured')),
+                ('custom_followup_due', _('Follow-up due')),
+            )),
             ('testmode', _('Test mode')),
         ),
         required=False,
@@ -298,8 +304,8 @@ class OrderFilterForm(FilterForm):
             elif s == 'underpaid':
                 qs = Order.annotate_overpayments(qs, refunds=False, results=False, sums=True)
                 qs = qs.filter(
-                    status=Order.STATUS_PAID,
-                    pending_sum_t__gt=0
+                    Q(status=Order.STATUS_PAID, pending_sum_t__gt=0) |
+                    Q(status=Order.STATUS_CANCELED, pending_sum_rc__gt=0)
                 )
             elif s == 'cni':
                 i = Invoice.objects.filter(
@@ -323,6 +329,14 @@ class OrderFilterForm(FilterForm):
                     status=Order.STATUS_PENDING,
                     require_approval=False
                 )
+            elif s == 'custom_followup_at':
+                qs = qs.filter(
+                    custom_followup_at__isnull=False
+                )
+            elif s == 'custom_followup_due':
+                qs = qs.filter(
+                    custom_followup_at__lte=now().astimezone(get_current_timezone()).date()
+                )
             elif s == 'testmode':
                 qs = qs.filter(
                     testmode=True
@@ -818,17 +832,30 @@ class SubEventFilterForm(FilterForm):
     date_from = forms.DateField(
         label=_('Date from'),
         required=False,
-        widget=DatePickerWidget,
+        widget=DatePickerWidget({
+            'placeholder': _('Date from'),
+        }),
     )
     date_until = forms.DateField(
         label=_('Date until'),
         required=False,
-        widget=DatePickerWidget,
+        widget=DatePickerWidget({
+            'placeholder': _('Date until'),
+        }),
     )
-    weekday = forms.ChoiceField(
+    time_from = forms.TimeField(
+        label=_('Start time from'),
+        required=False,
+        widget=TimePickerWidget({}),
+    )
+    time_until = forms.TimeField(
+        label=_('Start time until'),
+        required=False,
+        widget=TimePickerWidget({}),
+    )
+    weekday = forms.MultipleChoiceField(
         label=_('Weekday'),
         choices=(
-            ('', _('All days')),
             ('2', _('Monday')),
             ('3', _('Tuesday')),
             ('4', _('Wednesday')),
@@ -837,6 +864,7 @@ class SubEventFilterForm(FilterForm):
             ('7', _('Saturday')),
             ('1', _('Sunday')),
         ),
+        widget=forms.CheckboxSelectMultiple,
         required=False
     )
     query = forms.CharField(
@@ -885,7 +913,7 @@ class SubEventFilterForm(FilterForm):
             )
 
         if fdata.get('weekday'):
-            qs = qs.annotate(wday=ExtractWeekDay('date_from')).filter(wday=fdata.get('weekday'))
+            qs = qs.annotate(wday=ExtractWeekDay('date_from')).filter(wday__in=fdata.get('weekday'))
 
         if fdata.get('query'):
             query = fdata.get('query')
@@ -909,6 +937,11 @@ class SubEventFilterForm(FilterForm):
             ), get_current_timezone())
             qs = qs.filter(date_from__gte=date_start)
 
+        if fdata.get('time_until'):
+            qs = qs.filter(date_from__time__lte=fdata.get('time_until'))
+        if fdata.get('time_from'):
+            qs = qs.filter(date_from__time__gte=fdata.get('time_from'))
+
         if fdata.get('ordering'):
             qs = qs.order_by(self.get_order_by())
         else:
@@ -968,7 +1001,7 @@ class GiftCardFilterForm(FilterForm):
         required=False
     )
     state = forms.ChoiceField(
-        label=_('Empty'),
+        label=_('Status'),
         choices=(
             ('', _('All')),
             ('empty', _('Empty')),
@@ -1036,6 +1069,26 @@ class CustomerFilterForm(FilterForm):
         }),
         required=False
     )
+    status = forms.ChoiceField(
+        label=_('Status'),
+        required=False,
+        choices=(
+            ('', _('All')),
+            ('active', _('active')),
+            ('disabled', _('disabled')),
+            ('unverified', _('not yet activated')),
+        )
+    )
+    memberships = forms.ChoiceField(
+        label=_('Memberships'),
+        required=False,
+        choices=(
+            ('', _('All')),
+            ('no', _('Has no memberships')),
+            ('any', _('Has any membership')),
+            ('valid', _('Has valid membership')),
+        )
+    )
 
     def __init__(self, *args, **kwargs):
         kwargs.pop('request')
@@ -1052,12 +1105,26 @@ class CustomerFilterForm(FilterForm):
                 | Q(identifier__istartswith=query)
             )
 
-            if fdata.get('ordering'):
-                qs = qs.order_by(self.get_order_by())
-            else:
-                qs = qs.order_by('-email')
+        if fdata.get('status') == 'active':
+            qs = qs.filter(is_active=True, is_verified=True)
+        elif fdata.get('status') == 'disabled':
+            qs = qs.filter(is_active=False)
+        elif fdata.get('status') == 'unverified':
+            qs = qs.filter(is_verified=False)
 
-        return qs
+        if fdata.get('memberships') == 'no':
+            qs = qs.filter(memberships__isnull=True)
+        elif fdata.get('memberships') == 'any':
+            qs = qs.filter(memberships__isnull=False)
+        elif fdata.get('memberships') == 'valid':
+            qs = qs.filter(memberships__date_start__lt=now(), memberships__date_end__gt=now(), memberships__canceled=False)
+
+        if fdata.get('ordering'):
+            qs = qs.order_by(self.get_order_by())
+        else:
+            qs = qs.order_by('-email')
+
+        return qs.distinct()
 
 
 class TeamFilterForm(FilterForm):
@@ -1083,11 +1150,25 @@ class TeamFilterForm(FilterForm):
         if fdata.get('query'):
             query = fdata.get('query')
             qs = qs.filter(
-                Q(name__icontains=query)
-                | Q(members__email__icontains=query)
-                | Q(members__fullname__icontains=query)
-                | Q(invites__email__icontains=query)
-                | Q(tokens__name__icontains=query)
+                Q(Exists(
+                    Team.members.through.objects.filter(
+                        Q(user__email__icontains=query) | Q(user__fullname__icontains=query),
+                        team_id=OuterRef('pk'),
+                    )
+                ))
+                | Q(Exists(
+                    TeamInvite.objects.filter(
+                        email__icontains=query,
+                        team_id=OuterRef('pk'),
+                    )
+                ))
+                | Q(Exists(
+                    TeamAPIToken.objects.filter(
+                        name__icontains=query,
+                        team_id=OuterRef('pk'),
+                    )
+                ))
+                | Q(name__icontains=query)
             )
 
         if fdata.get('ordering'):
@@ -1264,7 +1345,7 @@ class EventFilterForm(FilterForm):
             )
 
 
-class CheckInFilterForm(FilterForm):
+class CheckinListAttendeeFilterForm(FilterForm):
     orders = {
         'code': ('order__code', 'item__name'),
         '-code': ('-order__code', '-item__name'),
@@ -1311,6 +1392,24 @@ class CheckInFilterForm(FilterForm):
         required=False,
         empty_label=_('All products')
     )
+    subevent = forms.ModelChoiceField(
+        label=pgettext_lazy('subevent', 'Date'),
+        queryset=SubEvent.objects.none(),
+        required=False,
+        empty_label=pgettext_lazy('subevent', 'All dates')
+    )
+    subevent_from = forms.SplitDateTimeField(
+        widget=SplitDateTimePickerWidget(attrs={
+        }),
+        label=pgettext_lazy('subevent', 'Date start from'),
+        required=False,
+    )
+    subevent_until = forms.SplitDateTimeField(
+        widget=SplitDateTimePickerWidget(attrs={
+        }),
+        label=pgettext_lazy('subevent', 'Date start until'),
+        required=False,
+    )
 
     def __init__(self, *args, **kwargs):
         self.event = kwargs.pop('event')
@@ -1321,6 +1420,24 @@ class CheckInFilterForm(FilterForm):
         else:
             self.fields['item'].queryset = self.list.limit_products.all()
 
+        if self.event.has_subevents:
+            self.fields['subevent'].queryset = self.event.subevents.all()
+            self.fields['subevent'].widget = Select2(
+                attrs={
+                    'data-model-select2': 'event',
+                    'data-select2-url': reverse('control:event.subevents.select2', kwargs={
+                        'event': self.event.slug,
+                        'organizer': self.event.organizer.slug,
+                    }),
+                    'data-placeholder': pgettext_lazy('subevent', 'All dates')
+                }
+            )
+            self.fields['subevent'].widget.choices = self.fields['subevent'].choices
+        else:
+            del self.fields['subevent']
+            del self.fields['subevent_from']
+            del self.fields['subevent_until']
+
     def filter_qs(self, qs):
         fdata = self.cleaned_data
 
@@ -1367,6 +1484,14 @@ class CheckInFilterForm(FilterForm):
         if fdata.get('item'):
             qs = qs.filter(item=fdata.get('item'))
 
+        if fdata.get('subevent'):
+            qs = qs.filter(subevent_id=fdata.get('subevent').pk)
+
+        if fdata.get('subevent_from'):
+            qs = qs.filter(subevent__date_from__gte=fdata.get('subevent_from'))
+        if fdata.get('subevent_until'):
+            qs = qs.filter(subevent__date_from__lte=fdata.get('subevent_until'))
+
         return qs
 
 
@@ -1736,3 +1861,195 @@ class OverviewFilterForm(FilterForm):
             self.fields['subevent'].widget.choices = self.fields['subevent'].choices
         elif 'subevent':
             del self.fields['subevent']
+
+
+class CheckinFilterForm(FilterForm):
+    status = forms.ChoiceField(
+        label=_('Status'),
+        choices=[
+            ('', _('All check-ins')),
+            ('successful', _('Successful check-ins')),
+            ('unsuccessful', _('Unsuccessful check-ins')),
+        ] + list(Checkin.REASONS),
+        required=False
+    )
+    type = forms.ChoiceField(
+        label=_('Scan type'),
+        choices=[
+            ('', _('All directions')),
+        ] + list(Checkin.CHECKIN_TYPES),
+        required=False
+    )
+    itemvar = forms.ChoiceField(
+        label=_("Product"),
+        required=False
+    )
+    device = SafeModelChoiceField(
+        label=_('Device'),
+        empty_label=_('All devices'),
+        queryset=Device.objects.none(),
+        required=False
+    )
+    gate = SafeModelChoiceField(
+        label=_('Gate'),
+        empty_label=_('All gates'),
+        queryset=Gate.objects.none(),
+        required=False
+    )
+    checkin_list = SafeModelChoiceField(queryset=CheckinList.objects.none(), required=False)  # overridden later
+    datetime_from = forms.SplitDateTimeField(
+        widget=SplitDateTimePickerWidget(attrs={
+        }),
+        label=pgettext_lazy('filter', 'Start date'),
+        required=False,
+    )
+    datetime_until = forms.SplitDateTimeField(
+        widget=SplitDateTimePickerWidget(attrs={
+        }),
+        label=pgettext_lazy('filter', 'End date'),
+        required=False,
+    )
+
+    def __init__(self, *args, **kwargs):
+        self.event = kwargs.pop('event')
+        super().__init__(*args, **kwargs)
+
+        self.fields['device'].queryset = self.event.organizer.devices.all()
+        self.fields['gate'].queryset = self.event.organizer.gates.all()
+
+        self.fields['checkin_list'].queryset = self.event.checkin_lists.all()
+        self.fields['checkin_list'].widget = Select2(
+            attrs={
+                'data-model-select2': 'generic',
+                'data-select2-url': reverse('control:event.orders.checkinlists.select2', kwargs={
+                    'event': self.event.slug,
+                    'organizer': self.event.organizer.slug,
+                }),
+                'data-placeholder': _('Check-in list'),
+            }
+        )
+        self.fields['checkin_list'].widget.choices = self.fields['checkin_list'].choices
+        self.fields['checkin_list'].label = _('Check-in list')
+
+        choices = [('', _('All products'))]
+        for i in self.event.items.prefetch_related('variations').all():
+            variations = list(i.variations.all())
+            if variations:
+                choices.append((str(i.pk), _('{product} – Any variation').format(product=i.name)))
+                for v in variations:
+                    choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (i.name, v.value)))
+            else:
+                choices.append((str(i.pk), i.name))
+        self.fields['itemvar'].choices = choices
+
+    def filter_qs(self, qs):
+        fdata = self.cleaned_data
+
+        if fdata.get('status'):
+            s = fdata.get('status')
+            if s == 'successful':
+                qs = qs.filter(successful=True)
+            elif s == 'unsuccessful':
+                qs = qs.filter(successful=False)
+            elif s:
+                qs = qs.filter(successful=False, error_reason=s)
+
+        if fdata.get('type'):
+            qs = qs.filter(type=fdata.get('type'))
+
+        if fdata.get('itemvar'):
+            if '-' in fdata.get('itemvar'):
+                qs = qs.alias(
+                    item_id=Coalesce('raw_item_id', 'position__item_id'),
+                    variation_id=Coalesce('raw_variation_id', 'position__variation_id'),
+                ).filter(
+                    item_id=fdata.get('itemvar').split('-')[0],
+                    variation_id=fdata.get('itemvar').split('-')[1]
+                )
+            else:
+                qs = qs.alias(
+                    item_id=Coalesce('raw_item_id', 'position__item_id'),
+                ).filter(item_id=fdata.get('itemvar'))
+
+        if fdata.get('device'):
+            qs = qs.filter(device_id=fdata.get('device').pk)
+
+        if fdata.get('gate'):
+            qs = qs.filter(gate_id=fdata.get('gate').pk)
+
+        if fdata.get('checkin_list'):
+            qs = qs.filter(list_id=fdata.get('checkin_list').pk)
+
+        if fdata.get('datetime_from'):
+            qs = qs.filter(datetime__gte=fdata.get('datetime_from'))
+
+        if fdata.get('datetime_until'):
+            qs = qs.filter(datetime__lte=fdata.get('datetime_until'))
+
+        return qs
+
+
+class DeviceFilterForm(FilterForm):
+    orders = {
+        'name': Upper('name'),
+        '-name': Upper('name').desc(),
+        'device_id': 'device_id',
+        'initialized': F('initialized').asc(nulls_last=True),
+        '-initialized': F('initialized').desc(nulls_first=True),
+    }
+    query = forms.CharField(
+        label=_('Search query'),
+        widget=forms.TextInput(attrs={
+            'placeholder': _('Search query'),
+            'autofocus': 'autofocus'
+        }),
+        required=False
+    )
+    gate = forms.ModelChoiceField(
+        queryset=Gate.objects.none(),
+        label=_('Gate'),
+        empty_label=_('All gates'),
+        required=False,
+    )
+    software_brand = forms.ChoiceField(
+        label=_('Software'),
+        choices=[
+            ('', _('All')),
+        ],
+        required=False,
+    )
+
+    def __init__(self, *args, **kwargs):
+        request = kwargs.pop('request')
+        super().__init__(*args, **kwargs)
+        self.fields['gate'].queryset = request.organizer.gates.all()
+        self.fields['software_brand'].choices = [
+            ('', _('All')),
+        ] + [
+            (f['software_brand'], f['software_brand']) for f in
+            request.organizer.devices.order_by().values('software_brand').annotate(c=Count('*'))
+            if f['software_brand']
+        ]
+
+    def filter_qs(self, qs):
+        fdata = self.cleaned_data
+
+        if fdata.get('query'):
+            query = fdata.get('query')
+            qs = qs.filter(
+                Q(name__icontains=query)
+                | Q(unique_serial__icontains=query)
+                | Q(hardware_brand__icontains=query)
+                | Q(hardware_model__icontains=query)
+                | Q(software_brand__icontains=query)
+            )
+
+        if fdata.get('gate'):
+            qs = qs.filter(gate=fdata['gate'])
+
+        if fdata.get('ordering'):
+            qs = qs.order_by(self.get_order_by())
+        else:
+            qs = qs.order_by('-device_id')
+
+        return qs

src/pretix/control/forms/orders.py

@@ -230,12 +230,13 @@ class ExporterForm(forms.Form):
 class CommentForm(I18nModelForm):
     class Meta:
         model = Order
-        fields = ['comment', 'checkin_attention']
+        fields = ['comment', 'checkin_attention', 'custom_followup_at']
         widgets = {
             'comment': forms.Textarea(attrs={
                 'rows': 3,
                 'class': 'helper-width-100',
             }),
+            'custom_followup_at': DatePickerWidget(),
         }