Fix Pillow version

Currently translated at 100.0% (4019 of 4019 strings)

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

powered by weblate

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,23 @@
+---
+name: Bug report
+about: Please only create issues for bug reports. Feature requests or general questions
+  should start as a "Discussion" on GitHub.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- Please only create issues for bug reports. Feature requests or general questions should start as a "Discussion" on GitHub. -->
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/workflows/docs.yml

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

.github/workflows/strings.yml

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

.github/workflows/style.yml

@@ -29,7 +29,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install Dependencies
-        run: pip3 install --no-use-pep517 -Ur src/requirements/dev.txt
+        run: pip3 install -Ur src/requirements/dev.txt
       - name: Run isort
         run: isort -c .
         working-directory: ./src
@@ -49,7 +49,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install Dependencies
-        run: pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt
+        run: pip3 install -r src/requirements.txt -Ur src/requirements/dev.txt
       - name: Run flake8
         run: flake8 .
         working-directory: ./src

.github/workflows/tests.yml

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

deployment/docker/supervisord/base.conf

@@ -2,9 +2,8 @@
 file=/tmp/supervisor.sock
 
 [supervisord]
-logfile=/tmp/supervisord.log
-logfile_maxbytes=50MB
-logfile_backups=10
+logfile=/dev/stdout
+logfile_maxbytes=0
 loglevel=info
 pidfile=/tmp/supervisord.pid
 nodaemon=false

deployment/docker/supervisord/nginx.conf

@@ -3,5 +3,7 @@ command=/usr/sbin/nginx
 autostart=true
 autorestart=true
 priority=10
-stdout_events_enabled=true
-stderr_events_enabled=true
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/fd/2
+stderr_logfile_maxbytes=0

deployment/docker/supervisord/pretixtask.conf

@@ -4,3 +4,7 @@ autostart=true
 autorestart=true
 priority=5
 user=pretixuser
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/fd/2
+stderr_logfile_maxbytes=0

deployment/docker/supervisord/pretixweb.conf

@@ -5,3 +5,7 @@ autorestart=true
 priority=5
 user=pretixuser
 environment=HOME=/pretix
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/fd/2
+stderr_logfile_maxbytes=0

doc/admin/indexes.rst

@@ -60,6 +60,7 @@ Here is the currently recommended set of commands::
     CREATE INDEX CONCURRENTLY pretix_addidx_ia_company
         ON pretixbase_invoiceaddress
         USING gin (upper("company") gin_trgm_ops);
+    CREATE INDEX CONCURRENTLY pretix_addidx_orderpos_email_upper ON public.pretixbase_orderposition (upper((attendee_email)::text));
 
 
 Also, if you use our ``pretix-shipping`` plugin::

doc/api/guides/index.rst

@@ -8,4 +8,5 @@ This part of the documentation contains how-to guides on some special use cases
 .. toctree::
    :maxdepth: 2
 
+   order_lifecycle
    custom_checkout

doc/api/guides/order_lifecycle.rst

@@ -0,0 +1,56 @@
+Understanding the life cycle of orders
+======================================
+
+When integrating pretix with other systems, it is important that you understand how orders and related objects
+such as order positions, fees, payments, refunds, and invoices work together, in order to react to their changes
+properly and map them to processes in your system.
+
+Order states
+------------
+
+Generally, an order can be in six states. For compatibility reasons, the ``status`` field only allows four values
+and the two remaining states are modeled through the ``require_approval`` field and the number of positions within
+an order. The states and their allowed changes are shown in the following graph:
+
+.. image:: /images/order_states.png
+
+
+Object types
+------------
+
+Order
+    One order represents one purchase. It's the main object you interact with and bundles all the other objects
+    together. Orders can change in many ways during their lifetime, but will never be deleted (unless ``testmode``
+    is set to ``true``).
+
+Order position
+    An order position represents one product contained in the order. Orders can usually have multiple positions.
+    There might be a parent-child relation between order positions if one position is an add-on to another position.
+    Order positions can change in many ways during their lifetime, and can also be removed or added to an order.
+
+Order fees
+    A fee represents a charge that is not related to a product. Examples include shipping fees, service fees, and
+    cancellation fees.
+    Order fees can change in many ways during their lifetime, and can also be removed or added to an order.
+
+Order payment
+    An order payment represents one payment attempt with a specific payment method and amount. An order can have
+    multiple payments attached.
+    Order payments have their own state diagram. Apart from their state and their meta information (e.g. used
+    credit card, …) they usually don't change. They may be added at any time, but will never be deleted.
+
+Order refund
+    An order payment represents one refund attempt with a specific payment method and amount. An order can have
+    multiple refunds attached.
+    Order refunds have their own state diagram. Apart from their state and their meta information (e.g. used
+    credit card, …) they usually don't change. They may be added at any time, but will never be deleted.
+
+Invoice
+    An invoice represents a legal document stating the contents of an order. While the backend technically allows
+    to update an invoice in some situations, invoices are generally considered immutable. Once they are issued,
+    they no longer change. If the order changes substantially (e.g. prices change), an invoice is canceled through
+    creation of a new invoice with the opposite amount, plus the issuance of a new invoice.
+
+Here's an example of how they all play together:
+
+.. image:: /images/order_objects.png

doc/api/resources/carts.rst

@@ -42,10 +42,6 @@ seat                                  objects                    The assigned se
 └ seat_guid                           string                     Identifier of the seat within the seating plan
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 1.17
-
-   This resource has been added.
-
 .. versionchanged:: 3.0
 
    This ``seat`` attribute has been added.

doc/api/resources/categories.rst

@@ -25,14 +25,6 @@ is_addon                              boolean                    If ``true``, it
                                                                  defining add-ons for other products.
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 1.14
-
-   The operations POST, PATCH, PUT and DELETE have been added.
-
-.. versionchanged:: 1.16
-
-   The field ``internal_name`` has been added.
-
 
 Endpoints
 ---------

doc/api/resources/checkinlists.rst

@@ -36,22 +36,6 @@ rules                                 object                     Custom check-in
 exit_all_at                           datetime                   Automatically check out (i.e. perform an exit scan) at this point in time. After this happened, this property will automatically be set exactly one day into the future. Note that this field is considered "internal configuration" and if you pull the list with ``If-Modified-Since``, the daily change in this field will not trigger a response.
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 1.10
-
-   This resource has been added.
-
-.. versionchanged:: 1.11
-
-   The ``positions`` endpoints have been added.
-
-.. versionchanged:: 1.13
-
-   The ``include_pending`` field has been added.
-
-.. versionchanged:: 3.2
-
-    The ``auto_checkin_sales_channels`` field has been added.
-
 .. versionchanged:: 3.9
 
     The ``subevent`` attribute may now be ``null`` inside event series. The ``allow_multiple_entries``,
@@ -68,10 +52,6 @@ exit_all_at                           datetime                   Automatically c
 Endpoints
 ---------
 
-.. versionchanged:: 1.15
-
-   The ``../status/`` detail endpoint has been added.
-
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/checkinlists/
 
    Returns a list of all check-in lists within a given event.
@@ -380,29 +360,6 @@ Endpoints
 Order position endpoints
 ------------------------
 
-.. versionchanged:: 1.15
-
-   The order positions endpoint has been extended by the filter queries ``item__in``, ``variation__in``,
-   ``order__status__in``, ``subevent__in``, ``addon_to__in``, and ``search``. The search for attendee names and order
-   codes is now case-insensitive.
-
-   The ``.../redeem/`` endpoint has been added.
-
-.. versionchanged:: 2.0
-
-   The order positions endpoint has been extended by the filter queries ``voucher`` and ``voucher__code``.
-
-.. versionchanged:: 2.7
-
-   The resource now contains the new attributes ``require_attention`` and ``order__status`` and accepts the new
-   ``ignore_status`` filter. The ``attendee_name`` field is now "smart" (see below) and the redemption endpoint
-   returns ``400`` instead of ``404`` on tickets which are known but not paid.
-
-.. versionchanged:: 3.2
-
-    The ``checkins`` dict now also contains a ``auto_checked_in`` value to indicate if the check-in has been performed
-    automatically by the system.
-
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/checkinlists/(list)/positions/
 
    Returns a list of all order positions within a given event. The result is the same as

doc/api/resources/events.rst

@@ -52,31 +52,6 @@ sales_channels                        list                       A list of sales
 ===================================== ========================== =======================================================
 
 
-.. versionchanged:: 1.7
-
-   The ``meta_data`` field has been added.
-
-.. versionchanged:: 1.15
-
-   The ``plugins`` field has been added.
-   The operations POST, PATCH, PUT and DELETE have been added.
-
-.. versionchanged:: 2.1
-
-   Filters have been added to the list of events.
-
-.. versionchanged:: 2.5
-
-   The ``testmode`` attribute has been added.
-
-.. versionchanged:: 2.8
-
-    When cloning events, the ``testmode`` attribute will now be cloned, too.
-
-.. versionchanged:: 3.0
-
-   The attributes ``seating_plan`` and ``seat_category_mapping`` have been added.
-
 .. versionchanged:: 3.3
 
    The attributes ``geo_lat`` and ``geo_lon`` have been added.

doc/api/resources/invoices.rst

@@ -15,8 +15,24 @@ number                                string                     Invoice number
 order                                 string                     Order code of the order this invoice belongs to
 is_cancellation                       boolean                    ``true``, if this invoice is the cancellation of a
                                                                  different invoice.
