Bump to 4.3.1

Currently translated at 100.0% (4413 of 4413 strings)

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

powered by weblate

.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

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

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

deployment/docker/nginx.conf

@@ -16,7 +16,6 @@ http {
 	charset utf-8;
 	tcp_nopush on;
 	tcp_nodelay on;
-	client_max_body_size 100M;
 
 	log_format private '[$time_local] $host "$request" $status $body_bytes_sent';
 
@@ -66,9 +65,18 @@ http {
             access_log off;
             expires 365d;
             add_header Cache-Control "public";
+            add_header Access-Control-Allow-Origin "*";
+            gzip on;
         }
         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

@@ -434,3 +434,19 @@ pretix can make use of some external tools if they are installed. Currently, the
 
 .. _Python documentation: https://docs.python.org/3/library/configparser.html?highlight=configparser#supported-ini-file-structure
 .. _Celery documentation: http://docs.celeryproject.org/en/latest/userguide/configuration.html
+
+Maximum upload file sizes
+-------------------------
+
+You can configure the maximum file size for uploading various files::
+
+    [pretix_file_upload]
+    ; Max upload size for images in MiB, defaults to 10 MiB
+    max_size_image = 12
+    ; Max upload size for favicons in MiB, defaults to 1 MiB
+    max_size_favicon = 2
+    ; Max upload size for email attachments in MiB, defaults to 10 MiB
+    max_size_email_attachment = 15
+    ; Max upload size for other files in MiB, defaults to 10 MiB
+    ; This includes all file upload type order questions
+    max_size_other = 100

doc/admin/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
 -------------
 
@@ -183,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 \
@@ -233,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`_.
@@ -72,7 +72,7 @@ To build and run pretix, you will need the following debian packages::
 
     # apt-get install git build-essential python-dev python3-venv python3 python3-pip \
                       python3-dev libxml2-dev libxslt1-dev libffi-dev zlib1g-dev libssl-dev \
-                      gettext libpq-dev libmariadbclient-dev libjpeg-dev libopenjp2-7-dev
+                      gettext libpq-dev libmariadb-dev libjpeg-dev libopenjp2-7-dev
 
 Config file
 -----------
@@ -237,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;
@@ -285,8 +285,7 @@ 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 --upgrade-strategy eager pretix gunicorn

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

@@ -604,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
@@ -618,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/item_variations.rst

@@ -26,6 +26,18 @@ description                           multi-lingual string       A public descri
 position                              integer                    An integer, used for sorting
 require_membership                    boolean                    If ``true``, booking this variation requires an active membership.
 require_membership_types              list of integers           Internal IDs of membership types valid if ``require_membership`` is ``true``
+sales_channels                        list of strings            Sales channels this variation is available on, such as
+                                                                 ``"web"`` or ``"resellers"``. Defaults to all existing sales channels.
+                                                                 The item-level list takes precedence, i.e. a sales
+                                                                 channel needs to be on both lists for the item to be
+                                                                 available.
+available_from                        datetime                   The first date time at which this variation can be bought
+                                                                 (or ``null``).
+available_until                       datetime                   The last date time at which this variation can be bought
+                                                                 (or ``null``).
+hide_without_voucher                  boolean                    If ``true``, this variation is only shown during the voucher
+                                                                 redemption process, but not in the normal shop
+                                                                 frontend.
 ===================================== ========================== =======================================================
 
 Endpoints
@@ -64,6 +76,10 @@ Endpoints
             "active": true,
             "require_membership": false,
             "require_membership_types": [],
+            "sales_channels": ["web"],
+            "available_from": null,
+            "available_until": null,
+            "hide_without_voucher": false,
             "description": {
               "en": "Test2"
             },
@@ -129,6 +145,10 @@ Endpoints
         "active": true,
         "require_membership": false,
         "require_membership_types": [],
+        "sales_channels": ["web"],
+        "available_from": null,
+        "available_until": null,
+        "hide_without_voucher": false,
         "description": null,
         "position": 0
       }
@@ -160,6 +180,10 @@ Endpoints
         "active": true,
         "require_membership": false,
         "require_membership_types": [],
+        "sales_channels": ["web"],
+        "available_from": null,
+        "available_until": null,
+        "hide_without_voucher": false,
         "description": null,
         "position": 0
       }
@@ -181,6 +205,10 @@ Endpoints
         "active": true,
         "require_membership": false,
         "require_membership_types": [],
+        "sales_channels": ["web"],
+        "available_from": null,
+        "available_until": null,
+        "hide_without_voucher": false,
         "description": null,
         "position": 0
       }
@@ -233,6 +261,10 @@ Endpoints
         "active": false,
         "require_membership": false,
         "require_membership_types": [],
+        "sales_channels": ["web"],
+        "available_from": null,
+        "available_until": null,
+        "hide_without_voucher": false,
         "description": null,
         "position": 1
       }

doc/api/resources/items.rst

@@ -107,6 +107,18 @@ variations                            list of objects            A list with one
 ├ require_membership                  boolean                    If ``true``, booking this variation requires an active membership.
 ├ require_membership_types            list of integers           Internal IDs of membership types valid if ``require_membership`` is ``true``
                                                                  Markdown syntax or can be ``null``.
+├ sales_channels                      list of strings            Sales channels this variation is available on, such as
+                                                                 ``"web"`` or ``"resellers"``. Defaults to all existing sales channels.
+                                                                 The item-level list takes precedence, i.e. a sales
+                                                                 channel needs to be on both lists for the item to be
+                                                                 available.
+├ available_from                      datetime                   The first date time at which this variation can be bought
+                                                                 (or ``null``).
+├ available_until                     datetime                   The last date time at which this variation can be bought
+                                                                 (or ``null``).
+├ hide_without_voucher                boolean                    If ``true``, this variation is only shown during the voucher
+                                                                 redemption process, but not in the normal shop
+                                                                 frontend.
 └ position                            integer                    An integer, used for sorting
 addons                                list of objects            Definition of add-ons that can be chosen for this item.
                                                                  Only writable during creation,
@@ -230,6 +242,10 @@ Endpoints
                  "active": true,
                  "require_membership": false,
                  "require_membership_types": [],
+                 "sales_channels": ["web"],
+                 "available_from": null,
+                 "available_until": null,
+                 "hide_without_voucher": false,
                  "description": null,
                  "position": 0
               },
@@ -241,6 +257,10 @@ Endpoints
                  "active": true,
                  "require_membership": false,
                  "require_membership_types": [],
+                 "sales_channels": ["web"],
+                 "available_from": null,
+                 "available_until": null,
+                 "hide_without_voucher": false,
                  "description": null,
                  "position": 1
               }
@@ -337,6 +357,10 @@ Endpoints
              "require_membership": false,
              "require_membership_types": [],
              "description": null,
+             "sales_channels": ["web"],
+             "available_from": null,
+             "available_until": null,
+             "hide_without_voucher": false,
              "position": 0
           },
           {
@@ -347,6 +371,10 @@ Endpoints
              "active": true,
              "require_membership": false,
              "require_membership_types": [],
+             "sales_channels": ["web"],
+             "available_from": null,
+             "available_until": null,
+             "hide_without_voucher": false,
              "description": null,
              "position": 1
           }
@@ -422,6 +450,10 @@ Endpoints
              "active": true,
              "require_membership": false,
              "require_membership_types": [],
+             "sales_channels": ["web"],
+             "available_from": null,
+             "available_until": null,
+             "hide_without_voucher": false,
              "description": null,
              "position": 0
           },
@@ -433,6 +465,10 @@ Endpoints
              "active": true,
              "require_membership": false,
              "require_membership_types": [],
+             "sales_channels": ["web"],
+             "available_from": null,
+             "available_until": null,
+             "hide_without_voucher": false,
              "description": null,
              "position": 1
           }
@@ -497,6 +533,10 @@ Endpoints
              "active": true,
              "require_membership": false,
              "require_membership_types": [],
+             "sales_channels": ["web"],
+             "available_from": null,
+             "available_until": null,
+             "hide_without_voucher": false,
              "description": null,
              "position": 0
           },
@@ -508,6 +548,10 @@ Endpoints
              "active": true,
              "require_membership": false,
              "require_membership_types": [],
+             "sales_channels": ["web"],
+             "available_from": null,
+             "available_until": null,
+             "hide_without_voucher": false,
              "description": null,
              "position": 1
           }
@@ -603,6 +647,10 @@ Endpoints
              "active": true,
              "require_membership": false,
              "require_membership_types": [],
+             "sales_channels": ["web"],
+             "available_from": null,
+             "available_until": null,
+             "hide_without_voucher": false,
              "description": null,
              "position": 0
           },
@@ -614,6 +662,10 @@ Endpoints
              "active": true,
              "require_membership": false,
              "require_membership_types": [],
+             "sales_channels": ["web"],
+             "available_from": null,
+             "available_until": null,
+             "hide_without_voucher": false,
              "description": null,
              "position": 1
           }

doc/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/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/user/events/widget.rst

@@ -4,8 +4,7 @@ Embeddable Widget
 =================
 
 If you want to show your ticket shop on your event website or blog, you can use our JavaScript widget. This way,
-users will not need to leave your site to buy their ticket in most cases. The widget will still open a new tab
-for the checkout if the user is on a mobile device.
+users will not need to leave your site to buy their ticket in most cases.
 
 To obtain the correct HTML code for embedding your event into your website, we recommend that you go to the "Widget"
 tab of your event's settings. You can specify some optional settings there (for example the language of the widget)

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.1.0"
+__version__ = "4.3.1"

src/pretix/api/auth/devicesecurity.py

@@ -70,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'),
@@ -99,6 +99,36 @@ class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
     )
 
 
+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'),
+        ('GET', 'api-v1:event.settings'),
+        ('POST', 'api-v1:upload'),
+    )
+
+
 class PretixPosSecurityProfile(AllowListSecurityProfile):
     identifier = 'pretixpos'
     verbose_name = _('pretixPOS')
@@ -133,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'),
@@ -160,6 +191,7 @@ DEVICE_SECURITY_PROFILES = {
         FullAccessSecurityProfile,
         PretixScanSecurityProfile,
         PretixScanNoSyncSecurityProfile,
+        PretixScanNoSyncNoSearchSecurityProfile,
         PretixPosSecurityProfile,
     )
 }

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/migrations/0007_alter_webhookcall_target_url.py

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

src/pretix/api/models.py

@@ -95,7 +95,7 @@ class OAuthRefreshToken(AbstractRefreshToken):
 class WebHook(models.Model):
     organizer = models.ForeignKey('pretixbase.Organizer', on_delete=models.CASCADE, related_name='webhooks')
     enabled = models.BooleanField(default=True, verbose_name=_("Enable webhook"))
-    target_url = models.URLField(verbose_name=_("Target URL"))
+    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)
 
@@ -120,7 +120,7 @@ class WebHookEventListener(models.Model):
 class WebHookCall(models.Model):
     webhook = models.ForeignKey('WebHook', on_delete=models.CASCADE, related_name='calls')
     datetime = models.DateTimeField(auto_now_add=True)
-    target_url = models.URLField()
+    target_url = models.URLField(max_length=255)
     action_type = models.CharField(max_length=255)
     is_retry = models.BooleanField(default=False)
     execution_time = models.FloatField(null=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

@@ -54,7 +54,7 @@ from pretix.base.models.items import SubEventItem, SubEventItemVariation
 from pretix.base.services.seating import (
     SeatProtected, generate_seats, validate_plan_change,
 )
-from pretix.base.settings import validate_event_settings
+from pretix.base.settings import LazyI18nStringList, validate_event_settings
 from pretix.base.signals import api_event_settings_fields
 
 logger = logging.getLogger(__name__)
@@ -789,6 +789,10 @@ class EventSettingsSerializer(SettingsSerializer):
         data = super().validate(data)
         settings_dict = self.instance.freeze()
         settings_dict.update(data)
+
+        if data.get('confirm_texts') is not None:
+            data['confirm_texts'] = LazyI18nStringList(data['confirm_texts'])
+
         validate_event_settings(self.event, settings_dict)
         return data
 

src/pretix/api/serializers/item.py

@@ -31,9 +31,10 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
-
+import os.path
 from decimal import Decimal
 
+from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.db.models import QuerySet
@@ -58,7 +59,8 @@ class InlineItemVariationSerializer(I18nAwareModelSerializer):
         model = ItemVariation
         fields = ('id', 'value', 'active', 'description',
                   'position', 'default_price', 'price', 'original_price',
-                  'require_membership', 'require_membership_types',)
+                  'require_membership', 'require_membership_types', 'available_from', 'available_until',
+                  'sales_channels', 'hide_without_voucher',)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -73,7 +75,8 @@ class ItemVariationSerializer(I18nAwareModelSerializer):
         model = ItemVariation
         fields = ('id', 'value', 'active', 'description',
                   'position', 'default_price', 'price', 'original_price',
-                  'require_membership', 'require_membership_types',)
+                  'require_membership', 'require_membership_types', 'available_from', 'available_until',
+                  'sales_channels', 'hide_without_voucher',)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -161,7 +164,7 @@ class ItemSerializer(I18nAwareModelSerializer):
     meta_data = MetaDataField(required=False, source='*')
     picture = UploadedFileField(required=False, allow_null=True, allowed_types=(
         'image/png', 'image/jpeg', 'image/gif'
-    ), max_size=10 * 1024 * 1024)
+    ), max_size=settings.FILE_UPLOAD_MAX_SIZE_IMAGE)
 
     class Meta:
         model = Item
@@ -245,10 +248,13 @@ class ItemSerializer(I18nAwareModelSerializer):
         addons_data = validated_data.pop('addons') if 'addons' in validated_data else {}
         bundles_data = validated_data.pop('bundles') if 'bundles' in validated_data else {}
         meta_data = validated_data.pop('meta_data', None)
+        picture = validated_data.pop('picture', None)
         item = Item.objects.create(**validated_data)
+        if picture:
+            item.picture.save(os.path.basename(picture.name), picture)
 
         for variation_data in variations_data:
-            require_membership_types = variation_data.pop('require_membership_types')
+            require_membership_types = variation_data.pop('require_membership_types', [])
             v = ItemVariation.objects.create(item=item, **variation_data)
             if require_membership_types:
                 v.require_membership_types.add(*require_membership_types)
@@ -269,7 +275,10 @@ class ItemSerializer(I18nAwareModelSerializer):
 
     def update(self, instance, validated_data):
         meta_data = validated_data.pop('meta_data', None)
+        picture = validated_data.pop('picture', None)
         item = super().update(instance, validated_data)
+        if picture:
+            item.picture.save(os.path.basename(picture.name), picture)
 
         # Meta data
         if meta_data is not None:

src/pretix/api/serializers/order.py

@@ -26,6 +26,7 @@ from collections import Counter, defaultdict
 from decimal import Decimal
 
 import pycountry
+from django.conf import settings
 from django.core.files import File
 from django.db.models import F, Q
 from django.utils.timezone import now
@@ -191,7 +192,7 @@ class AnswerSerializer(I18nAwareModelSerializer):
         )
         if cf.type not in allowed_types:
             raise ValidationError('The submitted file "{fid}" has a file type that is not allowed in this field.'.format(fid=data))
-        if cf.file.size > 10 * 1024 * 1024:
+        if cf.file.size > settings.FILE_UPLOAD_MAX_SIZE_OTHER:
             raise ValidationError('The submitted file "{fid}" is too large to be used in this field.'.format(fid=data))
 
         data['options'] = []

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',
@@ -294,6 +295,7 @@ class OrganizerSettingsSerializer(SettingsSerializer):
         'theme_color_background',
         'theme_round_borders',
         'primary_font',
+        'organizer_logo_image_inherit',
         'organizer_logo_image'
     ]
 

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

@@ -20,6 +20,7 @@
 # <https://www.gnu.org/licenses/>.
 #
 import django_filters
+from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.db.models import (
@@ -32,6 +33,7 @@ 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
@@ -421,6 +423,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
             nonce=nonce,
             forced=force,
         )
+        raw_barcode_for_checkin = None
 
         try:
             queryset = self.get_queryset(ignore_status=True, ignore_products=True)
@@ -455,7 +458,41 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                     error_reason=Checkin.REASON_INVALID,
                     **common_checkin_args,
                 )
-                raise Http404()
+
+                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={
@@ -506,7 +543,8 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
                     user=self.request.user,
                     auth=self.request.auth,
                     type=type,
-                    raw_barcode=None,
+                    raw_barcode=raw_barcode_for_checkin,
+                    from_revoked_secret=True,
                 )
             except RequiredQuestionsError as e:
                 return Response({
@@ -566,7 +604,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
         )
         if cf.type not in allowed_types:
             raise ValidationError('The submitted file "{fid}" has a file type that is not allowed in this field.'.format(fid=data))
-        if cf.file.size > 10 * 1024 * 1024:
+        if cf.file.size > settings.FILE_UPLOAD_MAX_SIZE_OTHER:
             raise ValidationError('The submitted file "{fid}" is too large to be used in this field.'.format(fid=data))
 
         return cf.file

src/pretix/api/views/exporters.py

@@ -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/order.py

@@ -1451,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/channels.py

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

src/pretix/base/email.py

@@ -462,6 +462,16 @@ def base_placeholders(sender, **kwargs):
             lambda waiting_list_entry, event: (waiting_list_entry.subevent or event).get_date_from_display(),
             lambda event: (event if not event.has_subevents or not event.subevents.exists() else event.subevents.first()).get_date_from_display()
         ),
+        SimpleFunctionalMailTextPlaceholder(
+            'url_remove', ['waiting_list_entry', 'event'],
+            lambda waiting_list_entry, event: build_absolute_uri(
+                event, 'presale:event.waitinglist.remove'
+            ) + '?voucher=' + waiting_list_entry.voucher.code,
+            lambda event: build_absolute_uri(
+                event,
+                'presale:event.waitinglist.remove',
+            ) + '?voucher=68CYU2H6ZTP3WLK5',
+        ),
         SimpleFunctionalMailTextPlaceholder(
             'url', ['waiting_list_entry', 'event'],
             lambda waiting_list_entry, event: build_absolute_uri(

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

@@ -129,7 +129,7 @@ class OrderListExporter(MultiSheetListExporter):
                  label=_('End event date'),
                  widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
                  required=False,
-                 help_text=_('Only include orders including at least one ticket for a date on or after this date. '
+                 help_text=_('Only include orders including at least one ticket for a date on or before this date. '
                              'Will also include other dates in case of mixed orders!')
              )),
         ]

src/pretix/base/forms/questions.py

@@ -46,6 +46,7 @@ import vat_moss.errors
 import vat_moss.id
 from babel import Locale
 from django import forms
+from django.conf import settings
 from django.contrib import messages
 from django.core.exceptions import ValidationError
 from django.core.files.uploadedfile import SimpleUploadedFile
@@ -507,7 +508,7 @@ class PortraitImageField(SizeValidationMixin, ExtValidationMixin, forms.FileFiel
 
     def __init__(self, *args, **kwargs):
         kwargs.setdefault('ext_whitelist', (".png", ".jpg", ".jpeg", ".jfif", ".tif", ".tiff", ".bmp"))
-        kwargs.setdefault('max_size', 10 * 1024 * 1024)
+        kwargs.setdefault('max_size', settings.FILE_UPLOAD_MAX_SIZE_IMAGE)
         super().__init__(*args, **kwargs)
 
 
@@ -739,7 +740,7 @@ class BaseQuestionsForm(forms.Form):
                             ".pptx", ".ppt", ".doc", ".xlsx", ".xls", ".jfif", ".heic", ".heif", ".pages",
                             ".bmp", ".tif", ".tiff"
                         ),
-                        max_size=10 * 1024 * 1024,
+                        max_size=settings.FILE_UPLOAD_MAX_SIZE_OTHER,
                     )
             elif q.type == Question.TYPE_DATE:
                 attrs = {}
@@ -976,7 +977,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
             scheme=event.settings.name_scheme,
             titles=event.settings.name_scheme_titles,
             label=_('Name'),
-            initial=(self.instance.name_parts if self.instance else self.instance.name_parts),
+            initial=self.instance.name_parts,
         )
         if event.settings.invoice_address_required and not event.settings.invoice_address_company_required and not self.all_optional:
             if not event.settings.invoice_name_required:

src/pretix/base/forms/widgets.py

@@ -184,7 +184,7 @@ class BusinessBooleanRadio(forms.RadioSelect):
         self.require_business = require_business
         if self.require_business:
             choices = (
-                ('business', _('Business customer')),
+                ('business', _('Business or institutional customer')),
             )
         else:
             choices = (

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.refers.number,
+                          value_size, self.left_margin + 100 * mm, date_x - self.left_margin - 100 * mm - 5 * mm),
+                ]
+            else:
+                objects += [
+                    _draw(pgettext('invoice', 'Invoice number'), self.invoice.number,
+                          value_size, self.left_margin + 70 * mm, date_x - self.left_margin - 70 * mm - 5 * mm),
+                ]
+
+            if all(objects):
+                for o in objects:
+                    canvas.drawText(o)
+                break
+            value_size -= 1
 
-        p = Paragraph(date_format(self.invoice.date, "DATE_FORMAT"), style=self.stylesheet['Normal'])
-        w = stringWidth(p.text, p.frags[0].fontName, p.frags[0].fontSize)
-        p.wrapOn(canvas, w, 15 * mm)
-        date_x = self.pagesize[0] - w - self.right_margin
         p.drawOn(canvas, date_x, self.pagesize[1] - begin_top - 10 - 6)
 
         textobject = canvas.beginText(date_x, self.pagesize[1] - begin_top)

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

@@ -0,0 +1,67 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+"""
+Django, for theoretically very valid reasons, creates migrations for *every single thing*
+we change on a model. Even the `help_text`! This makes sense, as we don't know if any
+database backend unknown to us might actually use this information for its database schema.
+
+However, pretix only supports PostgreSQL, MySQL, MariaDB and SQLite and we can be pretty
+certain that some changes to models will never require a change to the database. In this case,
+not creating a migration for certain changes will save us some performance while applying them
+*and* allow for a cleaner git history. Win-win!
+
+Only caveat is that we need to do some dirty monkeypatching to achieve it...
+"""
+from django.db import models
+from django.db.migrations.operations import models as modelops
+from django_countries.fields import CountryField
+
+
+def monkeypatch_migrations():
+    modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("verbose_name")
+    modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("verbose_name_plural")
+    modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("ordering")
+    modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("get_latest_by")
+    modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("default_manager_name")
+    modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("permissions")
+    modelops.AlterModelOptions.ALTER_OPTION_KEYS.remove("default_permissions")
+    IGNORED_ATTRS = [
+        # (field type, attribute name, banlist of field sub-types)
+        (models.Field, 'verbose_name', []),
+        (models.Field, 'help_text', []),
+        (models.Field, 'validators', []),
+        (models.Field, 'editable', [models.DateField, models.DateTimeField, models.DateField, models.BinaryField]),
+        (models.Field, 'blank', [models.DateField, models.DateTimeField, models.AutoField, models.NullBooleanField,
+                                 models.TimeField]),
+        (models.CharField, 'choices', [CountryField])
+    ]
+
+    original_deconstruct = models.Field.deconstruct
+
+    def new_deconstruct(self):
+        name, path, args, kwargs = original_deconstruct(self)
+        for ftype, attr, banlist in IGNORED_ATTRS:
+            if isinstance(self, ftype) and not any(isinstance(self, ft) for ft in banlist):
+                kwargs.pop(attr, None)
+        return name, path, args, kwargs
+
+    models.Field.deconstruct = new_deconstruct

src/pretix/base/management/commands/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/management/commands/makemigrations.py

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

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

@@ -32,12 +32,6 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
 
-"""
-Django tries to be helpful by suggesting to run "makemigrations" in red font on every "migrate"
-run when there are things we have no migrations for. Usually, this is intended, and running
-"makemigrations" can really screw up the environment of a user, so we want to prevent novice
-users from doing that by going really dirty and filtering it from the output.
-"""
 import sys
 
 from django.core.management.base import OutputWrapper
@@ -45,9 +39,15 @@ from django.core.management.commands.migrate import Command as Parent
 
 
 class OutputFilter(OutputWrapper):
+    """
+    Django tries to be helpful by suggesting to run "makemigrations" in red font on every "migrate"
+    run when there are things we have no migrations for. Usually, this is intended, and running
+    "makemigrations" can really screw up the environment of a user, so we want to prevent novice
+    users from doing that by going really dirty and filtering it from the output.
+    """
     banlist = (
-        "Your models have changes that are not yet reflected",
-        "Run 'manage.py makemigrations' to make new "
+        "have changes that are not yet reflected",
+        "re-run 'manage.py migrate'"
     )
 
     def write(self, msg, style_func=None, ending=None):

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

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

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

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

src/pretix/base/models/customers.py

@@ -19,19 +19,21 @@
 # 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 pycountry
 from django.conf import settings
 from django.contrib.auth.hashers import (
     check_password, is_password_usable, make_password,
 )
 from django.db import models
 from django.utils.crypto import get_random_string, salted_hmac
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager, scopes_disabled
 
 from pretix.base.banlist import banned
 from pretix.base.models.base import LoggedModel
 from pretix.base.models.organizer import Organizer
 from pretix.base.settings import PERSON_NAME_SCHEMES
+from pretix.helpers.countries import FastCountryField
 
 
 class Customer(LoggedModel):
@@ -88,6 +90,8 @@ class Customer(LoggedModel):
         self.all_logentries().update(data={}, shredded=True)
         self.orders.all().update(customer=None)
         self.memberships.all().update(attendee_name_parts=None)
+        self.attendee_profiles.all().delete()
+        self.invoice_addresses.all().delete()
 
     @scopes_disabled()
     def assign_identifier(self):
@@ -174,3 +178,88 @@ class Customer(LoggedModel):
                 continue
             ctx['name_%s' % f] = self.name_parts.get(f, '')
         return ctx
+
+    @property
+    def stored_addresses(self):
+        return self.invoice_addresses(manager='profiles')
+
+
+class AttendeeProfile(models.Model):
+    customer = models.ForeignKey(
+        Customer,
+        related_name='attendee_profiles',
+        on_delete=models.CASCADE
+    )
+    attendee_name_cached = models.CharField(
+        max_length=255,
+        verbose_name=_("Attendee name"),
+        blank=True, null=True,
+    )
+    attendee_name_parts = models.JSONField(
+        blank=True, default=dict
+    )
+    attendee_email = models.EmailField(
+        verbose_name=_("Attendee email"),
+        blank=True, null=True,
+    )
+    company = models.CharField(max_length=255, blank=True, verbose_name=_('Company name'), null=True)
+    street = models.TextField(verbose_name=_('Address'), blank=True, null=True)
+    zipcode = models.CharField(max_length=30, verbose_name=_('ZIP code'), blank=True, null=True)
+    city = models.CharField(max_length=255, verbose_name=_('City'), blank=True, null=True)
+    country = FastCountryField(verbose_name=_('Country'), blank=True, blank_label=_('Select country'), null=True)
+    state = models.CharField(max_length=255, verbose_name=pgettext_lazy('address', 'State'), blank=True, null=True)
+    answers = models.JSONField(default=list)
+
+    objects = ScopedManager(organizer='customer__organizer')
+
+    @property
+    def attendee_name(self):
+        if not self.attendee_name_parts:
+            return None
+        if '_legacy' in self.attendee_name_parts:
+            return self.attendee_name_parts['_legacy']
+        if '_scheme' in self.attendee_name_parts:
+            scheme = PERSON_NAME_SCHEMES[self.attendee_name_parts['_scheme']]
+        else:
+            scheme = PERSON_NAME_SCHEMES[self.customer.organizer.settings.name_scheme]
+        return scheme['concatenation'](self.attendee_name_parts).strip()
+
+    @property
+    def state_name(self):
+        sd = pycountry.subdivisions.get(code='{}-{}'.format(self.country, self.state))
+        if sd:
+            return sd.name
+        return self.state
+
+    @property
+    def state_for_address(self):
+        from pretix.base.settings import COUNTRIES_WITH_STATE_IN_ADDRESS
+        if not self.state or str(self.country) not in COUNTRIES_WITH_STATE_IN_ADDRESS:
+            return ""
+        if COUNTRIES_WITH_STATE_IN_ADDRESS[str(self.country)][1] == 'long':
+            return self.state_name
+        return self.state
+
+    def describe(self):
+        from .items import Question
+        from .orders import QuestionAnswer
+
+        parts = [
+            self.attendee_name,
+            self.attendee_email,
+            self.company,
+            self.street,
+            (self.zipcode or '') + ' ' + (self.city or '') + ' ' + (self.state_for_address or ''),
+            self.country.name,
+        ]
+        for a in self.answers:
+            value = a.get('value')
+            try:
+                value = ", ".join(value.values())
+            except AttributeError:
+                value = str(value)
+            answer = QuestionAnswer(question=Question(type=a.get('question_type')), answer=value)
+            val = str(answer)
+            parts.append(f'{a["field_label"]}: {val}')
+
+        return '\n'.join([str(p).strip() for p in parts if p and str(p).strip()])

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,6 +74,8 @@ 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):
@@ -153,6 +156,29 @@ class EventMixin:
             return _date(self.date_from.astimezone(tz), "DATE_FORMAT")
         return daterange(self.date_from.astimezone(tz), self.date_to.astimezone(tz))
 
+    def get_time_range_display(self, tz=None, force_show_end=False) -> str:
+        """
+        Returns a formatted string containing the start time and sometimes the end time
+        of the event with respect to the current locale and to the ``show_date_to``
+        setting. Dates are not shown. This is usually used in combination with get_date_range_display
+        """
+        tz = tz or self.timezone
+
+        show_date_to = self.date_to and (self.settings.show_date_to or force_show_end) and (
+            # Show date to if start and end are on the same day ("08:00-10:00")
+            self.date_to.astimezone(tz).date() == self.date_from.astimezone(tz).date() or
+            # Show date to if start and end are on consecutive days and less than 24h ("23:00-03:00")
+            (self.date_to.astimezone(tz).date() == self.date_from.astimezone(tz).date() + timedelta(days=1) and
+             self.date_to.astimezone(tz).time() < self.date_from.astimezone(tz).time())
+            # Do not show end time if this is a 5-day event because there's no way to make it understandable
+        )
+        if show_date_to:
+            return '{} – {}'.format(
+                _date(self.date_from.astimezone(tz), "TIME_FORMAT"),
+                _date(self.date_to.astimezone(tz), "TIME_FORMAT"),
+            )
+        return _date(self.date_from.astimezone(tz), "TIME_FORMAT")
+
     @property
     def timezone(self):
         return pytz.timezone(self.settings.timezone)
@@ -242,6 +268,10 @@ class EventMixin:
         ).values('items')
         sq_active_variation = ItemVariation.objects.filter(
             Q(active=True)
+            & Q(sales_channels__contains=channel)
+            & Q(hide_without_voucher=False)
+            & Q(Q(available_from__isnull=True) | Q(available_from__lte=now()))
+            & Q(Q(available_until__isnull=True) | Q(available_until__gte=now()))
             & Q(item__active=True)
             & Q(Q(item__available_from__isnull=True) | Q(item__available_from__lte=now()))
             & Q(Q(item__available_until__isnull=True) | Q(item__available_until__gte=now()))
@@ -492,7 +522,7 @@ 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
@@ -534,9 +564,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)
 
@@ -741,7 +779,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
@@ -865,7 +905,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:
@@ -1004,6 +1044,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)
@@ -1113,15 +1158,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:
@@ -1150,6 +1198,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
@@ -1259,7 +1311,7 @@ class SubEvent(EventMixin, LoggedModel):
         verbose_name=_("Frontpage text")
     )
     seating_plan = models.ForeignKey('SeatingPlan', on_delete=models.PROTECT, null=True, blank=True,
-                                     related_name='subevents')
+                                     related_name='subevents', verbose_name=_('Seating plan'))
 
     items = models.ManyToManyField('Item', through='SubEventItem')
     variations = models.ManyToManyField('ItemVariation', through='SubEventItemVariation')

src/pretix/base/models/items.py

@@ -736,6 +736,11 @@ class Item(LoggedModel):
         return OrderedDict((k, v) for k, v in sorted(data.items(), key=lambda k: k[0]))
 
 
+def _all_sales_channels_identifiers():
+    from pretix.base.channels import get_all_sales_channels
+    return list(get_all_sales_channels().keys())
+
+
 class ItemVariation(models.Model):
     """
     A variation of a product. For example, if your item is 'T-Shirt'
@@ -761,7 +766,7 @@ class ItemVariation(models.Model):
     )
     value = I18nCharField(
         max_length=255,
-        verbose_name=_('Description')
+        verbose_name=_('Variation')
     )
     active = models.BooleanField(
         default=True,
@@ -797,6 +802,29 @@ class ItemVariation(models.Model):
         verbose_name=_('Membership types'),
         blank=True,
     )
+    available_from = models.DateTimeField(
+        verbose_name=_("Available from"),
+        null=True, blank=True,
+        help_text=_('This variation will not be sold before the given date.')
+    )
+    available_until = models.DateTimeField(
+        verbose_name=_("Available until"),
+        null=True, blank=True,
+        help_text=_('This variation will not be sold after the given date.')
+    )
+    sales_channels = fields.MultiStringField(
+        verbose_name=_('Sales channels'),
+        default=_all_sales_channels_identifiers,
+        help_text=_('The sales channel selection for the product as a whole takes precedence, so if a sales channel is '
+                    'selected here but not on product level, the variation will not be available.'),
+        blank=True,
+    )
+    hide_without_voucher = models.BooleanField(
+        verbose_name=_('This variation will only be shown if a voucher matching the product is redeemed.'),
+        default=False,
+        help_text=_('This variation will be hidden from the event page until the user enters a voucher '
+                    'that unlocks this variation.')
+    )
 
     objects = ScopedManager(organizer='item__event__organizer')
 
@@ -928,6 +956,24 @@ class ItemVariation(models.Model):
     def is_only_variation(self):
         return ItemVariation.objects.filter(item=self.item).count() == 1
 
+    def is_available_by_time(self, now_dt: datetime=None) -> bool:
+        now_dt = now_dt or now()
+        if self.available_from and self.available_from > now_dt:
+            return False
+        if self.available_until and self.available_until < now_dt:
+            return False
+        return True
+
+    def is_available(self, now_dt: datetime=None) -> bool:
+        """
+        Returns whether this item is available according to its ``active`` flag
+        and its ``available_from`` and ``available_until`` fields
+        """
+        now_dt = now_dt or now()
+        if not self.active or not self.is_available_by_time(now_dt):
+            return False
+        return True
+
 
 class ItemAddOn(models.Model):
     """
@@ -1051,7 +1097,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,
@@ -1620,6 +1666,8 @@ class Quota(LoggedModel):
 
     @staticmethod
     def clean_items(event, items, variations):
+        if not items:
+            return
         for item in items:
             if event != item.event:
                 raise ValidationError(_('One or more items do not belong to this event.'))

src/pretix/base/models/orders.py

@@ -419,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()
                 )
@@ -541,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()
@@ -783,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
@@ -1905,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 = (
@@ -1912,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")),
     )
@@ -2329,6 +2334,12 @@ class CartPosition(AbstractPosition):
 class InvoiceAddress(models.Model):
     last_modified = models.DateTimeField(auto_now=True)
     order = models.OneToOneField(Order, null=True, blank=True, related_name='invoice_address', on_delete=models.CASCADE)
+    customer = models.ForeignKey(
+        Customer,
+        related_name='invoice_addresses',
+        null=True, blank=True,
+        on_delete=models.CASCADE
+    )
     is_business = models.BooleanField(default=False, verbose_name=_('Business customer'))
     company = models.CharField(max_length=255, blank=True, verbose_name=_('Company name'))
     name_cached = models.CharField(max_length=255, verbose_name=_('Full name'), blank=True)
@@ -2355,6 +2366,7 @@ class InvoiceAddress(models.Model):
     )
 
     objects = ScopedManager(organizer='order__event__organizer')
+    profiles = ScopedManager(organizer='customer__organizer')
 
     def save(self, **kwargs):
         if self.order:
@@ -2367,6 +2379,20 @@ class InvoiceAddress(models.Model):
             self.name_parts = {}
         super().save(**kwargs)
 
+    def describe(self):
+        parts = [
+            self.company,
+            self.name,
+            self.street,
+            (self.zipcode or '') + ' ' + (self.city or '') + ' ' + (self.state_for_address or ''),
+            self.country.name,
+            self.vat_id,
+            self.custom_field,
+            self.internal_reference,
+            (_('Beneficiary') + ': ' + self.beneficiary) if self.beneficiary else '',
+        ]
+        return '\n'.join([str(p).strip() for p in parts if p and str(p).strip()])
+
     @property
     def is_empty(self):
         return (
@@ -2402,6 +2428,30 @@ class InvoiceAddress(models.Model):
             raise TypeError("Invalid name given.")
         return scheme['concatenation'](self.name_parts).strip()
 
+    def for_js(self):
+        d = {}
+
+        if self.name_parts:
+            if '_scheme' in self.name_parts:
+                scheme = PERSON_NAME_SCHEMES[self.name_parts['_scheme']]
+                for i, (k, l, w) in enumerate(scheme['fields']):
+                    d[f'name_parts_{i}'] = self.name_parts.get(k) or ''
+
+        d.update({
+            'company': self.company,
+            'is_business': self.is_business,
+            'street': self.street,
+            'zipcode': self.zipcode,
+            'city': self.city,
+            'country': str(self.country) if self.country else None,
+            'state': str(self.state) if self.state else None,
+            'vat_id': self.vat_id,
+            'custom_field': self.custom_field,
+            'internal_reference': self.internal_reference,
+            'beneficiary': self.beneficiary,
+        })
+        return d
+
 
 def cachedticket_name(instance, filename: str) -> str:
     secret = get_random_string(length=16, allowed_chars=string.ascii_letters + string.digits)

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/models/waitinglist.py

@@ -21,8 +21,9 @@
 #
 from datetime import timedelta
 
-from django.core.exceptions import ValidationError
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import models, transaction
+from django.db.models import F, Q, Sum
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager
@@ -114,9 +115,12 @@ class WaitingListEntry(LoggedModel):
         return '%s waits for %s' % (str(self.email), str(self.item))
 
     def clean(self):
-        WaitingListEntry.clean_duplicate(self.email, self.item, self.variation, self.subevent, self.pk)
-        WaitingListEntry.clean_itemvar(self.event, self.item, self.variation)
-        WaitingListEntry.clean_subevent(self.event, self.subevent)
+        try:
+            WaitingListEntry.clean_duplicate(self.email, self.item, self.variation, self.subevent, self.pk)
+            WaitingListEntry.clean_itemvar(self.event, self.item, self.variation)
+            WaitingListEntry.clean_subevent(self.event, self.subevent)
+        except ObjectDoesNotExist:
+            raise ValidationError('Invalid input')
 
     def save(self, *args, **kwargs):
         update_fields = kwargs.get('update_fields', [])
@@ -147,6 +151,34 @@ class WaitingListEntry(LoggedModel):
         )
         if availability[1] is None or availability[1] < 1:
             raise WaitingListException(_('This product is currently not available.'))
+
+        ev = self.subevent or self.event
+        if ev.seat_category_mappings.filter(product=self.item).exists():
+            # Generally, we advertise the waiting list to be based on quotas only. This makes it dangerous
+            # to use in combination with seating plans. If your event has 50 seats and a quota of 50 and
+            # default settings, everything is fine and the waiting list will work as usual. However, as soon
+            # as those two numbers diverge, either due to misconfiguration or due to intentional features such
+            # as our COVID-19 minimum distance feature, things get ugly. Theoretically, there could be
+            # significant quota available but not a single seat! The waiting list would happily send out vouchers
+            # which do not work at all. Generally, we consider this a "known bug" and not fixable with the current
+            # design of the waiting list and seating features.
+            # However, we've put in a simple safeguard that makes sure the waiting list on its own does not screw
+            # everything up. Specifically, we will not send out vouchers if the number of available seats is less
+            # than the number of valid vouchers *issued through the waiting list*. Things can still go wrong due to
+            # manually created vouchers, manually blocked seats or the minimum distance feature,  but this reduces
+            # the possible damage a bit.
+            num_free_seats_for_product = ev.free_seats().filter(product=self.item).count()
+            num_valid_vouchers_for_product = self.event.vouchers.filter(
+                Q(valid_until__isnull=True) | Q(valid_until__gte=now()),
+                block_quota=True,
+                item_id=self.item_id,
+                subevent_id=self.subevent_id,
+                waitinglistentries__isnull=False
+            ).aggregate(free=Sum(F('max_usages') - F('redeemed')))['free'] or 0
+            free_seats = num_free_seats_for_product - num_valid_vouchers_for_product
+            if not free_seats:
+                raise WaitingListException(_('No seat with this product is currently available.'))
+
         if self.voucher:
             raise WaitingListException(_('A voucher has already been sent to this person.'))
         if '@' not in self.email:

src/pretix/base/orderimport.py

@@ -36,6 +36,8 @@ 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
@@ -156,6 +158,29 @@ 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')
@@ -653,9 +678,12 @@ class SeatColumn(ImportColumn):
         if value:
             try:
                 value = Seat.objects.get(
+                    event=self.event,
                     seat_guid=value,
                     subevent=previous_values.get('subevent')
                 )
+            except Seat.MultipleObjectsReturned:
+                raise ValidationError(_('Multiple matching seats were found.'))
             except Seat.DoesNotExist:
                 raise ValidationError(_('No matching seat was found.'))
             if not value.is_available() or value in self._cached:
@@ -756,6 +784,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

@@ -99,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"),
@@ -429,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
@@ -469,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 ""

src/pretix/base/services/cart.py

@@ -283,13 +283,16 @@ class CartManager:
                 if op.item.require_voucher and op.voucher is None:
                     raise CartError(error_messages['voucher_required'])
 
-                if op.item.hide_without_voucher and (op.voucher is None or not op.voucher.show_hidden_items):
+                if (
+                    (op.item.hide_without_voucher or (op.variation and op.variation.hide_without_voucher)) and
+                    (op.voucher is None or not op.voucher.show_hidden_items)
+                ):
                     raise CartError(error_messages['voucher_required'])
 
-            if not op.item.is_available() or (op.variation and not op.variation.active):
+            if not op.item.is_available() or (op.variation and not op.variation.is_available()):
                 raise CartError(error_messages['unavailable'])
 
-            if self._sales_channel not in op.item.sales_channels:
+            if self._sales_channel not in op.item.sales_channels or (op.variation and self._sales_channel not in op.variation.sales_channels):
                 raise CartError(error_messages['unavailable'])
 
             if op.subevent and op.item.pk in op.subevent.item_overrides and not op.subevent.item_overrides[op.item.pk].is_available():

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:
@@ -567,7 +582,7 @@ 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,
-                    raw_barcode=None):
+                    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.
@@ -582,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):
@@ -649,15 +669,16 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
         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:
@@ -669,7 +690,7 @@ 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={

src/pretix/base/services/cleanup.py

@@ -40,7 +40,7 @@ def clean_cart_positions(sender, **kwargs):
         cp.delete()
     for cp in CartPosition.objects.filter(expires__lt=now() - timedelta(days=14), addon_to__isnull=True):
         cp.delete()
-    for ia in InvoiceAddress.objects.filter(order__isnull=True, last_modified__lt=now() - timedelta(days=14)):
+    for ia in InvoiceAddress.objects.filter(order__isnull=True, customer__isnull=True, last_modified__lt=now() - timedelta(days=14)):
         ia.delete()
 
 

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

@@ -323,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

@@ -404,7 +404,7 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
                                         logger.exception('Could not attach invoice to email')
                                         pass
 
-                            if attach_size < 4 * 1024 * 1024:
+                            if attach_size < settings.FILE_UPLOAD_MAX_SIZE_EMAIL_ATTACHMENT:
                                 # Do not attach more than 4MB, it will bounce way to often.
                                 for a in args:
                                     try:
@@ -640,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/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

@@ -572,7 +572,7 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
         if cp.pk in deleted_positions:
             continue
 
-        if not cp.item.is_available() or (cp.variation and not cp.variation.active):
+        if not cp.item.is_available() or (cp.variation and not cp.variation.is_available()):
             err = err or error_messages['unavailable']
             delete(cp)
             continue
@@ -644,7 +644,7 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
             err = err or error_messages['voucher_required']
             break
 
-        if cp.item.hide_without_voucher and (
+        if (cp.item.hide_without_voucher or (cp.variation and cp.variation.hide_without_voucher)) and (
                 cp.voucher is None or not cp.voucher.show_hidden_items or not cp.voucher.applies_to(cp.item, cp.variation)
         ) and not cp.is_bundled:
             delete(cp)

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/services/waitinglist.py

@@ -22,12 +22,14 @@
 import sys
 from datetime import timedelta
 
-from django.db.models import Exists, OuterRef, Q
+from django.db.models import Exists, F, OuterRef, Q, Sum
 from django.dispatch import receiver
 from django.utils.timezone import now
 from django_scopes import scopes_disabled
 
-from pretix.base.models import Event, User, WaitingListEntry
+from pretix.base.models import (
+    Event, SeatCategoryMapping, User, WaitingListEntry,
+)
 from pretix.base.models.waitinglist import WaitingListException
 from pretix.base.services.tasks import EventTask
 from pretix.base.signals import periodic_task
@@ -43,6 +45,19 @@ def assign_automatically(event: Event, user_id: int=None, subevent_id: int=None)
 
     quota_cache = {}
     gone = set()
+    seats_available = {}
+
+    for m in SeatCategoryMapping.objects.filter(event=event).select_related('subevent'):
+        # See comment in WaitingListEntry.send_voucher() for rationale
+        num_free_seets_for_product = (m.subevent or event).free_seats().filter(product_id=m.product_id).count()
+        num_valid_vouchers_for_product = event.vouchers.filter(
+            Q(valid_until__isnull=True) | Q(valid_until__gte=now()),
+            block_quota=True,
+            item_id=m.product_id,
+            subevent_id=m.subevent_id,
+            waitinglistentries__isnull=False
+        ).aggregate(free=Sum(F('max_usages') - F('redeemed')))['free'] or 0
+        seats_available[(m.product_id, m.subevent_id)] = num_free_seets_for_product - num_valid_vouchers_for_product
 
     qs = WaitingListEntry.objects.filter(
         event=event, voucher__isnull=True
@@ -70,6 +85,11 @@ def assign_automatically(event: Event, user_id: int=None, subevent_id: int=None)
                 gone.add((wle.item, wle.variation, wle.subevent))
                 continue
 
+            if (wle.item_id, wle.subevent_id) in seats_available:
+                if seats_available[wle.item_id, wle.subevent_id] < 1:
+                    gone.add((wle.item, wle.variation, wle.subevent))
+                    continue
+
             quotas = (wle.variation.quotas.filter(subevent=wle.subevent)
                       if wle.variation
                       else wle.item.quotas.filter(subevent=wle.subevent))
@@ -91,6 +111,9 @@ def assign_automatically(event: Event, user_id: int=None, subevent_id: int=None)
                         quota_cache[q.pk][0] if quota_cache[q.pk][0] > 1 else 0,
                         quota_cache[q.pk][1] - 1 if quota_cache[q.pk][1] is not None else sys.maxsize
                     )
+
+                if (wle.item_id, wle.subevent_id) in seats_available:
+                    seats_available[wle.item_id, wle.subevent_id] -= 1
             else:
                 gone.add((wle.item, wle.variation, wle.subevent))
 

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
@@ -1428,6 +1440,7 @@ DEFAULTS = {
                 ('off', _('All refunds are issued to the original payment method')),
                 ('option', _('Customers can choose between a gift card and a refund to their payment method')),
                 ('force', _('All refunds are issued as gift cards')),
+                ('manually', _('Do not handle refunds automatically at all')),
             ],
         ),
         'form_class': forms.ChoiceField,
@@ -1437,6 +1450,7 @@ DEFAULTS = {
                 ('off', _('All refunds are issued to the original payment method')),
                 ('option', _('Customers can choose between a gift card and a refund to their payment method')),
                 ('force', _('All refunds are issued as gift cards')),
+                ('manually', _('Do not handle refunds automatically at all')),
             ],
             widget=forms.RadioSelect,
             # When adding a new ordering, remember to also define it in the event model
@@ -1732,6 +1746,12 @@ Please note that this link is only valid within the next {hours} hours!
 We will reassign the ticket to the next person on the list if you do not
 redeem the voucher within that timeframe.
 
+If you do NOT need a ticket any more, we kindly ask you to click the
+following link to let us know. This way, we can send the ticket as quickly
+as possible to the next person on the waiting list:
+
+{url_remove}
+
 Best regards,
 Your {event} team"""))
     },
@@ -2047,7 +2067,7 @@ Your {organizer} team"""))
         'form_kwargs': dict(
             label=_('Header image'),
             ext_whitelist=(".png", ".jpg", ".gif", ".jpeg"),
-            max_size=10 * 1024 * 1024,
+            max_size=settings.FILE_UPLOAD_MAX_SIZE_IMAGE,
             help_text=_('If you provide a logo image, we will by default not show your event name and date '
                         'in the page header. By default, we show your logo with a size of up to 1140x120 pixels. You '
                         'can increase the size with the setting below. We recommend not using small details on the picture '
@@ -2058,7 +2078,7 @@ Your {organizer} team"""))
             allowed_types=[
                 'image/png', 'image/jpeg', 'image/gif'
             ],
-            max_size=10 * 1024 * 1024,
+            max_size=settings.FILE_UPLOAD_MAX_SIZE_IMAGE,
         )
 
     },
@@ -2079,7 +2099,8 @@ Your {organizer} team"""))
         'serializer_class': serializers.BooleanField,
         'form_kwargs': dict(
             label=_('Show event title even if a header image is present'),
-            help_text=_('The title will only be shown on the event front page.'),
+            help_text=_('The title will only be shown on the event front page. If no header image is uploaded for the event, but the header image '
+                        'from the organizer profile is used, this option will be ignored and the event title will always be shown.'),
         )
     },
     'organizer_logo_image': {
@@ -2089,7 +2110,7 @@ Your {organizer} team"""))
         'form_kwargs': dict(
             label=_('Header image'),
             ext_whitelist=(".png", ".jpg", ".gif", ".jpeg"),
-            max_size=10 * 1024 * 1024,
+            max_size=settings.FILE_UPLOAD_MAX_SIZE_IMAGE,
             help_text=_('If you provide a logo image, we will by default not show your organization name '
                         'in the page header. By default, we show your logo with a size of up to 1140x120 pixels. You '
                         'can increase the size with the setting below. We recommend not using small details on the picture '
@@ -2100,7 +2121,7 @@ Your {organizer} team"""))
             allowed_types=[
                 'image/png', 'image/jpeg', 'image/gif'
             ],
-            max_size=10 * 1024 * 1024,
+            max_size=settings.FILE_UPLOAD_MAX_SIZE_IMAGE,
         )
     },
     'organizer_logo_image_large': {
@@ -2113,6 +2134,15 @@ Your {organizer} team"""))
             help_text=_('We recommend to upload a picture at least 1170 pixels wide.'),
         )
     },
+    'organizer_logo_image_inherit': {
+        'default': 'False',
+        'type': bool,
+        'form_class': forms.BooleanField,
+        'serializer_class': serializers.BooleanField,
+        'form_kwargs': dict(
+            label=_('Use header image also for events without an individually uploaded logo'),
+        )
+    },
     'og_image': {
         'default': None,
         'type': File,
@@ -2120,7 +2150,7 @@ Your {organizer} team"""))
         'form_kwargs': dict(
             label=_('Social media image'),
             ext_whitelist=(".png", ".jpg", ".gif", ".jpeg"),
-            max_size=10 * 1024 * 1024,
+            max_size=settings.FILE_UPLOAD_MAX_SIZE_IMAGE,
             help_text=_('This picture will be used as a preview if you post links to your ticket shop on social media. '
                         'Facebook advises to use a picture size of 1200 x 630 pixels, however some platforms like '
                         'WhatsApp and Reddit only show a square preview, so we recommend to make sure it still looks good '
@@ -2131,7 +2161,7 @@ Your {organizer} team"""))
             allowed_types=[
                 'image/png', 'image/jpeg', 'image/gif'
             ],
-            max_size=10 * 1024 * 1024,
+            max_size=settings.FILE_UPLOAD_MAX_SIZE_IMAGE,
         )
     },
     'invoice_logo_image': {
@@ -2142,7 +2172,7 @@ Your {organizer} team"""))
             label=_('Logo image'),
             ext_whitelist=(".png", ".jpg", ".gif", ".jpeg"),
             required=False,
-            max_size=10 * 1024 * 1024,
+            max_size=settings.FILE_UPLOAD_MAX_SIZE_IMAGE,
             help_text=_('We will show your logo with a maximal height and width of 2.5 cm.')
         ),
         'serializer_class': UploadedFileField,
@@ -2150,7 +2180,7 @@ Your {organizer} team"""))
             allowed_types=[
                 'image/png', 'image/jpeg', 'image/gif'
             ],
-            max_size=10 * 1024 * 1024,
+            max_size=settings.FILE_UPLOAD_MAX_SIZE_IMAGE,
         )
     },
     'frontpage_text': {

src/pretix/base/shredder.py

@@ -314,14 +314,14 @@ class AttendeeInfoShredder(BaseDataShredder):
                         d['data'][i]['attendee_name_parts'] = {
                             '_legacy': '█'
                         }
-                if 'company' in row:
-                    d['data'][i]['company'] = '█'
-                if 'street' in row:
-                    d['data'][i]['street'] = '█'
-                if 'zipcode' in row:
-                    d['data'][i]['zipcode'] = '█'
-                if 'city' in row:
-                    d['data'][i]['city'] = '█'
+                    if 'company' in row:
+                        d['data'][i]['company'] = '█'
+                    if 'street' in row:
+                        d['data'][i]['street'] = '█'
+                    if 'zipcode' in row:
+                        d['data'][i]['zipcode'] = '█'
+                    if 'city' in row:
+                        d['data'][i]['city'] = '█'
                 le.data = json.dumps(d)
                 le.shredded = True
                 le.save(update_fields=['data', 'shredded'])

src/pretix/base/signals.py

@@ -509,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
@@ -520,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/pretixbase/email/simple_logo.html

@@ -1,12 +1,18 @@
 {% 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;
@@ -208,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/templates/pretixbase/redirect.html

@@ -0,0 +1,26 @@
+{% extends "error.html" %}
+{% load i18n %}
+{% load rich_text %}
+{% load static %}
+{% block title %}{% trans "Redirect" %}{% endblock %}
+{% block content %}
+<i class="fa fa-link fa-fw big-icon"></i>
+<div class="error-details">
+    <h1>{% trans "Redirect" %}</h1>
+    <h3>
+        {% blocktrans trimmed with host="<strong>"|add:hostname|add:"</strong>"|safe %}
+        The link you clicked on wants to redirect you to a destination on the website {{ host }}.
+        {% endblocktrans %}
+        {% blocktrans trimmed %}
+        Please only proceed if you trust this website to be safe.
+        {% endblocktrans %}
+    </h3>
+    <p>
+        <a href="{{ url }}" class="btn btn-primary btn-lg">
+            {% blocktrans trimmed with host=hostname %}
+            Proceed to {{ host }}
+            {% endblocktrans %}
+        </a>
+    </p>
+</div>
+{% endblock %}

src/pretix/base/templatetags/escapejson.py

@@ -24,7 +24,7 @@ import json
 from django import template
 from django.template.defaultfilters import stringfilter
 
-from pretix.helpers.escapejson import escapejson
+from pretix.helpers.escapejson import escapejson, escapejson_attr
 
 register = template.Library()
 
@@ -40,3 +40,9 @@ def escapejs_filter(value):
 def escapejs_dumps_filter(value):
     """Hex encodes characters for use in a application/json type script."""
     return escapejson(json.dumps(value))
+
+
+@register.filter("attr_escapejson_dumps")
+def attr_escapejs_dumps_filter(value):
+    """Hex encodes characters for use in an HTML attribute."""
+    return escapejson_attr(json.dumps(value))

src/pretix/base/templatetags/lists.py

@@ -0,0 +1,34 @@
+#
+# 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 import template
+
+register = template.Library()
+
+
+@register.filter(name='splitlines')
+def splitlines(value):
+    return value.split("\n")
+
+
+@register.filter(name='joinlines')
+def joinlines(value):
+    return "\n".join(value)

src/pretix/base/templatetags/rich_text.py

@@ -135,7 +135,7 @@ def truelink_callback(attrs, new=False):
 
         <a href="https://maps.google.com/location/foo">https://maps.google.com</a>
     """
-    text = re.sub(r'[^a-zA-Z0-9.\-/_]', '', attrs.get('_text'))  # clean up link text
+    text = re.sub(r'[^a-zA-Z0-9.\-/_ ]', '', attrs.get('_text'))  # clean up link text
     url = attrs.get((None, 'href'), '/')
     href_url = urllib.parse.urlparse(url)
     if URL_RE.match(text) and href_url.scheme not in ('tel', 'mailto'):

src/pretix/base/timeline.py

@@ -27,6 +27,7 @@ from django.urls import reverse
 from django.utils.timezone import make_aware
 from django.utils.translation import pgettext_lazy
 
+from pretix.base.models import ItemVariation
 from pretix.base.reldate import RelativeDateWrapper
 from pretix.base.signals import timeline_events
 
@@ -240,6 +241,39 @@ def timeline_for_event(event, subevent=None):
                 })
             ))
 
+    for v in ItemVariation.objects.filter(
+        Q(available_from__isnull=False) | Q(available_until__isnull=False),
+        item__event=event
+    ).select_related('item'):
+        if v.available_from:
+            tl.append(TimelineEvent(
+                event=event, subevent=subevent,
+                datetime=v.available_from,
+                description=pgettext_lazy('timeline', 'Product variation "{product} – {variation}" becomes available').format(
+                    product=str(v.item),
+                    variation=str(v.value),
+                ),
+                edit_url=reverse('control:event.item', kwargs={
+                    'event': event.slug,
+                    'organizer': event.organizer.slug,
+                    'item': v.item.pk,
+                })
+            ))
+        if v.available_until:
+            tl.append(TimelineEvent(
+                event=event, subevent=subevent,
+                datetime=v.available_until,
+                description=pgettext_lazy('timeline', 'Product variation "{product} – {variation}" becomes unavailable').format(
+                    product=str(v.item),
+                    variation=str(v.value),
+                ),
+                edit_url=reverse('control:event.item', kwargs={
+                    'event': event.slug,
+                    'organizer': event.organizer.slug,
+                    'item': v.item.pk,
+                })
+            ))
+
     pprovs = event.get_payment_providers()
     # This is a special case, depending on payment providers not overriding BasePaymentProvider by too much, but it's
     # preferrable to having all plugins implement this spearately.

src/pretix/base/views/mixins.py

@@ -36,6 +36,7 @@ from pretix.base.models import (
     CartPosition, InvoiceAddress, OrderPosition, Question, QuestionAnswer,
     QuestionOption,
 )
+from pretix.base.models.customers import AttendeeProfile
 from pretix.presale.signals import contact_form_fields_overrides
 
 
@@ -60,6 +61,9 @@ class BaseQuestionsViewMixin:
     def get_question_override_sets(self, position):
         return []
 
+    def question_form_kwargs(self, cr):
+        return {}
+
     @cached_property
     def forms(self):
         """
@@ -71,13 +75,16 @@ class BaseQuestionsViewMixin:
         for cr in self._positions_for_questions:
             cartpos = cr if isinstance(cr, CartPosition) else None
             orderpos = cr if isinstance(cr, OrderPosition) else None
+
+            kwargs = self.question_form_kwargs(cr)
             form = self.form_class(event=self.request.event,
                                    prefix=cr.id,
                                    cartpos=cartpos,
                                    orderpos=orderpos,
                                    all_optional=self.all_optional,
                                    data=(self.request.POST if self.request.method == 'POST' else None),
-                                   files=(self.request.FILES if self.request.method == 'POST' else None))
+                                   files=(self.request.FILES if self.request.method == 'POST' else None),
+                                   **kwargs)
             form.pos = cartpos or orderpos
             form.show_copy_answers_to_addon_button = form.pos.addon_to and (
                 set(form.pos.addon_to.item.questions.all()) & set(form.pos.item.questions.all()) or
@@ -93,21 +100,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)
@@ -136,25 +143,28 @@ class BaseQuestionsViewMixin:
             if not form.is_valid():
                 failed = True
             else:
+                if form.cleaned_data.get('saved_id'):
+                    prof = AttendeeProfile.objects.filter(
+                        customer=self.cart_customer, pk=form.cleaned_data.get('saved_id')
+                    ).first() or AttendeeProfile(customer=getattr(self, 'cart_customer', None))
+                    answers_key_to_index = {a.get('field_name'): i for i, a in enumerate(prof.answers)}
+                else:
+                    prof = AttendeeProfile(customer=getattr(self, 'cart_customer', None))
+                    answers_key_to_index = {}
+
                 # This form was correctly filled, so we store the data as
                 # answers to the questions / in the CartPosition object
                 for k, v in form.cleaned_data.items():
-                    if k == 'attendee_name_parts':
+                    if k in ('save', 'saved_id'):
+                        continue
+                    elif k == 'attendee_name_parts':
                         form.pos.attendee_name_parts = v if v else None
-                    elif k == 'attendee_email':
-                        form.pos.attendee_email = v if v != '' else None
-                    elif k == 'company':
-                        form.pos.company = v if v != '' else None
-                    elif k == 'street':
-                        form.pos.street = v if v != '' else None
-                    elif k == 'zipcode':
-                        form.pos.zipcode = v if v != '' else None
-                    elif k == 'city':
-                        form.pos.city = v if v != '' else None
-                    elif k == 'country':
-                        form.pos.country = v if v != '' else None
-                    elif k == 'state':
-                        form.pos.state = v if v != '' else None
+                        prof.attendee_name_parts = form.pos.attendee_name_parts
+                        prof.attendee_name_cached = form.pos.attendee_name
+                    elif k in ('attendee_email', 'company', 'street', 'zipcode', 'city', 'country', 'state'):
+                        v = v if v != '' else None
+                        setattr(form.pos, k, v)
+                        setattr(prof, k, v)
                     elif k.startswith('question_'):
                         field = form.fields[k]
                         if hasattr(field, 'answer'):
@@ -168,6 +178,23 @@ class BaseQuestionsViewMixin:
                             else:
                                 self._save_to_answer(field, field.answer, v)
                                 field.answer.save()
+                                if isinstance(field, forms.ModelMultipleChoiceField) or isinstance(field, forms.ModelChoiceField):
+                                    answer_value = {o.identifier: str(o) for o in field.answer.options.all()}
+                                elif isinstance(field, forms.BooleanField):
+                                    answer_value = bool(field.answer.answer)
+                                else:
+                                    answer_value = str(field.answer.answer)
+                                answer_dict = {
+                                    'field_name': k,
+                                    'field_label': str(field.label),
+                                    'value': answer_value,
+                                    'question_type': field.question.type,
+                                    'question_identifier': field.question.identifier,
+                                }
+                                if k in answers_key_to_index:
+                                    prof.answers[answers_key_to_index[k]] = answer_dict
+                                else:
+                                    prof.answers.append(answer_dict)
                         elif v != '' and v is not None:
                             answer = QuestionAnswer(
                                 cartposition=(form.pos if isinstance(form.pos, CartPosition) else None),
@@ -192,7 +219,27 @@ class BaseQuestionsViewMixin:
                                 self._save_to_answer(field, answer, v)
                                 answer.save()
 
+                            if isinstance(field, forms.ModelMultipleChoiceField) or isinstance(field, forms.ModelChoiceField):
+                                answer_value = {o.identifier: str(o) for o in answer.options.all()}
+                            elif isinstance(field, forms.BooleanField):
+                                answer_value = bool(answer.answer)
+                            else:
+                                answer_value = str(answer.answer)
+                            answer_dict = {
+                                'field_name': k,
+                                'field_label': str(field.label),
+                                'value': answer_value,
+                                'question_type': field.question.type,
+                                'question_identifier': field.question.identifier,
+                            }
+                            if k in answers_key_to_index:
+                                prof.answers[answers_key_to_index[k]] = answer_dict
+                            else:
+                                prof.answers.append(answer_dict)
+
                     else:
+                        field = form.fields[k]
+
                         meta_info.setdefault('question_form_data', {})
                         if v is None:
                             if k in meta_info['question_form_data']:
@@ -200,8 +247,25 @@ class BaseQuestionsViewMixin:
                         else:
                             meta_info['question_form_data'][k] = v
 
+                        answer_dict = {
+                            'field_name': k,
+                            'field_label': str(field.label),
+                            'value': str(v),
+                            'question_type': None,
+                            'question_identifier': None,
+                        }
+                        if k in answers_key_to_index:
+                            prof.answers[answers_key_to_index[k]] = answer_dict
+                        else:
+                            prof.answers.append(answer_dict)
+
             form.pos.meta_info = json.dumps(meta_info)
             form.pos.save()
+
+            if form.cleaned_data.get('save') and not failed:
+                prof.save()
+                self.cart_session[f'saved_attendee_profile_{form.pos.pk}'] = prof.pk
+
         return not failed
 
     def _save_to_answer(self, field, answer, value):

src/pretix/base/views/redirect.py

@@ -24,6 +24,21 @@ import urllib.parse
 from django.core import signing
 from django.http import HttpResponseBadRequest, HttpResponseRedirect
 from django.urls import reverse
+from django.shortcuts import render
+
+
+def _is_samesite_referer(request):
+    referer = request.META.get('HTTP_REFERER')
+    if referer is None:
+        return False
+
+    referer = urllib.parse.urlparse(referer)
+
+    # Make sure we have a valid URL for Referer.
+    if '' in (referer.scheme, referer.netloc):
+        return False
+
+    return (referer.scheme, referer.netloc) == (request.scheme, request.get_host())
 
 
 def redir_view(request):
@@ -32,6 +47,14 @@ def redir_view(request):
         url = signer.unsign(request.GET.get('url', ''))
     except signing.BadSignature:
         return HttpResponseBadRequest('Invalid parameter')
+
+    if not _is_samesite_referer(request):
+        u = urllib.parse.urlparse(url)
+        return render(request, 'pretixbase/redirect.html', {
+            'hostname': u.hostname,
+            'url': url,
+        })
+
     r = HttpResponseRedirect(url)
     r['X-Robots-Tag'] = 'noindex'
     return r

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) if isinstance(res.result, dict) else 0
+                'percentage': info.get('value', 0) if isinstance(info, dict) else 0
             })
-        elif res.state == 'STARTED':
+        elif state == 'STARTED':
             data.update({
                 'started': True,
             })

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

@@ -42,7 +42,7 @@ 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
@@ -52,7 +52,7 @@ 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, CheckinList, Device, Event, EventMetaProperty, EventMetaValue,
@@ -304,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(
@@ -832,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')),
@@ -851,6 +864,7 @@ class SubEventFilterForm(FilterForm):
             ('7', _('Saturday')),
             ('1', _('Sunday')),
         ),
+        widget=forms.CheckboxSelectMultiple,
         required=False
     )
     query = forms.CharField(
@@ -899,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')
@@ -923,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:
@@ -982,7 +1001,7 @@ class GiftCardFilterForm(FilterForm):
         required=False
     )
     state = forms.ChoiceField(
-        label=_('Empty'),
+        label=_('Status'),
         choices=(
             ('', _('All')),
             ('empty', _('Empty')),
@@ -1326,7 +1345,7 @@ class EventFilterForm(FilterForm):
             )
 
 
-class CheckInFilterForm(FilterForm):
+class CheckinListAttendeeFilterForm(FilterForm):
     orders = {
         'code': ('order__code', 'item__name'),
         '-code': ('-order__code', '-item__name'),
@@ -1373,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')
@@ -1383,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
 
@@ -1429,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
 
 
@@ -1924,3 +1987,69 @@ class CheckinFilterForm(FilterForm):
             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/item.py

@@ -683,7 +683,20 @@ class ItemVariationForm(I18nModelForm):
         qs = kwargs.pop('membership_types')
         super().__init__(*args, **kwargs)
         change_decimal_field(self.fields['default_price'], self.event.currency)
+        self.fields['sales_channels'] = forms.MultipleChoiceField(
+            label=_('Sales channels'),
+            required=False,
+            choices=(
+                (c.identifier, c.verbose_name) for c in get_all_sales_channels().values()
+            ),
+            help_text=_('The sales channel selection for the product as a whole takes precedence, so if a sales channel is '
+                        'selected here but not on product level, the variation will not be available.'),
+            widget=forms.CheckboxSelectMultiple
+        )
+        if not self.instance.pk:
+            self.initial.setdefault('sales_channels', list(get_all_sales_channels().keys()))
 
+        self.fields['description'].widget.attrs['rows'] = 3
         if qs:
             self.fields['require_membership_types'].queryset = qs
         else:
@@ -700,9 +713,19 @@ class ItemVariationForm(I18nModelForm):
             'original_price',
             'description',
             'require_membership',
-            'require_membership_types'
+            'require_membership_types',
+            'available_from',
+            'available_until',
+            'sales_channels',
+            'hide_without_voucher',
         ]
+        field_classes = {
+            'available_from': SplitDateTimeField,
+            'available_until': SplitDateTimeField,
+        }
         widgets = {
+            'available_from': SplitDateTimePickerWidget(),
+            'available_until': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_available_from_0'}),
             'require_membership_types': forms.CheckboxSelectMultiple(attrs={
                 'class': 'scrolling-multiple-choice'
             }),

src/pretix/control/forms/organizer.py

@@ -286,6 +286,7 @@ class OrganizerSettingsForm(SettingsForm):
     auto_fields = [
         'customer_accounts',
         'customer_accounts_link_by_email',
+        'invoice_regenerate_allowed',
         'contact_mail',
         'imprint_url',
         'organizer_info_text',
@@ -294,6 +295,7 @@ class OrganizerSettingsForm(SettingsForm):
         'organizer_homepage_text',
         'organizer_link_back',
         'organizer_logo_image_large',
+        'organizer_logo_image_inherit',
         'giftcard_length',
         'giftcard_expiry_years',
         'locales',
@@ -312,7 +314,7 @@ class OrganizerSettingsForm(SettingsForm):
     organizer_logo_image = ExtFileField(
         label=_('Header image'),
         ext_whitelist=(".png", ".jpg", ".gif", ".jpeg"),
-        max_size=10 * 1024 * 1024,
+        max_size=settings.FILE_UPLOAD_MAX_SIZE_IMAGE,
         required=False,
         help_text=_('If you provide a logo image, we will by default not show your organization name '
                     'in the page header. By default, we show your logo with a size of up to 1140x120 pixels. You '
@@ -323,7 +325,7 @@ class OrganizerSettingsForm(SettingsForm):
         label=_('Favicon'),
         ext_whitelist=(".ico", ".png", ".jpg", ".gif", ".jpeg"),
         required=False,
-        max_size=1 * 1024 * 1024,
+        max_size=settings.FILE_UPLOAD_MAX_SIZE_FAVICON,
         help_text=_('If you provide a favicon, we will show it instead of the default pretix icon. '
                     'We recommend a size of at least 200x200px to accommodate most devices.')
     )

src/pretix/control/forms/vouchers.py

@@ -206,7 +206,7 @@ class VoucherForm(I18nModelForm):
             seats_given=data.get('seat') or data.get('seats'),
             block_quota=data.get('block_quota')
         )
-        if not self.instance.show_hidden_items and (
+        if not data.get('show_hidden_items') and (
             (self.instance.quota and all(i.hide_without_voucher for i in self.instance.quota.items.all()))
             or (self.instance.item and self.instance.item.hide_without_voucher)
         ):

src/pretix/control/templates/pretixcontrol/base.html

@@ -43,6 +43,7 @@
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/quota.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/subevent.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/question.js" %}"></script>
+            <script type="text/javascript" src="{% static "pretixcontrol/js/ui/variations.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/dragndroplist.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/mail.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/orderchange.js" %}"></script>

src/pretix/control/templates/pretixcontrol/checkin/checkins.html

@@ -4,40 +4,45 @@
 {% block title %}{% trans "Check-in history" %}{% endblock %}
 {% block inside %}
     <h1>{% trans "Check-in history" %}</h1>
-    <form class="" action="" method="get">
-        <div class="row filter-form">
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.checkin_list layout='inline' %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">{% trans "Filter" %}</h3>
+        </div>
+        <form class="panel-body filter-form" action="" method="get">
+            <div class="row">
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.checkin_list %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.status %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.type %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.device %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.datetime_from %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.datetime_until %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.gate %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.itemvar %}
+                </div>
             </div>
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.status layout='inline' %}
-            </div>
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.type layout='inline' %}
-            </div>
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.device layout='inline' %}
-            </div>
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.datetime_from layout='inline' %}
-            </div>
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.datetime_until layout='inline' %}
-            </div>
-            <div class="col-md-2 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.gate layout='inline' %}
-            </div>
-            <div class="col-md-2 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.itemvar layout='inline' %}
-            </div>
-            <div class="col-md-2 col-xs-6">
-                <button class="btn btn-block btn-primary" type="submit">
+            <div class="text-right">
+                <button class="btn btn-primary btn-lg" type="submit">
                     <span class="fa fa-filter"></span>
-                    <span class="hidden-md">{% trans "Filter" %}</span>
+                    {% trans "Filter" %}
                 </button>
             </div>
-        </div>
-    </form>
+        </form>
+    </div>
     {% if checkins|length == 0 %}
         <div class="empty-collection">
             <p>
@@ -69,17 +74,17 @@
                             {{ c.datetime|date:"SHORT_DATETIME_FORMAT" }}
                             {% if c.type == "exit" %}
                                 {% if c.auto_checked_in %}
-                                    <span class="fa fa-fw fa-hourglass-end" data-toggle="tooltip_html"
+                                    <span class="fa fa-fw fa-hourglass-end" data-toggle="tooltip"
                                           title="{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Automatically marked not present: {{ date }}{% endblocktrans %}"></span>
                                 {% endif %}
                             {% elif c.forced and c.successful %}
-                                <span class="fa fa-fw fa-warning" data-toggle="tooltip_html"
+                                <span class="fa fa-fw fa-warning" data-toggle="tooltip"
                                       title="{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Additional entry scan: {{ date }}{% endblocktrans %}"></span>
                             {% elif c.forced and not c.successful %}
                                 <br>
                                 <small class="text-muted">{% trans "Failed in offline mode" %}</small>
                             {% elif c.auto_checked_in %}
-                                <span class="fa fa-fw fa-magic" data-toggle="tooltip_html"
+                                <span class="fa fa-fw fa-magic" data-toggle="tooltip"
                                       title="{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Automatically checked in: {{ date }}{% endblocktrans %}"></span>
                             {% endif %}
                         </td>
@@ -127,7 +132,7 @@
                                 {% if c.position.item %}
                                     <br>
                                     <small>
-                                        <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=c.position.id %}">
+                                        <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=c.position.item_id %}">
                                             {{ c.position.item }}{% if c.position.variation %} –
                                                 {{ c.position.variation }}{% endif %}
                                         </a>

src/pretix/control/templates/pretixcontrol/checkin/index.html

@@ -27,25 +27,41 @@
             {% trans "CSV" %}
         </a>
     </h1>
-    <form class="row filter-form" action="" method="get">
-        <div class="col-md-4 col-sm-6 col-xs-12">
-            {% bootstrap_field filter_form.user layout='inline' %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">{% trans "Filter" %}</h3>
         </div>
-        <div class="col-md-3 col-sm-6 col-xs-12">
-            {% bootstrap_field filter_form.status layout='inline' %}
-        </div>
-        <div class="col-md-3 col-sm-6 col-xs-12">
-            {% bootstrap_field filter_form.item layout='inline' %}
-        </div>
-        <div class="col-md-2 col-sm-6 col-xs-12">
-            <button class="btn btn-primary btn-block" type="submit">
-                <span class="fa fa-filter"></span>
-                <span class="hidden-md">
+        <form class="panel-body filter-form" action="" method="get">
+            <div class="row">
+                <div class="col-md-6 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.user %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.status %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.item %}
+                </div>
+                {% if filter_form.subevent %}
+                    <div class="col-md-6 col-sm-6 col-xs-12">
+                        {% bootstrap_field filter_form.subevent %}
+                    </div>
+                    <div class="col-md-3 col-sm-6 col-xs-12">
+                        {% bootstrap_field filter_form.subevent_from %}
+                    </div>
+                    <div class="col-md-3 col-sm-6 col-xs-12">
+                        {% bootstrap_field filter_form.subevent_until %}
+                    </div>
+                {% endif %}
+            </div>
+            <div class="text-right">
+                <button class="btn btn-primary btn-lg" type="submit">
+                    <span class="fa fa-filter"></span>
                     {% trans "Filter" %}
-                </span>
-            </button>
-        </div>
-    </form>
+                </button>
+            </div>
+        </form>
+    </div>
     {% if entries|length == 0 %}
         <div class="empty-collection">
             <p>

src/pretix/control/templates/pretixcontrol/event/settings.html

@@ -256,9 +256,22 @@
                 <div class="alert alert-info">
                     {% blocktrans trimmed %}
                         The waiting list currently is not compatible with some advanced features of pretix such as
-                        seating plans, add-on products or product bundles.
+                        add-on products or product bundles.
                     {% endblocktrans %}
                 </div>
+                <div class="alert alert-info">
+                    {% blocktrans trimmed %}
+                        The waiting list determines availability mainly based on quotas. If you use a seating plan and your
+                        number of available seats is less than the available quota, you might run into situations where
+                        people are sent an email from the waiting list but still are unable to book a seat.
+                    {% endblocktrans %}
+                    <strong>
+                        {% blocktrans trimmed %}
+                            Specifically, this means the waiting list is not safe to use together with the minimum distance
+                            feature of our seating plan module.
+                        {% endblocktrans %}
+                    </strong>
+                </div>
                 {% bootstrap_field sform.waiting_list_enabled layout="control" %}
                 {% bootstrap_field sform.waiting_list_auto layout="control" %}
                 {% bootstrap_field sform.waiting_list_hours layout="control" %}

src/pretix/control/templates/pretixcontrol/events/index.html

@@ -24,32 +24,30 @@
             <div class="panel-heading">
                 <h3 class="panel-title">{% trans "Filter" %}</h3>
             </div>
-            <div class="panel-body">
-                <form class="" action="" method="get">
-                    <div class="row filter-form">
-                        <div class="col-md-3 col-sm-6 col-xs-12">
-                            {% bootstrap_field filter_form.query layout='inline' %}
-                        </div>
-                        <div class="col-md-3 col-sm-6 col-xs-12">
-                            {% bootstrap_field filter_form.status layout='inline' %}
-                        </div>
-                        <div class="col-md-3 col-sm-6 col-xs-12">
-                            {% bootstrap_field filter_form.organizer layout='inline' %}
-                        </div>
-                        {% for mf in meta_fields %}
-                            <div class="col-md-3 col-sm-6 col-xs-12">
-                                {% bootstrap_field mf layout='inline' %}
-                            </div>
-                        {% endfor %}
+            <form class="panel-body filter-form" action="" method="get">
+                <div class="row">
+                    <div class="col-md-3 col-sm-6 col-xs-12">
+                        {% bootstrap_field filter_form.query %}
                     </div>
-                    <div class="text-right">
-                        <button class="btn btn-primary" type="submit">
-                            <span class="fa fa-filter"></span>
-                            <span class="hidden-md">{% trans "Filter" %}</span>
-                        </button>
+                    <div class="col-md-3 col-sm-6 col-xs-12">
+                        {% bootstrap_field filter_form.status %}
                     </div>
-                </form>
-            </div>
+                    <div class="col-md-3 col-sm-6 col-xs-12">
+                        {% bootstrap_field filter_form.organizer %}
+                    </div>
+                    {% for mf in meta_fields %}
+                        <div class="col-md-3 col-sm-6 col-xs-12">
+                            {% bootstrap_field mf %}
+                        </div>
+                    {% endfor %}
+                </div>
+                <div class="text-right">
+                    <button class="btn btn-primary btn-lg" type="submit">
+                        <span class="fa fa-filter"></span>
+                        {% trans "Filter" %}
+                    </button>
+                </div>
+            </form>
         </div>
         <p>
             <a href="{% url "control:events.add" %}" class="btn btn-default">

src/pretix/control/templates/pretixcontrol/fragment_quota_box.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 <div class="quotabox availability" data-toggle="tooltip_html" data-placement="top"
-        title="{% trans "Quota:" %} {{ q.name }}<br>{% blocktrans with date=q.cached_availability_time|date:"SHORT_DATETIME_FORMAT" %}Numbers as of {{ date }}{% endblocktrans %}">
+        title="{% trans "Quota:" %} {{ q.name|force_escape|force_escape }}<br>{% blocktrans with date=q.cached_availability_time|date:"SHORT_DATETIME_FORMAT" %}Numbers as of {{ date }}{% endblocktrans %}">
     {% if q.size|default_if_none:"NONE" == "NONE" %}
         <div class="progress">
             <div class="progress-bar progress-bar-success progress-bar-100">

src/pretix/control/templates/pretixcontrol/fragment_quota_box_paid.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 <a class="quotabox" data-toggle="tooltip_html" data-placement="top"
-        title="{% trans "Quota:" %} {{ q.name }}{% if q.cached_avail.1 is not None %}<br>{% blocktrans with num=q.cached_avail.1 %}Currently available: {{ num }}{% endblocktrans %}{% endif %}"
+        title="{% trans "Quota:" %} {{ q.name|force_escape|force_escape }}{% if q.cached_avail.1 is not None %}<br>{% blocktrans with num=q.cached_avail.1 %}Currently available: {{ num }}{% endblocktrans %}{% endif %}"
     href="{% url "control:event.items.quotas.show" event=q.event.slug organizer=q.event.organizer.slug quota=q.pk %}">
     {% if q.size|default_if_none:"NONE" == "NONE" %}
         <div class="progress">

src/pretix/control/templates/pretixcontrol/item/include_variations.html

@@ -1,37 +1,59 @@
 {% load i18n %}
 {% load bootstrap3 %}
 {% load formset_tags %}
-<div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}">
+<div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}" id="item_variations">
     {{ formset.management_form }}
     {% bootstrap_formset_errors formset %}
     <div data-formset-body>
         {% for form in formset %}
-            <div class="panel panel-default" data-formset-form>
+            <details class="panel panel-default" data-formset-form>
                 <div class="sr-only">
                     {{ form.id }}
                     {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
                     {% bootstrap_field form.ORDER form_group_class="" layout="inline" %}
                 </div>
-                <div class="panel-heading">
-                    <h4 class="panel-title">
-                        <div class="row">
-                            <div class="col-md-9">
-                                {% bootstrap_field form.value layout='inline' form_group_class="" %}
-                            </div>
-                            <div class="col-md-3 text-right flip">
-                                <button type="button" class="btn btn-default" data-formset-move-up-button>
-                                    <i class="fa fa-arrow-up"></i></button>
-                                <button type="button" class="btn btn-default" data-formset-move-down-button>
-                                    <i class="fa fa-arrow-down"></i></button>
-                                <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                    <i class="fa fa-trash"></i></button>
-                                {% if form.instance.id %}
-                                    <br><small class="text-muted">#{{ form.instance.id }}</small>
-                                {% endif %}
-                            </div>
+                <summary class="panel-heading">
+                    <div class="row">
+                        <div class="col-md-4 col-xs-12">
+                            <strong class="panel-title">
+                                <span class="fa fa-fw chevron"></span>
+                                <span class="fa fa-warning text-danger hidden variation-error"></span>
+                                <span class="variation-name">
+                                    Variation name
+                                </span>
+                            </strong>
+                            <span class="fa fa-warning text-warning hidden variation-warning"></span>
+                            {% if form.instance.id %}
+                                <br>
+                                <small class="text-muted">#{{ form.instance.id }}</small>
+                            {% endif %}
                         </div>
-                    </h4>
-                </div>
+                        <div class="col-md-2 col-xs-6">
+                            <span class="fa fa-clock-o fa-fw text-muted variation-timeframe variation-icon-hidden" data-toggle="tooltip" title="{% trans "Only available in a limited timeframe" %}"></span>
+                            <span class="fa fa-tags fa-fw text-muted variation-voucher variation-icon-hidden" data-toggle="tooltip"
+                                    title="{% trans "Only visible with a voucher" %}"></span>
+                            <span class="fa fa-id-badge fa-fw text-muted variation-membership variation-icon-hidden" data-toggle="tooltip"
+                                    title="{% trans "Require a valid membership" %}"></span>
+                        </div>
+                        <div class="col-md-2 col-xs-6">
+                            {% for k, c in sales_channels.items %}
+                                <span class="fa fa-fw fa-{{ c.icon }} text-muted variation-channel-{{ k }} variation-icon-hidden"
+                                        data-toggle="tooltip" title="{% trans c.verbose_name %}"></span>
+                            {% endfor %}
+                        </div>
+                        <div class="col-md-1 col-xs-6 text-right flip variation-price">
+                            <!-- price will be inserted by JS here -->
+                        </div>
+                        <div class="col-md-3 col-xs-6 text-right flip">
+                            <button type="button" class="btn btn-default" data-formset-move-up-button>
+                                <i class="fa fa-arrow-up"></i></button>
+                            <button type="button" class="btn btn-default" data-formset-move-down-button>
+                                <i class="fa fa-arrow-down"></i></button>
+                            <button type="button" class="btn btn-danger" data-formset-delete-button>
+                                <i class="fa fa-trash"></i></button>
+                        </div>
+                    </div>
+                </summary>
                 <div class="panel-body form-horizontal">
                     {% if form.instance.pk and not form.instance.quotas.exists %}
                         <div class="alert alert-warning">
@@ -43,9 +65,14 @@
                     {% endif %}
                     {% bootstrap_form_errors form %}
                     {% bootstrap_field form.active layout="control" %}
+                    {% bootstrap_field form.value layout="control" %}
                     {% bootstrap_field form.default_price addon_after=request.event.currency layout="control" %}
                     {% bootstrap_field form.original_price addon_after=request.event.currency layout="control" %}
                     {% bootstrap_field form.description layout="control" %}
+                    {% bootstrap_field form.available_from layout="control" %}
+                    {% bootstrap_field form.available_until layout="control" %}
+                    {% bootstrap_field form.sales_channels layout="control" %}
+                    {% bootstrap_field form.hide_without_voucher layout="control" %}
                     {% if form.require_membership %}
                         {% bootstrap_field form.require_membership layout="control" %}
                         <div data-display-dependency="#{{ form.require_membership.id_for_label }}">
@@ -53,39 +80,69 @@
                         </div>
                     {% endif %}
                 </div>
-            </div>
+            </details>
         {% endfor %}
     </div>
     <script type="form-template" data-formset-empty-form>
         {% escapescript %}
-            <div class="panel panel-default" data-formset-form>
+            <details class="panel panel-default" data-formset-form open>
                 <div class="sr-only">
                     {{ formset.empty_form.id }}
                     {% bootstrap_field formset.empty_form.DELETE form_group_class="" layout="inline" %}
                     {% bootstrap_field formset.empty_form.ORDER form_group_class="" layout="inline" %}
                 </div>
-                <div class="panel-heading">
-                    <h4 class="panel-title">
-                        <div class="row">
-                            <div class="col-md-9">
-                                {% bootstrap_field formset.empty_form.value layout='inline' form_group_class="" %}
-                            </div>
-                            <div class="col-md-3 text-right flip">
-                                <button type="button" class="btn btn-default" data-formset-move-up-button>
-                                    <i class="fa fa-arrow-up"></i></button>
-                                <button type="button" class="btn btn-default" data-formset-move-down-button>
-                                    <i class="fa fa-arrow-down"></i></button>
-                                <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                    <i class="fa fa-trash"></i></button>
-                            </div>
+                <summary class="panel-heading">
+                    <div class="row">
+                        <div class="col-md-4 col-xs-12">
+                            <strong class="panel-title">
+                                <span class="fa fa-fw chevron"></span>
+                                <span class="fa fa-warning text-danger hidden variation-error"></span>
+                                <span class="variation-name">
+                                    {% trans "New variation" %}
+                                </span>
+                            </strong>
+                            <span class="fa fa-warning text-warning hidden variation-warning"></span>
+                            {% if form.instance.id %}
+                                <br>
+                                <small class="text-muted">#{{ form.instance.id }}</small>
+                            {% endif %}
                         </div>
-                    </h4>
-                </div>
+                        <div class="col-md-2 col-xs-6">
+                            <span class="fa fa-clock-o fa-fw text-muted variation-timeframe variation-icon-hidden" data-toggle="tooltip" title="{% trans "Only available in a limited timeframe" %}"></span>
+                            <span class="fa fa-tags fa-fw text-muted variation-voucher variation-icon-hidden" data-toggle="tooltip"
+                                    title="{% trans "Only visible with a voucher" %}"></span>
+                            <span class="fa fa-id-badge fa-fw text-muted variation-membership variation-icon-hidden" data-toggle="tooltip"
+                                    title="{% trans "Require a valid membership" %}"></span>
+                        </div>
+                        <div class="col-md-2 col-xs-6">
+                            {% for k, c in sales_channels.items %}
+                                <span class="fa fa-fw fa-{{ c.icon }} text-muted variation-channel-{{ k }} variation-icon-hidden"
+                                        data-toggle="tooltip" title="{% trans c.verbose_name %}"></span>
+                            {% endfor %}
+                        </div>
+                        <div class="col-md-1 col-xs-6 text-right flip variation-price">
+                            <!-- price will be inserted by JS here -->
+                        </div>
+                        <div class="col-md-3 col-xs-6 text-right flip">
+                            <button type="button" class="btn btn-default" data-formset-move-up-button>
+                                <i class="fa fa-arrow-up"></i></button>
+                            <button type="button" class="btn btn-default" data-formset-move-down-button>
+                                <i class="fa fa-arrow-down"></i></button>
+                            <button type="button" class="btn btn-danger" data-formset-delete-button>
+                                <i class="fa fa-trash"></i></button>
+                        </div>
+                    </div>
+                </summary>
                 <div class="panel-body form-horizontal">
                     {% bootstrap_field formset.empty_form.active layout="control" %}
+                    {% bootstrap_field formset.empty_form.value layout="control" %}
                     {% bootstrap_field formset.empty_form.default_price addon_after=request.event.currency layout="control" %}
                     {% bootstrap_field formset.empty_form.original_price addon_after=request.event.currency layout="control" %}
                     {% bootstrap_field formset.empty_form.description layout="control" %}
+                    {% bootstrap_field formset.empty_form.available_from layout="control" %}
+                    {% bootstrap_field formset.empty_form.available_until layout="control" %}
+                    {% bootstrap_field formset.empty_form.sales_channels layout="control" %}
+                    {% bootstrap_field formset.empty_form.hide_without_voucher layout="control" %}
                     {% if formset.empty_form.require_membership %}
                         {% bootstrap_field formset.empty_form.require_membership layout="control" %}
                         <div data-display-dependency="#{{ formset.empty_form.require_membership.id_for_label }}">
@@ -93,7 +150,7 @@
                         </div>
                     {% endif %}
                 </div>
-            </div>
+            </details>
         {% endescapescript %}
     </script>
     <p>

src/pretix/control/templates/pretixcontrol/order/index.html

@@ -236,14 +236,16 @@
                                         {% if i.is_cancellation %}{% trans "Cancellation" context "invoice" %}{% else %}{% trans "Invoice" %}{% endif %}
                                         {{ i.number }}</a> ({{ i.date|date:"SHORT_DATE_FORMAT" }})
                                     {% if not i.canceled %}
-                                        <form class="form-inline helper-display-inline" method="post"
-                                                action="{% url "control:event.order.regeninvoice" event=request.event.slug organizer=request.event.organizer.slug code=order.code id=i.pk %}">
-                                            {% csrf_token %}
-                                            <button class="btn btn-default btn-xs" data-toggle="tooltip"
-                                                title="{% trans 'Rebuild the invoice with updated data but the same invoice number.' %}">
-                                                {% trans "Regenerate" %}
-                                            </button>
-                                        </form>
+                                        {% if request.event.settings.invoice_regenerate_allowed %}
+                                            <form class="form-inline helper-display-inline" method="post"
+                                                    action="{% url "control:event.order.regeninvoice" event=request.event.slug organizer=request.event.organizer.slug code=order.code id=i.pk %}">
+                                                {% csrf_token %}
+                                                <button class="btn btn-default btn-xs" data-toggle="tooltip"
+                                                    title="{% trans 'Rebuild the invoice with updated data but the same invoice number.' %}">
+                                                    {% trans "Regenerate" %}
+                                                </button>
+                                            </form>
+                                        {% endif %}
                                         {% if not i.is_cancellation %}
                                             <form class="form-inline helper-display-inline" method="post"
                                                     action="{% url "control:event.order.reissueinvoice" event=request.event.slug organizer=request.event.organizer.slug code=order.code id=i.pk %}">
@@ -326,19 +328,19 @@
                                 {% if line.checkins.all %}
                                     {% for c in line.all_checkins.all %}
                                         {% if not c.successful %}
-                                            <span class="fa fa-fw fa-exclamation-circle text-danger" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Denied scan: {{ date }}{% endblocktrans %}<br>{{ c.get_error_reason_display }}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
+                                            <span class="fa fa-fw fa-exclamation-circle text-danger" data-toggle="tooltip_html" title="{{ c.list.name|force_escape|force_escape }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Denied scan: {{ date }}{% endblocktrans %}<br>{{ c.get_error_reason_display }}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
                                         {% elif c.type == "exit" %}
                                             {% if c.auto_checked_in %}
-                                                <span class="fa fa-fw text-success fa-hourglass-end" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Automatically marked not present: {{ date }}{% endblocktrans %}"></span>
+                                                <span class="fa fa-fw text-success fa-hourglass-end" data-toggle="tooltip_html" title="{{ c.list.name|force_escape|force_escape }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Automatically marked not present: {{ date }}{% endblocktrans %}"></span>
                                             {% else %}
-                                                <span class="fa fa-fw text-success fa-sign-out" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Exit scan: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
+                                                <span class="fa fa-fw text-success fa-sign-out" data-toggle="tooltip_html" title="{{ c.list.name|force_escape|force_escape }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Exit scan: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
                                             {% endif %}
                                         {% elif c.forced %}
-                                            <span class="fa fa-fw fa-warning text-warning" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Additional entry scan: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
+                                            <span class="fa fa-fw fa-warning text-warning" data-toggle="tooltip_html" title="{{ c.list.name|force_escape|force_escape }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Additional entry scan: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
                                         {% elif c.auto_checked_in %}
-                                            <span class="fa fa-fw fa-magic text-success" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Automatically checked in: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
+                                            <span class="fa fa-fw fa-magic text-success" data-toggle="tooltip_html" title="{{ c.list.name|force_escape|force_escape }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Automatically checked in: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
                                         {% else %}
-                                            <span class="fa fa-fw fa-check text-success" data-toggle="tooltip_html" title="{{ c.list.name }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Entry scan: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
+                                            <span class="fa fa-fw fa-check text-success" data-toggle="tooltip_html" title="{{ c.list.name|force_escape|force_escape }}<br>{% blocktrans trimmed with date=c.datetime|date:'SHORT_DATETIME_FORMAT' %}Entry scan: {{ date }}{% endblocktrans %}{% if c.gate %}<br>{{ c.gate }}{% endif %}"></span>
                                         {% endif %}
                                     {% endfor %}
                                 {% endif %}