-invoice_from                          string                     Sender address
-invoice_to                            string                     Receiver address
+invoice_from_name                     string                     Sender address: Name
+invoice_from                          string                     Sender address: Address lines
+invoice_from_zipcode                  string                     Sender address: ZIP code
+invoice_from_city                     string                     Sender address: City
+invoice_from_country                  string                     Sender address: Country code
+invoice_from_tax_id                   string                     Sender address: Local Tax ID
+invoice_from_vat_id                   string                     Sender address: EU VAT ID
+invoice_to                            string                     Full recipient address
+invoice_to_company                    string                     Recipient address: Company name
+invoice_to_name                       string                     Recipient address: Person name
+invoice_to_street                     string                     Recipient address: Address lines
+invoice_to_zipcode                    string                     Recipient address: ZIP code
+invoice_to_city                       string                     Recipient address: City
+invoice_to_state                      string                     Recipient address: State (only used in some countries)
+invoice_to_country                    string                     Recipient address: Country code
+invoice_to_vat_id                     string                     Recipient address: EU VAT ID
+invoice_to_beneficiary                string                     Invoice beneficiary
+custom_field                          string                     Custom invoice address field
 date                                  date                       Invoice date
 refers                                string                     Invoice number of an invoice this invoice refers to
                                                                  (for example a cancellation refers to the invoice it
@@ -30,6 +46,31 @@ footer_text                           string                     Text to be prin
 lines                                 list of objects            The actual invoice contents
 ├ position                            integer                    Number of the line within an invoice.
 ├ description                         string                     Text representing the invoice line (e.g. product name)
+├ item                                integer                    Product used to create this line. Note that everything
+                                                                 about the product might have changed since the creation
+                                                                 of the invoice. Can be ``null`` for all invoice lines
+                                                                 created before this field was introduced as well as for
+                                                                 all lines not created by a product (e.g. a shipping or
+                                                                 cancellation fee).
+├ variation                           integer                    Product variation used to create this line. Note that everything
+                                                                 about the product might have changed since the creation
+                                                                 of the invoice. Can be ``null`` for all invoice lines
+                                                                 created before this field was introduced as well as for
+                                                                 all lines not created by a product (e.g. a shipping or
+                                                                 cancellation fee).
+├ event_date_from                     datetime                   Start date of the (sub)event this line was created for as it
+                                                                 was set during invoice creation. Can be ``null`` for all invoice
+                                                                 lines created before this was introduced as well as for lines in
+                                                                 an event series not created by a product (e.g. shipping or
+                                                                 cancellation fees).
+├ event_date_to                       datetime                   End date of the (sub)event this line was created for as it
+                                                                 was set during invoice creation. Can be ``null`` for all invoice
+                                                                 lines created before this was introduced as well as for lines in
+                                                                 an event series not created by a product (e.g. shipping or
+                                                                 cancellation fees) as well as whenever the respective (sub)event
+                                                                 has no end date set.
+├ attendee_name                       string                     Attendee name at time of invoice creation. Can be ``null`` if no
+                                                                 name was set or if names are configured to not be added to invoices.
 ├ gross_value                         money (string)             Price including taxes
 ├ tax_value                           money (string)             Tax amount included
 ├ tax_name                            string                     Name of used tax rate (e.g. "VAT")
@@ -46,28 +87,16 @@ internal_reference                    string                     Customer's refe
 ===================================== ========================== =======================================================
 
 
-.. versionchanged:: 1.6
-
-   The attribute ``invoice_no`` has been dropped in favor of ``number`` which includes the number including the prefix,
-   since the prefix can now vary. Also, invoices now need to be identified by their ``number`` instead of the raw
-   number.
-
-
-.. versionchanged:: 1.7
-
-   The attributes ``lines.tax_name``, ``foreign_currency_display``, ``foreign_currency_rate``, and
-   ``foreign_currency_rate_date`` have been added.
-
-
-.. versionchanged:: 1.9
-
-   The attribute ``internal_reference`` has been added.
-
-
 .. versionchanged:: 3.4
 
    The attribute ``lines.number`` has been added.
 
+.. versionchanged:: 3.17
+
+   The attribute ``invoice_to_*``, ``invoice_from_*``, ``custom_field``, ``lines.item``, ``lines.variation``, ``lines.event_date_from``,
+   ``lines.event_date_to``, and ``lines.attendee_name`` have been added.
+   ``refers`` now returns an invoice number including the prefix.
+
 
 Endpoints
 ---------
@@ -101,8 +130,24 @@ Endpoints
             "number": "SAMPLECONF-00001",
             "order": "ABC12",
             "is_cancellation": false,
-            "invoice_from": "Big Events LLC\nDemo street 12\nDemo town",
-            "invoice_to": "Sample company\nJohn Doe\nTest street 12\n12345 Testington\nTestikistan\nVAT ID: EU123456789",
+            "invoice_from_name": "Big Events LLC",
+            "invoice_from": "Demo street 12",
+            "invoice_from_zipcode":"",
+            "invoice_from_city":"Demo town",
+            "invoice_from_country":"US",
+            "invoice_from_tax_id":"",
+            "invoice_from_vat_id":"",
+            "invoice_to": "Sample company\nJohn Doe\nTest street 12\n12345 Testington\nTestikistan\nVAT-ID: EU123456789",
+            "invoice_to_company": "Sample company",
+            "invoice_to_name": "John Doe",
+            "invoice_to_street": "Test street 12",
+            "invoice_to_zipcode": "12345",
+            "invoice_to_city": "Testington",
+            "invoice_to_state": null,
+            "invoice_to_country": "TE",
+            "invoice_to_vat_id": "EU123456789",
+            "invoice_to_beneficiary": "",
+            "custom_field": null,
             "date": "2017-12-01",
             "refers": null,
             "locale": "en",
@@ -115,6 +160,11 @@ Endpoints
               {
                 "position": 1,
                 "description": "Budget Ticket",
+                "item": 1234,
+                "variation": 245,
+                "event_date_from": "2017-12-27T10:00:00Z",
+                "event_date_to": null,
+                "attendee_name": null,
                 "gross_value": "23.00",
                 "tax_value": "0.00",
                 "tax_name": "VAT",
@@ -166,8 +216,24 @@ Endpoints
         "number": "SAMPLECONF-00001",
         "order": "ABC12",
         "is_cancellation": false,
-        "invoice_from": "Big Events LLC\nDemo street 12\nDemo town",
-        "invoice_to": "Sample company\nJohn Doe\nTest street 12\n12345 Testington\nTestikistan\nVAT ID: EU123456789",
+        "invoice_from_name": "Big Events LLC",
+        "invoice_from": "Demo street 12",
+        "invoice_from_zipcode":"",
+        "invoice_from_city":"Demo town",
+        "invoice_from_country":"US",
+        "invoice_from_tax_id":"",
+        "invoice_from_vat_id":"",
+        "invoice_to": "Sample company\nJohn Doe\nTest street 12\n12345 Testington\nTestikistan\nVAT-ID: EU123456789",
+        "invoice_to_company": "Sample company",
+        "invoice_to_name": "John Doe",
+        "invoice_to_street": "Test street 12",
+        "invoice_to_zipcode": "12345",
+        "invoice_to_city": "Testington",
+        "invoice_to_state": null,
+        "invoice_to_country": "TE",
+        "invoice_to_vat_id": "EU123456789",
+        "invoice_to_beneficiary": "",
+        "custom_field": null,
         "date": "2017-12-01",
         "refers": null,
         "locale": "en",
@@ -180,6 +246,11 @@ Endpoints
           {
             "position": 1,
             "description": "Budget Ticket",
+            "item": 1234,
+            "variation": 245,
+            "event_date_from": "2017-12-27T10:00:00Z",
+            "event_date_to": null,
+            "attendee_name": null,
             "gross_value": "23.00",
             "tax_value": "0.00",
             "tax_name": "VAT",

doc/api/resources/item_add-ons.rst

@@ -28,10 +28,6 @@ multi_allowed                         boolean                    Adding the same
 price_included                        boolean                    Adding this add-on to the item is free
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 1.12
-
-   This resource has been added.
-
 Endpoints
 ---------
 

doc/api/resources/item_bundles.rst

@@ -30,10 +30,6 @@ designated_price                      money (string)             Designated pric
                                                                  taxation. This is not added to the price.
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 2.6
-
-   This resource has been added.
-
 Endpoints
 ---------
 

doc/api/resources/item_variations.rst

@@ -26,14 +26,6 @@ description                           multi-lingual string       A public descri
 position                              integer                    An integer, used for sorting
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 2.7
-
-   The attribute ``original_price`` has been added.
-
-.. versionchanged:: 1.12
-
-   This resource has been added.
-
 Endpoints
 ---------
 

doc/api/resources/items.rst

@@ -118,44 +118,6 @@ bundles                               list of objects            Definition of b
 meta_data                             object                     Values set for event-specific meta data parameters.
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 2.7
-
-   The attribute ``original_price`` has been added for ``variations``.
-
-.. versionchanged:: 1.7
-
-   The attribute ``tax_rule`` has been added. ``tax_rate`` is kept for compatibility. The attribute
-   ``checkin_attention`` has been added.
-
-.. versionchanged:: 1.12
-
-   The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
-   The attribute ``price_included`` has been added to ``addons``.
-
-.. versionchanged:: 1.16
-
-   The ``internal_name`` and ``original_price`` fields have been added.
-
-.. versionchanged:: 2.0
-
-   The field ``require_approval`` has been added.
-
-.. versionchanged:: 2.3
-
-   The ``sales_channels`` attribute has been added.
-
-.. versionchanged:: 2.4
-
-   The ``generate_tickets`` attribute has been added.
-
-.. versionchanged:: 2.6
-
-   The ``bundles`` and ``require_bundling`` attributes have been added.
-
-.. versionchanged:: 3.0
-
-   The ``show_quota_left``, ``allow_waitinglist``, and ``hidden_if_available`` attributes have been added.
-
 .. versionchanged:: 3.7
 
    The attribute ``meta_data`` has been added.

doc/api/resources/orders.rst

@@ -94,60 +94,6 @@ last_modified                         datetime                   Last modificati
 ===================================== ========================== =======================================================
 
 
-.. versionchanged:: 1.6
-
-   The ``invoice_address.country`` attribute contains a two-letter country code for all new orders. For old orders,
-   a custom text might still be returned.
-
-.. versionchanged:: 1.7
-
-   The attributes ``invoice_address.vat_id_validated`` and ``invoice_address.is_business`` have been added.
-   The attributes ``order.payment_fee``, ``order.payment_fee_tax_rate`` and ``order.payment_fee_tax_value`` have been
-   deprecated in favor of the new ``fees`` attribute but will still be served and removed in 1.9.
-
-.. versionchanged:: 1.9
-
-   First write operations (``…/mark_paid/``, ``…/mark_pending/``, ``…/mark_canceled/``, ``…/mark_expired/``) have been added.
-   The attribute ``invoice_address.internal_reference`` has been added.
-
-.. versionchanged:: 1.13
-
-   The field ``checkin_attention`` has been added.
-
-.. versionchanged:: 1.15
-
-   The attributes ``order.payment_fee``, ``order.payment_fee_tax_rate``, ``order.payment_fee_tax_value`` and
-   ``order.payment_fee_tax_rule`` have finally been removed.
-
-.. versionchanged:: 1.16
-
-   The attributes ``order.last_modified`` as well as the corresponding filters to the resource have been added.
-   An endpoint for order creation as well as ``…/mark_refunded/`` has been added.
-
-.. versionchanged:: 2.0
-
-   The ``order.payment_date`` and ``order.payment_provider`` attributes have been deprecated in favor of the new
-   nested ``payments`` and ``refunds`` resources, but will still be served and removed in 2.2. The ``require_approval``
-   attribute has been added, as have been the ``…/approve/`` and ``…/deny/`` endpoints.
-
-.. versionchanged:: 2.3
-
-   The ``sales_channel`` attribute has been added.
-
-.. versionchanged:: 2.4
-
-   ``order.status`` can no longer be ``r``, ``…/mark_canceled/`` now accepts a ``cancellation_fee`` parameter and
-   ``…/mark_refunded/`` has been deprecated.
-
-.. versionchanged:: 2.5
-
-   The ``testmode`` attribute has been added and ``DELETE`` has been implemented for orders.
-
-.. versionchanged:: 3.1
-
-   The ``invoice_address.state`` and ``url`` attributes have been added. When creating orders through the API,
-   vouchers are now supported and many fields are now optional.
-
 .. versionchanged:: 3.5
 
    The ``order.fees.canceled`` attribute has been added.
@@ -220,7 +166,7 @@ downloads                             list of objects            List of ticket
 └ url                                 string                     Download URL
 answers                               list of objects            Answers to user-defined questions
 ├ question                            integer                    Internal ID of the answered question
-├ answer                              string                     Text representation of the answer
+├ answer                              string                     Text representation of the answer (URL if answer is a file)
 ├ question_identifier                 string                     The question's ``identifier`` field
 ├ options                             list of integers           Internal IDs of selected option(s)s (only for choice types)
 └ option_identifiers                  list of strings            The ``identifier`` fields of the selected option(s)s
@@ -233,30 +179,6 @@ pdf_data                              object                     Data object req
                                                                  ``pdf_data=true`` query parameter to your request.
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 1.7
-
-   The attribute ``tax_rule`` has been added.
-
-.. versionchanged:: 1.11
-
-   The attribute ``checkins.list`` has been added.
-
-.. versionchanged:: 1.14
-
-  The attributes ``answers.question_identifier`` and ``answers.option_identifiers`` have been added.
-
-.. versionchanged:: 1.16
-
-  The attributes ``pseudonymization_id`` and ``pdf_data`` have been added.
-
-.. versionchanged:: 3.0
-
-  The attribute ``seat`` has been added.
-
-.. versionchanged:: 3.2
-
-  The value ``auto_checked_in`` has been added to the ``checkins``-attribute.
-
 .. versionchanged:: 3.3
 
   The ``url`` of a ticket ``download`` can now also return a ``text/uri-list`` instead of a file. See
@@ -274,6 +196,10 @@ pdf_data                              object                     Data object req
 
   The ``checkin.type`` attribute has been added.
 
+.. versionchanged:: 3.16
+
+   Answers to file questions are now returned as an URL.
+
 .. _order-payment-resource:
 
 Order payment resource
@@ -302,14 +228,6 @@ details                               object                     Payment-specifi
                                                                  the object is empty.
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 2.0
-
-  This resource has been added.
-
-.. versionchanged:: 3.1
-
-  The attributes ``payment_url`` and ``details`` have been added.
-
 .. _order-refund-resource:
 
 Order refund resource
@@ -330,17 +248,9 @@ execution_date                        datetime                   Date and time o
 provider                              string                     Identification string of the payment provider
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 2.0
-
-  This resource has been added.
-
 List of all orders
 ------------------
 
-.. versionchanged:: 1.15
-
-   Filtering for emails or order codes is now case-insensitive.
-
 .. versionchanged:: 3.5
 
    The ``include_canceled_positions`` and ``include_canceled_fees`` query parameters have been added.
@@ -1446,21 +1356,6 @@ Sending e-mails
 List of all order positions
 ---------------------------
 
-.. versionchanged:: 1.15
-
-   The order positions endpoint has been extended by the filter queries ``item__in``, ``variation__in``,
-   ``order__status__in``, ``subevent__in``, ``addon_to__in`` and ``search``. The search for attendee names and order
-   codes is now case-insensitive.
-
-.. versionchanged:: 2.0
-
-   The order positions endpoint has been extended by the filter queries ``voucher``, ``voucher__code`` and
-   ``pseudonymization_id``.
-
-.. versionchanged:: 3.2
-
-  The value ``auto_checked_in`` has been added to the ``checkins``-attribute.
-
 .. versionchanged:: 3.5
 
    The ``include_canceled_positions`` and ``include_canceled_fees`` query parameters have been added.
@@ -1800,10 +1695,6 @@ Manipulating individual positions
 Order payment endpoints
 -----------------------
 
-.. versionchanged:: 2.0
-
-  These endpoints have been added.
-
 .. versionchanged:: 3.6
 
    Payments can now be created through the API.
@@ -2083,10 +1974,6 @@ Order payment endpoints
 Order refund endpoints
 ----------------------
 
-.. versionchanged:: 2.0
-
-  These endpoints have been added.
-
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/refunds/
 
    Returns a list of all refunds for an order.

doc/api/resources/question_options.rst

@@ -19,10 +19,6 @@ identifier                            string                     An arbitrary st
 answer                                multi-lingual string       The displayed value of this option
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 1.12
-
-   This resource has been added.
-
 Endpoints
 ---------
 

doc/api/resources/questions.rst

@@ -75,28 +75,6 @@ dependency_value                      string                     An old version
                                                                  for one value. **Deprecated.**
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 1.12
-
-  The values ``D``, ``H``, and ``W`` for the field ``type`` are now allowed and the ``ask_during_checkin`` field has
-  been added.
-
-.. versionchanged:: 1.14
-
-  Write methods have been added. The attribute ``identifier`` has been added to both the resource itself and the
-  options resource. The ``position`` attribute has been added to the options resource.
-
-.. versionchanged:: 2.7
-
-  The attribute ``hidden`` and the question type ``CC`` have been added.
-
-.. versionchanged:: 3.0
-
-  The attribute ``dependency_values`` has been added.
-
-.. versionchanged:: 3.1
-
-  The attribute ``print_on_invoice`` has been added.
-
 .. versionchanged:: 3.5
 
   The attribute ``help_text`` has been added.

doc/api/resources/quotas.rst

@@ -30,14 +30,6 @@ release_after_exit                    boolean                    Whether the quo
                                                                  have been scanned at an exit.
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 1.10
-
-   The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
-
-.. versionchanged:: 3.0
-
-   The attributes ``close_when_sold_out`` and ``closed`` have been added.
-
 .. versionchanged:: 3.10
 
    The attribute ``release_after_exit`` has been added.

doc/api/resources/seatingplans.rst

@@ -20,10 +20,6 @@ layout                                object                     JSON representa
                                                                  still evolves. The version in use can be found `here`_.
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 3.0
-
-   This endpoint has been added.
-
 Endpoints
 ---------
 

doc/api/resources/subevents.rst

@@ -33,6 +33,7 @@ date_to                               datetime                   The sub-event's
 date_admission                        datetime                   The sub-event's admission date (or ``null``)
 presale_start                         datetime                   The sub-date at which the ticket shop opens (or ``null``)
 presale_end                           datetime                   The sub-date at which the ticket shop closes (or ``null``)
+frontpage_text                        multi-lingual string       The description of the event (or ``null``)
 location                              multi-lingual string       The sub-event location (or ``null``)
 geo_lat                               float                      Latitude of the location (or ``null``)
 geo_lon                               float                      Longitude of the location (or ``null``)
@@ -54,25 +55,6 @@ seat_category_mapping                 object                     An object mappi
 last_modified                         datetime                   Last modification of this object
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 1.7
-
-   The ``meta_data`` field has been added.
-
-.. versionchanged:: 2.1
-
-   The ``event`` field has been added, together with filters on the list of dates and an organizer-level list.
-
-.. versionchanged:: 2.6
-   The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
-
-.. versionchanged:: 2.7
-
-   The attribute ``is_public`` has been added.
-
-.. versionchanged:: 3.0
-
-   The attributes ``seating_plan`` and ``seat_category_mapping`` have been added.
-
 .. versionchanged:: 3.3
 
    The attributes ``geo_lat`` and ``geo_lon`` have been added.

doc/api/resources/taxrules.rst

@@ -24,14 +24,6 @@ home_country                          string                     Merchant countr
                                                                  ``null`` or empty string
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 1.7
-
-   This resource has been added.
-
-.. versionchanged:: 1.9
-
-   The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
-
 
 Endpoints
 ---------

doc/api/resources/vouchers.rst

@@ -46,14 +46,6 @@ show_hidden_items                     boolean                    Only if set to
 ===================================== ========================== =======================================================
 
 
-.. versionchanged:: 1.9
-
-   The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added.
-
-.. versionchanged:: 3.0
-
-   The attribute ``show_hidden_items`` has been added.
-
 .. versionchanged:: 3.4
 
    The attribute ``seat`` has been added.

doc/api/resources/waitinglist.rst

@@ -13,7 +13,10 @@ Field                                 Type                       Description
 ===================================== ========================== =======================================================
 id                                    integer                    Internal ID of the waiting list entry
 created                               datetime                   Creation date of the waiting list entry
+name                                  string                     Name of the user on the waiting list (or ``null``)
+name_parts                            object of strings          Decomposition of name of the user (or ``null``)
 email                                 string                     Email address of the user on the waiting list
+phone                                 string                     Phone number of the user on the waiting list (or ``null``)
 voucher                               integer                    Internal ID of the voucher sent to this user. If
                                                                  this field is set, the user has been sent a voucher
                                                                  and is no longer waiting. If it is ``null``, the

doc/development/api/general.rst

@@ -34,7 +34,7 @@ Frontend
 --------
 
 .. automodule:: pretix.presale.signals
-   :members: html_head, html_footer, footer_link, front_page_top, front_page_bottom, front_page_bottom_widget, fee_calculation_for_cart, contact_form_fields, question_form_fields, contact_form_fields_overrides, question_form_fields_overrides, checkout_confirm_messages, checkout_confirm_page_content, checkout_all_optional, html_page_header, sass_preamble, sass_postamble, render_seating_plan, checkout_flow_steps, position_info, position_info_top, item_description, global_html_head, global_html_footer, global_html_page_header
+   :members: html_head, html_footer, footer_link, global_footer_link, front_page_top, front_page_bottom, front_page_bottom_widget, fee_calculation_for_cart, contact_form_fields, question_form_fields, contact_form_fields_overrides, question_form_fields_overrides, checkout_confirm_messages, checkout_confirm_page_content, checkout_all_optional, html_page_header, sass_preamble, sass_postamble, render_seating_plan, checkout_flow_steps, position_info, position_info_top, item_description, global_html_head, global_html_footer, global_html_page_header
 
 
 .. automodule:: pretix.presale.signals
@@ -79,7 +79,7 @@ Ticket designs
 """"""""""""""
 
 .. automodule:: pretix.base.signals
-   :members: layout_text_variables
+   :members: layout_text_variables, layout_image_variables
 
 .. automodule:: pretix.plugins.ticketoutputpdf.signals
    :members: override_layout

doc/development/concepts.rst

@@ -82,11 +82,15 @@ Orders
 ^^^^^^
 
 If a customer completes the checkout process, an **Order** will be created containing all the entered information.
-An order can be in one of currently four states that are listed in the diagram below:
+An order can be in one of currently six states that are listed in the diagram below:
 
 .. image:: /images/order_states.png
 
-There are additional "fake" states that are displayed like states but not represented as states in the system:
+The dotted lines represent status changes that usually do not happen as part of the regular process, but can be
+performed manually in the admin backend.
+
+For historical reasons, there are only four valid values of the ``status`` field, and the two additional states are
+represented differently:
 
 * An order is considered **canceled (with paid fee)** if it is in **paid** status but does not include any non-cancelled positions.
 

doc/images/order_objects.puml

@@ -0,0 +1,34 @@
+@startuml
+
+participant User
+collections "OrderPayment\nOrderRefund" as P
+collections "Order\nOrderPosition" as O
+collections "Invoice\nInvoiceLine" as I
+
+User -> O: Order placed (€100)
+rnote over O #6DD96D: Order A1B2C\nstatus = **n**\ntotal = €100
+O -> P: Payment created
+O -> I: Invoice created\n(can also happen later)
+rnote over I #6DD96D: Invoice 00001\n€100
+rnote over P #6DD96D: OrderPayment A1B2C-P-1\nstate = **created**
+P -> User: Payment details (web, email)
+User -> P: Payment performed
+rnote over P #EFF46B: OrderPayment A1B2C-P-1\nstate = **confirmed**
+P -> O: Order marked as paid
+rnote over O #EFF46B: Order A1B2C\nstatus = **p**\ntotal = €100
+User -> O: Data change (e.g. invoice address)
+O -> I: Invoice reissued
+rnote over I #6DD96D: Invoice 00002\n€-100
+rnote over I #6DD96D: Invoice 00003\n€100
+rnote over O #EFF46B: Order A1B2C\nstatus = **p**\ntotal = €100
+User -> O: Order canceled
+rnote over O #EFF46B: Order A1B2C\nstatus = **c**
+O -> I: Invoice canceled
+rnote over I #6DD96D: Invoice 00004\n€-100
+O -> P: Refund started
+rnote over P #6DD96D: OrderRefund\nA1B2C-R-1\nstate = **created**
+P -> User: Money sent
+rnote over P #EFF46B: OrderRefund\nA1B2C-R-1\nstate = **done**
+
+@enduml
+

doc/images/order_states.puml

@@ -1,19 +1,39 @@
 @startuml
 
-Pending: Order is expecting payment\nOrder reduces quotas
-Expired: Payment period is over\nOrder does not affect quotas
-Paid: Order was successful\nOrder reduces quotas
-Canceled: Order has been canceled\nOrder does not affect quotas
+state "Approval Pending" as AP
+state "Canceled (with paid fee)" as CP
+AP: status = "n"
+AP: require_approval = true
+Pending: status = "n"
+Pending: require_approval = false
+Pending: Tickets reserved: yes
+Expired: status = "e"
+Expired: Tickets reserved: no
+Paid: status = "p"
+Paid: count(positions | !canceled) > 0
+Paid: Tickets reserved: yes
+CP: status = "p"
+CP: count(positions | !canceled) = 0
+Canceled: status = "c"
+Canceled: Tickets reserved: no
 
-[*] --> Pending: customer\nplaces order
-Pending --> Paid: successful payment
-Pending --> Expired: automatically\nor manually\non admin action
-Expired --> Paid: if payment is received\nonly if quota left
-Expired --> Canceled
-Expired --> Pending: manually\non admin action
-Paid --> Canceled: manually on\nadmin action\nor if an external\npayment provider\nnotifies about a\npayment refund
-Pending --> Canceled: on admin or\ncustomer action
-Paid -> Pending: manually on admin action
-[*] --> Paid: customer\nplaces free order
+
+[*] -> Pending: order placed\ntotal > 0
+[*] -> Paid: order placed\ntotal = 0
+[*] -> AP: order placed\napproval required
+Pending --> Paid: order paid
+Pending --> Expired: after payment\ndeadline
+Expired --> Paid: order paid\n(only if quota left)
+Expired -[dashed]-> Canceled
+Expired -[dashed]-> Pending: order extended
+Paid --> Canceled: order canceled
+Pending --> Canceled: order canceled
+Paid -[dashed]-> Pending: refund
+AP --> Pending: order approved
+AP --> Canceled: order denied
+Paid --> CP: order canceled\n(with cancellation fee)
+Canceled -[dashed]-> Pending: order reactivated
+Canceled -[dashed]-> Paid: order reactivated
+CP -[dashed]-> Canceled: fee canceled
 
 @enduml

doc/plugins/badges.rst

@@ -22,10 +22,6 @@ item_assignments                      list of objects            Products this l
 └ item                                integer                    Item ID
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 1.16
-
-   This resource has been added.
-
 
 Endpoints
 ---------

doc/plugins/ticketoutputpdf.rst

@@ -24,14 +24,6 @@ item_assignments                      list of objects            Products this l
 └ item                                integer                    Item ID
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 1.16
-
-   This resource has been added.
-
-.. versionchanged:: 2.3
-
-   The ``item_assignments.sales_channel`` field has been added.
-
 
 Endpoints
 ---------

doc/user/events/widget.rst

@@ -88,6 +88,15 @@ website. If you confident to have a good reason for not using SSL, you can overr
 
    <pretix-widget event="https://pretix.eu/demo/democon/" skip-ssl-check></pretix-widget>
 
+Always open a new tab
+---------------------
+
+If you want the checkout process to always open a new tab regardless of screen size, you can pass the ``disable-iframe``
+attribute::
+
+   <pretix-widget event="https://pretix.eu/demo/democon/" disable-iframe></pretix-widget>
+
+
 Pre-selecting a voucher
 -----------------------
 
@@ -197,7 +206,10 @@ should be added to the cart. The syntax of this attribute is ``item_ITEMID=1,ite
 where ``ITEMID`` are the internal IDs of items to be added and ``VARID`` are the internal IDs of variations of those
 items, if the items have variations. If you omit the ``items`` attribute, the general start page will be presented.
 
-Just as the widget, the button supports the optional attributes ``voucher`` and ``skip-ssl-check``.
+In case you are using an event-series, you will need to specify the subevent for which the item(s) should be put in the
+cart. This can be done by specifying the ``subevent``-attribute.
+
+Just as the widget, the button supports the optional attributes ``voucher``, ``disable-iframe``, and ``skip-ssl-check``.
 
 You can style the button using the ``pretix-button`` CSS class.
 
@@ -425,11 +437,6 @@ Hosted or pretix Enterprise are active, you can pass the following fields:
     </script>
 
 
-.. versionchanged:: 2.3
-
-   Data passing options have been added in pretix 2.3. If you use a self-hosted version of pretix, they only work
-   fully if you configured a redis server.
-
 .. versionchanged:: 3.6
 
    Dynamically opening the widget has been added in pretix 3.6.

src/Makefile

@@ -6,8 +6,8 @@ localecompile:
 	./manage.py compilemessages
 
 localegen:
-	./manage.py makemessages --keep-pot --ignore "pretix/helpers/*" $(LNGS)
-	./manage.py makemessages --keep-pot -d djangojs --ignore "pretix/helpers/*" --ignore "pretix/static/jsi18n/*" --ignore "pretix/static/jsi18n/*" --ignore "pretix/static.dist/*" --ignore "data/*" --ignore "pretix/static/rrule/*" --ignore "build/*" $(LNGS)
+	./manage.py makemessages --keep-pot --ignore "pretix/helpers/*" --ignore "pretix/static/npm_dir/*" $(LNGS)
+	./manage.py makemessages --keep-pot -d djangojs --ignore "pretix/static/npm_dir/*" --ignore "pretix/helpers/*" --ignore "pretix/static/jsi18n/*" --ignore "pretix/static/jsi18n/*" --ignore "pretix/static.dist/*" --ignore "data/*" --ignore "pretix/static/rrule/*" --ignore "build/*" $(LNGS)
 
 staticfiles: jsi18n
 	./manage.py collectstatic --noinput
@@ -23,3 +23,8 @@ test:
 
 coverage:
 	coverage run -m py.test
+
+npminstall:
+	mkdir -p pretix/static.dist/node_prefix
+	npm install --prefix=pretix/static.dist/node_prefix pretix/static/npm_dir/
+

src/pretix/__init__.py

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

src/pretix/api/auth/devicesecurity.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class FullAccessSecurityProfile:
@@ -41,6 +41,7 @@ class PretixScanSecurityProfile(AllowListSecurityProfile):
         ('POST', 'api-v1:checkinlistpos-redeem'),
         ('GET', 'api-v1:revokedsecrets-list'),
         ('GET', 'api-v1:order-list'),
+        ('GET', 'api-v1:orderposition-pdf_image'),
         ('GET', 'api-v1:event.settings'),
         ('POST', 'api-v1:upload'),
     )
@@ -68,6 +69,7 @@ class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:checkinlist-status'),
         ('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'),
     )
@@ -97,7 +99,9 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
         ('POST', 'api-v1:order-list'),
         ('GET', 'api-v1:order-detail'),
         ('DELETE', 'api-v1:orderposition-detail'),
+        ('GET', 'api-v1:orderposition-pdf_image'),
         ('POST', 'api-v1:order-mark_canceled'),
+        ('POST', 'api-v1:orderpayment-list'),
         ('POST', 'api-v1:orderrefund-list'),
         ('POST', 'api-v1:orderrefund-done'),
         ('POST', 'api-v1:cartposition-list'),

src/pretix/api/serializers/event.py

@@ -13,7 +13,7 @@ from rest_framework.relations import SlugRelatedField
 
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.api.serializers.settings import SettingsSerializer
-from pretix.base.models import Event, TaxRule
+from pretix.base.models import Device, Event, TaxRule, TeamAPIToken
 from pretix.base.models.event import SubEvent
 from pretix.base.models.items import SubEventItem, SubEventItemVariation
 from pretix.base.services.seating import (
@@ -174,9 +174,12 @@ class EventSerializer(I18nAwareModelSerializer):
         }
 
     def validate_meta_data(self, value):
-        for key in value['meta_data'].keys():
+        for key, v in value['meta_data'].items():
             if key not in self.meta_properties:
                 raise ValidationError(_('Meta data property \'{name}\' does not exist.').format(name=key))
+            if self.meta_properties[key].allowed_values:
+                if v not in [_v.strip() for _v in self.meta_properties[key].allowed_values.splitlines()]:
+                    raise ValidationError(_('Meta data property \'{name}\' does not allow value \'{value}\'.').format(name=key, value=v))
         return value
 
     @cached_property
@@ -223,6 +226,14 @@ class EventSerializer(I18nAwareModelSerializer):
 
         return value
 
+    @cached_property
+    def ignored_meta_properties(self):
+        perm_holder = (self.context['request'].auth if isinstance(self.context['request'].auth, (Device, TeamAPIToken))
+                       else self.context['request'].user)
+        if perm_holder.has_organizer_permission('can_change_organizer_settings', request=self.context['request']):
+            return []
+        return [k for k, p in self.meta_properties.items() if p.protected]
+
     @transaction.atomic
     def create(self, validated_data):
         meta_data = validated_data.pop('meta_data', None)
@@ -238,10 +249,11 @@ class EventSerializer(I18nAwareModelSerializer):
         # Meta data
         if meta_data is not None:
             for key, value in meta_data.items():
-                event.meta_values.create(
-                    property=self.meta_properties.get(key),
-                    value=value
-                )
+                if key not in self.ignored_meta_properties:
+                    event.meta_values.create(
+                        property=self.meta_properties.get(key),
+                        value=value
+                    )
 
         # Item Meta properties
         if item_meta_properties is not None:
@@ -279,19 +291,21 @@ class EventSerializer(I18nAwareModelSerializer):
         if meta_data is not None:
             current = {mv.property: mv for mv in event.meta_values.select_related('property')}
             for key, value in meta_data.items():
-                prop = self.meta_properties.get(key)
-                if prop in current:
-                    current[prop].value = value
-                    current[prop].save()
-                else:
-                    event.meta_values.create(
-                        property=self.meta_properties.get(key),
-                        value=value
-                    )
+                if key not in self.ignored_meta_properties:
+                    prop = self.meta_properties.get(key)
+                    if prop in current:
+                        current[prop].value = value
+                        current[prop].save()
+                    else:
+                        event.meta_values.create(
+                            property=self.meta_properties.get(key),
+                            value=value
+                        )
 
             for prop, current_object in current.items():
-                if prop.name not in meta_data:
-                    current_object.delete()
+                if prop.name not in self.ignored_meta_properties:
+                    if prop.name not in meta_data:
+                        current_object.delete()
 
         # Item Meta properties
         if item_meta_properties is not None:
@@ -395,8 +409,8 @@ class SubEventSerializer(I18nAwareModelSerializer):
         model = SubEvent
         fields = ('id', 'name', 'date_from', 'date_to', 'active', 'date_admission',
                   'presale_start', 'presale_end', 'location', 'geo_lat', 'geo_lon', 'event', 'is_public',
-                  'seating_plan', 'item_price_overrides', 'variation_price_overrides', 'meta_data',
-                  'seat_category_mapping', 'last_modified')
+                  'frontpage_text', 'seating_plan', 'item_price_overrides', 'variation_price_overrides',
+                  'meta_data', 'seat_category_mapping', 'last_modified')
 
     def validate(self, data):
         data = super().validate(data)
@@ -444,11 +458,22 @@ class SubEventSerializer(I18nAwareModelSerializer):
         }
 
     def validate_meta_data(self, value):
-        for key in value['meta_data'].keys():
+        for key, v in value['meta_data'].items():
             if key not in self.meta_properties:
                 raise ValidationError(_('Meta data property \'{name}\' does not exist.').format(name=key))
+            if self.meta_properties[key].allowed_values:
+                if v not in [_v.strip() for _v in self.meta_properties[key].allowed_values.splitlines()]:
+                    raise ValidationError(_('Meta data property \'{name}\' does not allow value \'{value}\'.').format(name=key, value=v))
         return value
 
+    @cached_property
+    def ignored_meta_properties(self):
+        perm_holder = (self.context['request'].auth if isinstance(self.context['request'].auth, (Device, TeamAPIToken))
+                       else self.context['request'].user)
+        if perm_holder.has_organizer_permission('can_change_organizer_settings', request=self.context['request']):
+            return []
+        return [k for k, p in self.meta_properties.items() if p.protected]
+
     @transaction.atomic
     def create(self, validated_data):
         item_price_overrides_data = validated_data.pop('subeventitem_set') if 'subeventitem_set' in validated_data else {}
@@ -465,10 +490,11 @@ class SubEventSerializer(I18nAwareModelSerializer):
         # Meta data
         if meta_data is not None:
             for key, value in meta_data.items():
-                subevent.meta_values.create(
-                    property=self.meta_properties.get(key),
-                    value=value
-                )
+                if key not in self.ignored_meta_properties:
+                    subevent.meta_values.create(
+                        property=self.meta_properties.get(key),
+                        value=value
+                    )
 
         # Seats
         if subevent.seating_plan:
@@ -514,19 +540,21 @@ class SubEventSerializer(I18nAwareModelSerializer):
         if meta_data is not None:
             current = {mv.property: mv for mv in subevent.meta_values.select_related('property')}
             for key, value in meta_data.items():
-                prop = self.meta_properties.get(key)
-                if prop in current:
-                    current[prop].value = value
-                    current[prop].save()
-                else:
-                    subevent.meta_values.create(
-                        property=self.meta_properties.get(key),
-                        value=value
-                    )
+                if key not in self.ignored_meta_properties:
+                    prop = self.meta_properties.get(key)
+                    if prop in current:
+                        current[prop].value = value
+                        current[prop].save()
+                    else:
+                        subevent.meta_values.create(
+                            property=self.meta_properties.get(key),
+                            value=value
+                        )
 
             for prop, current_object in current.items():
-                if prop.name not in meta_data:
-                    current_object.delete()
+                if prop.name not in self.ignored_meta_properties:
+                    if prop.name not in meta_data:
+                        current_object.delete()
 
         # Seats
         if seat_category_mapping is not None or ('seating_plan' in validated_data and validated_data['seating_plan'] is None):
@@ -568,6 +596,7 @@ class EventSettingsSerializer(SettingsSerializer):
         'checkout_email_helptext',
         'presale_has_ended_text',
         'voucher_explanation_text',
+        'checkout_success_text',
         'banner_text',
         'banner_text_bottom',
         'show_dates_on_frontpage',
@@ -580,10 +609,16 @@ class EventSettingsSerializer(SettingsSerializer):
         'locale',
         'region',
         'last_order_modification_date',
+        'allow_modifications_after_checkin',
         'show_quota_left',
         'waiting_list_enabled',
         'waiting_list_hours',
         'waiting_list_auto',
+        'waiting_list_names_asked',
+        'waiting_list_names_required',
+        'waiting_list_phones_asked',
+        'waiting_list_phones_required',
+        'waiting_list_phones_explanation_text',
         'max_items_per_order',
         'reservation_time',
         'contact_mail',
@@ -594,6 +629,7 @@ class EventSettingsSerializer(SettingsSerializer):
         'frontpage_subevent_ordering',
         'event_list_type',
         'frontpage_text',
+        'event_info_text',
         'attendee_names_asked',
         'attendee_names_required',
         'attendee_emails_asked',
@@ -627,6 +663,7 @@ class EventSettingsSerializer(SettingsSerializer):
         'mail_from',
         'mail_from_name',
         'mail_attach_ical',
+        'mail_attach_tickets',
         'invoice_address_asked',
         'invoice_address_required',
         'invoice_address_vatid',

src/pretix/api/serializers/order.py

@@ -25,7 +25,7 @@ from pretix.base.models import (
 from pretix.base.models.orders import (
     CartPosition, OrderFee, OrderPayment, OrderRefund, RevokedTicketSecret,
 )
-from pretix.base.pdf import get_variables
+from pretix.base.pdf import get_images, get_variables
 from pretix.base.services.cart import error_messages
 from pretix.base.services.locking import NoLockManager
 from pretix.base.services.pricing import get_price
@@ -45,6 +45,14 @@ class CompatibleCountryField(serializers.Field):
             return instance.country_old
 
 
+class CountryField(serializers.Field):
+    def to_internal_value(self, data):
+        return {self.field_name: Country(data)}
+
+    def to_representation(self, src):
+        return str(src) if src else None
+
+
 class InvoiceAddressSerializer(I18nAwareModelSerializer):
     country = CompatibleCountryField(source='*')
     name = serializers.CharField(required=False)
@@ -112,6 +120,17 @@ class AnswerSerializer(I18nAwareModelSerializer):
     question_identifier = AnswerQuestionIdentifierField(source='*', read_only=True)
     option_identifiers = AnswerQuestionOptionsIdentifierField(source='*', read_only=True)
 
+    def to_representation(self, instance):
+        r = super().to_representation(instance)
+        if r['answer'].startswith('file://') and instance.orderposition:
+            r['answer'] = reverse('api-v1:orderposition-answer', kwargs={
+                'organizer': instance.orderposition.order.event.organizer.slug,
+                'event': instance.orderposition.order.event.slug,
+                'pk': instance.orderposition.pk,
+                'question': instance.question_id,
+            }, request=self.context['request'])
+        return r
+
     class Meta:
         model = QuestionAnswer
         fields = ('question', 'answer', 'question_identifier', 'options', 'option_identifiers')
@@ -265,6 +284,9 @@ class PdfDataSerializer(serializers.Field):
             if 'vars' not in self.context:
                 self.context['vars'] = get_variables(self.context['request'].event)
 
+            if 'vars_images' not in self.context:
+                self.context['vars_images'] = get_images(self.context['request'].event)
+
             for k, f in self.context['vars'].items():
                 res[k] = f['evaluate'](instance, instance.order, ev)
 
@@ -279,7 +301,28 @@ class PdfDataSerializer(serializers.Field):
             for k, v in instance.item._cached_meta_data.items():
                 res['itemmeta:' + k] = v
 
-        return res
+            res['images'] = {}
+
+            for k, f in self.context['vars_images'].items():
+                if 'etag' in f:
+                    has_image = etag = f['etag'](instance, instance.order, ev)
+                else:
+                    has_image = f['etag'](instance, instance.order, ev)
+                    etag = None
+                if has_image:
+                    url = reverse('api-v1:orderposition-pdf_image', kwargs={
+                        'organizer': instance.order.event.organizer.slug,
+                        'event': instance.order.event.slug,
+                        'pk': instance.pk,
+                        'key': k,
+                    }, request=self.context['request'])
+                    if etag:
+                        url += f'#etag={etag}'
+                    res['images'][k] = url
+                else:
+                    res['images'][k] = None
+
+            return res
 
 
 class OrderPositionSerializer(I18nAwareModelSerializer):
@@ -1287,17 +1330,24 @@ class InlineInvoiceLineSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = InvoiceLine
-        fields = ('position', 'description', 'gross_value', 'tax_value', 'tax_rate', 'tax_name')
+        fields = ('position', 'description', 'item', 'variation', 'attendee_name', 'event_date_from',
+                  'event_date_to', 'gross_value', 'tax_value', 'tax_rate', 'tax_name')
 
 
 class InvoiceSerializer(I18nAwareModelSerializer):
     order = serializers.SlugRelatedField(slug_field='code', read_only=True)
-    refers = serializers.SlugRelatedField(slug_field='invoice_no', read_only=True)
+    refers = serializers.SlugRelatedField(slug_field='full_invoice_no', read_only=True)
     lines = InlineInvoiceLineSerializer(many=True)
+    invoice_to_country = CountryField()
+    invoice_from_country = CountryField()
 
     class Meta:
         model = Invoice
-        fields = ('order', 'number', 'is_cancellation', 'invoice_from', 'invoice_to', 'date', 'refers', 'locale',
+        fields = ('order', 'number', 'is_cancellation', 'invoice_from', 'invoice_from_name', 'invoice_from_zipcode',
+                  'invoice_from_city', 'invoice_from_country', 'invoice_from_tax_id', 'invoice_from_vat_id',
+                  'invoice_to', 'invoice_to_company', 'invoice_to_name', 'invoice_to_street', 'invoice_to_zipcode',
+                  'invoice_to_city', 'invoice_to_state', 'invoice_to_country', 'invoice_to_vat_id', 'invoice_to_beneficiary',
+                  'custom_field', 'date', 'refers', 'locale',
                   'introductory_text', 'additional_text', 'payment_provider_text', 'footer_text', 'lines',
                   'foreign_currency_display', 'foreign_currency_rate', 'foreign_currency_rate_date',
                   'internal_reference')

src/pretix/api/serializers/organizer.py

@@ -213,6 +213,8 @@ class TeamMemberSerializer(serializers.ModelSerializer):
 
 class OrganizerSettingsSerializer(SettingsSerializer):
     default_fields = [
+        'contact_mail',
+        'imprint_url',
         'organizer_info_text',
         'event_list_type',
         'event_list_availability',

src/pretix/api/serializers/waitinglist.py

@@ -8,7 +8,7 @@ class WaitingListSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = WaitingListEntry
-        fields = ('id', 'created', 'email', 'voucher', 'item', 'variation', 'locale', 'subevent', 'priority')
+        fields = ('id', 'created', 'name', 'name_parts', 'email', 'phone', 'voucher', 'item', 'variation', 'locale', 'subevent', 'priority')
         read_only_fields = ('id', 'created', 'voucher')
 
     def validate(self, data):
@@ -32,4 +32,11 @@ class WaitingListSerializer(I18nAwareModelSerializer):
             if availability[0] == 100:
                 raise ValidationError("This product is currently available.")
 
+        if data.get('name') and data.get('name_parts'):
+            raise ValidationError(
+                {'name': ['Do not specify name if you specified name_parts.']}
+            )
+        if data.get('name_parts') and '_scheme' not in data.get('name_parts'):
+            data['name_parts']['_scheme'] = event.settings.name_scheme
+
         return data

src/pretix/api/signals.py

@@ -8,9 +8,7 @@ from pretix.api.models import ApiCall, WebHookCall
 from pretix.base.signals import periodic_task
 from pretix.helpers.periodic import minimum_interval
 
-register_webhook_events = Signal(
-    providing_args=[]
-)
+register_webhook_events = Signal()
 """
 This signal is sent out to get all known webhook events. Receivers should return an
 instance of a subclass of pretix.api.webhooks.WebhookEvent or a list of such

src/pretix/api/urls.py

@@ -1,7 +1,7 @@
 import importlib
 
 from django.apps import apps
-from django.conf.urls import include, url
+from django.conf.urls import include, re_path
 from rest_framework import routers
 
 from pretix.api.views import cart
@@ -72,30 +72,32 @@ for app in apps.get_app_configs():
             importlib.import_module(app.name + '.urls')
 
 urlpatterns = [
-    url(r'^', include(router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/', include(orga_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/settings/$', organizer.OrganizerSettingsView.as_view(),
-        name="organizer.settings"),
-    url(r'^organizers/(?P<organizer>[^/]+)/giftcards/(?P<giftcard>[^/]+)/', include(giftcard_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/settings/$', event.EventSettingsView.as_view(),
-        name="event.settings"),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/', include(event_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/teams/(?P<team>[^/]+)/', include(team_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/items/(?P<item>[^/]+)/', include(item_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/questions/(?P<question>[^/]+)/',
-        include(question_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/checkinlists/(?P<list>[^/]+)/',
-        include(checkinlist_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/orders/(?P<order>[^/]+)/', include(order_router.urls)),
-    url(r"^oauth/authorize$", oauth.AuthorizationView.as_view(), name="authorize"),
-    url(r"^oauth/token$", oauth.TokenView.as_view(), name="token"),
-    url(r"^oauth/revoke_token$", oauth.RevokeTokenView.as_view(), name="revoke-token"),
-    url(r"^device/initialize$", device.InitializeView.as_view(), name="device.initialize"),
-    url(r"^device/update$", device.UpdateView.as_view(), name="device.update"),
-    url(r"^device/roll$", device.RollKeyView.as_view(), name="device.roll"),
-    url(r"^device/revoke$", device.RevokeKeyView.as_view(), name="device.revoke"),
-    url(r"^device/eventselection$", device.EventSelectionView.as_view(), name="device.eventselection"),
-    url(r"^upload$", upload.UploadView.as_view(), name="upload"),
-    url(r"^me$", user.MeView.as_view(), name="user.me"),
-    url(r"^version$", version.VersionView.as_view(), name="version"),
+    re_path(r'^', include(router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/', include(orga_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/settings/$', organizer.OrganizerSettingsView.as_view(),
+            name="organizer.settings"),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/giftcards/(?P<giftcard>[^/]+)/', include(giftcard_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/settings/$', event.EventSettingsView.as_view(),
+            name="event.settings"),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/', include(event_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/teams/(?P<team>[^/]+)/', include(team_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/items/(?P<item>[^/]+)/',
+            include(item_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/questions/(?P<question>[^/]+)/',
+            include(question_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/checkinlists/(?P<list>[^/]+)/',
+            include(checkinlist_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/orders/(?P<order>[^/]+)/',
+            include(order_router.urls)),
+    re_path(r"^oauth/authorize$", oauth.AuthorizationView.as_view(), name="authorize"),
+    re_path(r"^oauth/token$", oauth.TokenView.as_view(), name="token"),
+    re_path(r"^oauth/revoke_token$", oauth.RevokeTokenView.as_view(), name="revoke-token"),
+    re_path(r"^device/initialize$", device.InitializeView.as_view(), name="device.initialize"),
+    re_path(r"^device/update$", device.UpdateView.as_view(), name="device.update"),
+    re_path(r"^device/roll$", device.RollKeyView.as_view(), name="device.roll"),
+    re_path(r"^device/revoke$", device.RevokeKeyView.as_view(), name="device.revoke"),
+    re_path(r"^device/eventselection$", device.EventSelectionView.as_view(), name="device.eventselection"),
+    re_path(r"^upload$", upload.UploadView.as_view(), name="upload"),
+    re_path(r"^me$", user.MeView.as_view(), name="user.me"),
+    re_path(r"^version$", version.VersionView.as_view(), name="version"),
 ]

src/pretix/api/views/order.py

@@ -1,4 +1,6 @@
 import datetime
+import mimetypes
+import os
 from decimal import Decimal
 
 import django_filters
@@ -12,6 +14,7 @@ from django.utils.timezone import make_aware, now
 from django.utils.translation import gettext as _
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
 from django_scopes import scopes_disabled
+from PIL import Image
 from rest_framework import mixins, serializers, status, viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import (
@@ -35,8 +38,9 @@ from pretix.base.models import (
     Order, OrderFee, OrderPayment, OrderPosition, OrderRefund, Quota, SubEvent,
     TaxRule, TeamAPIToken, generate_secret,
 )
-from pretix.base.models.orders import RevokedTicketSecret
+from pretix.base.models.orders import QuestionAnswer, RevokedTicketSecret
 from pretix.base.payment import PaymentException
+from pretix.base.pdf import get_images
 from pretix.base.secrets import assign_ticket_secret
 from pretix.base.services import tickets
 from pretix.base.services.invoices import (
@@ -913,6 +917,62 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, mixins.UpdateModelMixin, vi
                 'tax_rule': tr.pk if tr else None,
             })
 
+    @action(detail=True, url_name='answer', url_path=r'answer/(?P<question>\d+)')
+    def answer(self, request, **kwargs):
+        pos = self.get_object()
+        answer = get_object_or_404(
+            QuestionAnswer,
+            orderposition=self.get_object(),
+            question_id=kwargs.get('question')
+        )
+        if not answer.file:
+            raise NotFound()
+
+        ftype, ignored = mimetypes.guess_type(answer.file.name)
+        resp = FileResponse(answer.file, content_type=ftype or 'application/binary')
+        resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}-{}"'.format(
+            self.request.event.slug.upper(),
+            pos.order.code,
+            pos.positionid,
+            os.path.basename(answer.file.name).split('.', 1)[1]
+        )
+        return resp
+
+    @action(detail=True, url_name='pdf_image', url_path=r'pdf_image/(?P<key>[^/]+)')
+    def pdf_image(self, request, key, **kwargs):
+        pos = self.get_object()
+
+        image_vars = get_images(request.event)
+        if key not in image_vars:
+            raise NotFound('Unknown key')
+
+        image_file = image_vars[key]['evaluate'](pos, pos.order, pos.subevent or self.request.event)
+        if image_file is None:
+            raise NotFound('No image available')
+
+        if getattr(image_file, 'name', ''):
+            ftype, ignored = mimetypes.guess_type(image_file.name)
+            extension = os.path.basename(image_file.name).split('.')[-1]
+        else:
+            img = Image.open(image_file)
+            ftype = Image.MIME[img.format]
+            extensions = {
+                'GIF': 'gif', 'TIFF': 'tif', 'BMP': 'bmp', 'JPEG': 'jpg', 'PNG': 'png'
+            }
+            extension = extensions.get(img.format, 'bin')
+            if hasattr(image_file, 'seek'):
+                image_file.seek(0)
+
+        resp = FileResponse(image_file, content_type=ftype or 'application/binary')
+        resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}-{}.{}"'.format(
+            self.request.event.slug.upper(),
+            pos.order.code,
+            pos.positionid,
+            key,
+            extension,
+        )
+        return resp
+
     @action(detail=True, url_name='download', url_path='download/(?P<output>[^/]+)')
     def download(self, request, output, **kwargs):
         provider = self._get_output_provider(output)

src/pretix/base/email.py

@@ -2,10 +2,12 @@ import inspect
 import logging
 from datetime import timedelta
 from decimal import Decimal
+from itertools import groupby
 from smtplib import SMTPResponseException
 
 from django.conf import settings
 from django.core.mail.backends.smtp import EmailBackend
+from django.db.models import Count
 from django.dispatch import receiver
 from django.template.loader import get_template
 from django.utils.timezone import now
@@ -128,9 +130,21 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
 
         if order:
             htmlctx['order'] = order
+            positions = list(order.positions.select_related(
+                'item', 'variation', 'subevent', 'addon_to'
+            ).annotate(
+                has_addons=Count('addons')
+            ))
+            htmlctx['cart'] = [(k, list(v)) for k, v in groupby(
+                positions, key=lambda op: (
+                    op.item, op.variation, op.subevent, op.attendee_name,
+                    (op.pk if op.addon_to_id else None), (op.pk if op.has_addons else None)
+                )
+            )]
 
         if position:
             htmlctx['position'] = position
+            htmlctx['ev'] = position.subevent or self.event
 
         tpl = get_template(self.template_name)
         body_html = inline_css(tpl.render(htmlctx))
@@ -237,6 +251,8 @@ def get_email_context(**kwargs):
     from pretix.base.models import InvoiceAddress
 
     event = kwargs['event']
+    if 'position' in kwargs:
+        kwargs.setdefault("position_or_address", kwargs['position'])
     if 'order' in kwargs:
         try:
             kwargs['invoice_address'] = kwargs['order'].invoice_address
@@ -468,7 +484,8 @@ def base_placeholders(sender, **kwargs):
             '68CYU2H6ZTP3WLK5'
         ),
         SimpleFunctionalMailTextPlaceholder(
-            'voucher_list', ['voucher_list'], lambda voucher_list: '\n'.join(voucher_list),
+            # join vouchers with two spaces at end of line so markdown-parser inserts a <br>
+            'voucher_list', ['voucher_list'], lambda voucher_list: '  \n'.join(voucher_list),
             '    68CYU2H6ZTP3WLK5\n    7MB94KKPVEPSMVF2'
         ),
         SimpleFunctionalMailTextPlaceholder(

src/pretix/base/exporter.py

@@ -1,4 +1,5 @@
 import io
+import re
 import tempfile
 from collections import OrderedDict, namedtuple
 from decimal import Decimal
@@ -10,11 +11,21 @@ from django.db.models import QuerySet
 from django.utils.formats import localize
 from django.utils.translation import gettext, gettext_lazy as _
 from openpyxl import Workbook
-from openpyxl.cell.cell import KNOWN_TYPES
+from openpyxl.cell.cell import ILLEGAL_CHARACTERS_RE, KNOWN_TYPES
 
 from pretix.base.models import Event
 
 
+def excel_safe(val):
+    if not isinstance(val, KNOWN_TYPES):
+        val = str(val)
+
+    if isinstance(val, str):
+        val = re.sub(ILLEGAL_CHARACTERS_RE, '', val)
+
+    return val
+
+
 class BaseExporter:
     """
     This is the base class for all data exporters
@@ -181,7 +192,7 @@ class ListExporter(BaseExporter):
                 total = line.total
                 continue
             ws.append([
-                str(val) if not isinstance(val, KNOWN_TYPES) else val
+                excel_safe(val) if not isinstance(val, KNOWN_TYPES) else val
                 for val in line
             ])
             if total:
@@ -242,7 +253,10 @@ class MultiSheetListExporter(ListExporter):
         pass
 
     def iterate_sheet(self, form_data, sheet):
-        raise NotImplementedError()  # noqa
+        if hasattr(self, 'iterate_' + sheet):
+            yield from getattr(self, 'iterate_' + sheet)(form_data)
+        else:
+            raise NotImplementedError()  # noqa
 
     def _render_sheet_csv(self, form_data, sheet, output_file=None, **kwargs):
         total = 0
@@ -288,6 +302,9 @@ class MultiSheetListExporter(ListExporter):
         n_sheets = len(self.sheets)
         for i_sheet, (s, l) in enumerate(self.sheets):
             ws = wb.create_sheet(str(l))
+            if hasattr(self, 'prepare_xlsx_sheet_' + s):
+                getattr(self, 'prepare_xlsx_sheet_' + s)(ws)
+
             total = 0
             counter = 0
             for i, line in enumerate(self.iterate_sheet(form_data, sheet=s)):
@@ -295,7 +312,7 @@ class MultiSheetListExporter(ListExporter):
                     total = line.total
                     continue
                 ws.append([
-                    str(val) if not isinstance(val, KNOWN_TYPES) else val
+                    excel_safe(val)
                     for val in line
                 ])
                 if total:

src/pretix/base/exporters/invoices.py

@@ -18,6 +18,7 @@ from ...control.forms.filter import get_all_payment_providers
 from ...helpers import GroupConcat
 from ...helpers.iter import chunked_iterable
 from ..exporter import BaseExporter, MultiSheetListExporter
+from ..services.export import ExportError
 from ..services.invoices import invoice_pdf_task
 from ..signals import (
     register_data_exporters, register_multievent_data_exporters,
@@ -66,7 +67,7 @@ class InvoiceExporterMixin:
         )
 
     def invoices_queryset(self, form_data: dict):
-        qs = Invoice.objects.filter(event__in=self.events)
+        qs = Invoice.objects.filter(event__in=self.events).select_related('order')
 
         if form_data.get('payment_provider'):
             qs = qs.annotate(
@@ -111,14 +112,16 @@ class InvoiceExporter(InvoiceExporterMixin, BaseExporter):
                         if not i.file:
                             invoice_pdf_task.apply(args=(i.pk,))
                             i.refresh_from_db()
+                        if not i.file:
+                            raise ExportError('Could not generate PDF for invoice {nr}'.format(nr=i.full_invoice_no))
                         i.file.open('rb')
-                        zipf.writestr('{}.pdf'.format(i.number), i.file.read())
+                        zipf.writestr('{}-{}.pdf'.format(i.number, i.order.code), i.file.read())
                         i.file.close()
                     except FileNotFoundError:
                         invoice_pdf_task.apply(args=(i.pk,))
                         i.refresh_from_db()
                         i.file.open('rb')
-                        zipf.writestr('{}.pdf'.format(i.number), i.file.read())
+                        zipf.writestr('{}-{}.pdf'.format(i.number, i.order.code), i.file.read())
                         i.file.close()
                     counter += 1
                     if total and counter % max(10, total // 100) == 0:

src/pretix/base/exporters/orderlist.py

@@ -691,13 +691,18 @@ class QuotaListExporter(ListExporter):
     verbose_name = gettext_lazy('Quota availabilities')
 
     def iterate_list(self, form_data):
+        has_subevents = self.event.has_subevents
         headers = [
             _('Quota name'), _('Total quota'), _('Paid orders'), _('Pending orders'), _('Blocking vouchers'),
             _('Current user\'s carts'), _('Waiting list'), _('Exited orders'), _('Current availability')
         ]
+        if has_subevents:
+            headers.append(pgettext('subevent', 'Date'))
+            headers.append(_('Start date'))
+            headers.append(_('End date'))
         yield headers
 
-        quotas = list(self.event.quotas.all())
+        quotas = list(self.event.quotas.select_related('subevent'))
         qa = QuotaAvailability(full_results=True)
         qa.queue(*quotas)
         qa.compute()
@@ -715,6 +720,18 @@ class QuotaListExporter(ListExporter):
                 qa.count_exited_orders[quota],
                 _('Infinite') if avail[1] is None else avail[1]
             ]
+            if has_subevents:
+                if quota.subevent:
+                    row.append(quota.subevent.name)
+                    row.append(quota.subevent.date_from.astimezone(self.event.timezone).strftime('%Y-%m-%d %H:%M:%S'))
+                    if quota.subevent.date_to:
+                        row.append(quota.subevent.date_to.astimezone(self.event.timezone).strftime('%Y-%m-%d %H:%M:%S'))
+                    else:
+                        row.append('')
+                else:
+                    row.append('')
+                    row.append('')
+                    row.append('')
             yield row
 
     def get_filename(self):

src/pretix/base/exporters/waitinglist.py

@@ -82,7 +82,9 @@ class WaitingListExporter(ListExporter):
 
         headers = [
             _('Date'),
+            _('Name'),
             _('Email'),
+            _('Phone number'),
             _('Product name'),
             _('Variation'),
             _('Event slug'),
@@ -117,7 +119,9 @@ class WaitingListExporter(ListExporter):
 
             row = [
                 entry.created.astimezone(tz).strftime(datetime_format),  # alternative: .isoformat(),
+                entry.name,
                 entry.email,
+                entry.phone,
                 str(entry.item) if entry.item else "",
                 str(entry.variation) if entry.variation else "",
                 entry.event.slug,

src/pretix/base/forms/questions.py

@@ -444,6 +444,7 @@ class BaseQuestionsForm(forms.Form):
             c = [('', pgettext_lazy('address', 'Select state'))]
             fprefix = str(self.prefix) + '-' if self.prefix is not None and self.prefix != '-' else ''
             cc = None
+            state = None
             if fprefix + 'country' in self.data:
                 cc = str(self.data[fprefix + 'country'])
             elif country:
@@ -452,6 +453,7 @@ class BaseQuestionsForm(forms.Form):
                 types, form = COUNTRIES_WITH_STATE_IN_ADDRESS[cc]
                 statelist = [s for s in pycountry.subdivisions.get(country_code=cc) if s.type in types]
                 c += sorted([(s.code[3:], s.name) for s in statelist], key=lambda s: s[1])
+                state = (cartpos.state if cartpos else orderpos.state)
             elif fprefix + 'state' in self.data:
                 self.data = self.data.copy()
                 del self.data[fprefix + 'state']
@@ -460,6 +462,7 @@ class BaseQuestionsForm(forms.Form):
                 label=pgettext_lazy('address', 'State'),
                 required=False,
                 choices=c,
+                initial=state,
                 widget=forms.Select(attrs={
                     'autocomplete': 'address-level1',
                 }),
@@ -848,11 +851,13 @@ class BaseInvoiceAddressForm(forms.ModelForm):
         ) and len(data.get('name_parts', {})) == 1:
             # Do not save the country if it is the only field set -- we don't know the user even checked it!
             self.cleaned_data['country'] = ''
+
+        if data.get('vat_id') and is_eu_country(data.get('country')) and data.get('vat_id')[:2] != cc_to_vat_prefix(str(data.get('country'))):
+            raise ValidationError(_('Your VAT ID does not match the selected country.'))
+
         if self.validate_vat_id and self.instance.vat_id_validated and 'vat_id' not in self.changed_data:
             pass
         elif self.validate_vat_id and data.get('is_business') and is_eu_country(data.get('country')) and data.get('vat_id'):
-            if data.get('vat_id')[:2] != cc_to_vat_prefix(str(data.get('country'))):
-                raise ValidationError(_('Your VAT ID does not match the selected country.'))
             try:
                 result = vat_moss.id.validate(data.get('vat_id'))
                 if result:

src/pretix/base/forms/widgets.py

@@ -16,7 +16,7 @@ class DatePickerWidget(forms.DateInput):
         date_attrs = dict(attrs)
         date_attrs.setdefault('class', 'form-control')
         date_attrs['class'] += ' datepickerfield'
-        date_attrs['autocomplete'] = 'date-picker-do-not-autofill'
+        date_attrs['autocomplete'] = 'off'
 
         def placeholder():
             df = date_format or get_format('DATE_INPUT_FORMATS')[0]
@@ -37,7 +37,7 @@ class TimePickerWidget(forms.TimeInput):
         time_attrs = dict(attrs)
         time_attrs.setdefault('class', 'form-control')
         time_attrs['class'] += ' timepickerfield'
-        time_attrs['autocomplete'] = 'time-picker-do-not-autofill'
+        time_attrs['autocomplete'] = 'off'
 
         def placeholder():
             tf = time_format or get_format('TIME_INPUT_FORMATS')[0]
@@ -111,8 +111,8 @@ class SplitDateTimePickerWidget(forms.SplitDateTimeWidget):
         time_attrs.setdefault('autocomplete', 'off')
         date_attrs['class'] += ' datepickerfield'
         time_attrs['class'] += ' timepickerfield'
-        date_attrs['autocomplete'] = 'date-picker-do-not-autofill'
-        time_attrs['autocomplete'] = 'time-picker-do-not-autofill'
+        date_attrs['autocomplete'] = 'off'
+        time_attrs['autocomplete'] = 'off'
         if min_date:
             date_attrs['data-min'] = (
                 min_date if isinstance(min_date, date) else min_date.astimezone(get_current_timezone()).date()

src/pretix/base/invoice.py

@@ -12,12 +12,10 @@ from django.utils.formats import date_format, localize
 from django.utils.translation import (
     get_language, gettext, gettext_lazy, pgettext,
 )
-from PIL.Image import BICUBIC
 from reportlab.lib import pagesizes
 from reportlab.lib.enums import TA_LEFT, TA_RIGHT
 from reportlab.lib.styles import ParagraphStyle, StyleSheet1
 from reportlab.lib.units import mm
-from reportlab.lib.utils import ImageReader
 from reportlab.pdfbase import pdfmetrics
 from reportlab.pdfbase.pdfmetrics import stringWidth
 from reportlab.pdfbase.ttfonts import TTFont
@@ -31,6 +29,7 @@ from pretix.base.decimal import round_decimal
 from pretix.base.models import Event, Invoice, Order
 from pretix.base.signals import register_invoice_renderers
 from pretix.base.templatetags.money import money_filter
+from pretix.helpers.reportlab import ThumbnailingImageReader
 
 logger = logging.getLogger(__name__)
 
@@ -221,26 +220,6 @@ class BaseReportlabInvoiceRenderer(BaseInvoiceRenderer):
         return 'invoice.pdf', 'application/pdf', buffer.read()
 
 
-class ThumbnailingImageReader(ImageReader):
-    def resize(self, width, height, dpi):
-        if width is None:
-            width = height * self._image.size[0] / self._image.size[1]
-        if height is None:
-            height = width * self._image.size[1] / self._image.size[0]
-        self._image.thumbnail(
-            size=(int(width * dpi / 72), int(height * dpi / 72)),
-            resample=BICUBIC
-        )
-        self._data = None
-        return width, height
-
-    def _jpeg_fh(self):
-        # Bypass a reportlab-internal optimization that falls back to the original
-        # file handle if the file is a JPEG, and therefore does not respect the
-        # (smaller) size of the modified image.
-        return None
-
-
 class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
     identifier = 'classic'
     verbose_name = pgettext('invoice', 'Classic renderer (pretix 1.0)')
@@ -276,8 +255,10 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
     invoice_from_top = 17 * mm
 
     def _draw_invoice_from(self, canvas):
-        p = Paragraph(self.invoice.full_invoice_from.strip().replace('\n', '<br />\n'), style=self.stylesheet[
-            'InvoiceFrom'])
+        p = Paragraph(
+            bleach.clean(self.invoice.full_invoice_from, tags=[]).strip().replace('\n', '<br />\n'),
+            style=self.stylesheet['InvoiceFrom']
+        )
         p.wrapOn(canvas, self.invoice_from_width, self.invoice_from_height)
         p_size = p.wrap(self.invoice_from_width, self.invoice_from_height)
         p.drawOn(canvas, self.invoice_from_left, self.pagesize[1] - p_size[1] - self.invoice_from_top)
@@ -382,6 +363,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
     def _draw_event(self, canvas):
         def shorten(txt):
             txt = str(txt)
+            txt = bleach.clean(txt, tags=[]).strip()
             p = Paragraph(txt.strip().replace('\n', '<br />\n'), style=self.stylesheet['Normal'])
             p_size = p.wrap(self.event_width, self.event_height)
 
@@ -462,13 +444,18 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
         story = []
         if self.invoice.custom_field:
             story.append(Paragraph(
-                '{}: {}'.format(self.invoice.event.settings.invoice_address_custom_field, self.invoice.custom_field),
+                '{}: {}'.format(
+                    bleach.clean(self.invoice.event.settings.invoice_address_custom_field, tags=[]).strip().replace('\n', '<br />\n'),
+                    bleach.clean(self.invoice.custom_field, tags=[]).strip().replace('\n', '<br />\n'),
+                ),
                 self.stylesheet['Normal']
             ))
 
         if self.invoice.internal_reference:
             story.append(Paragraph(
-                pgettext('invoice', 'Customer reference: {reference}').format(reference=self.invoice.internal_reference),
+                pgettext('invoice', 'Customer reference: {reference}').format(
+                    reference=bleach.clean(self.invoice.internal_reference, tags=[]).strip().replace('\n', '<br />\n'),
+                ),
                 self.stylesheet['Normal']
             ))
 
@@ -487,7 +474,10 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
             ))
 
         if self.invoice.introductory_text:
-            story.append(Paragraph(self.invoice.introductory_text, self.stylesheet['Normal']))
+            story.append(Paragraph(
+                self.invoice.introductory_text,
+                self.stylesheet['Normal']
+            ))
             story.append(Spacer(1, 10 * mm))
 
         return story
@@ -587,10 +577,16 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
         story.append(Spacer(1, 15 * mm))
 
         if self.invoice.payment_provider_text:
-            story.append(Paragraph(self.invoice.payment_provider_text, self.stylesheet['Normal']))
+            story.append(Paragraph(
+                self.invoice.payment_provider_text,
+                self.stylesheet['Normal']
+            ))
 
         if self.invoice.additional_text:
-            story.append(Paragraph(self.invoice.additional_text, self.stylesheet['Normal']))
+            story.append(Paragraph(
+                self.invoice.additional_text,
+                self.stylesheet['Normal']
+            ))
             story.append(Spacer(1, 15 * mm))
 
         tstyledata = [
@@ -722,7 +718,10 @@ class Modern1Renderer(ClassicInvoiceRenderer):
     def _draw_invoice_from(self, canvas):
         if not self.invoice.invoice_from:
             return
-        c = self.invoice.address_invoice_from.strip().split('\n')
+        c = [
+            bleach.clean(l, tags=[]).strip().replace('\n', '<br />\n')
+            for l in self.invoice.address_invoice_from.strip().split('\n')
+        ]
         p = Paragraph(' · '.join(c), style=self.stylesheet['Sender'])
         p.wrapOn(canvas, self.invoice_to_width, 15.7 * mm)
         p.drawOn(canvas, self.invoice_to_left, self.pagesize[1] - self.invoice_to_top + 2 * mm)

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

@@ -16,6 +16,8 @@ class Command(BaseCommand):
     def add_arguments(self, parser):
         parser.add_argument('--tasks', action='store', type=str, help='Only execute the tasks with this name '
                                                                       '(dotted path, comma separation)')
+        parser.add_argument('--exclude', action='store', type=str, help='Exclude the tasks with this name '
+                                                                        '(dotted path, comma separation)')
 
     def handle(self, *args, **options):
         verbosity = int(options['verbosity'])
@@ -28,9 +30,12 @@ class Command(BaseCommand):
             if options.get('tasks'):
                 if name not in options.get('tasks').split(','):
                     continue
+            if options.get('exclude'):
+                if name in options.get('exclude').split(','):
+                    continue
 
             if verbosity > 1:
-                self.stdout.write(f'Running {name}…')
+                self.stdout.write(f'INFO Running {name}…')
             t0 = time.time()
             try:
                 r = receiver(signal=periodic_task, sender=self)
@@ -40,13 +45,13 @@ class Command(BaseCommand):
                 if settings.SENTRY_ENABLED:
                     from sentry_sdk import capture_exception
                     capture_exception(err)
-                    self.stdout.write(self.style.ERROR(f'FAIL: {str(err)}\n'))
+                    self.stdout.write(self.style.ERROR(f'ERROR runperiodic {str(err)}\n'))
                 else:
-                    self.stdout.write(self.style.ERROR(f'FAIL: {str(err)}\n'))
+                    self.stdout.write(self.style.ERROR(f'ERROR runperiodic {str(err)}\n'))
                     traceback.print_exc()
             else:
                 if options.get('verbosity') > 1:
                     if r is SKIPPED:
-                        self.stdout.write(self.style.SUCCESS(f'Skipped {name}'))
+                        self.stdout.write(self.style.SUCCESS(f'INFO Skipped {name}'))
                     else:
-                        self.stdout.write(self.style.SUCCESS(f'Completed {name} in {round(time.time() - t0, 3)}s'))
+                        self.stdout.write(self.style.SUCCESS(f'INFO Completed {name} in {round(time.time() - t0, 3)}s'))

src/pretix/base/migrations/0102_auto_20181017_0024.py

@@ -1,6 +1,6 @@
 # Generated by Django 2.1 on 2018-10-17 00:24
 
-import jsonfallback.fields
+
 from django.core.exceptions import ImproperlyConfigured
 from django.db import migrations
 from django_mysql.checks import mysql_connections
@@ -77,19 +77,19 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='cartposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(null=False, default=dict),
+            field=models.JSONField(null=False, default=dict),
             preserve_default=False,
         ),
         migrations.AddField(
             model_name='orderposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(null=False, default=dict),
+            field=models.JSONField(null=False, default=dict),
             preserve_default=False,
         ),
         migrations.AddField(
             model_name='invoiceaddress',
             name='name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
             preserve_default=False,
         ),
         migrations.RunPython(set_attendee_name_parts, migrations.RunPython.noop)

src/pretix/base/migrations/0103_auto_20181121_1224.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.1 on 2018-11-21 12:24
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0104_auto_20181114_1526.py

@@ -2,7 +2,6 @@
 
 import django.db.models.deletion
 import django.db.models.manager
-import jsonfallback.fields
 from django.db import migrations, models
 
 

src/pretix/base/migrations/0105_auto_20190112_1512.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1 on 2019-01-12 15:12
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0107_auto_20190129_1337.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-01-29 13:37
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0108_auto_20190201_1527.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-02-01 15:27
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0108_auto_20190201_1527_squashed_0141_seat_sorting_rank.py

@@ -3,7 +3,6 @@
 from decimal import Decimal
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.conf import settings
 from django.core.cache import cache
 from django.db import migrations, models
@@ -190,7 +189,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='cartposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='cartposition',
@@ -210,7 +209,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='invoiceaddress',
             name='name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='item',
@@ -225,7 +224,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='orderposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='orderposition',

src/pretix/base/migrations/0109_auto_20190208_1432.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1 on 2019-02-08 14:32
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0110_auto_20190219_1245.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-02-19 12:45
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0111_auto_20190219_0949.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-02-19 09:49
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0113_auto_20190312_0942.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-03-12 09:42
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0114_auto_20190316_1014.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.7 on 2019-03-16 10:14
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0115_auto_20190323_2238.py

@@ -3,7 +3,6 @@
 from decimal import Decimal
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0116_auto_20190402_0722.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-04-02 07:22
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0118_auto_20190423_0839.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.2 on 2019-04-23 08:39
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0119_auto_20190509_0654.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.2 on 2019-05-09 06:54
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0120_auto_20190509_0736.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.2 on 2019-05-09 07:36
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields
@@ -17,7 +16,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='cartposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='cartposition',
@@ -37,7 +36,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='invoiceaddress',
             name='name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='item',
@@ -52,7 +51,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='orderposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='orderposition',

src/pretix/base/migrations/0152_auto_20200511_1504.py

@@ -2,7 +2,6 @@
 
 import django.db.models.deletion
 import django_countries.fields
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.helpers.countries
@@ -43,7 +42,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='checkinlist',
             name='rules',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterUniqueTogether(
             name='checkin',

src/pretix/base/migrations/0176_auto_20210205_1512.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.0.11 on 2021-02-05 15:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0175_orderrefund_comment'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='eventmetaproperty',
+            name='allowed_values',
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name='eventmetaproperty',
+            name='protected',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='eventmetaproperty',
+            name='required',
+            field=models.BooleanField(default=False),
+        ),
+    ]

src/pretix/base/migrations/0177_auto_20210301_1510.py

@@ -0,0 +1,30 @@
+# Generated by Django 3.0.10 on 2021-03-01 15:10
+
+
+import phonenumber_field.modelfields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0176_auto_20210205_1512'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='waitinglistentry',
+            name='name_cached',
+            field=models.CharField(max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='waitinglistentry',
+            name='name_parts',
+            field=models.JSONField(default=dict),
+        ),
+        migrations.AddField(
+            model_name='waitinglistentry',
+            name='phone',
+            field=phonenumber_field.modelfields.PhoneNumberField(max_length=128, null=True, region=None),
+        ),
+    ]

src/pretix/base/migrations/0178_auto_20210308_1326.py

@@ -0,0 +1,34 @@
+# Generated by Django 3.0.12 on 2021-03-08 13:26
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0177_auto_20210301_1510'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='invoiceline',
+            name='attendee_name',
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name='invoiceline',
+            name='event_date_to',
+            field=models.DateTimeField(null=True),
+        ),
+        migrations.AddField(
+            model_name='invoiceline',
+            name='item',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='pretixbase.Item'),
+        ),
+        migrations.AddField(
+            model_name='invoiceline',
+            name='variation',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='pretixbase.ItemVariation'),
+        ),
+    ]

src/pretix/base/models/checkin.py

@@ -4,7 +4,6 @@ from django.db.models import Exists, F, Max, OuterRef, Q, Subquery
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager, scopes_disabled
-from jsonfallback.fields import FallbackJSONField
 
 from pretix.base.models import LoggedModel
 from pretix.base.models.fields import MultiStringField
@@ -47,7 +46,7 @@ class CheckinList(LoggedModel):
                     'any of the selected sales channels. This option can be useful when tickets sold at the box office '
                     'are not checked again before entry and should be considered validated directly upon purchase.')
     )
-    rules = FallbackJSONField(default=dict, blank=True)
+    rules = models.JSONField(default=dict, blank=True)
 
     objects = ScopedManager(organizer='event__organizer')
 

src/pretix/base/models/event.py

@@ -16,11 +16,12 @@ from django.core.validators import (
 from django.db import models
 from django.db.models import Exists, OuterRef, Prefetch, Q, Subquery, Value
 from django.template.defaultfilters import date as _date
+from django.urls import reverse
 from django.utils.crypto import get_random_string
 from django.utils.formats import date_format
 from django.utils.functional import cached_property
 from django.utils.timezone import make_aware, now
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext, gettext_lazy as _
 from django_scopes import ScopedManager, scopes_disabled
 from i18nfield.fields import I18nCharField, I18nTextField
 
@@ -696,9 +697,9 @@ class Event(EventMixin, LoggedModel):
                 for k, v in rules.items():
                     if k == 'lookup':
                         if v[0] == 'product':
-                            v[1] = str(item_map.get(int(v[1]), 0).pk)
+                            v[1] = str(item_map.get(int(v[1]), 0).pk) if int(v[1]) in item_map else "0"
                         elif v[0] == 'variation':
-                            v[1] = str(variation_map.get(int(v[1]), 0).pk)
+                            v[1] = str(variation_map.get(int(v[1]), 0).pk) if int(v[1]) in variation_map else "0"
                     else:
                         _walk_rules(v)
             elif isinstance(rules, list):
@@ -861,7 +862,7 @@ class Event(EventMixin, LoggedModel):
         Returns the currently configured ticket secret generator.
         """
         tsgs = self.ticket_secret_generators
-        return tsgs[self.settings.ticket_secret_generator]
+        return tsgs.get(self.settings.ticket_secret_generator, tsgs.get('random'))
 
     def get_data_shredders(self) -> dict:
         """
@@ -953,6 +954,18 @@ class Event(EventMixin, LoggedModel):
         if not self.quotas.exists():
             issues.append(_('You need to configure at least one quota to sell anything.'))
 
+        for mp in self.organizer.meta_properties.all():
+            if mp.required and not self.meta_data.get(mp.name):
+                issues.append(
+                    ('<a {a_attr}>' + gettext('You need to fill the meta parameter "{property}".') + '</a>').format(
+                        property=mp.name,
+                        a_attr='href="%s#id_prop-%d-value"' % (
+                            reverse('control:event.settings', kwargs={'organizer': self.organizer.slug, 'event': self.slug}),
+                            mp.pk
+                        )
+                    )
+                )
+
         responses = event_live_issues.send(self)
         for receiver, response in sorted(responses, key=lambda r: str(r[0])):
             if response:
@@ -1363,7 +1376,26 @@ class EventMetaProperty(LoggedModel):
         ],
         verbose_name=_("Name"),
     )
-    default = models.TextField(blank=True)
+    default = models.TextField(blank=True, verbose_name=_("Default value"))
+    protected = models.BooleanField(default=False,
+                                    verbose_name=_("Can only be changed by organizer-level administrators"))
+    required = models.BooleanField(
+        default=False, verbose_name=_("Required for events"),
+        help_text=_("If checked, an event can only be taken live if the property is set. In event series, its always "
+                    "optional to set a value for individual dates")
+    )
+    allowed_values = models.TextField(
+        null=True, blank=True,
+        verbose_name=_("Valid values"),
+        help_text=_("If you keep this empty, any value is allowed. Otherwise, enter one possible value per line.")
+    )
+
+    def full_clean(self, exclude=None, validate_unique=True):
+        super().full_clean(exclude, validate_unique)
+        if self.default and self.required:
+            raise ValidationError(_("A property can either be required or have a default value, not both."))
+        if self.default and self.allowed_values and self.default not in self.allowed_values.splitlines():
+            raise ValidationError(_("You cannot set a default value that is not a valid value."))
 
 
 class EventMetaValue(LoggedModel):

src/pretix/base/models/invoices.py

@@ -273,6 +273,14 @@ class InvoiceLine(models.Model):
     :type subevent: SubEvent
     :param event_date_from: Event date of the (sub)event at the time the invoice was created
     :type event_date_from: datetime
+    :param event_date_to: Event end date of the (sub)event at the time the invoice was created
+    :type event_date_to: datetime
+    :param item: The item this line refers to
+    :type item: Item
+    :param variation: The variation this line refers to
+    :type variation: ItemVariation
+    :param attendee_name: The attendee name at the time the invoice was created
+    :type attendee_name: str
     """
     invoice = models.ForeignKey('Invoice', related_name='lines', on_delete=models.CASCADE)
     position = models.PositiveIntegerField(default=0)
@@ -283,6 +291,10 @@ class InvoiceLine(models.Model):
     tax_name = models.CharField(max_length=190)
     subevent = models.ForeignKey('SubEvent', null=True, blank=True, on_delete=models.PROTECT)
     event_date_from = models.DateTimeField(null=True)
+    event_date_to = models.DateTimeField(null=True)
+    item = models.ForeignKey('Item', null=True, blank=True, on_delete=models.PROTECT)
+    variation = models.ForeignKey('ItemVariation', null=True, blank=True, on_delete=models.PROTECT)
+    attendee_name = models.TextField(null=True, blank=True)
 
     @property
     def net_value(self):

src/pretix/base/models/orders.py

@@ -2,7 +2,6 @@ import copy
 import hashlib
 import json
 import logging
-import os
 import string
 from collections import Counter
 from datetime import datetime, time, timedelta
@@ -30,7 +29,6 @@ from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_countries.fields import Country
 from django_scopes import ScopedManager, scopes_disabled
 from i18nfield.strings import LazyI18nString
-from jsonfallback.fields import FallbackJSONField
 from phonenumber_field.modelfields import PhoneNumberField
 from phonenumber_field.phonenumber import PhoneNumber
 from phonenumbers import NumberParseException
@@ -666,6 +664,8 @@ class Order(LockModel, LoggedModel):
         related to the order. This checks order status and modification deadlines. It also
         returns ``False`` if there are no questions that can be answered.
         """
+        from .checkin import Checkin
+
         if self.status not in (Order.STATUS_PENDING, Order.STATUS_PAID, Order.STATUS_EXPIRED):
             return False
 
@@ -681,10 +681,21 @@ class Order(LockModel, LoggedModel):
 
         if modify_deadline is not None and now() > modify_deadline:
             return False
+
+        positions = list(
+            self.positions.all().annotate(
+                has_checkin=Exists(Checkin.objects.filter(position_id=OuterRef('pk')))
+            ).select_related('item').prefetch_related('item__questions')
+        )
+        if not self.event.settings.allow_modifications_after_checkin:
+            for cp in positions:
+                if cp.has_checkin:
+                    return False
+
         if self.event.settings.get('invoice_address_asked', as_type=bool):
             return True
         ask_names = self.event.settings.get('attendee_names_asked', as_type=bool)
-        for cp in self.positions.all().prefetch_related('item__questions'):
+        for cp in positions:
             if (cp.item.admission and ask_names) or cp.item.questions.all():
                 return True
 
@@ -1120,7 +1131,7 @@ class AbstractPosition(models.Model):
         blank=True, null=True,
         help_text=_("Empty, if this product is not an admission ticket")
     )
-    attendee_name_parts = FallbackJSONField(
+    attendee_name_parts = models.JSONField(
         blank=True, default=dict
     )
     attendee_email = models.EmailField(
@@ -1492,7 +1503,7 @@ class OrderPayment(models.Model):
                        OrderRefund.REFUND_STATE_CREATED)
         ).aggregate(s=Sum('amount'))['s'] or Decimal('0.00')
         if payment_sum - refund_sum < self.order.total:
-            logger.info('Confirmed payment {} but payment sum is {} and refund sum is.'.format(
+            logger.info('Confirmed payment {} but payment sum is {} and refund sum is {}.'.format(
                 self.full_id, payment_sum, refund_sum
             ))
             return
@@ -2240,7 +2251,7 @@ class InvoiceAddress(models.Model):
     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)
-    name_parts = FallbackJSONField(default=dict)
+    name_parts = models.JSONField(default=dict)
     street = models.TextField(verbose_name=_('Address'), blank=False)
     zipcode = models.CharField(max_length=30, verbose_name=_('ZIP code'), blank=False)
     city = models.CharField(max_length=255, verbose_name=_('City'), blank=False)
@@ -2320,7 +2331,6 @@ def cachedticket_name(instance, filename: str) -> str:
         no=instance.order_position.positionid,
         code=instance.order_position.order.code,
         secret=secret,
-        ext=os.path.splitext(filename)[1]
     )
 
 

src/pretix/base/models/organizer.py

@@ -4,6 +4,7 @@ from datetime import date, datetime, time
 from django.core.validators import MinLengthValidator, RegexValidator
 from django.db import models
 from django.db.models import Exists, OuterRef, Q
+from django.urls import reverse
 from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
 from django.utils.timezone import get_current_timezone, make_aware, now
@@ -88,6 +89,15 @@ class Organizer(LoggedModel):
 
         return ObjectRelatedCache(self)
 
+    @cached_property
+    def all_logentries_link(self):
+        return reverse(
+            'control:organizer.log',
+            kwargs={
+                'organizer': self.slug,
+            }
+        )
+
     @property
     def has_gift_cards(self):
         return self.cache.get_or_set(

src/pretix/base/models/waitinglist.py

@@ -5,11 +5,13 @@ from django.db import models, transaction
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager
+from phonenumber_field.modelfields import PhoneNumberField
 
 from pretix.base.email import get_email_context
 from pretix.base.i18n import language
 from pretix.base.models import Voucher
 from pretix.base.services.mail import mail
+from pretix.base.settings import PERSON_NAME_SCHEMES
 
 from .base import LoggedModel
 from .event import Event, SubEvent
@@ -37,9 +39,21 @@ class WaitingListEntry(LoggedModel):
         verbose_name=_("On waiting list since"),
         auto_now_add=True
     )
+    name_cached = models.CharField(
+        max_length=255,
+        verbose_name=_("Name"),
+        blank=True, null=True,
+    )
+    name_parts = models.JSONField(
+        blank=True, default=dict
+    )
     email = models.EmailField(
         verbose_name=_("E-mail address")
     )
+    phone = PhoneNumberField(
+        null=True, blank=True,
+        verbose_name=_("Phone number")
+    )
     voucher = models.ForeignKey(
         'Voucher',
         verbose_name=_("Assigned voucher"),
@@ -83,6 +97,27 @@ class WaitingListEntry(LoggedModel):
         WaitingListEntry.clean_itemvar(self.event, self.item, self.variation)
         WaitingListEntry.clean_subevent(self.event, self.subevent)
 
+    def save(self, *args, **kwargs):
+        update_fields = kwargs.get('update_fields', [])
+        if 'name_parts' in update_fields:
+            update_fields.append('name_cached')
+        self.name_cached = self.name
+        if self.name_parts is None:
+            self.name_parts = {}
+        super().save(*args, **kwargs)
+
+    @property
+    def name(self):
+        if not self.name_parts:
+            return None
+        if '_legacy' in self.name_parts:
+            return self.name_parts['_legacy']
+        if '_scheme' in self.name_parts:
+            scheme = PERSON_NAME_SCHEMES[self.name_parts['_scheme']]
+        else:
+            scheme = PERSON_NAME_SCHEMES[self.event.settings.name_scheme]
+        return scheme['concatenation'](self.name_parts).strip()
+
     def send_voucher(self, quota_cache=None, user=None, auth=None):
         availability = (
             self.variation.check_quotas(count_waitinglist=False, subevent=self.subevent, _cache=quota_cache)

src/pretix/base/payment.py

@@ -718,7 +718,7 @@ class BasePaymentProvider:
         return a very short version of the payment method. Usually, this should return e.g.
         a transaction ID or account identifier, but no information on status, dates, etc.
 
-        The default implementation falls back to payment_presa_elrender.
+        The default implementation falls back to ``payment_presale_render``.
 
         :param order: The order object
         """
@@ -970,17 +970,17 @@ class ManualPayment(BasePaymentProvider):
                     label=_('Payment process description in order confirmation emails'),
                     help_text=_('This text will be included for the {payment_info} placeholder in order confirmation '
                                 'mails. It should instruct the user on how to proceed with the payment. You can use '
-                                'the placeholders {order}, {total}, {currency} and {total_with_currency}.'),
+                                'the placeholders {order}, {amount}, {currency} and {amount_with_currency}.'),
                     widget=I18nTextarea,
-                    validators=[PlaceholderValidator(['{order}', '{total}', '{currency}', '{total_with_currency}'])],
+                    validators=[PlaceholderValidator(['{order}', '{amount}', '{currency}', '{amount_with_currency}'])],
                 )),
                 ('pending_description', I18nFormField(
                     label=_('Payment process description for pending orders'),
                     help_text=_('This text will be shown on the order confirmation page for pending orders. '
                                 'It should instruct the user on how to proceed with the payment. You can use '
-                                'the placeholders {order}, {total}, {currency} and {total_with_currency}.'),
+                                'the placeholders {order}, {amount}, {currency} and {amount_with_currency}.'),
                     widget=I18nTextarea,
-                    validators=[PlaceholderValidator(['{order}', '{total}', '{currency}', '{total_with_currency}'])],
+                    validators=[PlaceholderValidator(['{order}', '{amount}', '{currency}', '{amount_with_currency}'])],
                 )),
             ] + list(super().settings_form_fields.items())
         )
@@ -1001,21 +1001,24 @@ class ManualPayment(BasePaymentProvider):
     def checkout_confirm_render(self, request):
         return self.payment_form_render(request)
 
-    def format_map(self, order):
+    def format_map(self, order, payment):
         return {
             'order': order.code,
-            'total': order.total,
+            'amount': payment.amount,
             'currency': self.event.currency,
-            'total_with_currency': money_filter(order.total, self.event.currency)
+            'amount_with_currency': money_filter(payment.amount, self.event.currency),
+            # {total} and {total_with_currency} are deprecated
+            'total': order.total,
+            'total_with_currency': money_filter(order.total, self.event.currency),
         }
 
-    def order_pending_mail_render(self, order) -> str:
-        msg = str(self.settings.get('email_instructions', as_type=LazyI18nString)).format_map(self.format_map(order))
+    def order_pending_mail_render(self, order, payment) -> str:
+        msg = str(self.settings.get('email_instructions', as_type=LazyI18nString)).format_map(self.format_map(order, payment))
         return msg
 
     def payment_pending_render(self, request, payment) -> str:
         return rich_text(
-            str(self.settings.get('pending_description', as_type=LazyI18nString)).format_map(self.format_map(payment.order))
+            str(self.settings.get('pending_description', as_type=LazyI18nString)).format_map(self.format_map(payment.order, payment))
         )
 
 

src/pretix/base/pdf.py

@@ -1,4 +1,5 @@
 import copy
+import hashlib
 import itertools
 import logging
 import os
@@ -35,9 +36,9 @@ from reportlab.platypus import Paragraph
 
 from pretix.base.i18n import language
 from pretix.base.invoice import ThumbnailingImageReader
-from pretix.base.models import Order, OrderPosition
+from pretix.base.models import Order, OrderPosition, Question
 from pretix.base.settings import PERSON_NAME_SCHEMES
-from pretix.base.signals import layout_text_variables
+from pretix.base.signals import layout_image_variables, layout_text_variables
 from pretix.base.templatetags.money import money_filter
 from pretix.base.templatetags.phone_format import phone_format
 from pretix.presale.style import get_fonts
@@ -154,6 +155,11 @@ DEFAULT_VARIABLES = OrderedDict((
         "editor_sample": _("Sample event name"),
         "evaluate": lambda op, order, ev: str(ev.name)
     }),
+    ("event_series_name", {
+        "label": _("Event series"),
+        "editor_sample": _("Sample event name"),
+        "evaluate": lambda op, order, ev: str(order.event.name)
+    }),
     ("event_date", {
         "label": _("Event date"),
         "editor_sample": _("May 31st, 2017"),
@@ -292,6 +298,11 @@ DEFAULT_VARIABLES = OrderedDict((
         "editor_sample": _("Event organizer info text"),
         "evaluate": lambda op, order, ev: str(order.event.settings.organizer_info_text)
     }),
+    ("event_info_text", {
+        "label": _("Event info text"),
+        "editor_sample": _("Event info text"),
+        "evaluate": lambda op, order, ev: str(order.event.settings.event_info_text)
+    }),
     ("now_date", {
         "label": _("Printing date"),
         "editor_sample": _("2017-05-31"),
@@ -339,6 +350,47 @@ DEFAULT_VARIABLES = OrderedDict((
         "evaluate": lambda op, order, ev: str(op.seat.seat_number if op.seat else "")
     }),
 ))
+DEFAULT_IMAGES = OrderedDict([])
+
+
+@receiver(layout_image_variables, dispatch_uid="pretix_base_layout_image_variables_questions")
+def images_from_questions(sender, *args, **kwargs):
+    def get_answer(op, order, event, question_id, etag):
+        a = None
+        if op.addon_to:
+            if 'answers' in getattr(op.addon_to, '_prefetched_objects_cache', {}):
+                try:
+                    a = [a for a in op.addon_to.answers.all() if a.question_id == question_id][0]
+                except IndexError:
+                    pass
+            else:
+                a = op.addon_to.answers.filter(question_id=question_id).first()
+
+        if 'answers' in getattr(op, '_prefetched_objects_cache', {}):
+            try:
+                a = [a for a in op.answers.all() if a.question_id == question_id][0]
+            except IndexError:
+                pass
+        else:
+            a = op.answers.filter(question_id=question_id).first()
+
+        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
+        else:
+            if etag:
+                return hashlib.sha1(a.file.name.encode()).hexdigest()
+            return a.file
+
+    d = {}
+    for q in sender.questions.all():
+        if q.type != Question.TYPE_FILE:
+            continue
+        d['question_{}'.format(q.identifier)] = {
+            'label': _('Question: {question}').format(question=q.question),
+            'evaluate': partial(get_answer, question_id=q.pk, etag=False),
+            'etag': partial(get_answer, question_id=q.pk, etag=True),
+        }
+    return d
 
 
 @receiver(layout_text_variables, dispatch_uid="pretix_base_layout_text_variables_questions")
@@ -369,6 +421,8 @@ def variables_from_questions(sender, *args, **kwargs):
 
     d = {}
     for q in sender.questions.all():
+        if q.type == Question.TYPE_FILE:
+            continue
         d['question_{}'.format(q.pk)] = {
             'label': _('Question: {question}').format(question=q.question),
             'editor_sample': _('<Answer: {question}>').format(question=q.question),
@@ -387,6 +441,15 @@ def _get_ia_name_part(key, op, order, ev):
     return order.invoice_address.name_parts.get(key, '') if getattr(order, 'invoice_address', None) else ''
 
 
+def get_images(event):
+    v = copy.copy(DEFAULT_IMAGES)
+
+    for recv, res in layout_image_variables.send(sender=event):
+        v.update(res)
+
+    return v
+
+
 def get_variables(event):
     v = copy.copy(DEFAULT_VARIABLES)
 
@@ -427,6 +490,7 @@ class Renderer:
         self.layout = layout
         self.background_file = background_file
         self.variables = get_variables(event)
+        self.images = get_images(event)
         self.event = event
         if self.background_file:
             self.bg_bytes = self.background_file.read()
@@ -514,6 +578,47 @@ class Renderer:
                 return '(error)'
         return ''
 
+    def _draw_imagearea(self, canvas: Canvas, op: OrderPosition, order: Order, o: dict):
+        ev = self._get_ev(op, order)
+        if not o['content'] or o['content'] not in self.images:
+            image_file = None
+        else:
+            try:
+                image_file = self.images[o['content']]['evaluate'](op, order, ev)
+            except:
+                logger.exception('Failed to process variable.')
+                image_file = None
+
+        if image_file:
+            ir = ThumbnailingImageReader(image_file)
+            try:
+                ir.resize(float(o['width']) * mm, float(o['height']) * mm, 300)
+            except:
+                logger.exception("Can not resize image")
+                pass
+            canvas.drawImage(
+                image=ir,
+                x=float(o['left']) * mm,
+                y=float(o['bottom']) * mm,
+                width=float(o['width']) * mm,
+                height=float(o['height']) * mm,
+                preserveAspectRatio=True,
+                anchor='c',  # centered in frame
+                mask='auto'
+            )
+        else:
+            canvas.saveState()
+            canvas.setFillColorRGB(.8, .8, .8, alpha=1)
+            canvas.rect(
+                x=float(o['left']) * mm,
+                y=float(o['bottom']) * mm,
+                width=float(o['width']) * mm,
+                height=float(o['height']) * mm,
+                stroke=0,
+                fill=1,
+            )
+            canvas.restoreState()
+
     def _draw_textarea(self, canvas: Canvas, op: OrderPosition, order: Order, o: dict):
         font = o['fontfamily']
         if o['bold']:
@@ -572,6 +677,8 @@ class Renderer:
         for o in self.layout:
             if o['type'] == "barcodearea":
                 self._draw_barcodearea(canvas, op, o)
+            elif o['type'] == "imagearea":
+                self._draw_imagearea(canvas, op, order, o)
             elif o['type'] == "textarea":
                 self._draw_textarea(canvas, op, order, o)
             elif o['type'] == "poweredby":

src/pretix/base/secrets.py

@@ -4,7 +4,7 @@ import struct
 
 from cryptography.hazmat.backends.openssl.backend import Backend
 from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
-from cryptography.hazmat.primitives.serialization.base import (
+from cryptography.hazmat.primitives.serialization import (
     Encoding, NoEncryption, PrivateFormat, PublicFormat, load_pem_private_key,
     load_pem_public_key,
 )

src/pretix/base/services/checkin.py

@@ -102,9 +102,11 @@ class RequiredQuestionsError(Exception):
 
 
 def _save_answers(op, answers, given_answers):
+    written = False
     for q, a in given_answers.items():
         if not a:
             if q in answers:
+                written = True
                 answers[q].delete()
             else:
                 continue
@@ -113,6 +115,7 @@ def _save_answers(op, answers, given_answers):
                 qa = answers[q]
                 qa.answer = str(a.answer)
                 qa.save()
+                written = True
                 qa.options.clear()
             else:
                 qa = op.answers.create(question=q, answer=str(a.answer))
@@ -122,6 +125,7 @@ def _save_answers(op, answers, given_answers):
                 qa = answers[q]
                 qa.answer = ", ".join([str(o) for o in a])
                 qa.save()
+                written = True
                 qa.options.clear()
             else:
                 qa = op.answers.create(question=q, answer=", ".join([str(o) for o in a]))
@@ -134,6 +138,7 @@ def _save_answers(op, answers, given_answers):
             qa.file.save(a.name, a, save=False)
             qa.answer = 'file://' + qa.file.name
             qa.save()
+            written = True
         else:
             if q in answers:
                 qa = answers[q]
@@ -141,9 +146,14 @@ def _save_answers(op, answers, given_answers):
                 qa.save()
             else:
                 op.answers.create(question=q, answer=str(a))
+            written = True
+
+    if written:
+        prefetched_objects_cache = getattr(op, '_prefetched_objects_cache', {})
+        if 'answers' in prefetched_objects_cache:
+            del prefetched_objects_cache['answers']
 
 
-@transaction.atomic
 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):
@@ -163,18 +173,16 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
     """
     dt = datetime or now()
 
-    # Lock order positions
-    op = OrderPosition.all.select_for_update().get(pk=op.pk)
-    checkin_questions = list(
-        clist.event.questions.filter(ask_during_checkin=True, items__in=[op.item_id])
-    )
-
     if op.canceled or op.order.status not in (Order.STATUS_PAID, Order.STATUS_PENDING):
         raise CheckInError(
             _('This order position has been canceled.'),
             'canceled' if canceled_supported else 'unpaid'
         )
 
+    # Do this outside of transaction so it is saved even if the checkin fails for some other reason
+    checkin_questions = list(
+        clist.event.questions.filter(ask_during_checkin=True, items__in=[op.item_id])
+    )
     require_answers = []
     if checkin_questions:
         answers = {a.question: a for a in op.answers.all()}
@@ -184,81 +192,85 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
 
         _save_answers(op, answers, given_answers)
 
-    if not clist.all_products and op.item_id not in [i.pk for i in clist.limit_products.all()]:
-        raise CheckInError(
-            _('This order position has an invalid product for this check-in list.'),
-            'product'
-        )
-    elif clist.subevent_id and op.subevent_id != clist.subevent_id:
-        raise CheckInError(
-            _('This order position has an invalid date for this check-in list.'),
-            'product'
-        )
-    elif op.order.status != Order.STATUS_PAID and not force and not (
-        ignore_unpaid and clist.include_pending and op.order.status == Order.STATUS_PENDING
-    ):
-        raise CheckInError(
-            _('This order is not marked as paid.'),
-            'unpaid'
-        )
-    elif require_answers and not force and questions_supported:
-        raise RequiredQuestionsError(
-            _('You need to answer questions to complete this check-in.'),
-            'incomplete',
-            require_answers
-        )
+    with transaction.atomic():
+        # Lock order positions
+        op = OrderPosition.all.select_for_update().get(pk=op.pk)
 
-    if type == Checkin.TYPE_ENTRY and clist.rules and not force:
-        rule_data = LazyRuleVars(op, clist, dt)
-        logic = get_logic_environment(op.subevent or clist.event)
-        if not logic.apply(clist.rules, rule_data):
+        if not clist.all_products and op.item_id not in [i.pk for i in clist.limit_products.all()]:
             raise CheckInError(
-                _('This entry is not permitted due to custom rules.'),
-                'rules'
+                _('This order position has an invalid product for this check-in list.'),
+                'product'
+            )
+        elif clist.subevent_id and op.subevent_id != clist.subevent_id:
+            raise CheckInError(
+                _('This order position has an invalid date for this check-in list.'),
+                'product'
+            )
+        elif op.order.status != Order.STATUS_PAID and not force and not (
+            ignore_unpaid and clist.include_pending and op.order.status == Order.STATUS_PENDING
+        ):
+            raise CheckInError(
+                _('This order is not marked as paid.'),
+                'unpaid'
+            )
+        elif require_answers and not force and questions_supported:
+            raise RequiredQuestionsError(
+                _('You need to answer questions to complete this check-in.'),
+                'incomplete',
+                require_answers
             )
 
-    device = None
-    if isinstance(auth, Device):
-        device = auth
+        if type == Checkin.TYPE_ENTRY and clist.rules and not force:
+            rule_data = LazyRuleVars(op, clist, dt)
+            logic = get_logic_environment(op.subevent or clist.event)
+            if not logic.apply(clist.rules, rule_data):
+                raise CheckInError(
+                    _('This entry is not permitted due to custom rules.'),
+                    'rules'
+                )
 
-    last_ci = op.checkins.order_by('-datetime').filter(list=clist).only('type', 'nonce').first()
-    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)
-    )
+        device = None
+        if isinstance(auth, Device):
+            device = auth
 
-    if nonce and ((last_ci and last_ci.nonce == nonce) or op.checkins.filter(type=type, list=clist, device=device, nonce=nonce).exists()):
-        return
-
-    if entry_allowed or force:
-        ci = Checkin.objects.create(
-            position=op,
-            type=type,
-            list=clist,
-            datetime=dt,
-            device=device,
-            gate=device.gate if device else None,
-            nonce=nonce,
-            forced=force and not entry_allowed,
-        )
-        op.order.log_action('pretix.event.checkin', data={
-            'position': op.id,
-            'positionid': op.positionid,
-            'first': True,
-            'forced': force or op.order.status != Order.STATUS_PAID,
-            'datetime': dt,
-            'type': type,
-            'list': clist.pk
-        }, user=user, auth=auth)
-        checkin_created.send(op.order.event, checkin=ci)
-    else:
-        raise CheckInError(
-            _('This ticket has already been redeemed.'),
-            'already_redeemed',
+        last_ci = op.checkins.order_by('-datetime').filter(list=clist).only('type', 'nonce').first()
+        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)
         )
 
+        if nonce and ((last_ci and last_ci.nonce == nonce) or op.checkins.filter(type=type, list=clist, device=device, nonce=nonce).exists()):
+            return
+
+        if entry_allowed or force:
+            ci = Checkin.objects.create(
+                position=op,
+                type=type,
+                list=clist,
+                datetime=dt,
+                device=device,
+                gate=device.gate if device else None,
+                nonce=nonce,
+                forced=force and not entry_allowed,
+            )
+            op.order.log_action('pretix.event.checkin', data={
+                'position': op.id,
+                'positionid': op.positionid,
+                'first': True,
+                'forced': force or op.order.status != Order.STATUS_PAID,
+                'datetime': dt,
+                'type': type,
+                'list': clist.pk
+            }, user=user, auth=auth)
+            checkin_created.send(op.order.event, checkin=ci)
+        else:
+            raise CheckInError(
+                _('This ticket has already been redeemed.'),
+                'already_redeemed',
+            )
+
 
 @receiver(order_placed, dispatch_uid="autocheckin_order_placed")
 def order_placed(sender, **kwargs):

src/pretix/base/services/invoices.py

@@ -171,9 +171,17 @@ def build_invoice(invoice: Invoice) -> Invoice:
             if invoice.event.has_subevents:
                 desc += "<br />" + pgettext("subevent", "Date: {}").format(p.subevent)
             InvoiceLine.objects.create(
-                position=i, invoice=invoice, description=desc,
-                gross_value=p.price, tax_value=p.tax_value,
-                subevent=p.subevent, event_date_from=(p.subevent.date_from if p.subevent else invoice.event.date_from),
+                position=i,
+                invoice=invoice,
+                description=desc,
+                gross_value=p.price,
+                tax_value=p.tax_value,
+                subevent=p.subevent,
+                item=p.item,
+                variation=p.variation,
+                attendee_name=p.attendee_name if invoice.event.settings.invoice_attendee_name else None,
+                event_date_from=p.subevent.date_from if invoice.event.has_subevents else invoice.event.date_from,
+                event_date_to=p.subevent.date_to if invoice.event.has_subevents else invoice.event.date_to,
                 tax_rate=p.tax_rate, tax_name=p.tax_rule.name if p.tax_rule else ''
             )
 
@@ -198,6 +206,8 @@ def build_invoice(invoice: Invoice) -> Invoice:
                 invoice=invoice,
                 description=fee_title,
                 gross_value=fee.value,
+                event_date_from=None if invoice.event.has_subevents else invoice.event.date_from,
+                event_date_to=None if invoice.event.has_subevents else invoice.event.date_to,
                 tax_value=fee.tax_value,
                 tax_rate=fee.tax_rate,
                 tax_name=fee.tax_rule.name if fee.tax_rule else ''

src/pretix/base/services/mail.py

@@ -19,6 +19,7 @@ from django.core.mail import (
     EmailMultiAlternatives, SafeMIMEMultipart, get_connection,
 )
 from django.core.mail.message import SafeMIMEText
+from django.db import transaction
 from django.template.loader import get_template
 from django.utils.translation import gettext as _, pgettext
 from django_scopes import scope, scopes_disabled
@@ -240,7 +241,15 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
             task_chain = []
 
         task_chain.append(send_task)
-        chain(*task_chain).apply_async()
+
+        if 'locmem' in settings.EMAIL_BACKEND:
+            # This clause is triggered during unit tests, because transaction.on_commit never fires due to the nature
+            # Django's unit tests work
+            chain(*task_chain).apply_async()
+        else:
+            transaction.on_commit(
+                lambda: chain(*task_chain).apply_async()
+            )
 
 
 class CustomEmail(EmailMultiAlternatives):
@@ -291,6 +300,8 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
                     order = None
                 else:
                     with language(order.locale, event.settings.region):
+                        if not event.settings.mail_attach_tickets:
+                            attach_tickets = False
                         if position:
                             try:
                                 position = order.positions.get(pk=position)

src/pretix/base/services/orders.py

@@ -327,7 +327,7 @@ def deny_order(order, comment='', user=None, send_mail: bool=True, auth=None):
 
 
 def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device=None, oauth_application=None,
-                  cancellation_fee=None, keep_fees=None):
+                  cancellation_fee=None, keep_fees=None, cancel_invoice=True):
     """
     Mark this order as canceled
     :param order: The order to change
@@ -351,9 +351,10 @@ def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device
         if not order.cancel_allowed():
             raise OrderError(_('You cannot cancel this order.'))
         invoices = []
-        i = order.invoices.filter(is_cancellation=False).last()
-        if i and not i.refered.exists():
-            invoices.append(generate_cancellation(i))
+        if cancel_invoice:
+            i = order.invoices.filter(is_cancellation=False).last()
+            if i and not i.refered.exists():
+                invoices.append(generate_cancellation(i))
 
         for position in order.positions.all():
             for gc in position.issued_gift_cards.all():
@@ -403,7 +404,7 @@ def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device
                 order.cancellation_date = now()
                 order.save(update_fields=['status', 'cancellation_date', 'total'])
 
-            if i:
+            if cancel_invoice and i:
                 invoices.append(generate_invoice(order))
         else:
             with order.event.lock():
@@ -2152,11 +2153,12 @@ def _try_auto_refund(order, manual_refund=False, allow_partial=False, source=Ord
 @app.task(base=ProfiledTask, bind=True, max_retries=5, default_retry_delay=1, throws=(OrderError,))
 @scopes_disabled()
 def cancel_order(self, order: int, user: int=None, send_mail: bool=True, api_token=None, oauth_application=None,
-                 device=None, cancellation_fee=None, try_auto_refund=False, refund_as_giftcard=False, comment=None):
+                 device=None, cancellation_fee=None, try_auto_refund=False, refund_as_giftcard=False, comment=None,
+                 cancel_invoice=True):
     try:
         try:
             ret = _cancel_order(order, user, send_mail, api_token, device, oauth_application,
-                                cancellation_fee)
+                                cancellation_fee, cancel_invoice=cancel_invoice)
             if try_auto_refund:
                 _try_auto_refund(order, refund_as_giftcard=refund_as_giftcard,
                                  comment=comment)

src/pretix/base/settings.py

@@ -13,6 +13,7 @@ from django.core.validators import (
     MaxValueValidator, MinValueValidator, RegexValidator,
 )
 from django.db.models import Model
+from django.utils.text import format_lazy
 from django.utils.translation import (
     gettext_lazy as _, gettext_noop, pgettext, pgettext_lazy,
 )
@@ -974,6 +975,61 @@ DEFAULTS = {
             widget=forms.NumberInput(),
         )
     },
+    'waiting_list_names_asked': {
+        'default': 'False',
+        'type': bool,
+        'form_class': forms.BooleanField,
+        'serializer_class': serializers.BooleanField,
+        'form_kwargs': dict(
+            label=_("Ask for a name"),
+            help_text=_("Ask for a name when signing up to the waiting list."),
+        )
+    },
+    'waiting_list_names_required': {
+        'default': 'False',
+        'type': bool,
+        'form_class': forms.BooleanField,
+        'serializer_class': serializers.BooleanField,
+        'form_kwargs': dict(
+            label=_("Require name"),
+            help_text=_("Require a name when signing up to the waiting list.."),
+            widget=forms.CheckboxInput(attrs={'data-checkbox-dependency': '#id_settings-waiting_list_names_asked'}),
+        )
+    },
+    'waiting_list_phones_asked': {
+        'default': 'False',
+        'type': bool,
+        'form_class': forms.BooleanField,
+        'serializer_class': serializers.BooleanField,
+        'form_kwargs': dict(
+            label=_("Ask for a phone number"),
+            help_text=_("Ask for a phone number when signing up to the waiting list."),
+        )
+    },
+    'waiting_list_phones_required': {
+        'default': 'False',
+        'type': bool,
+        'form_class': forms.BooleanField,
+        'serializer_class': serializers.BooleanField,
+        'form_kwargs': dict(
+            label=_("Require phone number"),
+            help_text=_("Require a phone number when signing up to the waiting list.."),
+            widget=forms.CheckboxInput(attrs={'data-checkbox-dependency': '#id_settings-waiting_list_phones_asked'}),
+        )
+    },
+    'waiting_list_phones_explanation_text': {
+        'default': '',
+        'type': LazyI18nString,
+        'form_class': I18nFormField,
+        'serializer_class': I18nField,
+        'form_kwargs': dict(
+            label=_("Phone number explanation"),
+            widget=I18nTextarea,
+            widget_kwargs={'attrs': {'rows': '2'}},
+            help_text=_("If you ask for a phone number, explain why you do so and what you will use the phone number for.")
+        )
+    },
+
     'ticket_download': {
         'default': 'False',
         'type': bool,
@@ -1082,6 +1138,15 @@ DEFAULTS = {
             help_text=_('If your event series has more than 50 dates in the future, only the month or week calendar can be used.')
         ),
     },
+    'allow_modifications_after_checkin': {
+        'default': 'False',
+        'type': bool,
+        'form_class': forms.BooleanField,
+        'serializer_class': serializers.BooleanField,
+        'form_kwargs': dict(
+            label=_("Allow customers to modify their information after they checked in."),
+        )
+    },
     'last_order_modification_date': {
         'default': None,
         'type': RelativeDateWrapper,
@@ -1313,6 +1378,19 @@ DEFAULTS = {
         'default': 'classic',
         'type': str
     },
+    'mail_attach_tickets': {
+        'default': 'True',
+        'type': bool,
+        'form_class': forms.BooleanField,
+        'serializer_class': serializers.BooleanField,
+        'form_kwargs': dict(
+            label=_("Attach ticket files"),
+            help_text=format_lazy(
+                _("Tickets will never be attached if they're larger than {size} to avoid email delivery problems."),
+                size='4 MB'
+            ),
+        )
+    },
     'mail_attach_ical': {
         'default': 'False',
         'type': bool,
@@ -1922,6 +2000,18 @@ Your {event} team"""))
             widget=I18nTextarea
         )
     },
+    'event_info_text': {
+        'default': '',
+        'type': LazyI18nString,
+        'serializer_class': I18nField,
+        'form_class': I18nFormField,
+        'form_kwargs': dict(
+            label=_('Info text'),
+            widget=I18nTextarea,
+            widget_kwargs={'attrs': {'rows': '2'}},
+            help_text=_('Not displayed anywhere by default, but if you want to, you can use this e.g. in ticket templates.')
+        )
+    },
     'banner_text': {
         'default': '',
         'type': LazyI18nString,
@@ -1974,6 +2064,19 @@ Your {event} team"""))
                         "why you need information from them.")
         )
     },
+    'checkout_success_text': {
+        'default': '',
+        'type': LazyI18nString,
+        'serializer_class': I18nField,
+        'form_class': I18nFormField,
+        'form_kwargs': dict(
+            label=_("Additional success message"),
+            help_text=_("This message will be shown after an order has been created successfully. It will be shown in additional "
+                        "to the default text."),
+            widget_kwargs={'attrs': {'rows': '2'}},
+            widget=I18nTextarea
+        )
+    },
     'checkout_phone_helptext': {
         'default': '',
         'type': LazyI18nString,
@@ -2367,6 +2470,22 @@ PERSON_NAME_SCHEMES = OrderedDict([
             '_scheme': 'full_transcription',
         },
     }),
+    ('salutation_given_family', {
+        'fields': (
+            ('salutation', pgettext_lazy('person_name', 'Salutation'), 1),
+            ('given_name', _('Given name'), 2),
+            ('family_name', _('Family name'), 2),
+        ),
+        'concatenation': lambda d: ' '.join(
+            str(p) for p in (d.get(key, '') for key in ["given_name", "family_name"]) if p
+        ),
+        'sample': {
+            'salutation': pgettext_lazy('person_name_sample', 'Mr'),
+            'given_name': pgettext_lazy('person_name_sample', 'John'),
+            'family_name': pgettext_lazy('person_name_sample', 'Doe'),
+            '_scheme': 'salutation_given_family',
+        },
+    }),
     ('salutation_title_given_family', {
         'fields': (
             ('salutation', pgettext_lazy('person_name', 'Salutation'), 1),

src/pretix/base/shredder.py

@@ -203,7 +203,7 @@ class EmailAddressShredder(BaseDataShredder):
 class WaitingListShredder(BaseDataShredder):
     verbose_name = _('Waiting list')
     identifier = 'waiting_list'
-    description = _('This will remove all email addresses from the waiting list.')
+    description = _('This will remove all names, email addresses, and phone numbers from the waiting list.')
 
     def generate_files(self) -> List[Tuple[str, str, str]]:
         yield 'waiting-list.json', 'application/json', json.dumps([
@@ -213,7 +213,7 @@ class WaitingListShredder(BaseDataShredder):
 
     @transaction.atomic
     def shred_data(self):
-        self.event.waitinglistentries.update(email='█')
+        self.event.waitinglistentries.update(name_cached=None, name_parts={'_shredded': True}, email='█', phone='█')
 
         for wle in self.event.waitinglistentries.select_related('voucher').filter(voucher__isnull=False):
             if '@' in wle.voucher.comment:
@@ -222,7 +222,14 @@ class WaitingListShredder(BaseDataShredder):
 
         for le in self.event.logentry_set.filter(action_type="pretix.voucher.added.waitinglist").exclude(data=""):
             d = le.parsed_data
+            if 'name' in d:
+                d['name'] = '█'
+            if 'name_parts' in d:
+                d['name_parts'] = {
+                    '_legacy': '█'
+                }
             d['email'] = '█'
+            d['phone'] = '█'
             le.data = json.dumps(d)
             le.shredded = True
             le.save(update_fields=['data', 'shredded'])

src/pretix/base/signals.py

@@ -164,9 +164,7 @@ class DeprecatedSignal(django.dispatch.Signal):
         super().connect(receiver, sender=None, weak=True, dispatch_uid=None)
 
 
-event_live_issues = EventPluginSignal(
-    providing_args=[]
-)
+event_live_issues = EventPluginSignal()
 """
 This signal is sent out to determine whether an event can be taken live. If you want to
 prevent the event from going live, return a string that will be displayed to the user
@@ -176,9 +174,7 @@ As with all event-plugin signals, the ``sender`` keyword argument will contain t
 """
 
 
-register_payment_providers = EventPluginSignal(
-    providing_args=[]
-)
+register_payment_providers = EventPluginSignal()
 """
 This signal is sent out to get all known payment providers. Receivers should return a
 subclass of pretix.base.payment.BasePaymentProvider or a list of these
@@ -186,9 +182,7 @@ subclass of pretix.base.payment.BasePaymentProvider or a list of these
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_mail_placeholders = EventPluginSignal(
-    providing_args=[]
-)
+register_mail_placeholders = EventPluginSignal()
 """
 This signal is sent out to get all known email text placeholders. Receivers should return
 an instance of a subclass of pretix.base.email.BaseMailTextPlaceholder or a list of these.
@@ -196,9 +190,7 @@ an instance of a subclass of pretix.base.email.BaseMailTextPlaceholder or a list
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_html_mail_renderers = EventPluginSignal(
-    providing_args=[]
-)
+register_html_mail_renderers = EventPluginSignal()
 """
 This signal is sent out to get all known HTML email renderers. Receivers should return a
 subclass of pretix.base.email.BaseHTMLMailRenderer or a list of these
@@ -206,9 +198,7 @@ subclass of pretix.base.email.BaseHTMLMailRenderer or a list of these
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_invoice_renderers = EventPluginSignal(
-    providing_args=[]
-)
+register_invoice_renderers = EventPluginSignal()
 """
 This signal is sent out to get all known invoice renderers. Receivers should return a
 subclass of pretix.base.invoice.BaseInvoiceRenderer or a list of these
@@ -216,9 +206,7 @@ subclass of pretix.base.invoice.BaseInvoiceRenderer or a list of these
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_ticket_secret_generators = EventPluginSignal(
-    providing_args=[]
-)
+register_ticket_secret_generators = EventPluginSignal()
 """
 This signal is sent out to get all known ticket secret generators. Receivers should return a
 subclass of ``pretix.base.secrets.BaseTicketSecretGenerator`` or a list of these
@@ -226,9 +214,7 @@ subclass of ``pretix.base.secrets.BaseTicketSecretGenerator`` or a list of these
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_data_shredders = EventPluginSignal(
-    providing_args=[]
-)
+register_data_shredders = EventPluginSignal()
 """
 This signal is sent out to get all known data shredders. Receivers should return a
 subclass of pretix.base.shredder.BaseDataShredder or a list of these
@@ -236,9 +222,7 @@ subclass of pretix.base.shredder.BaseDataShredder or a list of these
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_ticket_outputs = EventPluginSignal(
-    providing_args=[]
-)
+register_ticket_outputs = EventPluginSignal()
 """
 This signal is sent out to get all known ticket outputs. Receivers should return a
 subclass of pretix.base.ticketoutput.BaseTicketOutput
@@ -246,9 +230,7 @@ subclass of pretix.base.ticketoutput.BaseTicketOutput
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_notification_types = EventPluginSignal(
-    providing_args=[]
-)
+register_notification_types = EventPluginSignal()
 """
 This signal is sent out to get all known notification types. Receivers should return an
 instance of a subclass of pretix.base.notifications.NotificationType or a list of such
@@ -259,18 +241,14 @@ however for this signal, the ``sender`` **may also be None** to allow creating t
 notification settings!
 """
 
-register_sales_channels = django.dispatch.Signal(
-    providing_args=[]
-)
+register_sales_channels = django.dispatch.Signal()
 """
 This signal is sent out to get all known sales channels types. Receivers should return an
 instance of a subclass of ``pretix.base.channels.SalesChannel`` or a list of such
 instances.
 """
 
-register_data_exporters = EventPluginSignal(
-    providing_args=[]
-)
+register_data_exporters = EventPluginSignal()
 """
 This signal is sent out to get all known data exporters. Receivers should return a
 subclass of pretix.base.exporter.BaseExporter
@@ -278,21 +256,20 @@ subclass of pretix.base.exporter.BaseExporter
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_multievent_data_exporters = django.dispatch.Signal(
-    providing_args=["event"]
-)
+register_multievent_data_exporters = django.dispatch.Signal()
 """
+Arguments: ``event``
+
 This signal is sent out to get all known data exporters, which support exporting data for
 multiple events. Receivers should return a subclass of pretix.base.exporter.BaseExporter
 
 The ``sender`` keyword argument will contain an organizer.
 """
 
-validate_order = EventPluginSignal(
-    providing_args=["payment_provider", "positions", "email", "locale", "invoice_address",
-                    "meta_info"]
-)
+validate_order = EventPluginSignal()
 """
+Arguments: ``payment_provider``, ``positions``, ``email``, ``locale``, ``invoice_address``, ``meta_info``
+
 This signal is sent out when the user tries to confirm the order, before we actually create
 the order. It allows you to inspect the cart positions. Your return value will be ignored,
 but you can raise an OrderError with an appropriate exception message if you like to block
@@ -301,10 +278,10 @@ the order. We strongly discourage making changes to the order here.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-validate_cart = EventPluginSignal(
-    providing_args=["positions"]
-)
+validate_cart = EventPluginSignal()
 """
+Arguments: ``positions``
+
 This signal is sent out before the user starts checkout. It includes an iterable
 with the current CartPosition objects.
 The response of receivers will be ignored, but you can raise a CartError with an
@@ -313,10 +290,10 @@ appropriate exception message.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-validate_cart_addons = EventPluginSignal(
-    providing_args=["addons", "base_position", "iao"]
-)
+validate_cart_addons = EventPluginSignal()
 """
+Arguments: ``addons``, ``base_position``, ``iao``
+
 This signal is sent when a user tries to select a combination of addons. In contrast to
  ``validate_cart``, this is executed before the cart is actually modified. You are passed
 an argument ``addons`` containing a dict of ``(item, variation or None) → count`` tuples as well
@@ -328,10 +305,10 @@ appropriate exception message.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_placed = EventPluginSignal(
-    providing_args=["order"]
-)
+order_placed = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is placed. The order object is given
 as the first argument. This signal is *not* sent out if an order is created through
 splitting an existing order, so you can not expect to see all orders by listening
@@ -340,10 +317,10 @@ to this signal.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_paid = EventPluginSignal(
-    providing_args=["order"]
-)
+order_paid = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is paid. The order object is given
 as the first argument. This signal is *not* sent out if an order is marked as paid
 because an already-paid order has been split.
@@ -351,80 +328,80 @@ because an already-paid order has been split.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_canceled = EventPluginSignal(
-    providing_args=["order"]
-)
+order_canceled = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is canceled. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_reactivated = EventPluginSignal(
-    providing_args=["order"]
-)
+order_reactivated = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time a canceled order is reactivated. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_expired = EventPluginSignal(
-    providing_args=["order"]
-)
+order_expired = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is marked as expired. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_modified = EventPluginSignal(
-    providing_args=["order"]
-)
+order_modified = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order's information is modified. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_changed = EventPluginSignal(
-    providing_args=["order"]
-)
+order_changed = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order's content is changed. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_approved = EventPluginSignal(
-    providing_args=["order"]
-)
+order_approved = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is being approved. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_denied = EventPluginSignal(
-    providing_args=["order"]
-)
+order_denied = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is being denied. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_gracefully_delete = EventPluginSignal(
-    providing_args=["order"]
-)
+order_gracefully_delete = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time a test-mode order is being deleted. The order object
 is given as the first argument.
 
@@ -435,10 +412,10 @@ the deletion of the order.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-checkin_created = EventPluginSignal(
-    providing_args=["checkin"],
-)
+checkin_created = EventPluginSignal()
 """
+Arguments: ``checkin``
+
 This signal is sent out every time a check-in is created (i.e. an order position is marked as
 checked in). It is not send if the position was already checked in and is force-checked-in a second time.
 The check-in object is given as the first argument
@@ -446,10 +423,10 @@ The check-in object is given as the first argument
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-logentry_display = EventPluginSignal(
-    providing_args=["logentry"]
-)
+logentry_display = EventPluginSignal()
 """
+Arguments: ``logentry``
+
 To display an instance of the ``LogEntry`` model to a human user,
 ``pretix.base.signals.logentry_display`` will be sent out with a ``logentry`` argument.
 
@@ -459,10 +436,10 @@ to the user. The receivers are expected to return plain text.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-logentry_object_link = EventPluginSignal(
-    providing_args=["logentry"]
-)
+logentry_object_link = EventPluginSignal()
 """
+Arguments: ``logentry``
+
 To display the relationship of an instance of the ``LogEntry`` model to another model
 to a human user, ``pretix.base.signals.logentry_object_link`` will be sent out with a
 ``logentry`` argument.
@@ -487,10 +464,10 @@ Make sure that any user content in the HTML code you return is properly escaped!
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-requiredaction_display = EventPluginSignal(
-    providing_args=["action", "request"]
-)
+requiredaction_display = EventPluginSignal()
 """
+Arguments: ``action``, ``request``
+
 To display an instance of the ``RequiredAction`` model to a human user,
 ``pretix.base.signals.requiredaction_display`` will be sent out with a ``action`` argument.
 You will also get the current ``request`` in a different argument.
@@ -501,10 +478,10 @@ to the user. The receivers are expected to return HTML code.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-event_copy_data = EventPluginSignal(
-    providing_args=["other", "tax_map", "category_map", "item_map", "question_map", "variation_map", "checkin_list_map"]
-)
+event_copy_data = EventPluginSignal()
 """
+Arguments: "other", ``tax_map``, ``category_map``, ``item_map``, ``question_map``, ``variation_map``, ``checkin_list_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
 signal to copy data or configuration stored within your plugin's models as well.
@@ -519,10 +496,10 @@ keyword argument will contain the event to **copy from**. The keyword arguments
 in the new event of the respective types.
 """
 
-item_copy_data = EventPluginSignal(
-    providing_args=["source", "target"]
-)
+item_copy_data = EventPluginSignal()
 """
+Arguments: ``source``, ``target``
+
 This signal is sent out when a new product is created as a clone of an existing product, i.e.
 the settings from the older product are copied to the newer one. You can listen to this
 signal to copy data or configuration stored within your plugin's models as well.
@@ -546,10 +523,10 @@ All plugins that are installed may send fields for the global settings form, as
 an OrderedDict of (setting name, form field).
 """
 
-order_fee_calculation = EventPluginSignal(
-    providing_args=['positions', 'invoice_address', 'meta_info', 'total', 'gift_cards']
-)
+order_fee_calculation = EventPluginSignal()
 """
+Arguments: 'positions', 'invoice_address', 'meta_info', 'total', 'gift_cards'
+
 This signals allows you to add fees to an order while it is being created. You are expected to
 return a list of ``OrderFee`` objects that are not yet saved to the database
 (because there is no order yet).
@@ -562,10 +539,10 @@ keyword argument will contain the total cart sum without any fees. You should no
 the gift cards in use.
 """
 
-order_fee_type_name = EventPluginSignal(
-    providing_args=['request', 'fee']
-)
+order_fee_type_name = EventPluginSignal()
 """
+Arguments: 'request', 'fee'
+
 This signals allows you to return a human-readable description for a fee type based on the ``fee_type``
 and ``internal_type`` attributes of the ``OrderFee`` model that you get as keyword arguments. You are
 expected to return a string or None, if you don't know about this fee.
@@ -573,20 +550,20 @@ expected to return a string or None, if you don't know about this fee.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-allow_ticket_download = EventPluginSignal(
-    providing_args=['order']
-)
+allow_ticket_download = EventPluginSignal()
 """
+Arguments: 'order'
+
 This signal is sent out to check if tickets for an order can be downloaded. If any receiver returns false,
 a download will not be offered.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-email_filter = EventPluginSignal(
-    providing_args=['message', 'order', 'user']
-)
+email_filter = EventPluginSignal()
 """
+Arguments: 'message', 'order', 'user'
+
 This signal allows you to implement a middleware-style filter on all outgoing emails. You are expected to
 return a (possibly modified) copy of the message object passed to you.
 
@@ -598,10 +575,10 @@ If the email is associated with a specific user, e.g. a notification email, the
 well, otherwise it will be ``None``.
 """
 
-global_email_filter = GlobalSignal(
-    providing_args=['message', 'order', 'user']
-)
+global_email_filter = GlobalSignal()
 """
+Arguments: 'message', 'order', 'user'
+
 This signal allows you to implement a middleware-style filter on all outgoing emails. You are expected to
 return a (possibly modified) copy of the message object passed to you.
 
@@ -613,6 +590,7 @@ If the email is associated with a specific user, e.g. a notification email, the
 well, otherwise it will be ``None``.
 """
 
+
 layout_text_variables = EventPluginSignal()
 """
 This signal is sent out to collect variables that can be used to display text in ticket-related PDF layouts.
@@ -627,11 +605,35 @@ dictionaries as values that contain keys like in the following example::
         }
     }
 
-The evaluate member will be called with the order position, order and event as arguments. The event might
+The ``evaluate`` member will be called with the order position, order and event as arguments. The event might
 also be a subevent, if applicable.
 """
 
 
+layout_image_variables = EventPluginSignal()
+"""
+This signal is sent out to collect variables that can be used to display dynamic images in ticket-related PDF layouts.
+Receivers are expected to return a dictionary with globally unique identifiers as keys and more
+dictionaries as values that contain keys like in the following example::
+
+    return {
+        "profile": {
+            "label": _("Profile picture"),
+            "evaluate": lambda orderposition, order, event: ContentFile(b"some-image-data"),
+            "etag": lambda orderposition, order, event: hash(b"some-image-data")
+        }
+    }
+
+The ``evaluate`` member will be called with the order position, order and event as arguments. The event might
+also be a subevent, if applicable. The return value of ``evaluate`` should be an instance of Django's ``File``
+class and point to a valid JPEG or PNG file. If no image is available, ``evaluate`` should return ``None``.
+
+The ``etag`` member will be called with the same arguments as ``evaluate`` but should return a ``str`` value
+uniquely identifying the version of the file. This can be a hash of the file, but can also be something else.
+If no image is available, ``etag`` should return ``None``. In some cases, this can speed up the implementation.
+"""
+
+
 timeline_events = EventPluginSignal()
 """
 This signal is sent out to collect events for the time line shown on event dashboards. You are passed
@@ -641,10 +643,10 @@ a ``subevent`` argument which might be none and you are expected to return a lis
 """
 
 
-quota_availability = EventPluginSignal(
-    providing_args=['quota', 'result', 'count_waitinglist']
-)
+quota_availability = EventPluginSignal()
 """
+Arguments: 'quota', 'result', 'count_waitinglist'
+
 This signal allows you to modify the availability of a quota. You are passed the ``quota`` and an
 ``availability`` result calculated by pretix code or other plugins. ``availability`` is a tuple
 with the first entry being one of the ``Quota.AVAILABILITY_*`` constants and the second entry being
@@ -657,25 +659,23 @@ system really bad.** Also, keep in mind that your response is subject to caching
 quotas might be used for display (not for actual order processing).
 """
 
-order_split = EventPluginSignal(
-    providing_args=["original", "split_order"]
-)
+order_split = EventPluginSignal()
 """
+Arguments: ``original``, ``split_order``
+
 This signal is sent out when an order is split into two orders and allows you to copy related models
 to the new order. You will be passed the old order as ``original`` and the new order as ``split_order``.
 """
 
-invoice_line_text = EventPluginSignal(
-    providing_args=["position"]
-)
+invoice_line_text = EventPluginSignal()
 """
+Arguments: ``position``
+
 This signal is sent out when an invoice is built for an order. You can return additional text that
 should be shown on the invoice for the given ``position``.
 """
 
-order_import_columns = EventPluginSignal(
-    providing_args=[]
-)
+order_import_columns = EventPluginSignal()
 """
 This signal is sent out if the user performs an import of orders from an external source. You can use this
 to define additional columns that can be read during import. You are expected to return a list of instances of
@@ -684,10 +684,10 @@ to define additional columns that can be read during import. You are expected to
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-validate_event_settings = EventPluginSignal(
-    providing_args=["settings_dict"]
-)
+validate_event_settings = EventPluginSignal()
 """
+Arguments: ``settings_dict``
+
 This signal is sent out if the user performs an update of event settings through the API or web interface.
 You are passed a ``settings_dict`` dictionary with the new state of the event settings object and are expected
 to raise a ``django.core.exceptions.ValidationError`` if the new state is not valid.
@@ -698,9 +698,7 @@ serializer field instead.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-api_event_settings_fields = EventPluginSignal(
-    providing_args=[]
-)
+api_event_settings_fields = EventPluginSignal()
 """
 This signal is sent out to collect serializable settings fields for the API. You are expected to
 return a dictionary mapping names of attributes in the settings store to DRF serializer field instances.

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

@@ -136,6 +136,31 @@
             text-decoration: none;
             color: {{ color }};
         }
+
+        .order-button {
+            padding-top: 5px
+        }
+        .order-button a.button {
+            font-size: 12px;
+        }
+        .order-info {
+            padding-bottom: 5px
+        }
+
+        .order {
+            font-size: 12px;
+        }
+
+        .cart-table > tr > td:first-child {
+            width: 40px;
+        }
+        .order-details > tr > td:first-child {
+            width: 20%;
+        }
+        .order-details td {
+            font-size: 12px;
+        }
+
         {% if rtl %}
             body {
                 direction: rtl;

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

@@ -0,0 +1,142 @@
+{% load eventurl %}
+{% load i18n %}
+
+{% if position %}
+    <div class="order-info">
+        {% trans "You are receiving this email because someone signed you up for the following event:" %}
+    </div>
+    <table class="order-details">
+        <tr>
+            <td>
+                <strong>{% trans "Event:" %}</strong>
+            </td>
+            <td>
+                {{ event.name }}
+                <br>
+                {% if event.has_subevents and ev.name|upper != event.name|upper %}{{ ev.name }}<br>{% endif %}
+                {{ ev.get_date_range_display }}
+                {% if event.settings.show_times %}
+                    {{ ev.date_from|date:"TIME_FORMAT" }}
+                {% endif %}
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <strong>{% trans "Order code:" %}</strong>
+            </td>
+            <td>
+                {{ order.code }} ({{ order.datetime|date:"SHORT_DATE_FORMAT" }})<br>
+                {% if order.email %}
+                    {% trans "created by" %} {{ order.email }}
+                {% endif %}
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <strong>{% trans "Organizer:" %}</strong>
+            </td>
+            <td>
+                {{ event.organizer }}
+                {% if event.settings.contact_mail %}
+                    <br>
+                    <a href="mailto:{{ event.settings.contact_mail }}">
+                        {{ event.settings.contact_mail }}
+                    </a>
+                {% endif %}
+            </td>
+        </tr>
+    </table>
+    <div class="order-button">
+        <a href="{% abseventurl event "presale:event.order.position" order=order.code secret=position.web_secret position=position.positionid %}" class="button">
+            {% trans "View registration details" %}
+        </a>
+    </div>
+{% else %}
+    <div class="order-info">
+        {% trans "You are receiving this email because you placed an order for the following event:" %}
+    </div>
+    <table class="order-details">
+        <tr>
+            <td>
+                <strong>{% trans "Event:" %}</strong>
+            </td>
+            <td>
+                {{ event.name }}
+                {% if not event.has_subevents and event.settings.show_dates_on_frontpage %}
+                    <br>
+                    {{ event.get_date_range_display }}
+                    {% if event.settings.show_times %}
+                        {{ event.date_from|date:"TIME_FORMAT" }}
+                    {% endif %}
+                {% endif %}
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <strong>{% trans "Order code:" %}</strong>
+            </td>
+            <td>
+                {{ order.code }} ({{ order.datetime|date:"SHORT_DATE_FORMAT" }})
+            </td>
+        </tr>
+        {% if cart %}
+            <tr>
+                <td>
+                    <strong>{% trans "Details:" %}</strong>
+                </td>
+                <td>
+                    <table class="cart-table">
+                        {% for groupkey, positions in cart %}
+                            <tr>
+                                <td>
+                                    {% if not groupkey.4 %} {# is addon #}
+                                        {{ positions|length }}x
+                                    {% endif %}
+                                </td>
+                                <td>
+                                    {% if groupkey.4 %} {# is addon #}
+                                        +
+                                    {% endif %}
+                                    {{ groupkey.0.name }}{% if groupkey.1 %} – {{ groupkey.1.value }}{% endif %}
+                                    {% if groupkey.2 %} {# subevent #}
+                                        <br>
+                                        {% if groupkey.2.name|upper != event.name|upper %}
+                                            {{ groupkey.2.name }} &middot;
+                                        {% endif %}
+                                        {{ groupkey.2.get_date_range_display }}
+                                        {% if event.settings.show_times %}
+                                            {{ groupkey.2.date_from|date:"TIME_FORMAT" }}
+                                        {% endif %}
+                                    {% endif %}
+                                    {% if groupkey.3 %} {# attendee name #}
+                                        <br>
+                                        {{ groupkey.3.name }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                </td>
+            </tr>
+        {% endif %}
+        <tr>
+            <td>
+                <strong>{% trans "Organizer:" %}</strong>
+            </td>
+            <td>
+                {{ event.organizer }}
+                {% if event.settings.contact_mail %}
+                    <br>
+                    <a href="mailto:{{ event.settings.contact_mail }}">
+                        {{ event.settings.contact_mail }}
+                    </a>
+                {% endif %}
+            </td>
+        </tr>
+    </table>
+    <div class="order-button">
+        <a href="{% abseventurl event "presale:event.order.open" hash=order.email_confirm_hash order=order.code secret=order.secret %}" class="button">
+            {% trans "View order details" %}
+        </a>
+    </div>
+{% endif %}

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

@@ -23,23 +23,7 @@
                     <table cellpadding="20"><tr><td>
                 <![endif]-->
                 <div class="content">
-                    {% if position %}
-                        {% trans "You are receiving this email because someone signed you up for the following event:" %}<br>
-                        <strong>{% trans "Event:" %}</strong> {{ event.name }}<br>
-                        <strong>{% trans "Order code:" %}</strong> {{ order.code }}<br>
-                        <strong>{% trans "Order date:" %}</strong> {{ order.datetime|date:"SHORT_DATE_FORMAT" }}<br>
-                        <a href="{% abseventurl event "presale:event.order.position" order=order.code secret=position.web_secret position=position.positionid %}">
-                            {% trans "View registration details" %}
-                        </a>
-                    {% else %}
-                        {% trans "You are receiving this email because you placed an order for the following event:" %}<br>
-                        <strong>{% trans "Event:" %}</strong> {{ event.name }}<br>
-                        <strong>{% trans "Order code:" %}</strong> {{ order.code }}<br>
-                        <strong>{% trans "Order date:" %}</strong> {{ order.datetime|date:"SHORT_DATE_FORMAT" }}<br>
-                        <a href="{% abseventurl event "presale:event.order.open" hash=order.email_confirm_hash order=order.code secret=order.secret %}">
-                            {% trans "View order details" %}
-                        </a>
-                    {% endif %}
+                    {% include "pretixbase/email/order_details.html" %}
                 </div>
                 <!--[if gte mso 9]>
                     </td></tr></table>

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

@@ -147,6 +147,31 @@
             text-decoration: none;
             color: {{ color }};
         }
+
+        .order-button {
+            padding-top: 5px
+        }
+        .order-button a.button {
+            font-size: 12px;
+        }
+        .order-info {
+            padding-bottom: 5px
+        }
+
+        .order {
+            font-size: 12px;
+        }
+
+        .cart-table > tr > td:first-child {
+            width: 40px;
+        }
+        .order-details > tr > td:first-child {
+            width: 20%;
+        }
+        .order-details td {
+            font-size: 12px;
+        }
+
         {% if rtl %}
             body {
                 direction: rtl;
@@ -226,23 +251,7 @@
                         <table cellpadding="20"><tr><td>
                     <![endif]-->
                     <div class="content">
-                        {% if position %}
-                            {% trans "You are receiving this email because someone signed you up for the following event:" %}<br>
-                            <strong>{% trans "Event:" %}</strong> {{ event.name }}<br>
-                            <strong>{% trans "Order code:" %}</strong> {{ order.code }}<br>
-                            <strong>{% trans "Order date:" %}</strong> {{ order.datetime|date:"SHORT_DATE_FORMAT" }}<br>
-                            <a href="{% abseventurl event "presale:event.order.position" order=order.code secret=position.web_secret position=position.positionid %}">
-                                {% trans "View registration details" %}
-                            </a>
-                        {% else %}
-                            {% trans "You are receiving this email because you placed an order for the following event:" %}<br>
-                            <strong>{% trans "Event:" %}</strong> {{ event.name }}<br>
-                            <strong>{% trans "Order code:" %}</strong> {{ order.code }}<br>
-                            <strong>{% trans "Order date:" %}</strong> {{ order.datetime|date:"SHORT_DATE_FORMAT" }}<br>
-                            <a href="{% abseventurl event "presale:event.order.open" hash=order.email_confirm_hash order=order.code secret=order.secret %}">
-                                {% trans "View order details" %}
-                            </a>
-                        {% endif %}
+                        {% include "pretixbase/email/order_details.html" %}
                     </div>
                     <!--[if gte mso 9]>
                         </td></tr></table>

src/pretix/base/templates/pretixbase/forms/widgets/thumbnailed_file_input.html

@@ -1,7 +1,7 @@
 {% load thumb %}
 {% if widget.is_initial %}{{ widget.initial_text }}: <a href="{{ widget.value.url }}">{{ widget.value }}</a>{% if not widget.required %}
     <input type="checkbox" name="{{ widget.checkbox_name }}" id="{{ widget.checkbox_id }}">
-    <label for="{{ widget.checkbox_id }}">{{ widget.clear_checkbox_label }}</label>{% endif %}{% if widget.value.is_img %}<br><a href="{{ widget.value.url }}" data-lightbox="{{ widget.value.name }}"><img src="{{ widget.value|thumb:"200x100" }}" /></a>{% endif %}<br>
+    <label for="{{ widget.checkbox_id }}">{{ widget.clear_checkbox_label }}</label>{% endif %}{% if widget.value.is_img %}<br><a href="{{ widget.value.url }}" data-lightbox="{{ widget.name }}"><img src="{{ widget.value|thumb:"200x100" }}" /></a>{% endif %}<br>
     {{ widget.input_text }}:{% endif %}
 <input type="{{ widget.type }}" name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>
 {% if widget.cachedfile %}<input type="hidden" name="{{ widget.hidden_name }}" value="{{ widget.cachedfile.id }}">{% endif %}