Add test coverage and small improvements to event cloning logic

Currently translated at 100.0% (4709 of 4709 strings)

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

powered by weblate

.github/workflows/tests.yml

@@ -55,7 +55,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system dependencies
-        run: sudo apt update && sudo apt install gettext mariadb-client
+        run: sudo apt update && sudo apt install gettext mariadb-client-10.3
       - name: Install Python dependencies
         run: pip3 install -e ".[dev]" mysqlclient psycopg2-binary
         working-directory: ./src

doc/_themes/pretix_theme/layout.html

@@ -157,7 +157,7 @@
         <div class="rst-content">
           {% include "breadcrumbs.html" %}
           <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
+           <div itemprop="articleBody" class="section">
             {% block body %}{% endblock %}
            </div>
            <div class="articleComments">

doc/admin/config.rst

@@ -65,6 +65,9 @@ Example::
     A comma-separated list of plugins that are not available even though they are installed.
     Defaults to an empty string.
 
+``plugins_show_meta``
+    Whether to show authors and versions of plugins, defaults to ``on``.
+
 ``auth_backends``
     A comma-separated list of available auth backends. Defaults to ``pretix.base.auth.NativeAuthBackend``.
 

doc/api/deviceauth.rst

@@ -99,7 +99,8 @@ following endpoint:
        "hardware_brand": "Samsung",
        "hardware_model": "Galaxy S",
        "software_brand": "pretixdroid",
-       "software_version": "4.1.0"
+       "software_version": "4.1.0",
+       "info": {"arbitrary": "data"}
    }
 
 You will receive a response equivalent to the response of your initialization request.

doc/api/fundamentals.rst

@@ -43,6 +43,8 @@ Possible permissions are:
 * Can view vouchers
 * Can change vouchers
 
+.. _`rest-compat`:
+
 Compatibility
 -------------
 
@@ -58,6 +60,7 @@ that your clients can deal with them properly:
 * Support of new HTTP methods for a given API endpoint
 * Support of new query parameters for a given API endpoint
 * New fields contained in API responses
+* Response body structure or message texts on failed requests (``4xx``, ``5xx`` response codes)
 
 We treat the following types of changes as *backwards-incompatible*:
 

doc/api/resources/carts.rst

@@ -189,7 +189,7 @@ Cart position endpoints
    * ``attendee_email`` (optional)
    * ``subevent`` (optional)
    * ``expires`` (optional)
-   * ``includes_tax`` (optional)
+   * ``includes_tax`` (optional, **deprecated**, do not use, will be removed)
    * ``sales_channel`` (optional)
    * ``answers``
 

doc/api/resources/discounts.rst

@@ -0,0 +1,306 @@
+.. _`rest-discounts`:
+
+Discounts
+=========
+
+Resource description
+--------------------
+
+Discounts provide a way to automatically reduce the price of a cart if it matches a given set of conditions.
+Discounts are available to everyone. If you want to give a discount just to specific persons, look at
+:ref:`vouchers <rest-vouchers>` instead. If you are interested in the behind-the-scenes details of how
+discounts are calculated for a specific order, have a look at :ref:`our algorithm documentation <algorithms-pricing>`.
+
+.. rst-class:: rest-resource-table
+
+======================================== ========================== =======================================================
+Field                                    Type                       Description
+======================================== ========================== =======================================================
+id                                       integer                    Internal ID of the discount rule
+active                                   boolean                    The discount will be ignored if this is ``false``
+internal_name                            string                     A name for the rule used in the backend
+position                                 integer                    An integer, used for sorting the rules which are applied in order
+sales_channels                           list of strings            Sales channels this discount is available on, such as
+                                                                    ``"web"`` or ``"resellers"``. Defaults to ``["web"]``.
+available_from                           datetime                   The first date time at which this discount can be applied
+                                                                    (or ``null``).
+available_until                          datetime                   The last date time at which this discount can be applied
+                                                                    (or ``null``).
+subevent_mode                            strings                    Determines how the discount is handled when used in an
+                                                                    event series. Can be ``"mixed"`` (no special effect),
+                                                                    ``"same"`` (discount is only applied for groups within
+                                                                    the same date), or ``"distinct"`` (discount is only applied
+                                                                    for groups with no two same dates).
+condition_all_products                   boolean                    If ``true``, the discount applies to all items.
+condition_limit_products                 list of integers           If ``condition_all_products`` is not set, this is a list
+                                                                    of internal item IDs that the discount applies to.
+condition_apply_to_addons                boolean                    If ``true``, the discount applies to add-on products as well,
+                                                                    otherwise it only applies to top-level items. The discount never
+                                                                    applies to bundled products.
+condition_ignore_voucher_discounted      boolean                    If ``true``, the discount does not apply to products which have
+                                                                    been discounted by a voucher.
+condition_min_count                      integer                    The minimum number of matching products for the discount
+                                                                    to be activated.
+condition_min_value                      money (string)             The minimum value of matching products for the discount
+                                                                    to be activated. Cannot be combined with ``condition_min_count``,
+                                                                    or with ``subevent_mode`` set to ``distinct``.
+benefit_discount_matching_percent        decimal (string)           The percentage of price reduction for matching products.
+benefit_only_apply_to_cheapest_n_matches integer                    If set higher than 0, the discount will only be applied to
+                                                                    the cheapest matches. Useful for a "3 for 2"-style discount.
+                                                                    Cannot be combined with ``condition_min_value``.
+======================================== ========================== =======================================================
+
+
+Endpoints
+---------
+
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/discounts/
+
+   Returns a list of all discounts within a given event.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/events/sampleconf/discounts/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "count": 1,
+        "next": null,
+        "previous": null,
+        "results": [
+          {
+            "id": 1,
+            "active": true,
+            "internal_name": "3 for 2",
+            "position": 1,
+            "sales_channels": ["web"],
+            "available_from": null,
+            "available_until": null,
+            "subevent_mode": "mixed",
+            "condition_all_products": true,
+            "condition_limit_products": [],
+            "condition_apply_to_addons": true,
+            "condition_ignore_voucher_discounted": false,
+            "condition_min_count": 3,
+            "condition_min_value": "0.00",
+            "benefit_discount_matching_percent": "100.00",
+            "benefit_only_apply_to_cheapest_n_matches": 1
+          }
+        ]
+      }
+
+   :query integer page: The page number in case of a multi-page result set, default is 1
+   :query boolean active: If set to ``true`` or ``false``, only discounts with this value for the field ``active`` will be
+                          returned.
+   :query string ordering: Manually set the ordering of results. Valid fields to be used are ``id`` and ``position``.
+                           Default: ``position``
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param event: The ``slug`` field of the event to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
+
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/discounts/(id)/
+
+   Returns information on one discount, identified by its ID.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/events/sampleconf/discounts/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "active": true,
+        "internal_name": "3 for 2",
+        "position": 1,
+        "sales_channels": ["web"],
+        "available_from": null,
+        "available_until": null,
+        "subevent_mode": "mixed",
+        "condition_all_products": true,
+        "condition_limit_products": [],
+        "condition_apply_to_addons": true,
+        "condition_ignore_voucher_discounted": false,
+        "condition_min_count": 3,
+        "condition_min_value": "0.00",
+        "benefit_discount_matching_percent": "100.00",
+        "benefit_only_apply_to_cheapest_n_matches": 1
+      }
+
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param event: The ``slug`` field of the event to fetch
+   :param id: The ``id`` field of the discount to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
+
+.. http:post:: /api/v1/organizers/(organizer)/events/(event)/discounts/
+
+   Creates a new discount
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      POST /api/v1/organizers/bigevents/events/sampleconf/discounts/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+
+      {
+        "active": true,
+        "internal_name": "3 for 2",
+        "position": 1,
+        "sales_channels": ["web"],
+        "available_from": null,
+        "available_until": null,
+        "subevent_mode": "mixed",
+        "condition_all_products": true,
+        "condition_limit_products": [],
+        "condition_apply_to_addons": true,
+        "condition_ignore_voucher_discounted": false,
+        "condition_min_count": 3,
+        "condition_min_value": "0.00",
+        "benefit_discount_matching_percent": "100.00",
+        "benefit_only_apply_to_cheapest_n_matches": 1
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 201 Created
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "active": true,
+        "internal_name": "3 for 2",
+        "position": 1,
+        "sales_channels": ["web"],
+        "available_from": null,
+        "available_until": null,
+        "subevent_mode": "mixed",
+        "condition_all_products": true,
+        "condition_limit_products": [],
+        "condition_apply_to_addons": true,
+        "condition_ignore_voucher_discounted": false,
+        "condition_min_count": 3,
+        "condition_min_value": "0.00",
+        "benefit_discount_matching_percent": "100.00",
+        "benefit_only_apply_to_cheapest_n_matches": 1
+      }
+
+   :param organizer: The ``slug`` field of the organizer of the event to create a discount for
+   :param event: The ``slug`` field of the event to create a discount for
+   :statuscode 201: no error
+   :statuscode 400: The discount could not be created due to invalid submitted data.
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this resource.
+
+.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/discounts/(id)/
+
+   Update a discount. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
+   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
+   want to change.
+
+   You can change all fields of the resource except the ``id`` field.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      PATCH /api/v1/organizers/bigevents/events/sampleconf/discounts/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+      Content-Length: 94
+
+      {
+        "active": false
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "active": false,
+        "internal_name": "3 for 2",
+        "position": 1,
+        "sales_channels": ["web"],
+        "available_from": null,
+        "available_until": null,
+        "subevent_mode": "mixed",
+        "condition_all_products": true,
+        "condition_limit_products": [],
+        "condition_apply_to_addons": true,
+        "condition_ignore_voucher_discounted": false,
+        "condition_min_count": 3,
+        "condition_min_value": "0.00",
+        "benefit_discount_matching_percent": "100.00",
+        "benefit_only_apply_to_cheapest_n_matches": 1
+      }
+
+   :param organizer: The ``slug`` field of the organizer to modify
+   :param event: The ``slug`` field of the event to modify
+   :param id: The ``id`` field of the discount to modify
+   :statuscode 200: no error
+   :statuscode 400: The discount could not be modified due to invalid submitted data
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
+
+.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/discount/(id)/
+
+   Delete a discount.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      DELETE /api/v1/organizers/bigevents/events/sampleconf/discount/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 204 No Content
+      Vary: Accept
+
+   :param organizer: The ``slug`` field of the organizer to modify
+   :param event: The ``slug`` field of the event to modify
+   :param id: The ``id`` field of the discount to delete
+   :statuscode 204: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.

doc/api/resources/index.rst

@@ -1,6 +1,11 @@
 Resources and endpoints
 =======================
 
+With a few exceptions, this only lists resources bundled in the pretix core modules.
+Additional endpoints are provided by pretix plugins. Some of them are documented
+at :ref:`plugin-docs`.
+
+
 .. toctree::
    :maxdepth: 2
 
@@ -19,6 +24,7 @@ Resources and endpoints
    orders
    invoices
    vouchers
+   discounts
    checkinlists
    waitinglist
    customers
@@ -33,4 +39,4 @@ Resources and endpoints
    exporters
    sendmail_rules
    billing_invoices
-   billing_var
+   billing_var

doc/api/resources/orders.rst

@@ -68,6 +68,7 @@ positions                             list of objects            List of order p
                                                                  non-canceled positions are included.
 fees                                  list of objects            List of fees included in the order total. By default, only
                                                                  non-canceled fees are included.
+├ id                                  integer                    Internal ID of the fee record
 ├ fee_type                            string                     Type of fee (currently ``payment``, ``passbook``,
                                                                  ``other``)
 ├ value                               money (string)             Fee amount
@@ -136,6 +137,10 @@ last_modified                         datetime                   Last modificati
 
    The ``subevent`` query parameters has been added.
 
+.. versionchanged:: 4.8
+
+   The ``order.fees.id`` attribute has been added.
+
 
 .. _order-position-resource:
 
@@ -735,6 +740,37 @@ Generating new secrets
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to update this order.
 
+.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/(id)/regenerate_secrets/
+
+   Triggers generation of a new ``secret`` attribute for a single order position.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      POST /api/v1/organizers/bigevents/events/sampleconf/orderpositions/23/regenerate_secrets/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      (Full order position resource, see above.)
+
+   :param organizer: The ``slug`` field of the organizer of the event
+   :param event: The ``slug`` field of the event
+   :param code: The ``id`` field of the order position to update
+
+   :statuscode 200: no error
+   :statuscode 400: The order position could not be updated due to invalid submitted data.
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to update this order position.
+
 Deleting orders
 ---------------
 
@@ -1046,6 +1082,9 @@ Order state operations
    will instead stay paid, but all positions will be removed (or marked as canceled) and replaced by the cancellation
    fee as the only component of the order.
 
+   You can control whether the customer is notified through ``send_email`` (defaults to ``true``).
+   You can pass a ``comment`` that can be visible to the user if it is used in the email template.
+
    **Example request**:
 
    .. sourcecode:: http
@@ -1057,6 +1096,7 @@ Order state operations
 
       {
           "send_email": true,
+          "comment": "Event was canceled.",
           "cancellation_fee": null
       }
 
@@ -1642,6 +1682,8 @@ Order position ticket download
    :statuscode 409: The file is not yet ready and will now be prepared. Retry the request after waiting for a few
                     seconds.
 
+.. _rest-orderpositions-manipulate:
+
 Manipulating individual positions
 ---------------------------------
 
@@ -1649,6 +1691,11 @@ Manipulating individual positions
 
    The ``PATCH`` method has been added for individual positions.
 
+.. versionchanged:: 4.8
+
+   The ``PATCH`` method now supports changing items, variations, subevents, seats, prices, and tax rules.
+   The ``POST`` endpoint to add individual positions has been added.
+
 .. http:patch:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/(id)/
 
    Updates specific fields on an order position. Currently, only the following fields are supported:
@@ -1675,6 +1722,21 @@ Manipulating individual positions
      and ``option_identifiers`` will be ignored. As a special case, you can submit the magic value
      ``"file:keep"`` as the answer to a file question to keep the current value without re-uploading it.
 
+   * ``item``
+
+   * ``variation``
+
+   * ``subevent``
+
+   * ``seat`` (specified as a string mapping to a ``string_guid``)
+
+   * ``price``
+
+   * ``tax_rule``
+
+   Changing parameters such as ``item`` or ``price`` will **not** automatically trigger creation of a new invoice,
+   you need to take care of that yourself.
+
    **Example request**:
 
    .. sourcecode:: http
@@ -1696,7 +1758,7 @@ Manipulating individual positions
       Vary: Accept
       Content-Type: application/json
 
-      (Full order resource, see above.)
+      (Full order position resource, see above.)
 
    :param organizer: The ``slug`` field of the organizer of the event
    :param event: The ``slug`` field of the event
@@ -1707,9 +1769,83 @@ Manipulating individual positions
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to update this order.
 
+.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/
+
+   Adds a new position to an order. Currently, only the following fields are supported:
+
+   * ``order`` (mandatory, specified as a string mapping to a ``code``)
+
+   * ``addon_to`` (optional, specified as an integer mapping to the ``positionid`` of the parent position)
+
+   * ``item`` (mandatory)
+
+   * ``variation`` (mandatory depending on item)
+
+   * ``subevent`` (mandatory depending on event)
+
+   * ``seat`` (specified as a string mapping to a ``string_guid``, mandatory depending on event and item)
+
+   * ``price`` (default price will be used if unset)
+
+   * ``attendee_email``
+
+   * ``attendee_name_parts`` or ``attendee_name``
+
+   * ``company``
+
+   * ``street``
+
+   * ``zipcode``
+
+   * ``city``
+
+   * ``country``
+
+   * ``state``
+
+   * ``answers``: Validation is handled the same way as when creating orders through the API. You are therefore
+     expected to provide ``question``, ``answer``, and possibly ``options``. ``question_identifier``
+     and ``option_identifiers`` will be ignored. As a special case, you can submit the magic value
+     ``"file:keep"`` as the answer to a file question to keep the current value without re-uploading it.
+
+   This will **not** automatically trigger creation of a new invoice, you need to take care of that yourself.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      POST /api/v1/organizers/bigevents/events/sampleconf/orderpositions/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+
+      {
+        "order": "ABC12",
+        "item": 5,
+        "addon_to": 1
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 201 Created
+      Vary: Accept
+      Content-Type: application/json
+
+      (Full order position resource, see above.)
+
+   :param organizer: The ``slug`` field of the organizer of the event
+   :param event: The ``slug`` field of the event
+
+   :statuscode 200: no error
+   :statuscode 400: The position could not be created due to invalid submitted data.
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create this position.
+
 .. http:delete:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/(id)/
 
-   Deletes an order position, identified by its internal ID.
+   Cancels an order position, identified by its internal ID.
 
    **Example request**:
 
@@ -1735,6 +1871,128 @@ Manipulating individual positions
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
    :statuscode 404: The requested order position does not exist.
 
+Changing order contents
+-----------------------
+
+While you can :ref:`change positions individually <rest-orderpositions-manipulate>` sometimes it is necessary to make
+multiple changes to an order at once within one transaction. This makes it possible to e.g. swap the seats of two
+attendees in an order without running into conflicts. This interface also offers some possibilities not available
+otherwise, such as splitting an order or changing fees.
+
+.. versionchanged:: 4.8
+
+   This endpoint has been added to the system.
+
+.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/change/
+
+   Performs a change operation on an order. You can supply the following fields:
+
+   * ``patch_positions``: A list of objects with the two keys ``position`` specifying an order position ID and
+     ``body`` specifying the desired changed values of the position (``item``, ``variation``, ``subevent``, ``seat``,
+     ``price``, ``tax_rule``).
+
+   * ``cancel_positions``: A list of objects with the single key ``position`` specifying an order position ID.
+
+   * ``split_positions``: A list of objects with the single key ``position`` specifying an order position ID.
+
+   * ``create_positions``: A list of objects describing new order positions with the same fields supported as when
+     creating them individually through the ``POST …/orderpositions/`` endpoint.
+
+   * ``patch_fees``: A list of objects with the two keys ``fee`` specifying an order fee ID and
+     ``body`` specifying the desired changed values of the position (``value``).
+
+   * ``cancel_fees``: A list of objects with the single key ``fee`` specifying an order fee ID.
+
+   * ``recalculate_taxes``: If set to ``"keep_net"``, all taxes will be recalculated based on the tax rule and invoice
+     address, the net price will be kept. If set to ``"keep_gross"``, the gross price will be kept. If set to ``null``
+     (the default) the taxes are not recalculated.
+
+   * ``send_email``: If set to ``true``, the customer will be notified about the change. Defaults to ``false``.
+
+   * ``reissue_invoice``: If set to ``true`` and an invoice exists for the order, it will be canceled and a new invoice
+     will be issued. Defaults to ``true``.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      POST /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+
+      {
+        "cancel_positions": [
+          {
+            "position": 12373
+          }
+        ],
+        "patch_positions": [
+          {
+            "position": 12374,
+            "body": {
+              "item": 12,
+              "variation": None,
+              "subevent": 562,
+              "seat": "seat-guid-2",
+              "price": "99.99",
+              "tax_rule": 15
+            }
+          }
+        ],
+        "split_positions": [
+          {
+            "position": 12375
+          }
+        ],
+        "create_positions": [
+          {
+            "item": 12,
+            "variation": None,
+            "subevent": 562,
+            "seat": "seat-guid-2",
+            "price": "99.99",
+            "addon_to": 12374,
+            "attendee_name": "Peter",
+          }
+        ],
+        "cancel_fees": [
+          {
+            "fee": 49
+          }
+        ],
+        "change_fees": [
+          {
+            "fee": 51,
+            "body": {
+              "value": "12.00"
+            }
+          }
+        ],
+        "reissue_invoice": true,
+        "send_email": true,
+        "recalculate_taxes": "keep_gross"
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      (Full order position resource, see above.)
+
+   :param organizer: The ``slug`` field of the organizer of the event
+   :param event: The ``slug`` field of the event
+   :param code: The ``code`` field of the order to update
+
+   :statuscode 200: no error
+   :statuscode 400: The order could not be updated due to invalid submitted data.
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to update this order.
+
 
 Order payment endpoints
 -----------------------

doc/api/resources/vouchers.rst

@@ -1,3 +1,5 @@
+.. _`rest-vouchers`:
+
 Vouchers
 ========
 

doc/development/algorithms/index.rst

@@ -9,5 +9,6 @@ ticket scanning apps and we want to ensure the implementations are as similar as
 .. toctree::
    :maxdepth: 2
 
+   pricing
    checkin
    layouts

doc/development/algorithms/pricing.rst

@@ -0,0 +1,180 @@
+.. _`algorithms-pricing`:
+
+Pricing algorithms
+==================
+
+With pretix being an e-commerce application, one of its core tasks is to determine the price of a purchase. With the
+complexity allowed by our range of features, this is not a trivial task and there are many edge cases that need to be
+clearly defined. The most challenging part about this is that there are many situations in which a price might change
+while the user is going through the checkout process and we're learning more information about them or their purchase.
+For example, prices change when
+
+* The cart expires and the listed prices changed in the meantime
+* The user adds an invoice address that triggers a change in taxation
+* The user chooses a custom price for an add-on product and adjusts the price later on
+* The user adds a voucher to their cart
+* An automatic discount is applied
+
+For the purposes of this page, we're making a distinction between "naive prices" (which are just a plain number like 23.00), and
+"taxed prices" (which are a combination of a net price, a tax rate, and a gross price, like 19.33 + 19% = 23.00).
+
+Computation of listed prices
+----------------------------
+
+When showing a list of products, e.g. on the event front page, we always need to show a price. This price is what we
+call the "listed price" later on.
+
+To compute the listed price, we first use the ``default_price`` attribute of the ``Item`` that is being shown.
+If we are showing an ``ItemVariation`` and that variation has a ``default_price`` set on itself, the variation's price
+takes precedence and replaces the item's price.
+If we're in an event series and there exists a ``SubEventItem`` or ``SubEventItemVariation`` with a price set, the
+subevent's price configuration takes precedence over both the item as well as the variation and replaces the listed price.
+
+Listed prices are naive prices. Before we actually show them to the user, we need to check if ``TaxRule.price_includes_tax``
+is set to determine if we need to add tax or subtract tax to get to the taxed price. We then consider the event's
+``display_net_prices`` setting to figure out which way to present the taxed price in the interface.
+
+Guarantees on listed prices
+---------------------------
+
+One goal of all further logic is that if a user sees a listed price, they are guaranteed to get the product at that
+price as long as they complete their purchase within the cart expiration time frame. For example, if the cart expiration
+time is set to 30 minutes and someone puts a item listed at €23 in their cart at 4pm, they can still complete checkout
+at €23 until 4.30pm, even if the organizer decides to raise the price to €25 at 4.10pm. If they complete checkout after
+4.30pm, their cart will be adjusted to the new price and the user will see a warning that the price has changed.
+
+Computation of cart prices
+--------------------------
+
+Input
+"""""
+
+To ensure the guarantee mentioned above, even in the light of all possible dynamic changes, the ``listed_price``
+is explicitly stored in the ``CartPosition`` model after the item has been added to the cart.
+
+If ``Item.free_price`` is set, the user is allowed to voluntarily increase the price. In this case, the user's input
+is stored as ``custom_price_input`` without much further validation for use further down below in the process.
+If ``display_net_prices`` is set, the user's input is also considered to be a net price and ``custom_price_input_is_net``
+is stored for the cart position. In any other case, the user's input is considered to be a gross price based on the tax
+rules' default tax rate.
+
+The computation of prices in the cart always starts from the ``listed_price``. The ``list_price`` is only computed
+when adding the product to the cart or when extending the cart's lifetime after it expired. All other steps such as
+creating an order based on the cart trust ``list_price`` without further checks.
+
+Vouchers
+""""""""
+
+As a first step, the cart is checked for any voucher that should be applied to the position. If such a voucher exists,
+it's discount (percentage or fixed) is applied to the listed price. The result of this is stored to ``price_after_voucher``.
+Since ``listed_price`` naive, ``price_after_voucher`` is naive as well. As a consequence, if you have a voucher configured
+to "set the price to €10", it depends on ``TaxRule.price_includes_tax`` again whether this is €10 including or excluding
+taxes.
+
+The ``price_after_voucher`` is only computed when adding the product to the cart or when extending the cart's
+lifetime after it expired. It is also checked again when the order is created, since the available discount might have
+changed due to the voucher's budget being (almost) exhausted.
+
+Line price
+""""""""""
+
+The next step computes the final price of this position if it is the only position in the cart. This happens in "reverse
+order", i.e. before the computation can be performed for a cart position, the step needs to be performed on all of its
+bundled positions. The sum of ``price_after_voucher`` of all bundled positions is now called ``bundled_sum``.
+
+First, the value from ``price_after_voucher`` will be processed by the applicable ``TaxRule.tax()`` (which is complex
+in itself but is not documented here in detail at the moment).
+
+If ``custom_price_input`` is not set, ``bundled_sum`` will be subtracted from the gross price and the net price is
+adjusted accordingly. The result is stored as ``tax_rate`` and ``line_price_gross`` in the cart position.
+
+If ``custom_price_input`` is set, the value will be compared to either the gross or the net value of the ``tax()``
+result, depending on ``custom_price_input_is_net``. If the comparison yields that the custom price is higher, ``tax()``
+will be called again . Then, ``bundled_sum`` will be subtracted from the gross price and the result is stored like
+above.
+
+The computation of ``line_price_gross`` from ``price_after_voucher``, ``custom_price_input``, and tax settings
+is repeated after every change of anything in the cart or after every change of the invoice address.
+
+Discounts
+---------
+
+After ``line_price_gross`` has been computed for all positions, the discount engine will run to apply any automatic
+discounts. Organizers can add rules for automatic discounts in the pretix backend. These rules are ordered and
+will be applied in order. Every cart position can only be "used" by one discount rule. "Used" can either mean that
+the price of the position was actually discounted, but it can also mean that the position was required to enable
+a discount for a different position, e.g. in case of a "buy 3 for the price of 2" offer.
+
+The algorithm for applying an individual discount rule first starts with eliminating all products that do not match
+the rule based on its product scope. Then, the algorithm is handled differently for different configurations.
+
+Case 1: Discount based on minimum value without respect to subevents
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+* Check whether the gross sum of all positions is at least ``condition_min_value``, otherwise abort.
+
+* Reduce the price of all positions by ``benefit_discount_matching_percent``.
+
+* Mark all positions as "used" to hide them from further rules
+
+Case 2: Discount based on minimum number of tickets without respect to subevents
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+* Check whether the number of all positions is at least ``condition_min_count``, otherwise abort.
+
+* If ``benefit_only_apply_to_cheapest_n_maches`` is set,
+
+    * Sort all positions by price.
+    * Reduce the price of the first ``n_positions // condition_min_count * benefit_only_apply_to_cheapest_n_matches`` positions by ``benefit_discount_matching_percent``.
+    * Mark the first ``n_positions // condition_min_count * condition_min_count`` as "used" to hide them from further rules.
+    * Mark all positions as "used" to hide them from further rules.
+
+* Else,
+
+    * Reduce the price of all positions by ``benefit_discount_matching_percent``.
+    * Mark all positions as "used" to hide them from further rules.
+
+Case 3: Discount only for products of the same subevent
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+* Split the cart into groups based on the subevent.
+
+* Proceed with case 1 or 2 for every group.
+
+Case 4: Discount only for products of distinct subevents
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+* Let ``subevents`` be a list of distinct subevents in the cart.
+
+* Let ``positions[subevent]`` be a list of positions for every subevent.
+
+* Let ``current_group`` be the current group and ``groups`` the list of all groups.
+
+* Repeat
+
+    * Order ``subevents`` by the length of their ``positions[subevent]`` list, starting with the longest list.
+      Do not count positions that are part of ``current_group`` already.
+
+    * Let ``candidates`` be the concatenation of all ``positions[subevent]`` lists with the same length as the
+      longest list.
+
+    * If ``candidates`` is empty, abort the repetition.
+
+    * Order ``candidates`` by their price, starting with the lowest price.
+
+    * Pick one entry from ``candidates`` and put it into ``current_group``. If ``current_group`` is shorter than
+      ``benefit_only_apply_to_cheapest_n_matches``, we pick from the start (lowest price), otherwise we pick from
+      the end (highest price)
+
+    * If ``current_group`` is now ``condition_min_count``, remove all entries from ``current_group`` from
+      ``positions[…]``, add ``current_group`` to ``groups``, and reset ``current_group`` to an empty group.
+
+* For every position still left in a ``positions[…]`` list, try if there is any ``group`` in groups that it can
+  still be added to without violating the rule of distinct subevents
+
+* For every group in ``groups``, proceed with case 1 or 2.
+
+Flowchart
+---------
+
+.. image:: /images/cart_pricing.png

doc/development/api/plugins.rst

@@ -45,13 +45,17 @@ Attribute          Type                 Description
 name               string               The human-readable name of your plugin
 author             string               Your name
 version            string               A human-readable version code of your plugin
-description        string               A more verbose description of what your plugin does.
+description        string               A more verbose description of what your plugin does. May contain HTML.
 category           string               Category of a plugin. Either one of ``"FEATURE"``, ``"PAYMENT"``,
                                         ``"INTEGRATION"``, ``"CUSTOMIZATION"``, ``"FORMAT"``, or ``"API"``,
                                         or any other string.
+picture            string (optional)    Path to a picture resolvable through the static file system.
+featured           boolean (optional)   ``False`` by default, can promote a plugin if it's something many users will want, use carefully.
 visible            boolean (optional)   ``True`` by default, can hide a plugin so it cannot be normally activated.
 restricted         boolean (optional)   ``False`` by default, restricts a plugin such that it can only be enabled
                                         for an event by system administrators / superusers.
+experimental       boolean (optional)   ``False`` by default, marks a plugin as an experimental feature in the plugins list.
+picture            string (optional)    Path to a picture resolvable through the static file system.
 compatibility      string               Specifier for compatible pretix versions.
 ================== ==================== ===========================================================
 
@@ -74,8 +78,10 @@ A working example would be:
             name = _("PayPal")
             author = _("the pretix team")
             version = '1.0.0'
-            category = 'PAYMENT
+            category = 'PAYMENT'
+            picture = 'pretix_paypal/paypal_logo.svg'
             visible = True
+            featured = False
             restricted = False
             description = _("This plugin allows you to receive payments via PayPal")
             compatibility = "pretix>=2.7.0"

doc/images/cart_pricing.puml

@@ -0,0 +1,28 @@
+@startuml
+
+partition "For every cart position" {
+    (*) --> "Get default price from product"
+    --> if "Product has variations?" then
+        -->[yes] "Override with price from variation"
+        --> if "Event series?" then
+            -->[yes] "Override with price from subevent"
+            -down-> "Store as listed_price"
+        else
+            -down->[no] "Store as listed_price"
+        endif
+    else
+        -down->[no] "Store as listed_price"
+    endif
+    --> if "Voucher applied?" then
+        -->[yes] "Apply voucher pricing"
+        --> "Store as price_after_voucher"
+    else
+        -->[no] "Store as price_after_voucher"
+    endif
+    --> "Apply custom price if product allows\nApply tax rule\nSubtract bundled products"
+    --> "Store as line_price (gross), tax_rate"
+}
+--> "Apply discount engine"
+--> "Store as price (gross)"
+
+@enduml

doc/plugins/digital.rst

@@ -52,6 +52,7 @@ Variable                            Description
 ``order_email``                     E-mail address of the ticket purchaser
 ``product_id``                      Internal ID of the purchased product
 ``product_variation``               Internal ID of the purchased product variation (or empty)
+``secret``                          The secret ticket code, would be used as the QR code for physical tickets
 ``attendee_name``                   Full name of the ticket holder (or empty)
 ``attendee_name_*``                 Name parts of the ticket holder, depending on configuration, e.g. ``attendee_name_given_name`` or ``attendee_name_family_name``
 ``attendee_email``                  E-mail address of the ticket holder (or empty)

doc/plugins/exhibitors.rst

@@ -0,0 +1,630 @@
+Exhibitors
+==========
+
+The exhibitors plugin allows to manage exhibitors at your trade show or conference. After signing up your exhibitors
+in the system, you can assign vouchers to exhibitors and give them access to the data of these vouchers. The exhibitors
+module is also the basis of the pretixLEAD lead scanning application.
+
+.. note:: On pretix Hosted, using the lead scanning feature of the exhibitors plugin can add additional costs
+          depending on your contract.
+
+The plugin exposes two APIs. One (REST API) is intended for bulk-data operations from the admin side, and one
+(App API) that is used by the pretixLEAD app.
+
+REST API
+---------
+
+The REST API for exhibitors requires the usual :ref:`rest-auth`.
+
+Resources
+"""""""""
+
+The exhibitors plugin provides a HTTP API that allows you to create new exhibitors.
+
+The exhibitors resource contains the following public fields:
+
+.. rst-class:: rest-resource-table
+
+===================================== ========================== =======================================================
+Field                                 Type                       Description
+===================================== ========================== =======================================================
+id                                    integer                    Internal exhibitor ID in pretix
+name                                  string                     Exhibitor name
+internal_id                           string                     Can be used for the ID in your exhibition system, your customer ID, etc. Can be ``null``. Maximum 255 characters.
+contact_name                          string                     Contact person (or ``null``)
+contact_name_parts                    object of strings          Decomposition of contact name (i.e. given name, family name)
+contact_email                         string                     Contact person email address (or ``null``)
+booth                                 string                     Booth number (or ``null``). Maximum 100 characters.
+locale                                string                     Locale for communication with the exhibitor (or ``null``).
+access_code                           string                     Access code for the exhibitor to access their data or use the lead scanning app (read-only).
+allow_lead_scanning                   boolean                    Enables lead scanning app
+allow_lead_access                     boolean                    Enables access to data gathered by the lead scanning app
+allow_voucher_access                  boolean                    Enables access to data gathered by exhibitor vouchers
+comment                               string                     Internal comment, not shown to exhibitor
+===================================== ========================== =======================================================
+
+You can also access the scanned leads through the API which contains the following public fields:
+
+.. rst-class:: rest-resource-table
+
+===================================== ========================== =======================================================
+Field                                 Type                       Description
+===================================== ========================== =======================================================
+attendee_order                        string                     Order code of the order the scanned attendee belongs to
+attendee_positionid                   integer                    ``positionid`` if the attendee within the order specified by ``attendee_order``
+rating                                integer                    A rating of 0 to 5 stars (or ``null``)
+notes                                 string                     A note taken by the exhibitor after scanning
+tags                                  list of strings            Additional tags selected by the exhibitor
+first_upload                          datetime                   Date and time of the first upload of this lead
+data                                  list of objects            Attendee data set that may be shown to the exhibitor based o
+                                                                 the event's configuration. Each entry contains the fields ``id``,
+                                                                 ``label``, ``value``, and ``details``. ``details`` is usually empty
+                                                                 except in a few cases where it contains an additional list of objects
+                                                                 with ``value`` and ``label`` keys (e.g. splitting of names).
+device_name                           string                     User-defined name for the device used for scanning (or ``null``).
+===================================== ========================== =======================================================
+
+Endpoints
+"""""""""
+
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/exhibitors/
+
+   Returns a list of all exhibitors configured for an event.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/events/sampleconf/exhibitors/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "count": 1,
+        "next": null,
+        "previous": null,
+        "results": [
+          {
+            "id": 1,
+            "name": "Aperture Science",
+            "internal_id": null,
+            "contact_name": "Dr Cave Johnson",
+            "contact_name_parts": {
+                "_scheme": "salutation_title_given_family",
+                "family_name": "Johnson",
+                "given_name": "Cave",
+                "salutation": "",
+                "title": "Dr"
+            },
+            "contact_email": "johnson@as.example.org",
+            "booth": "A2",
+            "locale": "de",
+            "access_code": "VKHZ2FU8",
+            "allow_lead_scanning": true,
+            "allow_lead_access": true,
+            "allow_voucher_access": true,
+            "comment": ""
+          }
+        ]
+      }
+
+   :query page: The page number in case of a multi-page result set, default is 1
+   :param organizer: The ``slug`` field of a valid organizer
+   :param event: The ``slug`` field of the event to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer or event does not exist **or** you have no permission to view it.
+
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/exhibitors/(id)/
+
+   Returns information on one exhibitor, identified by its ID.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/events/sampleconf/exhibitors/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "name": "Aperture Science",
+        "internal_id": null,
+        "contact_name": "Dr Cave Johnson",
+        "contact_name_parts": {
+            "_scheme": "salutation_title_given_family",
+            "family_name": "Johnson",
+            "given_name": "Cave",
+            "salutation": "",
+            "title": "Dr"
+        },
+        "contact_email": "johnson@as.example.org",
+        "booth": "A2",
+        "locale": "de",
+        "access_code": "VKHZ2FU8",
+        "allow_lead_scanning": true,
+        "allow_lead_access": true,
+        "allow_voucher_access": true,
+        "comment": ""
+      }
+
+   :param organizer: The ``slug`` field of the organizer to fetch
+   :param event: The ``slug`` field of the event to fetch
+   :param id: The ``id`` field of the exhibitor to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event/exhibitor does not exist **or** you have no permission to view it.
+
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/exhibitors/(id)/leads/
+
+   Returns a list of all scanned leads of an exhibitor.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      GET /api/v1/organizers/bigevents/events/sampleconf/exhibitors/1/leads/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "count": 1,
+        "next": null,
+        "previous": null,
+        "results": [
+          {
+            "attendee_order": "T0E7E",
+            "attendee_positionid": 1,
+            "rating": 1,
+            "notes": "",
+            "tags": [],
+            "first_upload": "2021-07-06T11:03:31.414491+01:00",
+            "data": [
+              {
+                "id": "attendee_name",
+                "label": "Attendee name",
+                "value": "Peter Miller",
+                "details": [
+                  {"label": "Given name", "value": "Peter"},
+                  {"label": "Family name", "value": "Miller"},
+                ]
+              }
+            ]
+          }
+        ]
+      }
+
+   :query page: The page number in case of a multi-page result set, default is 1
+   :param organizer: The ``slug`` field of a valid organizer
+   :param event: The ``slug`` field of the event to fetch
+   :param id: The ``id`` field of the exhibitor to fetch
+   :statuscode 200: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer or event or exhibitor does not exist **or** you have no permission to view it.
+
+.. http:post:: /api/v1/organizers/(organizer)/events/(event)/exhibitors/
+
+   Create a new exhibitor.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      POST /api/v1/organizers/bigevents/events/sampleconf/exhibitors/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+      Content-Length: 166
+
+      {
+        "name": "Aperture Science",
+        "internal_id": null,
+        "contact_name_parts": {
+            "_scheme": "salutation_title_given_family",
+            "family_name": "Johnson",
+            "given_name": "Cave",
+            "salutation": "",
+            "title": "Dr"
+        },
+        "contact_email": "johnson@as.example.org",
+        "booth": "A2",
+        "locale": "de",
+        "access_code": "VKHZ2FU8",
+        "allow_lead_scanning": true,
+        "allow_lead_access": true,
+        "allow_voucher_access": true,
+        "comment": ""
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 201 Created
+      Vary: Accept
+      Content-Type: application/json
+
+      {
+        "id": 1,
+        "name": "Aperture Science",
+        "internal_id": null,
+        "contact_name": "Dr Cave Johnson",
+        "contact_name_parts": {
+            "_scheme": "salutation_title_given_family",
+            "family_name": "Johnson",
+            "given_name": "Cave",
+            "salutation": "",
+            "title": "Dr"
+        },
+        "contact_email": "johnson@as.example.org",
+        "booth": "A2",
+        "locale": "de",
+        "access_code": "VKHZ2FU8",
+        "allow_lead_scanning": true,
+        "allow_lead_access": true,
+        "allow_voucher_access": true,
+        "comment": ""
+      }
+
+   :param organizer: The ``slug`` field of the organizer to create new exhibitor for
+   :param event: The ``slug`` field of the event to create new exhibitor for
+   :statuscode 201: no error
+   :statuscode 400: The exhibitor could not be created due to invalid submitted data.
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create exhibitors.
+
+
+.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/exhibitors/(id)/
+
+   Update an exhibitor. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
+   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
+   want to change.
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      PATCH /api/v1/organizers/bigevents/events/sampleconf/digitalcontents/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+      Content-Type: application/json
+      Content-Length: 34
+
+      {
+        "internal_id": "ABC"
+      }
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 200 OK
+      Vary: Accept
+      Content-Type: text/javascript
+
+      {
+        "id": 1,
+        "name": "Aperture Science",
+        "internal_id": "ABC",
+        "contact_name": "Dr Cave Johnson",
+        "contact_name_parts": {
+            "_scheme": "salutation_title_given_family",
+            "family_name": "Johnson",
+            "given_name": "Cave",
+            "salutation": "",
+            "title": "Dr"
+        },
+        "contact_email": "johnson@as.example.org",
+        "booth": "A2",
+        "locale": "de",
+        "access_code": "VKHZ2FU8",
+        "allow_lead_scanning": true,
+        "allow_lead_access": true,
+        "allow_voucher_access": true,
+        "comment": ""
+      }
+
+   :param organizer: The ``slug`` field of the organizer to modify
+   :param event: The ``slug`` field of the event to modify
+   :param id: The ``id`` field of the exhibitor to modify
+   :statuscode 200: no error
+   :statuscode 400: The exhibitor could not be modified due to invalid submitted data.
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event/exhibitor does not exist **or** you have no permission to change it.
+
+
+.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/exhibitors/(id)/
+
+   Delete an exhibitor.
+
+   .. warning:: This deletes all lead scan data and removes all connections to vouchers (the vouchers are not deleted).
+
+   **Example request**:
+
+   .. sourcecode:: http
+
+      DELETE /api/v1/organizers/bigevents/events/sampleconf/exhibitors/1/ HTTP/1.1
+      Host: pretix.eu
+      Accept: application/json, text/javascript
+
+   **Example response**:
+
+   .. sourcecode:: http
+
+      HTTP/1.1 204 No Content
+      Vary: Accept
+
+   :param organizer: The ``slug`` field of the organizer to modify
+   :param event: The ``slug`` field of the event to modify
+   :param id: The ``id`` field of the exhibitor to delete
+   :statuscode 204: no error
+   :statuscode 401: Authentication failure
+   :statuscode 403: The requested organizer/event/exhibitor does not exist **or** you have no permission to change it
+
+
+App API
+-------
+
+The App API is used for communication between the pretixLEAD app and the pretix server.
+
+.. warning:: We consider this an internal API, it is not intended for external use. You may still use it, but
+             our :ref:`compatibility commitment <rest-compat>` does not apply.
+
+Authentication
+""""""""""""""
+
+Every exhibitor has an "access code", usually consisting of 8 alphanumeric uppercase characters.
+This access code is communicated to event exhibitors by the event organizers, so this is also what
+exhibitors should enter into a login screen.
+
+All API requests need to contain this access code as a header like this::
+
+    Authorization: Exhibitor ABCDE123
+
+Exhibitor profile
+"""""""""""""""""
+
+Upon login and in regular intervals after that, the API should fetch the exhibitors profile.
+This serves two purposes:
+
+* Checking if the authorization code is actually valid
+
+* Obtaining information that can be shown in the app
+
+The resource consists of the following fields:
+
+.. rst-class:: rest-resource-table
+
+===================================== ========================== =======================================================
+Field                                 Type                       Description
+===================================== ========================== =======================================================
+name                                  string                     Exhibitor name
+booth                                 string                     Booth number (or ``null``)
+event                                 object                     Object describing the event
+├ name                                multi-lingual string       Event name
+├ imprint_url                         string                     URL to legal notice page. If not ``null``, a button in the app should link to this page.
+├ privacy_url                         string                     URL to privacy notice page. If not ``null``, a button in the app should link to this page.
+├ help_url                            string                     URL to help page. If not ``null``, a button in the app should link to this page.
+├ logo_url                            string                     URL to event logo. If not ``null``, this logo may be shown in the app.
+├ slug                                string                     Event short form
+└ organizer                           string                     Organizer short form
+notes                                 boolean                    Specifies whether the exhibitor is allowed to take notes on leads
+tags                                  list of strings            List of tags the exhibitor can assign to their leads
+scan_types                            list of objects            Only used for a special case, fixed value that external API consumers should ignore
+===================================== ========================== =======================================================
+
+.. http:get:: /exhibitors/api/v1/profile
+
+   **Example request:**
+
+   .. sourcecode:: http
+
+    GET /exhibitors/api/v1/profile HTTP/1.1
+    Authorization: Exhibitor ABCDE123
+    Accept: application/json, text/javascript
+
+   **Example response:**
+
+   .. sourcecode:: http
+
+    HTTP/1.1 200 OK
+    Vary: Accept
+    Content-Type: application/json
+
+    {
+      "name": "Aperture Science",
+      "booth": "A2",
+      "event": {
+        "name": {"en": "Sample conference", "de": "Beispielkonferenz"},
+        "slug": "bigevents",
+        "imprint_url": null,
+        "privacy_url": null,
+        "help_url": null,
+        "logo_url": null,
+        "organizer": "sampleconf"
+      },
+      "notes": true,
+      "tags": ["foo", "bar"],
+      "scan_types": [
+        {
+          "key": "lead",
+          "label": "Lead Scanning"
+        }
+      ]
+    }
+
+   :statuscode 200: no error
+   :statuscode 401: Invalid authentication code
+
+Submitting a lead
+"""""""""""""""""
+
+After a ticket/badge is scanned, it should immediately be submitted to the server
+so the scan is stored and information about the person can be shown in the app. The same
+code can be submitted multiple times, so it's no problem to just submit it again after the
+exhibitor set a note or a rating (0-5) inside the app.
+
+On the request, you should set the following properties:
+
+* ``code`` with the scanned barcode
+* ``notes`` with the exhibitor's notes
+* ``scanned`` with the date and time of the actual scan (not the time of the upload)
+* ``scan_type`` set to ``lead`` statically
+* ``tags`` with the list of selected tags
+* ``rating`` with the rating assigned by the exhibitor
+* ``device_name`` with a user-specified name of the device used for scanning (max. 190 characters), or ``null``
+
+If you submit ``tags`` and ``rating`` to be ``null`` and ``notes`` to be ``""``, the server
+responds with the previously saved information and will not delete that information. If you
+supply other values, the information saved on the server will be overridden.
+
+The response will also contain ``tags``, ``rating``, and ``notes``. Additionally,
+it will include ``attendee`` with a list of ``fields`` that can be shown to the
+user. Each field has an internal ``id``, a human-readable ``label``, and a ``value`` (all strings).
+
+Note that the ``fields`` array can contain any number of dynamic keys!
+Depending on the exhibitors permission and event configuration this might be empty,
+or contain lots of details. The app should dynamically show these values (read-only)
+with the labels sent by the server.
+
+The request for this looks like this:
+
+.. http:post:: /exhibitors/api/v1/leads/
+
+   **Example request:**
+
+   .. sourcecode:: http
+
+    POST /exhibitors/api/v1/leads/ HTTP/1.1
+    Authorization: Exhibitor ABCDE123
+    Accept: application/json, text/javascript
+    Content-Type: application/json
+
+    {
+      "code": "qrcodecontent",
+      "notes": "Great customer, wants our newsletter",
+      "scanned": "2020-10-18T12:24:23.000+00:00",
+      "scan_type": "lead",
+      "tags": ["foo"],
+      "rating": 4,
+      "device_name": "DEV1"
+    }
+
+   **Example response:**
+
+   .. sourcecode:: http
+
+    HTTP/1.1 201 Created
+    Vary: Accept
+    Content-Type: application/json
+
+    {
+      "attendee": {
+        "fields": [
+          {
+            "id": "attendee_name",
+            "label": "Name",
+            "value": "Jon Doe",
+            "details": [
+              {"label": "Given name", "value": "John"},
+              {"label": "Family name", "value": "Doe"},
+            ]
+          },
+          {
+            "id": "attendee_email",
+            "label": "Email",
+            "value": "test@example.com",
+            "details": []
+          }
+         ]
+        },
+        "rating": 4,
+        "tags": ["foo"],
+        "notes": "Great customer, wants our newsletter"
+    }
+
+   :statuscode 200: No error, leads was not scanned for the first time
+   :statuscode 201: No error, leads was scanned for the first time
+   :statuscode 400: Invalid data submitted
+   :statuscode 401: Invalid authentication code
+
+You can also fetch existing leads (if you are authorized to do so):
+
+.. http:get:: /exhibitors/api/v1/leads/
+
+   **Example request:**
+
+   .. sourcecode:: http
+
+    GET /exhibitors/api/v1/leads/ HTTP/1.1
+    Authorization: Exhibitor ABCDE123
+    Accept: application/json, text/javascript
+
+   **Example response:**
+
+   .. sourcecode:: http
+
+    HTTP/1.1 200 OK
+    Vary: Accept
+    Content-Type: application/json
+
+    {
+      "count": 1,
+      "next": null,
+      "previous": null,
+      "results": [
+        {
+          "attendee": {
+            "fields": [
+              {
+                "id": "attendee_name",
+                "label": "Name",
+                "value": "Jon Doe",
+                "details": [
+                  {"label": "Given name", "value": "John"},
+                  {"label": "Family name", "value": "Doe"},
+                ]
+              },
+              {
+                "id": "attendee_email",
+                "label": "Email",
+                "value": "test@example.com",
+                "details": []
+              }
+           ]
+          },
+          "rating": 4,
+          "tags": ["foo"],
+          "notes": "Great customer, wants our newsletter"
+        }
+      ]
+    }
+
+   :statuscode 200: No error
+   :statuscode 401: Invalid authentication code
+   :statuscode 403: Not permitted to access bulk data

doc/plugins/index.rst

@@ -1,3 +1,5 @@
+.. _`plugin-docs`:
+
 Plugin documentation
 ====================
 
@@ -10,13 +12,13 @@ If you want to **create** a plugin, please go to the
    :maxdepth: 2
 
    list
-   pretixdroid
    banktransfer
    ticketoutputpdf
    badges
    campaigns
    certificates
    digital
+   exhibitors
    imported_secrets
    webinar
    presale-saml

doc/plugins/list.rst

@@ -5,6 +5,6 @@ List of plugins
 ===============
 
 A detailed list of plugins that are available for pretix can be found on the
-`project website`_.
+`pretix Marketplace`_.
 
-.. _project website: https://pretix.eu/about/en/plugins
+.. _pretix Marketplace: https://marketplace.pretix.eu

doc/plugins/pretixdroid.rst

@@ -1,368 +0,0 @@
-pretixdroid HTTP API
-====================
-
-The pretixdroid plugin provides a HTTP API that the `pretixdroid Android app`_
-uses to communicate with the pretix server.
-
-.. warning:: This API is **DEPRECATED** and will probably go away soon. It is used **only** to serve the pretixdroid
-             Android app. There are no backwards compatibility guarantees on this API. We will not add features that
-             are not required for the  Android App. There is a general-purpose :ref:`rest-api` that provides all
-             features that you need to check in.
-
-.. versionchanged:: 1.12
-
-   Support for check-in-time questions has been added. The new API features are fully backwards-compatible and
-   negotiated live, so clients which do not need this feature can ignore the change. For this reason, the API version
-   has not been increased and is still set to 3.
-
-.. versionchanged:: 1.13
-
-   Support for checking in unpaid tickets has been added.
-
-
-.. http:post:: /pretixdroid/api/(organizer)/(event)/redeem/
-
-   Redeems a ticket, i.e. checks the user in.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /pretixdroid/api/demoorga/democon/redeem/?key=ABCDEF HTTP/1.1
-      Host: demo.pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/x-www-form-urlencoded
-
-      secret=az9u4mymhqktrbupmwkvv6xmgds5dk3&questions_supported=true
-
-   You **must** set the parameter secret.
-
-   You **must** set the parameter ``questions_supported`` to ``true`` **if** you support asking questions
-   back to the app operator. You **must not** set it if you do not support this feature. In that case, questions
-   will just be ignored.
-
-   You **may** set the additional parameter ``datetime`` in the body containing an ISO8601-encoded
-   datetime of the entry attempt. If you don"t, the current date and time will be used.
-
-   You **may** set the additional parameter ``force`` to indicate that the request should be logged
-   regardless of previous check-ins for the same ticket. This might be useful if you made the entry decision offline.
-   Questions will also always be ignored in this case (i.e. supplied answers will be saved, but no error will be
-   thrown if they are missing or invalid).
-
-   You **may** set the additional parameter ``nonce`` with a globally unique random value to identify this
-   check-in. This is meant to be used to prevent duplicate check-ins when you are just retrying after a connection
-   failure.
-
-   You **may** set the additional parameter ``ignore_unpaid`` to indicate that the check-in should be performed even
-   if the order is in pending state.
-
-   If questions are supported and required, you will receive a dictionary ``questions`` containing details on the
-   particular questions to ask. To answer them, just re-send your redemption request with additional parameters of
-   the form ``answer_<question>=<answer>``, e.g. ``answer_12=24``.
-
-   **Example successful response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Content-Type: text/json
-
-      {
-        "status": "ok"
-        "version": 3,
-        "data": {
-          "secret": "az9u4mymhqktrbupmwkvv6xmgds5dk3",
-          "order": "ABCDE",
-          "item": "Standard ticket",
-          "item_id": 1,
-          "variation": null,
-          "variation_id": null,
-          "attendee_name": "Peter Higgs",
-          "attention": false,
-          "redeemed": true,
-          "checkin_allowed": true,
-          "addons_text": "Parking spot",
-          "paid": true
-        }
-      }
-
-   **Example response with required questions**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Content-Type: text/json
-
-      {
-        "status": "incomplete"
-        "version": 3
-        "data": {
-          "secret": "az9u4mymhqktrbupmwkvv6xmgds5dk3",
-          "order": "ABCDE",
-          "item": "Standard ticket",
-          "item_id": 1,
-          "variation": null,
-          "variation_id": null,
-          "attendee_name": "Peter Higgs",
-          "attention": false,
-          "redeemed": true,
-          "checkin_allowed": true,
-          "addons_text": "Parking spot",
-          "paid": true
-        },
-        "questions": [
-          {
-            "id": 12,
-            "type": "C",
-            "question": "Choose a shirt size",
-            "required": true,
-            "position": 2,
-            "items": [1],
-            "options": [
-              {
-                "id": 24,
-                "answer": "M"
-              },
-              {
-                "id": 25,
-                "answer": "L"
-              }
-            ]
-          }
-        ]
-      }
-
-   **Example error response with data**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Content-Type: text/json
-
-      {
-        "status": "error",
-        "reason": "already_redeemed",
-        "version": 3,
-        "data": {
-          "secret": "az9u4mymhqktrbupmwkvv6xmgds5dk3",
-          "order": "ABCDE",
-          "item": "Standard ticket",
-          "item_id": 1,
-          "variation": null,
-          "variation_id": null,
-          "attendee_name": "Peter Higgs",
-          "attention": false,
-          "redeemed": true,
-          "checkin_allowed": true,
-          "addons_text": "Parking spot",
-          "paid": true
-        }
-      }
-
-   **Example error response without data**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Content-Type: text/json
-
-      {
-        "status": "error",
-        "reason": "unkown_ticket",
-        "version": 3
-      }
-
-   Possible error reasons:
-
-   * ``unpaid`` - Ticket is not paid for or has been refunded
-   * ``already_redeemed`` - Ticket already has been redeemed
-   * ``product`` - Tickets with this product may not be scanned at this device
-   * ``unknown_ticket`` - Secret does not match a ticket in the database
-
-   :query key: Secret API key
-   :statuscode 200: Valid request
-   :statuscode 404: Unknown organizer or event
-   :statuscode 403: Invalid authorization key
-
-.. http:get:: /pretixdroid/api/(organizer)/(event)/search/
-
-   Searches for a ticket.
-   At most 25 results will be returned. **Queries with less than 4 characters will always return an empty result set.**
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /pretixdroid/api/demoorga/democon/search/?key=ABCDEF&query=Peter HTTP/1.1
-      Host: demo.pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Content-Type: text/json
-
-      {
-        "results": [
-          {
-            "secret": "az9u4mymhqktrbupmwkvv6xmgds5dk3",
-            "order": "ABCE6",
-            "item": "Standard ticket",
-            "variation": null,
-            "attendee_name": "Peter Higgs",
-            "redeemed": false,
-            "attention": false,
-            "checkin_allowed": true,
-            "addons_text": "Parking spot",
-            "paid": true
-          },
-          ...
-        ],
-        "version": 3
-      }
-
-   :query query: Search query
-   :query key: Secret API key
-   :statuscode 200: Valid request
-   :statuscode 404: Unknown organizer or event
-   :statuscode 403: Invalid authorization key
-
-.. http:get:: /pretixdroid/api/(organizer)/(event)/download/
-
-   Download data for all tickets.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /pretixdroid/api/demoorga/democon/download/?key=ABCDEF HTTP/1.1
-      Host: demo.pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Content-Type: text/json
-
-      {
-        "version": 3,
-        "results": [
-          {
-            "secret": "az9u4mymhqktrbupmwkvv6xmgds5dk3",
-            "order": "ABCE6",
-            "item": "Standard ticket",
-            "variation": null,
-            "attendee_name": "Peter Higgs",
-            "redeemed": false,
-            "attention": false,
-            "checkin_allowed": true,
-            "paid": true
-          },
-          ...
-        ],
-        "questions": [
-          {
-            "id": 12,
-            "type": "C",
-            "question": "Choose a shirt size",
-            "required": true,
-            "position": 2,
-            "items": [1],
-            "options": [
-              {
-                "id": 24,
-                "answer": "M"
-              },
-              {
-                "id": 25,
-                "answer": "L"
-              }
-            ]
-          }
-        ]
-      }
-
-   :query key: Secret API key
-   :statuscode 200: Valid request
-   :statuscode 404: Unknown organizer or event
-   :statuscode 403: Invalid authorization key
-
-.. http:get:: /pretixdroid/api/(organizer)/(event)/status/
-
-   Returns status information, such as the total number of tickets and the
-   number of performed check-ins.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /pretixdroid/api/demoorga/democon/status/?key=ABCDEF HTTP/1.1
-      Host: demo.pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Content-Type: text/json
-
-      {
-        "checkins": 17,
-        "total": 42,
-        "version": 3,
-        "event": {
-          "name": "Demo Conference",
-          "slug": "democon",
-          "date_from": "2016-12-27T17:00:00Z",
-          "date_to": "2016-12-30T18:00:00Z",
-          "timezone": "UTC",
-          "url": "https://demo.pretix.eu/demoorga/democon/",
-          "organizer": {
-            "name": "Demo Organizer",
-            "slug": "demoorga"
-          },
-        },
-        "items": [
-          {
-            "name": "T-Shirt",
-            "id": 1,
-            "checkins": 1,
-            "admission": False,
-            "total": 1,
-            "variations": [
-              {
-                "name": "Red",
-                "id": 1,
-                "checkins": 1,
-                "total": 12
-              },
-              {
-               "name": "Blue",
-                "id": 2,
-                "checkins": 4,
-                "total": 8
-              }
-            ]
-          },
-          {
-            "name": "Ticket",
-            "id": 2,
-            "checkins": 15,
-            "admission": True,
-            "total": 22,
-            "variations": []
-          }
-        ]
-      }
-
-   :query key: Secret API key
-   :statuscode 200: Valid request
-   :statuscode 404: Unknown organizer or event
-   :statuscode 403: Invalid authorization key
-
-.. _pretixdroid Android app: https://github.com/pretix/pretixdroid

doc/requirements.txt

@@ -1,5 +1,6 @@
 -e ../src/
 sphinx==2.3.*
+jinja2==3.0.*
 sphinx-rtd-theme
 sphinxcontrib-httpdomain
 sphinxcontrib-images

doc/spelling_wordlist.txt

@@ -103,6 +103,7 @@ prepending
 preprocessor
 presale
 pretix
+pretixLEAD
 pretixSCAN
 pretixdroid
 pretixPOS

doc/user/events/guides/groups.rst

@@ -1,20 +1,44 @@
 Use case: Group discounts
 -------------------------
 
-Often times, you want to give discounts for whole groups attending your event. pretix can't automatically discount based on volume, but there's still some ways you can set up group tickets.
+Often times, you want to give discounts for whole groups attending your event.
 
-Flexible group sizes
+Automatic discounts
+"""""""""""""""""""
+
+pretix can automatically grant discounts if a certain condition is met, such as a specific group size. To set this up,
+head to **Products**, **Discounts** in the event navigation and **Create a new discount**. You can choose a name so you
+can later find this again. You can also optionally restrict the discount to a specific time frame or a specific sales
+channel.
+
+Next, either select **Apply to all products** or create a selection of products that are eligible for the discount.
+
+For a **percentual group discount** similar to "if you buy at least 5 tickets, you get 20 percent off", set
+**Minimum number of matching products** to "5" and **Percentual discount on matching products** to "20.00".
+
+For a **buy-X-get-Y discount**, e.g. "if you buy 5 tickets, you get one free", set
+**Minimum number of matching products** to "5", **Percentual discount on matching products** to "100.00", and
+**Apply discount only to this number of matching products** to "1".
+
+Fixed group packages
 """"""""""""""""""""
 
-If you want to give out discounted tickets to groups starting at a given size, but still billed per person, you can do so by creating a special **Group ticket** at the per-person price and set the **Minimum amount per order** option of the ticket to the minimal group size.
+If you want to sell group tickets in fixed sizes, e.g. a table of eight at your gala dinner, you can use product bundles.
+Assuming you already set up a ticket for admission of single persons, you then set up a second product **Table (8 persons)**
+with a discounted full price. Then, head to the **Bundled products** tab of that product and add one bundle configuration
+to include the single admission product **eight times**. Next, create an unlimited quota mapped to the new product.
+
+This way, the purchase of a table will automatically create eight tickets, leading to a correct calculation of your total
+quota and, as expected, eight persons on your check-in list. You can even ask for the individual names of the persons
+during checkout.
+
+Minimum order amount
+""""""""""""""""""""
+
+If you want to promote discounted group tickets in your price list, you can also do so by creating a special
+**Group ticket** at the reduced per-person price and set the **Minimum amount per order** option of the ticket to the minimal
+group size.
 
 For more complex use cases, you can also use add-on products that can be chosen multiple times.
 
 This way, your ticket can be bought an arbitrary number of times – but no less than the given minimal amount per order.
-
-Fixed group sizes
-"""""""""""""""""
-
-If you want to sell group tickets in fixed sizes, e.g. a table of eight at your gala dinner, you can use product bundles. Assuming you already set up a ticket for admission of single persons, you then set up a second product **Table (8 persons)** with a discounted full price. Then, head to the **Bundled products** tab of that product and add one bundle configuration to include the single admission product **eight times**. Next, create an unlimited quota mapped to the new product.
-
-This way, the purchase of a table will automatically create eight tickets, leading to a correct calculation of your total quota and, as expected, eight persons on your check-in list. You can even ask for the individual names of the persons during checkout.

doc/user/events/widget.rst

@@ -253,18 +253,21 @@ If you want, you can suppress us loading the widget and/or modify the user data
 
 If you then later want to trigger loading the widgets, just call ``window.PretixWidget.buildWidgets()``.
 
-Waiting for the widget to load
-------------------------------
+Waiting for the widget to load or close
+---------------------------------------
 
-If you want to run custom JavaScript once the widget is fully loaded, you can register a callback function. Note that
-this function might be run multiple times, for example if you have multiple widgets on a page or if the user switches
-e.g. from an event list to an event detail view::
+If you want to run custom JavaScript once the widget is fully loaded or when it is closed, you can register callback
+functions. Note that these function might be run multiple times, for example if you have multiple widgets on a page
+or if the user switches e.g. from an event list to an event detail view::
 
     <script type="text/javascript">
     window.pretixWidgetCallback = function () {
         window.PretixWidget.addLoadListener(function () {
             console.log("Widget has loaded!");
         });
+        window.PretixWidget.addCloseListener(function () {
+            console.log("Widget has been closed!");
+        });
     }
     </script>
 

doc/user/glossary.rst

@@ -84,7 +84,9 @@ going to develop around pretix, for example connect to pretix through our API, y
      - A voucher is a code that can be used for multiple purposes: To grant a discount to specific customers, to only
        show certain products to certain customers, or to keep a seat open for someone specific even though you are
        sold out. If a voucher is used to apply a discount, the price of the purchased product is reduced by the
-       discounted amount. Vouchers are connected to a specific event.
+   * - | |:gb:| **(Automatic) Discount**
+       | |:de:| (Automatischer) Rabatt
+     - Discounts can be used to automatically provide discounts to customers if their cart satisfies a certain condition.
    * - | |:gb:| **Gift card**
        | |:de:| Wertgutschein
      - A :ref:`gift card <giftcards>` is a coupon representing an exact amount of money that can be used for purchases

src/MANIFEST.in

@@ -13,6 +13,7 @@ recursive-include pretix/plugins/banktransfer/static *
 recursive-include pretix/plugins/manualpayment/templates *
 recursive-include pretix/plugins/manualpayment/static *
 recursive-include pretix/plugins/paypal/templates *
+recursive-include pretix/plugins/paypal/static *
 recursive-include pretix/plugins/pretixdroid/templates *
 recursive-include pretix/plugins/pretixdroid/static *
 recursive-include pretix/plugins/sendmail/templates *

src/pretix/__init__.py

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

src/pretix/api/auth/devicesecurity.py

@@ -180,6 +180,7 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
         ('POST', 'plugins:pretix_posbackend:posdebuglogentry-bulk-create'),
         ('GET', 'plugins:pretix_posbackend:poscashier-list'),
         ('POST', 'plugins:pretix_posbackend:stripeterminal.token'),
+        ('PUT', 'plugins:pretix_posbackend:file.upload'),
         ('GET', 'api-v1:revokedsecrets-list'),
         ('GET', 'api-v1:event.settings'),
         ('GET', 'plugins:pretix_seating:event.event'),

src/pretix/api/serializers/cart.py

@@ -37,9 +37,15 @@ from pretix.base.models import Quota, Seat
 from pretix.base.models.orders import CartPosition
 
 
+class TaxIncludedField(serializers.Field):
+    def to_representation(self, instance: CartPosition):
+        return not instance.custom_price_input_is_net
+
+
 class CartPositionSerializer(I18nAwareModelSerializer):
     answers = AnswerSerializer(many=True)
     seat = InlineSeatSerializer()
+    includes_tax = TaxIncludedField(source='*')
 
     class Meta:
         model = CartPosition
@@ -54,6 +60,7 @@ class CartPositionCreateSerializer(I18nAwareModelSerializer):
     attendee_name = serializers.CharField(required=False, allow_null=True)
     seat = serializers.CharField(required=False, allow_null=True)
     sales_channel = serializers.CharField(required=False, default='sales_channel')
+    includes_tax = serializers.BooleanField(required=False, allow_null=True)
 
     class Meta:
         model = CartPosition
@@ -127,6 +134,12 @@ class CartPositionCreateSerializer(I18nAwareModelSerializer):
             raise ValidationError('The specified product requires to choose a seat.')
 
         validated_data.pop('sales_channel')
+        # todo: does this make sense?
+        validated_data['custom_price_input'] = validated_data['price']
+        # todo: listed price, etc?
+        # currently does not matter because there is no way to transform an API cart position into an order that keeps
+        # prices, cart positions are just quota/voucher placeholders
+        validated_data['custom_price_input_is_net'] = not validated_data.pop('includes_tax', True)
         cp = CartPosition.objects.create(event=self.context['event'], **validated_data)
 
         for answ_data in answers_data:

src/pretix/api/serializers/discount.py

@@ -0,0 +1,49 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+
+from pretix.api.serializers.i18n import I18nAwareModelSerializer
+from pretix.base.models import Discount
+
+
+class DiscountSerializer(I18nAwareModelSerializer):
+
+    class Meta:
+        model = Discount
+        fields = ('id', 'active', 'internal_name', 'position', 'sales_channels', 'available_from',
+                  'available_until', 'subevent_mode', 'condition_all_products', 'condition_limit_products',
+                  'condition_apply_to_addons', 'condition_min_count', 'condition_min_value',
+                  'benefit_discount_matching_percent', 'benefit_only_apply_to_cheapest_n_matches',
+                  'condition_ignore_voucher_discounted')
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['condition_limit_products'].queryset = self.context['event'].items.all()
+
+    def validate(self, data):
+        data = super().validate(data)
+
+        full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
+        full_data.update(data)
+
+        Discount.validate_config(full_data)
+
+        return data

src/pretix/api/serializers/order.py

@@ -56,7 +56,9 @@ from pretix.base.models.orders import (
 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
+from pretix.base.services.pricing import (
+    apply_discounts, get_line_price, get_listed_price, is_included_for_free,
+)
 from pretix.base.settings import COUNTRIES_WITH_STATE_IN_ADDRESS
 from pretix.base.signals import register_ticket_outputs
 from pretix.multidomain.urlreverse import build_absolute_uri
@@ -424,88 +426,7 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
             self.fields.pop('pdf_data', None)
 
     def validate(self, data):
-        if data.get('attendee_name') and data.get('attendee_name_parts'):
-            raise ValidationError(
-                {'attendee_name': ['Do not specify attendee_name if you specified attendee_name_parts.']}
-            )
-        if data.get('attendee_name_parts') and '_scheme' not in data.get('attendee_name_parts'):
-            data['attendee_name_parts']['_scheme'] = self.context['request'].event.settings.name_scheme
-
-        if data.get('country'):
-            if not pycountry.countries.get(alpha_2=data.get('country').code):
-                raise ValidationError(
-                    {'country': ['Invalid country code.']}
-                )
-
-        if data.get('state'):
-            cc = str(data.get('country') or self.instance.country or '')
-            if cc not in COUNTRIES_WITH_STATE_IN_ADDRESS:
-                raise ValidationError(
-                    {'state': ['States are not supported in country "{}".'.format(cc)]}
-                )
-            if not pycountry.subdivisions.get(code=cc + '-' + data.get('state')):
-                raise ValidationError(
-                    {'state': ['"{}" is not a known subdivision of the country "{}".'.format(data.get('state'), cc)]}
-                )
-        return data
-
-    def update(self, instance, validated_data):
-        # Even though all fields that shouldn't be edited are marked as read_only in the serializer
-        # (hopefully), we'll be extra careful here and be explicit about the model fields we update.
-        update_fields = [
-            'attendee_name_parts', 'company', 'street', 'zipcode', 'city', 'country',
-            'state', 'attendee_email',
-        ]
-        answers_data = validated_data.pop('answers', None)
-
-        name = validated_data.pop('attendee_name', '')
-        if name and not validated_data.get('attendee_name_parts'):
-            validated_data['attendee_name_parts'] = {
-                '_legacy': name
-            }
-
-        for attr, value in validated_data.items():
-            if attr in update_fields:
-                setattr(instance, attr, value)
-
-        instance.save(update_fields=update_fields)
-
-        if answers_data is not None:
-            qs_seen = set()
-            answercache = {
-                a.question_id: a for a in instance.answers.all()
-            }
-            for answ_data in answers_data:
-                options = answ_data.pop('options', [])
-                if answ_data['question'].pk in qs_seen:
-                    raise ValidationError(f'Question {answ_data["question"]} was sent twice.')
-                if answ_data['question'].pk in answercache:
-                    a = answercache[answ_data['question'].pk]
-                    if isinstance(answ_data['answer'], File):
-                        a.file.save(answ_data['answer'].name, answ_data['answer'], save=False)
-                        a.answer = 'file://' + a.file.name
-                    elif a.answer.startswith('file://') and answ_data['answer'] == "file:keep":
-                        pass  # keep current file
-                    else:
-                        for attr, value in answ_data.items():
-                            setattr(a, attr, value)
-                    a.save()
-                else:
-                    if isinstance(answ_data['answer'], File):
-                        an = answ_data.pop('answer')
-                        a = instance.answers.create(**answ_data, answer='')
-                        a.file.save(os.path.basename(an.name), an, save=False)
-                        a.answer = 'file://' + a.file.name
-                        a.save()
-                    else:
-                        a = instance.answers.create(**answ_data)
-                a.options.set(options)
-                qs_seen.add(a.question_id)
-            for qid, a in answercache.items():
-                if qid not in qs_seen:
-                    a.delete()
-
-        return instance
+        raise TypeError("this serializer is readonly")
 
 
 class RequireAttentionField(serializers.Field):
@@ -593,7 +514,7 @@ class OrderPaymentDateField(serializers.DateField):
 class OrderFeeSerializer(I18nAwareModelSerializer):
     class Meta:
         model = OrderFee
-        fields = ('fee_type', 'value', 'description', 'internal_type', 'tax_rate', 'tax_value', 'tax_rule', 'canceled')
+        fields = ('id', 'fee_type', 'value', 'description', 'internal_type', 'tax_rate', 'tax_value', 'tax_rule', 'canceled')
 
 
 class PaymentURLField(serializers.URLField):
@@ -1121,29 +1042,18 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
 
                     if v.budget is not None:
                         price = pos_data.get('price')
+                        listed_price = get_listed_price(pos_data.get('item'), pos_data.get('variation'), pos_data.get('subevent'))
+
+                        if pos_data.get('voucher'):
+                            price_after_voucher = pos_data.get('voucher').calculate_price(listed_price)
+                        else:
+                            price_after_voucher = listed_price
                         if price is None:
-                            price = get_price(
-                                item=pos_data.get('item'),
-                                variation=pos_data.get('variation'),
-                                voucher=v,
-                                custom_price=None,
-                                subevent=pos_data.get('subevent'),
-                                addon_to=pos_data.get('addon_to'),
-                                invoice_address=ia,
-                            ).gross
-                        pbv = get_price(
-                            item=pos_data['item'],
-                            variation=pos_data.get('variation'),
-                            voucher=None,
-                            custom_price=None,
-                            subevent=pos_data.get('subevent'),
-                            addon_to=pos_data.get('addon_to'),
-                            invoice_address=ia,
-                        )
+                            price = price_after_voucher
 
                         if v not in v_budget:
                             v_budget[v] = v.budget - v.budget_used()
-                        disc = pbv.gross - price
+                        disc = max(listed_price - price, 0)
                         if disc > v_budget[v]:
                             new_disc = v_budget[v]
                             v_budget[v] -= new_disc
@@ -1239,52 +1149,85 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                     order.invoice_address = ia
                     ia.last_modified = now()
 
+            # Generate position objects
             pos_map = {}
             for pos_data in positions_data:
-                answers_data = pos_data.pop('answers', [])
                 addon_to = pos_data.pop('addon_to', None)
                 attendee_name = pos_data.pop('attendee_name', '')
                 if attendee_name and not pos_data.get('attendee_name_parts'):
                     pos_data['attendee_name_parts'] = {
                         '_legacy': attendee_name
                     }
-                pos = OrderPosition(**pos_data)
+                pos = OrderPosition(**{k: v for k, v in pos_data.items() if k != 'answers'})
                 if simulate:
                     pos.order = order._wrapped
                 else:
                     pos.order = order
                 if addon_to:
                     if simulate:
-                        pos.addon_to = pos_map[addon_to]._wrapped
+                        pos.addon_to = pos_map[addon_to]
                     else:
                         pos.addon_to = pos_map[addon_to]
 
-                if pos.price is None:
-                    price = get_price(
-                        item=pos.item,
-                        variation=pos.variation,
-                        voucher=pos.voucher,
-                        custom_price=None,
-                        subevent=pos.subevent,
-                        addon_to=pos.addon_to,
-                        invoice_address=ia,
-                    )
-                    pos.price = price.gross
-                    pos.tax_rate = price.rate
-                    pos.tax_value = price.tax
-                    pos.tax_rule = pos.item.tax_rule
-                else:
-                    pos._calculate_tax()
+                pos_map[pos.positionid] = pos
+                pos_data['__instance'] = pos
 
-                pos.price_before_voucher = get_price(
-                    item=pos.item,
-                    variation=pos.variation,
-                    voucher=None,
-                    custom_price=None,
-                    subevent=pos.subevent,
-                    addon_to=pos.addon_to,
-                    invoice_address=ia,
-                ).gross
+            # Calculate prices if not set
+            for pos_data in positions_data:
+                pos = pos_data['__instance']
+                if pos.addon_to_id and is_included_for_free(pos.item, pos.addon_to):
+                    listed_price = Decimal('0.00')
+                else:
+                    listed_price = get_listed_price(pos.item, pos.variation, pos.subevent)
+
+                if pos.price is None:
+                    if pos.voucher:
+                        price_after_voucher = pos.voucher.calculate_price(listed_price)
+                    else:
+                        price_after_voucher = listed_price
+
+                    line_price = get_line_price(
+                        price_after_voucher=price_after_voucher,
+                        custom_price_input=None,
+                        custom_price_input_is_net=False,
+                        tax_rule=pos.item.tax_rule,
+                        invoice_address=ia,
+                        bundled_sum=Decimal('0.00'),
+                    )
+                    pos.price = line_price.gross
+                    pos._auto_generated_price = True
+                else:
+                    if pos.voucher:
+                        if not pos.item.tax_rule or pos.item.tax_rule.price_includes_tax:
+                            price_after_voucher = max(pos.price, pos.voucher.calculate_price(listed_price))
+                        else:
+                            price_after_voucher = max(pos.price - pos.tax_value, pos.voucher.calculate_price(listed_price))
+                    else:
+                        price_after_voucher = listed_price
+                    pos._auto_generated_price = False
+                pos._voucher_discount = listed_price - price_after_voucher
+                if pos.voucher:
+                    pos.voucher_budget_use = max(listed_price - price_after_voucher, Decimal('0.00'))
+
+            order_positions = [pos_data['__instance'] for pos_data in positions_data]
+            discount_results = apply_discounts(
+                self.context['event'],
+                order.sales_channel,
+                [
+                    (cp.item_id, cp.subevent_id, cp.price, bool(cp.addon_to), cp.is_bundled, pos._voucher_discount)
+                    for cp in order_positions
+                ]
+            )
+            for cp, (new_price, discount) in zip(order_positions, discount_results):
+                if new_price != pos.price and pos._auto_generated_price:
+                    pos.price = new_price
+                pos.discount = discount
+
+            # Save instances
+            for pos_data in positions_data:
+                answers_data = pos_data.pop('answers', [])
+                pos = pos_data['__instance']
+                pos._calculate_tax()
 
                 if simulate:
                     pos = WrappedModel(pos)
@@ -1297,6 +1240,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                         answers.append(answ)
                     pos.answers = answers
                     pos.pseudonymization_id = "PREVIEW"
+                    pos_map[pos.positionid] = pos
                 else:
                     if pos.voucher:
                         Voucher.objects.filter(pk=pos.voucher.pk).update(redeemed=F('redeemed') + 1)
@@ -1319,7 +1263,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                         else:
                             answ = pos.answers.create(**answ_data)
                             answ.options.add(*options)
-                pos_map[pos.positionid] = pos
 
             if not simulate:
                 for cp in delete_cps:
@@ -1361,14 +1304,18 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                     f.order = order._wrapped if simulate else order
                     f._calculate_tax()
                     fees.append(f)
-                    if not simulate:
+                    if simulate:
+                        f.id = 0
+                    else:
                         f.save()
             else:
                 f = OrderFee(**fee_data)
                 f.order = order._wrapped if simulate else order
                 f._calculate_tax()
                 fees.append(f)
-                if not simulate:
+                if simulate:
+                    f.id = 0
+                else:
                     f.save()
 
         order.total += sum([f.value for f in fees])

src/pretix/api/serializers/orderchange.py

@@ -0,0 +1,424 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+import logging
+import os
+
+import pycountry
+from django.core.files import File
+from rest_framework import serializers
+from rest_framework.exceptions import ValidationError
+
+from pretix.api.serializers.order import (
+    AnswerCreateSerializer, AnswerSerializer, CompatibleCountryField,
+    OrderPositionCreateSerializer,
+)
+from pretix.base.models import ItemVariation, Order, OrderFee, OrderPosition
+from pretix.base.services.orders import OrderError
+from pretix.base.settings import COUNTRIES_WITH_STATE_IN_ADDRESS
+
+logger = logging.getLogger(__name__)
+
+
+class OrderPositionCreateForExistingOrderSerializer(OrderPositionCreateSerializer):
+    order = serializers.SlugRelatedField(slug_field='code', queryset=Order.objects.none(), required=True, allow_null=False)
+    answers = AnswerCreateSerializer(many=True, required=False)
+    addon_to = serializers.IntegerField(required=False, allow_null=True)
+    secret = serializers.CharField(required=False)
+    attendee_name = serializers.CharField(required=False, allow_null=True)
+    seat = serializers.CharField(required=False, allow_null=True)
+    price = serializers.DecimalField(required=False, allow_null=True, decimal_places=2,
+                                     max_digits=10)
+    country = CompatibleCountryField(source='*')
+
+    class Meta:
+        model = OrderPosition
+        fields = ('order', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts', 'attendee_email',
+                  'company', 'street', 'zipcode', 'city', 'country', 'state',
+                  'secret', 'addon_to', 'subevent', 'answers', 'seat')
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if not self.context:
+            return
+        self.fields['order'].queryset = self.context['event'].orders.all()
+        self.fields['item'].queryset = self.context['event'].items.all()
+        self.fields['subevent'].queryset = self.context['event'].subevents.all()
+        self.fields['seat'].queryset = self.context['event'].seats.all()
+        self.fields['variation'].queryset = ItemVariation.objects.filter(item__event=self.context['event'])
+        if 'order' in self.context:
+            del self.fields['order']
+
+    def validate(self, data):
+        data = super().validate(data)
+        if data.get('addon_to'):
+            try:
+                data['addon_to'] = data['order'].positions.get(positionid=data['addon_to'])
+            except OrderPosition.DoesNotExist:
+                raise ValidationError({
+                    'addon_to': ['addon_to refers to an unknown position ID for this order.']
+                })
+        return data
+
+    def create(self, validated_data):
+        ocm = self.context['ocm']
+
+        try:
+            ocm.add_position(
+                item=validated_data['item'],
+                variation=validated_data.get('variation'),
+                price=validated_data.get('price'),
+                addon_to=validated_data.get('addon_to'),
+                subevent=validated_data.get('subevent'),
+                seat=validated_data.get('seat'),
+            )
+            if self.context.get('commit', True):
+                ocm.commit()
+                return validated_data['order'].positions.order_by('-positionid').first()
+            else:
+                return OrderPosition()  # fake to appease DRF
+        except OrderError as e:
+            raise ValidationError(str(e))
+
+
+class OrderPositionInfoPatchSerializer(serializers.ModelSerializer):
+    answers = AnswerSerializer(many=True)
+    country = CompatibleCountryField(source='*')
+    attendee_name = serializers.CharField(required=False)
+
+    class Meta:
+        model = OrderPosition
+        fields = (
+            'attendee_name', 'attendee_name_parts', 'company', 'street', 'zipcode', 'city', 'country',
+            'state', 'attendee_email', 'answers',
+        )
+
+    def validate(self, data):
+        if data.get('attendee_name') and data.get('attendee_name_parts'):
+            raise ValidationError(
+                {'attendee_name': ['Do not specify attendee_name if you specified attendee_name_parts.']}
+            )
+        if data.get('attendee_name_parts') and '_scheme' not in data.get('attendee_name_parts'):
+            data['attendee_name_parts']['_scheme'] = self.context['request'].event.settings.name_scheme
+
+        if data.get('country'):
+            if not pycountry.countries.get(alpha_2=data.get('country').code):
+                raise ValidationError(
+                    {'country': ['Invalid country code.']}
+                )
+
+        if data.get('state'):
+            cc = str(data.get('country') or self.instance.country or '')
+            if cc not in COUNTRIES_WITH_STATE_IN_ADDRESS:
+                raise ValidationError(
+                    {'state': ['States are not supported in country "{}".'.format(cc)]}
+                )
+            if not pycountry.subdivisions.get(code=cc + '-' + data.get('state')):
+                raise ValidationError(
+                    {'state': ['"{}" is not a known subdivision of the country "{}".'.format(data.get('state'), cc)]}
+                )
+        return data
+
+    def update(self, instance, validated_data):
+        answers_data = validated_data.pop('answers', None)
+
+        name = validated_data.pop('attendee_name', '')
+        if name and not validated_data.get('attendee_name_parts'):
+            validated_data['attendee_name_parts'] = {
+                '_legacy': name
+            }
+
+        for attr, value in validated_data.items():
+            if attr in self.fields:
+                setattr(instance, attr, value)
+
+        instance.save(update_fields=list(validated_data.keys()))
+
+        if answers_data is not None:
+            qs_seen = set()
+            answercache = {
+                a.question_id: a for a in instance.answers.all()
+            }
+            for answ_data in answers_data:
+                options = answ_data.pop('options', [])
+                if answ_data['question'].pk in qs_seen:
+                    raise ValidationError(f'Question {answ_data["question"]} was sent twice.')
+                if answ_data['question'].pk in answercache:
+                    a = answercache[answ_data['question'].pk]
+                    if isinstance(answ_data['answer'], File):
+                        a.file.save(answ_data['answer'].name, answ_data['answer'], save=False)
+                        a.answer = 'file://' + a.file.name
+                    elif a.answer.startswith('file://') and answ_data['answer'] == "file:keep":
+                        pass  # keep current file
+                    else:
+                        for attr, value in answ_data.items():
+                            setattr(a, attr, value)
+                    a.save()
+                else:
+                    if isinstance(answ_data['answer'], File):
+                        an = answ_data.pop('answer')
+                        a = instance.answers.create(**answ_data, answer='')
+                        a.file.save(os.path.basename(an.name), an, save=False)
+                        a.answer = 'file://' + a.file.name
+                        a.save()
+                    else:
+                        a = instance.answers.create(**answ_data)
+                a.options.set(options)
+                qs_seen.add(a.question_id)
+            for qid, a in answercache.items():
+                if qid not in qs_seen:
+                    a.delete()
+
+        return instance
+
+
+class OrderPositionChangeSerializer(serializers.ModelSerializer):
+    seat = serializers.CharField(source='seat.seat_guid', allow_null=True, required=False)
+
+    class Meta:
+        model = OrderPosition
+        fields = (
+            'item', 'variation', 'subevent', 'seat', 'price', 'tax_rule',
+        )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if not self.context:
+            return
+        self.fields['item'].queryset = self.context['event'].items.all()
+        self.fields['subevent'].queryset = self.context['event'].subevents.all()
+        self.fields['tax_rule'].queryset = self.context['event'].tax_rules.all()
+        if kwargs.get('partial'):
+            for k, v in self.fields.items():
+                self.fields[k].required = False
+
+    def validate_item(self, item):
+        if item.event != self.context['event']:
+            raise ValidationError(
+                'The specified item does not belong to this event.'
+            )
+        return item
+
+    def validate_subevent(self, subevent):
+        if self.context['event'].has_subevents:
+            if not subevent:
+                raise ValidationError(
+                    'You need to set a subevent.'
+                )
+            if subevent.event != self.context['event']:
+                raise ValidationError(
+                    'The specified subevent does not belong to this event.'
+                )
+        elif subevent:
+            raise ValidationError(
+                'You cannot set a subevent for this event.'
+            )
+        return subevent
+
+    def validate(self, data, instance=None):
+        instance = instance or self.instance
+        if instance is None:
+            return data  # needs to be done later
+        if data.get('item', instance.item):
+            if data.get('item', instance.item).has_variations:
+                if not data.get('variation', instance.variation):
+                    raise ValidationError({'variation': ['You should specify a variation for this item.']})
+                else:
+                    if data.get('variation', instance.variation).item != data.get('item', instance.item):
+                        raise ValidationError(
+                            {'variation': ['The specified variation does not belong to the specified item.']}
+                        )
+            elif data.get('variation', instance.variation):
+                raise ValidationError(
+                    {'variation': ['You cannot specify a variation for this item.']}
+                )
+
+        return data
+
+    def update(self, instance, validated_data):
+        ocm = self.context['ocm']
+        current_seat = {'seat_guid': instance.seat.seat_guid} if instance.seat else None
+        item = validated_data.get('item', instance.item)
+        variation = validated_data.get('variation', instance.variation)
+        subevent = validated_data.get('subevent', instance.subevent)
+        price = validated_data.get('price', instance.price)
+        seat = validated_data.get('seat', current_seat)
+        tax_rule = validated_data.get('tax_rule', instance.tax_rule)
+
+        change_item = None
+        if item != instance.item or variation != instance.variation:
+            change_item = (item, variation)
+
+        change_subevent = None
+        if self.context['event'].has_subevents and subevent != instance.subevent:
+            change_subevent = (subevent,)
+
+        try:
+            if change_item is not None and change_subevent is not None:
+                ocm.change_item_and_subevent(instance, *change_item, *change_subevent)
+            elif change_item is not None:
+                ocm.change_item(instance, *change_item)
+            elif change_subevent is not None:
+                ocm.change_subevent(instance, *change_subevent)
+
+            if seat != current_seat or change_subevent:
+                ocm.change_seat(instance, seat['seat_guid'] if seat else None)
+
+            if price != instance.price:
+                ocm.change_price(instance, price)
+
+            if tax_rule != instance.tax_rule:
+                ocm.change_tax_rule(instance, tax_rule)
+
+            if self.context.get('commit', True):
+                ocm.commit()
+                instance.refresh_from_db()
+        except OrderError as e:
+            raise ValidationError(str(e))
+        return instance
+
+
+class PatchPositionSerializer(serializers.Serializer):
+    position = serializers.PrimaryKeyRelatedField(queryset=OrderPosition.all.none())
+
+    def validate_position(self, value):
+        self.fields['body'].instance = value  # hack around DRFs validation order
+        return value
+
+    def validate(self, data):
+        OrderPositionChangeSerializer(context=self.context, partial=True).validate(data['body'], data['position'])
+        return data
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['position'].queryset = self.context['order'].positions.all()
+        self.fields['body'] = OrderPositionChangeSerializer(context=self.context, partial=True)
+
+
+class SelectPositionSerializer(serializers.Serializer):
+    position = serializers.PrimaryKeyRelatedField(queryset=OrderPosition.all.none())
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['position'].queryset = self.context['order'].positions.all()
+
+
+class OrderFeeChangeSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = OrderFee
+        fields = (
+            'value',
+        )
+
+    def update(self, instance, validated_data):
+        ocm = self.context['ocm']
+        value = validated_data.get('value', instance.value)
+
+        try:
+            if value != instance.value:
+                ocm.change_fee(instance, value)
+
+            if self.context.get('commit', True):
+                ocm.commit()
+                instance.refresh_from_db()
+        except OrderError as e:
+            raise ValidationError(str(e))
+        return instance
+
+
+class PatchFeeSerializer(serializers.Serializer):
+    fee = serializers.PrimaryKeyRelatedField(queryset=OrderFee.all.none())
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['fee'].queryset = self.context['order'].fees.all()
+        self.fields['body'] = OrderFeeChangeSerializer(context=self.context)
+
+
+class SelectFeeSerializer(serializers.Serializer):
+    fee = serializers.PrimaryKeyRelatedField(queryset=OrderFee.all.none())
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if not self.context:
+            return
+        self.fields['fee'].queryset = self.context['order'].fees.all()
+
+
+class OrderChangeOperationSerializer(serializers.Serializer):
+    send_email = serializers.BooleanField(default=False, required=False)
+    reissue_invoice = serializers.BooleanField(default=True, required=False)
+    recalculate_taxes = serializers.ChoiceField(default=None, allow_null=True, required=False, choices=[
+        ('keep_net', 'keep_net'),
+        ('keep_gross', 'keep_gross'),
+    ])
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(self, *args, **kwargs)
+        self.fields['patch_positions'] = PatchPositionSerializer(
+            many=True, required=False, context=self.context
+        )
+        self.fields['cancel_positions'] = SelectPositionSerializer(
+            many=True, required=False, context=self.context
+        )
+        self.fields['create_positions'] = OrderPositionCreateForExistingOrderSerializer(
+            many=True, required=False, context=self.context
+        )
+        self.fields['split_positions'] = SelectPositionSerializer(
+            many=True, required=False, context=self.context
+        )
+        self.fields['patch_fees'] = PatchFeeSerializer(
+            many=True, required=False, context=self.context
+        )
+        self.fields['cancel_fees'] = SelectFeeSerializer(
+            many=True, required=False, context=self.context
+        )
+
+    def validate(self, data):
+        seen_positions = set()
+        for d in data.get('patch_positions', []):
+            print(d, seen_positions)
+            if d['position'] in seen_positions:
+                raise ValidationError({'patch_positions': ['You have specified the same object twice.']})
+            seen_positions.add(d['position'])
+        seen_positions = set()
+        for d in data.get('cancel_positions', []):
+            if d['position'] in seen_positions:
+                raise ValidationError({'cancel_positions': ['You have specified the same object twice.']})
+            seen_positions.add(d['position'])
+        seen_positions = set()
+        for d in data.get('split_positions', []):
+            if d['position'] in seen_positions:
+                raise ValidationError({'split_positions': ['You have specified the same object twice.']})
+            seen_positions.add(d['position'])
+        seen_fees = set()
+        for d in data.get('patch_fees', []):
+            if d['fee'] in seen_fees:
+                raise ValidationError({'patch_fees': ['You have specified the same object twice.']})
+            seen_positions.add(d['fee'])
+        seen_fees = set()
+        for d in data.get('cancel_fees', []):
+            if d['fee'] in seen_fees:
+                raise ValidationError({'cancel_fees': ['You have specified the same object twice.']})
+            seen_positions.add(d['fee'])
+
+        return data

src/pretix/api/urls.py

@@ -41,8 +41,8 @@ from rest_framework import routers
 from pretix.api.views import cart
 
 from .views import (
-    checkin, device, event, exporters, item, oauth, order, organizer, upload,
-    user, version, voucher, waitinglist, webhooks,
+    checkin, device, discount, event, exporters, item, oauth, order, organizer,
+    upload, user, version, voucher, waitinglist, webhooks,
 )
 
 router = routers.DefaultRouter()
@@ -72,6 +72,7 @@ event_router.register(r'clone', event.CloneEventViewSet)
 event_router.register(r'items', item.ItemViewSet)
 event_router.register(r'categories', item.ItemCategoryViewSet)
 event_router.register(r'questions', item.QuestionViewSet)
+event_router.register(r'discounts', discount.DiscountViewSet)
 event_router.register(r'quotas', item.QuotaViewSet)
 event_router.register(r'vouchers', voucher.VoucherViewSet)
 event_router.register(r'orders', order.OrderViewSet)

src/pretix/api/views/device.py

@@ -42,6 +42,7 @@ class InitializationRequestSerializer(serializers.Serializer):
     hardware_model = serializers.CharField(max_length=190)
     software_brand = serializers.CharField(max_length=190)
     software_version = serializers.CharField(max_length=190)
+    info = serializers.JSONField(required=False, allow_null=True)
 
 
 class UpdateRequestSerializer(serializers.Serializer):
@@ -49,6 +50,7 @@ class UpdateRequestSerializer(serializers.Serializer):
     hardware_model = serializers.CharField(max_length=190)
     software_brand = serializers.CharField(max_length=190)
     software_version = serializers.CharField(max_length=190)
+    info = serializers.JSONField(required=False, allow_null=True)
 
 
 class GateSerializer(serializers.ModelSerializer):
@@ -94,6 +96,7 @@ class InitializeView(APIView):
         device.hardware_model = serializer.validated_data.get('hardware_model')
         device.software_brand = serializer.validated_data.get('software_brand')
         device.software_version = serializer.validated_data.get('software_version')
+        device.info = serializer.validated_data.get('info')
         device.api_token = generate_api_token()
         device.save()
 
@@ -114,6 +117,7 @@ class UpdateView(APIView):
         device.hardware_model = serializer.validated_data.get('hardware_model')
         device.software_brand = serializer.validated_data.get('software_brand')
         device.software_version = serializer.validated_data.get('software_version')
+        device.info = serializer.validated_data.get('info')
         device.save()
         device.log_action('pretix.device.updated', data=serializer.validated_data, auth=device)
 

src/pretix/api/views/discount.py

@@ -0,0 +1,99 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+
+# This file is based on an earlier version of pretix which was released under the Apache License 2.0. The full text of
+# the Apache License 2.0 can be obtained at <http://www.apache.org/licenses/LICENSE-2.0>.
+#
+# This file may have since been changed and any changes are released under the terms of AGPLv3 as described above. A
+# full history of changes and contributors is available at <https://github.com/pretix/pretix>.
+#
+# This file contains Apache-licensed contributions copyrighted by: Ture Gjørup
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under the License.
+
+from django_filters.rest_framework import DjangoFilterBackend, FilterSet
+from django_scopes import scopes_disabled
+from rest_framework import viewsets
+from rest_framework.exceptions import PermissionDenied
+from rest_framework.filters import OrderingFilter
+
+from pretix.api.serializers.discount import DiscountSerializer
+from pretix.api.views import ConditionalListView
+from pretix.base.models import CartPosition, Discount
+
+with scopes_disabled():
+    class DiscountFilter(FilterSet):
+        class Meta:
+            model = Discount
+            fields = ['active']
+
+
+class DiscountViewSet(ConditionalListView, viewsets.ModelViewSet):
+    serializer_class = DiscountSerializer
+    queryset = Discount.objects.none()
+    filter_backends = (DjangoFilterBackend, OrderingFilter)
+    filterset_class = DiscountFilter
+    ordering_fields = ('id', 'position')
+    ordering = ('position', 'id')
+    permission = None
+    write_permission = 'can_change_items'
+
+    def get_queryset(self):
+        return self.request.event.discounts.all()
+
+    def perform_create(self, serializer):
+        serializer.save(event=self.request.event)
+        serializer.instance.log_action(
+            'pretix.event.discount.added',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=self.request.data
+        )
+
+    def get_serializer_context(self):
+        ctx = super().get_serializer_context()
+        ctx['event'] = self.request.event
+        return ctx
+
+    def perform_update(self, serializer):
+        serializer.save(event=self.request.event)
+        serializer.instance.log_action(
+            'pretix.event.discount.changed',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=self.request.data
+        )
+
+    def perform_destroy(self, instance):
+        if not instance.allow_delete():
+            raise PermissionDenied('You cannot delete this discount because it already has '
+                                   'been used as part of an order.')
+
+        instance.log_action(
+            'pretix.event.discount.deleted',
+            user=self.request.user,
+            auth=self.request.auth,
+        )
+        CartPosition.objects.filter(discount=instance).update(discount=None)
+        super().perform_destroy(instance)

src/pretix/api/views/exporters.py

@@ -147,7 +147,11 @@ class OrganizerExportersViewSet(ExportersMixin, viewsets.ViewSet):
     @cached_property
     def exporters(self):
         exporters = []
-        events = (self.request.auth or self.request.user).get_events_with_permission('can_view_orders', request=self.request).filter(
+        if isinstance(self.request.auth, (Device, TeamAPIToken)):
+            perm_holder = self.request.auth
+        else:
+            perm_holder = self.request.user
+        events = perm_holder.get_events_with_permission('can_view_orders', request=self.request).filter(
             organizer=self.request.organizer
         )
         responses = register_multievent_data_exporters.send(self.request.organizer)
@@ -157,8 +161,12 @@ class OrganizerExportersViewSet(ExportersMixin, viewsets.ViewSet):
         return exporters
 
     def get_serializer_kwargs(self):
+        if isinstance(self.request.auth, (Device, TeamAPIToken)):
+            perm_holder = self.request.auth
+        else:
+            perm_holder = self.request.user
         return {
-            'events': self.request.auth.get_events_with_permission('can_view_orders', request=self.request).filter(
+            'events': perm_holder.get_events_with_permission('can_view_orders', request=self.request).filter(
                 organizer=self.request.organizer
             )
         }

src/pretix/api/views/order.py

@@ -36,7 +36,7 @@ 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 import serializers, status, viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import (
     APIException, NotFound, PermissionDenied, ValidationError,
@@ -53,6 +53,12 @@ from pretix.api.serializers.order import (
     PriceCalcSerializer, RevokedTicketSecretSerializer,
     SimulatedOrderSerializer,
 )
+from pretix.api.serializers.orderchange import (
+    OrderChangeOperationSerializer, OrderFeeChangeSerializer,
+    OrderPositionChangeSerializer,
+    OrderPositionCreateForExistingOrderSerializer,
+    OrderPositionInfoPatchSerializer,
+)
 from pretix.base.i18n import language
 from pretix.base.models import (
     CachedCombinedTicket, CachedTicket, Checkin, Device, Event, Invoice,
@@ -144,7 +150,8 @@ with scopes_disabled():
             matching_positions = OrderPosition.objects.filter(
                 Q(order=OuterRef('pk')) & Q(
                     Q(attendee_name_cached__icontains=u) | Q(attendee_email__icontains=u)
-                    | Q(secret__istartswith=u) | Q(voucher__code__icontains=u)
+                    | Q(secret__istartswith=u)
+                    # | Q(voucher__code__icontains=u)  # temporarily removed since it caused bad query performance on postgres
                 )
             ).values('id')
 
@@ -338,6 +345,7 @@ class OrderViewSet(viewsets.ModelViewSet):
     @action(detail=True, methods=['POST'])
     def mark_canceled(self, request, **kwargs):
         send_mail = request.data.get('send_email', True)
+        comment = request.data.get('comment', None)
         cancellation_fee = request.data.get('cancellation_fee', None)
         if cancellation_fee:
             try:
@@ -360,6 +368,7 @@ class OrderViewSet(viewsets.ModelViewSet):
                 device=request.auth if isinstance(request.auth, Device) else None,
                 oauth_application=request.auth.application if isinstance(request.auth, OAuthAccessToken) else None,
                 send_mail=send_mail,
+                email_comment=comment,
                 cancellation_fee=cancellation_fee
             )
         except OrderError as e:
@@ -644,7 +653,7 @@ class OrderViewSet(viewsets.ModelViewSet):
             if send_mail:
                 free_flow = (
                     payment and order.total == Decimal('0.00') and order.status == Order.STATUS_PAID and
-                    not order.require_approval and payment.provider == "free"
+                    not order.require_approval and payment.provider in ("free", "boxoffice")
                 )
                 if order.require_approval:
                     email_template = request.event.settings.mail_text_order_placed_require_approval
@@ -782,6 +791,79 @@ class OrderViewSet(viewsets.ModelViewSet):
         with transaction.atomic():
             self.get_object().gracefully_delete(user=self.request.user if self.request.user.is_authenticated else None, auth=self.request.auth)
 
+    @action(detail=True, methods=['POST'])
+    def change(self, request, **kwargs):
+        order = self.get_object()
+
+        serializer = OrderChangeOperationSerializer(
+            context={'order': order, **self.get_serializer_context()},
+            data=request.data,
+        )
+        serializer.is_valid(raise_exception=True)
+
+        try:
+            ocm = OrderChangeManager(
+                order=order,
+                user=self.request.user if self.request.user.is_authenticated else None,
+                auth=request.auth,
+                notify=serializer.validated_data.get('send_email', False),
+                reissue_invoice=serializer.validated_data.get('reissue_invoice', True),
+            )
+
+            canceled_positions = set()
+            for r in serializer.validated_data.get('cancel_positions', []):
+                ocm.cancel(r['position'])
+                canceled_positions.add(r['position'])
+
+            for r in serializer.validated_data.get('patch_positions', []):
+                if r['position'] in canceled_positions:
+                    continue
+                pos_serializer = OrderPositionChangeSerializer(
+                    context={'ocm': ocm, 'commit': False, 'event': request.event, **self.get_serializer_context()},
+                    partial=True,
+                )
+                pos_serializer.update(r['position'], r['body'])
+
+            for r in serializer.validated_data.get('split_positions', []):
+                if r['position'] in canceled_positions:
+                    continue
+                ocm.split(r['position'])
+
+            for r in serializer.validated_data.get('create_positions', []):
+                pos_serializer = OrderPositionCreateForExistingOrderSerializer(
+                    context={'ocm': ocm, 'commit': False, 'event': request.event, **self.get_serializer_context()},
+                )
+                pos_serializer.create(r)
+
+            canceled_fees = set()
+            for r in serializer.validated_data.get('cancel_fees', []):
+                ocm.cancel_fee(r['fee'])
+                canceled_fees.add(r['fee'])
+
+            for r in serializer.validated_data.get('patch_fees', []):
+                if r['fee'] in canceled_fees:
+                    continue
+                pos_serializer = OrderFeeChangeSerializer(
+                    context={'ocm': ocm, 'commit': False, 'event': request.event, **self.get_serializer_context()},
+                )
+                pos_serializer.update(r['fee'], r['body'])
+
+            if serializer.validated_data.get('recalculate_taxes') == 'keep_net':
+                ocm.recalculate_taxes(keep='net')
+            elif serializer.validated_data.get('recalculate_taxes') == 'keep_gross':
+                ocm.recalculate_taxes(keep='gross')
+
+            ocm.commit()
+        except OrderError as e:
+            raise ValidationError(str(e))
+
+        order.refresh_from_db()
+        serializer = OrderSerializer(
+            instance=order,
+            context=self.get_serializer_context(),
+        )
+        return Response(serializer.data)
+
 
 with scopes_disabled():
     class OrderPositionFilter(FilterSet):
@@ -823,7 +905,7 @@ with scopes_disabled():
             }
 
 
-class OrderPositionViewSet(mixins.DestroyModelMixin, mixins.UpdateModelMixin, viewsets.ReadOnlyModelViewSet):
+class OrderPositionViewSet(viewsets.ModelViewSet):
     serializer_class = OrderPositionSerializer
     queryset = OrderPosition.all.none()
     filter_backends = (DjangoFilterBackend, OrderingFilter)
@@ -1060,6 +1142,25 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, mixins.UpdateModelMixin, vi
                 )
                 return resp
 
+    @action(detail=True, methods=['POST'])
+    def regenerate_secrets(self, request, **kwargs):
+        instance = self.get_object()
+        try:
+            ocm = OrderChangeManager(
+                instance.order,
+                user=self.request.user if self.request.user.is_authenticated else None,
+                auth=self.request.auth,
+                notify=False,
+                reissue_invoice=False,
+            )
+            ocm.regenerate_secret(instance)
+            ocm.commit()
+        except OrderError as e:
+            raise ValidationError(str(e))
+        except Quota.QuotaExceededException as e:
+            raise ValidationError(str(e))
+        return self.retrieve(request, [], **kwargs)
+
     def perform_destroy(self, instance):
         try:
             ocm = OrderChangeManager(
@@ -1075,18 +1176,33 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, mixins.UpdateModelMixin, vi
         except Quota.QuotaExceededException as e:
             raise ValidationError(str(e))
 
-    def update(self, request, *args, **kwargs):
-        partial = kwargs.get('partial', False)
-        if not partial:
-            return Response(
-                {"detail": "Method \"PUT\" not allowed."},
-                status=status.HTTP_405_METHOD_NOT_ALLOWED,
-            )
-        return super().update(request, *args, **kwargs)
-
-    def perform_update(self, serializer):
+    def create(self, request, *args, **kwargs):
         with transaction.atomic():
-            old_data = self.get_serializer_class()(instance=serializer.instance, context=self.get_serializer_context()).data
+            serializer = OrderPositionCreateForExistingOrderSerializer(
+                data=request.data,
+                context=self.get_serializer_context(),
+            )
+            serializer.is_valid(raise_exception=True)
+            order = serializer.validated_data['order']
+            ocm = OrderChangeManager(
+                order=order,
+                user=self.request.user if self.request.user.is_authenticated else None,
+                auth=request.auth,
+                notify=False,
+                reissue_invoice=False,
+            )
+            serializer.context['ocm'] = ocm
+            serializer.save()
+
+            # Fields that can be easily patched after the position was added
+            old_data = OrderPositionInfoPatchSerializer(instance=serializer.instance, context=self.get_serializer_context()).data
+            serializer = OrderPositionInfoPatchSerializer(
+                instance=serializer.instance,
+                context=self.get_serializer_context(),
+                partial=True,
+                data=request.data
+            )
+            serializer.is_valid(raise_exception=True)
             serializer.save()
             new_data = serializer.data
 
@@ -1109,9 +1225,77 @@ class OrderPositionViewSet(mixins.DestroyModelMixin, mixins.UpdateModelMixin, vi
                         ]
                     }
                 )
+                tickets.invalidate_cache.apply_async(
+                    kwargs={'event': serializer.instance.order.event.pk, 'order': serializer.instance.order.pk})
+                order_modified.send(sender=serializer.instance.order.event, order=serializer.instance.order)
+        return Response(
+            OrderPositionSerializer(serializer.instance, context=self.get_serializer_context()).data,
+            status=status.HTTP_201_CREATED,
+        )
 
-        tickets.invalidate_cache.apply_async(kwargs={'event': serializer.instance.order.event.pk, 'order': serializer.instance.order.pk})
-        order_modified.send(sender=serializer.instance.order.event, order=serializer.instance.order)
+    def update(self, request, *args, **kwargs):
+        partial = kwargs.get('partial', False)
+        if not partial:
+            return Response(
+                {"detail": "Method \"PUT\" not allowed."},
+                status=status.HTTP_405_METHOD_NOT_ALLOWED,
+            )
+
+        with transaction.atomic():
+            instance = self.get_object()
+            ocm = OrderChangeManager(
+                order=instance.order,
+                user=self.request.user if self.request.user.is_authenticated else None,
+                auth=request.auth,
+                notify=False,
+                reissue_invoice=False,
+            )
+
+            # Field that need to go through OrderChangeManager
+            serializer = OrderPositionChangeSerializer(
+                instance=instance,
+                context={'ocm': ocm, **self.get_serializer_context()},
+                partial=True,
+                data=request.data
+            )
+            serializer.is_valid(raise_exception=True)
+            serializer.save()
+
+            # Fields that can be easily patched
+            old_data = OrderPositionInfoPatchSerializer(instance=instance, context=self.get_serializer_context()).data
+            serializer = OrderPositionInfoPatchSerializer(
+                instance=instance,
+                context=self.get_serializer_context(),
+                partial=True,
+                data=request.data
+            )
+            serializer.is_valid(raise_exception=True)
+            serializer.save()
+            new_data = serializer.data
+
+            if old_data != new_data:
+                log_data = self.request.data
+                if 'answers' in log_data:
+                    for a in new_data['answers']:
+                        log_data[f'question_{a["question"]}'] = a["answer"]
+                    log_data.pop('answers', None)
+                serializer.instance.order.log_action(
+                    'pretix.event.order.modified',
+                    user=self.request.user,
+                    auth=self.request.auth,
+                    data={
+                        'data': [
+                            dict(
+                                position=serializer.instance.pk,
+                                **log_data
+                            )
+                        ]
+                    }
+                )
+                tickets.invalidate_cache.apply_async(kwargs={'event': serializer.instance.order.event.pk, 'order': serializer.instance.order.pk})
+                order_modified.send(sender=serializer.instance.order.event, order=serializer.instance.order)
+
+        return Response(self.get_serializer_class()(instance=serializer.instance, context=self.get_serializer_context()).data)
 
 
 class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):

src/pretix/base/channels.py

@@ -89,6 +89,13 @@ class SalesChannel:
         """
         return True
 
+    @property
+    def discounts_supported(self) -> bool:
+        """
+        If this property is ``True``, this sales channel can be selected for automatic discounts.
+        """
+        return True
+
 
 def get_all_sales_channels():
     global _ALL_CHANNELS

src/pretix/base/email.py

@@ -177,7 +177,7 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
                     op.variation,
                     op.subevent,
                     op.attendee_name,
-                    (op.pk if op.addon_to_id else None),
+                    op.addon_to_id,
                     (op.pk if op.has_addons else None)
                 )
             )]
@@ -310,7 +310,11 @@ def get_email_context(**kwargs):
             val = [val]
         for v in val:
             if all(rp in kwargs for rp in v.required_context):
-                ctx[v.identifier] = v.render(kwargs)
+                try:
+                    ctx[v.identifier] = v.render(kwargs)
+                except:
+                    ctx[v.identifier] = '(error)'
+                    logger.exception(f'Failed to process email placeholder {v.identifier}.')
     return ctx
 
 

src/pretix/base/exporter.py

@@ -33,7 +33,6 @@
 # License for the specific language governing permissions and limitations under the License.
 
 import io
-import re
 import tempfile
 from collections import OrderedDict, namedtuple
 from decimal import Decimal
@@ -46,26 +45,13 @@ from django.conf import settings
 from django.db.models import QuerySet
 from django.utils.formats import localize
 from django.utils.translation import gettext, gettext_lazy as _
-from openpyxl import Workbook
-from openpyxl.cell.cell import ILLEGAL_CHARACTERS_RE, KNOWN_TYPES, Cell
 
 from pretix.base.models import Event
+from pretix.helpers.safe_openpyxl import (  # NOQA: backwards compatibility for plugins using excel_safe
+    SafeWorkbook, remove_invalid_excel_chars as excel_safe,
+)
 
-
-def excel_safe(val):
-    if isinstance(val, Cell):
-        return val
-
-    if not isinstance(val, KNOWN_TYPES):
-        val = str(val)
-
-    if isinstance(val, bytes):
-        val = val.decode("utf-8", errors="ignore")
-
-    if isinstance(val, str):
-        val = re.sub(ILLEGAL_CHARACTERS_RE, '', val)
-
-    return val
+__ = excel_safe  # just so the compatbility import above is "used" and doesn't get removed by linter
 
 
 class BaseExporter:
@@ -228,7 +214,7 @@ class ListExporter(BaseExporter):
         pass
 
     def _render_xlsx(self, form_data, output_file=None):
-        wb = Workbook(write_only=True)
+        wb = SafeWorkbook(write_only=True)
         ws = wb.create_sheet()
         self.prepare_xlsx_sheet(ws)
         try:
@@ -242,7 +228,7 @@ class ListExporter(BaseExporter):
                 total = line.total
                 continue
             ws.append([
-                excel_safe(val) for val in line
+                val for val in line
             ])
             if total:
                 counter += 1
@@ -347,7 +333,7 @@ class MultiSheetListExporter(ListExporter):
             return self.get_filename() + '.csv', 'text/csv', output.getvalue().encode("utf-8")
 
     def _render_xlsx(self, form_data, output_file=None):
-        wb = Workbook(write_only=True)
+        wb = SafeWorkbook(write_only=True)
         n_sheets = len(self.sheets)
         for i_sheet, (s, l) in enumerate(self.sheets):
             ws = wb.create_sheet(str(l))
@@ -361,8 +347,7 @@ class MultiSheetListExporter(ListExporter):
                     total = line.total
                     continue
                 ws.append([
-                    excel_safe(val)
-                    for val in line
+                    val for val in line
                 ])
                 if total:
                     counter += 1

src/pretix/base/exporters/__init__.py

@@ -21,6 +21,7 @@
 #
 from .answers import *  # noqa
 from .dekodi import *  # noqa
+from .events import *  # noqa
 from .invoices import *  # noqa
 from .json import *  # noqa
 from .mail import *  # noqa

src/pretix/base/exporters/events.py

@@ -0,0 +1,100 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+
+# This file is based on an earlier version of pretix which was released under the Apache License 2.0. The full text of
+# the Apache License 2.0 can be obtained at <http://www.apache.org/licenses/LICENSE-2.0>.
+#
+# This file may have since been changed and any changes are released under the terms of AGPLv3 as described above. A
+# full history of changes and contributors is available at <https://github.com/pretix/pretix>.
+#
+# This file contains Apache-licensed contributions copyrighted by: Tobias Kunze
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under the License.
+
+from django.dispatch import receiver
+from django.utils.formats import date_format
+from django.utils.functional import cached_property
+from django.utils.translation import gettext_lazy as _
+
+from ...control.forms.filter import get_all_payment_providers
+from ..exporter import ListExporter
+from ..signals import register_multievent_data_exporters
+
+
+class EventDataExporter(ListExporter):
+    identifier = 'eventdata'
+    verbose_name = _('Event data')
+
+    @cached_property
+    def providers(self):
+        return dict(get_all_payment_providers())
+
+    def iterate_list(self, form_data):
+        header = [
+            _("Event name"),
+            _("Short form"),
+            _("Shop is live"),
+            _("Event currency"),
+            _("Event start time"),
+            _("Event end time"),
+            _("Admission time"),
+            _("Start of presale"),
+            _("End of presale"),
+            _("Location"),
+            _("Latitude"),
+            _("Longitude"),
+            _("Internal comment"),
+        ]
+        props = list(self.organizer.meta_properties.all())
+        for p in props:
+            header.append(p.name)
+        yield header
+
+        for e in self.events.all():
+            m = e.meta_data
+            yield [
+                str(e.name),
+                e.slug,
+                _('Yes') if e.live else _('No'),
+                e.currency,
+                date_format(e.date_from, 'SHORT_DATETIME_FORMAT'),
+                date_format(e.date_to, 'SHORT_DATETIME_FORMAT') if e.date_to else '',
+                date_format(e.date_admission, 'SHORT_DATETIME_FORMAT') if e.date_admission else '',
+                date_format(e.presale_start, 'SHORT_DATETIME_FORMAT') if e.presale_start else '',
+                date_format(e.presale_end, 'SHORT_DATETIME_FORMAT') if e.presale_end else '',
+                str(e.location),
+                e.geo_lat or '',
+                e.geo_lon or '',
+                e.comment,
+            ] + [
+                m.get(p.name, '') for p in props
+            ]
+
+    def get_filename(self):
+        return '{}_events'.format(self.events.first().organizer.slug)
+
+
+@receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_eventdata")
+def register_multievent_eventdata_exporter(sender, **kwargs):
+    return EventDataExporter

src/pretix/base/forms/__init__.py

@@ -113,10 +113,13 @@ class SettingsForm(i18nfield.forms.I18nFormMixin, HierarkeyForm):
             if isinstance(f, (RelativeDateTimeField, RelativeDateField)):
                 f.set_event(self.obj)
 
-    def save(self):
+    def _unmask_secret_fields(self):
         for k, v in self.cleaned_data.items():
             if isinstance(self.fields.get(k), SecretKeySettingsField) and self.cleaned_data.get(k) == SECRET_REDACTED:
                 self.cleaned_data[k] = self.initial[k]
+
+    def save(self):
+        self._unmask_secret_fields()
         return super().save()
 
     def clean(self):

src/pretix/base/forms/questions.py

@@ -41,7 +41,6 @@ from io import BytesIO
 import dateutil.parser
 import pycountry
 import pytz
-from babel import Locale
 from django import forms
 from django.conf import settings
 from django.contrib import messages
@@ -52,7 +51,6 @@ from django.core.validators import (
 )
 from django.db.models import QuerySet
 from django.forms import Select, widgets
-from django.utils import translation
 from django.utils.formats import date_format
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
@@ -87,7 +85,9 @@ from pretix.base.templatetags.rich_text import rich_text
 from pretix.control.forms import (
     ExtFileField, ExtValidationMixin, SizeValidationMixin, SplitDateTimeField,
 )
-from pretix.helpers.countries import CachedCountries
+from pretix.helpers.countries import (
+    CachedCountries, get_phone_prefixes_sorted_and_localized,
+)
 from pretix.helpers.escapejson import escapejson_attr
 from pretix.helpers.i18n import get_format_without_seconds
 from pretix.presale.signals import question_form_fields
@@ -264,17 +264,14 @@ class WrappedPhonePrefixSelect(Select):
 
     def __init__(self, initial=None):
         choices = [("", "---------")]
-        language = get_babel_locale()  # changed from default implementation that used the django locale
-        locale = Locale(translation.to_locale(language))
-        for prefix, values in _COUNTRY_CODE_TO_REGION_CODE.items():
-            prefix = "+%d" % prefix
-            if initial and initial in values:
-                self.initial = prefix
-            for country_code in values:
-                country_name = locale.territories.get(country_code)
-                if country_name:
-                    choices.append((prefix, "{} {}".format(country_name, prefix)))
-        super().__init__(choices=sorted(choices, key=lambda item: item[1]), attrs={'aria-label': pgettext_lazy('phonenumber', 'International area code')})
+
+        if initial:
+            for prefix, values in _COUNTRY_CODE_TO_REGION_CODE.items():
+                if initial in values:
+                    self.initial = "+%d" % prefix
+                    break
+        choices += get_phone_prefixes_sorted_and_localized()
+        super().__init__(choices=choices, attrs={'aria-label': pgettext_lazy('phonenumber', 'International area code')})
 
     def render(self, name, value, *args, **kwargs):
         return super().render(name, value or self.initial, *args, **kwargs)
@@ -318,7 +315,12 @@ class WrappedPhoneNumberPrefixWidget(PhoneNumberPrefixWidget):
         silently deleting data.
         """
         if value:
-            if type(value) == PhoneNumber:
+            if isinstance(value, str):
+                try:
+                    value = PhoneNumber.from_string(value)
+                except:
+                    pass
+            if isinstance(value, PhoneNumber):
                 if value.country_code and value.national_number:
                     return [
                         "+%d" % value.country_code,
@@ -705,7 +707,7 @@ class BaseQuestionsForm(forms.Form):
                     label=label, required=required,
                     min_value=q.valid_number_min or Decimal('0.00'),
                     max_value=q.valid_number_max,
-                    help_text=q.help_text,
+                    help_text=help_text,
                     initial=initial.answer if initial else None,
                 )
             elif q.type == Question.TYPE_STRING:

src/pretix/base/forms/widgets.py

@@ -42,6 +42,24 @@ from django.utils.timezone import get_current_timezone, now
 from django.utils.translation import gettext_lazy as _
 
 
+def replace_arabic_numbers(inp):
+    if not isinstance(inp, str):
+        return inp
+    table = {
+        1632: 48,  # 0
+        1633: 49,  # 1
+        1634: 50,  # 2
+        1635: 51,  # 3
+        1636: 52,  # 4
+        1637: 53,  # 5
+        1638: 54,  # 6
+        1639: 55,  # 7
+        1640: 56,  # 8
+        1641: 57,  # 9
+    }
+    return inp.translate(table)
+
+
 class DatePickerWidget(forms.DateInput):
     def __init__(self, attrs=None, date_format=None):
         attrs = attrs or {}
@@ -62,6 +80,10 @@ class DatePickerWidget(forms.DateInput):
 
         forms.DateInput.__init__(self, date_attrs, date_format)
 
+    def value_from_datadict(self, data, files, name):
+        v = super().value_from_datadict(data, files, name)
+        return replace_arabic_numbers(v)
+
 
 class TimePickerWidget(forms.TimeInput):
     def __init__(self, attrs=None, time_format=None):
@@ -83,6 +105,10 @@ class TimePickerWidget(forms.TimeInput):
 
         forms.TimeInput.__init__(self, time_attrs, time_format)
 
+    def value_from_datadict(self, data, files, name):
+        v = super().value_from_datadict(data, files, name)
+        return replace_arabic_numbers(v)
+
 
 class UploadedFileWidget(forms.ClearableFileInput):
     def __init__(self, *args, **kwargs):
@@ -179,6 +205,10 @@ class SplitDateTimePickerWidget(forms.SplitDateTimeWidget):
         # Skip one hierarchy level
         forms.MultiWidget.__init__(self, widgets, attrs)
 
+    def value_from_datadict(self, data, files, name):
+        v = super().value_from_datadict(data, files, name)
+        return [replace_arabic_numbers(i) for i in v]
+
 
 class BusinessBooleanRadio(forms.RadioSelect):
     def __init__(self, require_business=False, attrs=None):

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

@@ -19,11 +19,13 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
+import logging
 import sys
 
 from django.apps import apps
 from django.core.management import call_command
 from django.core.management.base import BaseCommand
+from django.db import connection
 from django_scopes import scope, scopes_disabled
 
 
@@ -33,6 +35,13 @@ class Command(BaseCommand):
         parser.parse_args = lambda x: parser.parse_known_args(x)[0]
         return parser
 
+    def add_arguments(self, parser):
+        parser.add_argument(
+            '--print-sql',
+            action='store_true',
+            help='Print all SQL queries.',
+        )
+
     def handle(self, *args, **options):
         try:
             from django_extensions.management.commands import shell_plus  # noqa
@@ -41,6 +50,11 @@ class Command(BaseCommand):
             cmd = 'shell'
             del options['skip_checks']
 
+        if options['print_sql']:
+            connection.force_debug_cursor = True
+            logger = logging.getLogger("django.db.backends")
+            logger.setLevel(logging.DEBUG)
+
         parser = self.create_parser(sys.argv[0], sys.argv[1])
         flags = parser.parse_known_args(sys.argv[2:])[1]
         if "--override" in flags:

src/pretix/base/migrations/0209_device_info.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2022-03-22 11:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0208_auto_20220214_1632'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='device',
+            name='info',
+            field=models.JSONField(null=True),
+        ),
+    ]

src/pretix/base/migrations/0210_auto_20220303_2017.py

@@ -0,0 +1,89 @@
+# Generated by Django 3.2.2 on 2022-03-03 20:17
+
+from decimal import Decimal
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+import pretix.base.models.base
+import pretix.base.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0209_device_info'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='cartposition',
+            name='custom_price_input',
+            field=models.DecimalField(decimal_places=2, max_digits=10, null=True),
+        ),
+        migrations.AddField(
+            model_name='cartposition',
+            name='custom_price_input_is_net',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='cartposition',
+            name='line_price_gross',
+            field=models.DecimalField(decimal_places=2, max_digits=10, null=True),
+        ),
+        migrations.AddField(
+            model_name='cartposition',
+            name='listed_price',
+            field=models.DecimalField(decimal_places=2, max_digits=10, null=True),
+        ),
+        migrations.AddField(
+            model_name='cartposition',
+            name='price_after_voucher',
+            field=models.DecimalField(decimal_places=2, max_digits=10, null=True),
+        ),
+        migrations.AddField(
+            model_name='cartposition',
+            name='tax_rate',
+            field=models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=7),
+        ),
+        migrations.CreateModel(
+            name='Discount',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('active', models.BooleanField(default=True)),
+                ('internal_name', models.CharField(max_length=255)),
+                ('position', models.PositiveIntegerField(default=0)),
+                ('sales_channels', pretix.base.models.fields.MultiStringField(default=['web'])),
+                ('available_from', models.DateTimeField(blank=True, null=True)),
+                ('available_until', models.DateTimeField(blank=True, null=True)),
+                ('subevent_mode', models.CharField(max_length=50, default='mixed')),
+                ('condition_all_products', models.BooleanField(default=True)),
+                ('condition_min_count', models.PositiveIntegerField(default=0)),
+                ('condition_min_value', models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=10)),
+                ('benefit_discount_matching_percent', models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=10)),
+                ('benefit_only_apply_to_cheapest_n_matches', models.PositiveIntegerField(null=True)),
+                ('condition_limit_products', models.ManyToManyField(to='pretixbase.Item')),
+                ('condition_apply_to_addons', models.BooleanField(default=True)),
+                        ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='discounts', to='pretixbase.event')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=(models.Model, pretix.base.models.base.LoggingMixin),
+        ),
+        migrations.AddField(
+            model_name='cartposition',
+            name='discount',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.RESTRICT, to='pretixbase.discount'),
+        ),
+        migrations.AddField(
+            model_name='orderposition',
+            name='discount',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.RESTRICT, to='pretixbase.discount'),
+        ),
+        migrations.AddField(
+            model_name='orderposition',
+            name='voucher_budget_use',
+            field=models.DecimalField(decimal_places=2, max_digits=10, null=True),
+        ),
+    ]

src/pretix/base/migrations/0211_auto_20220314_2001.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.2 on 2022-03-14 20:01
+from decimal import Decimal
+
+from django.db import migrations
+from django.db.models import F
+from django.db.models.functions import Greatest
+
+
+def migrate_voucher_budget_use(apps, schema_editor):
+    OrderPosition = apps.get_model('pretixbase', 'OrderPosition')  # noqa
+    OrderPosition.all.filter(
+        price_before_voucher__isnull=False
+    ).exclude(price=F('price_before_voucher')).update(
+        voucher_budget_use=Greatest(F('price_before_voucher') - F('price'), Decimal('0.00'))
+    )
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('pretixbase', '0210_auto_20220303_2017'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            migrate_voucher_budget_use,
+            migrations.RunPython.noop,
+        ),
+    ]

src/pretix/base/migrations/0212_auto_20220318_1408.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.12 on 2022-03-18 14:08
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0211_auto_20220314_2001'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='cartposition',
+            name='includes_tax',
+        ),
+        migrations.RemoveField(
+            model_name='cartposition',
+            name='override_tax_rate',
+        ),
+        migrations.RemoveField(
+            model_name='cartposition',
+            name='price_before_voucher',
+        ),
+        migrations.RemoveField(
+            model_name='orderposition',
+            name='price_before_voucher',
+        ),
+    ]

src/pretix/base/migrations/0213_discount_condition_ignore_voucher_discounted.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.2 on 2022-04-13 08:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0212_auto_20220318_1408'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='discount',
+            name='condition_ignore_voucher_discounted',
+            field=models.BooleanField(default=False),
+        ),
+    ]

src/pretix/base/models/__init__.py

@@ -25,6 +25,7 @@ from .base import CachedFile, LoggedModel, cachedfile_name
 from .checkin import Checkin, CheckinList
 from .customers import Customer
 from .devices import Device, Gate
+from .discount import Discount
 from .event import (
     Event, Event_SettingsStore, EventLock, EventMetaProperty, EventMetaValue,
     SubEvent, SubEventMetaValue, generate_invite_token,

src/pretix/base/models/auth.py

@@ -498,6 +498,23 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
             | Q(id__in=self.teams.filter(**kwargs).values_list('limit_events__id', flat=True))
         )
 
+    @scopes_disabled()
+    def get_organizers_with_any_permission(self, request=None):
+        """
+        Returns a queryset of organizers the user has any permissions to.
+
+        :param request: The current request (optional). Required to detect staff sessions properly.
+        :return: Iterable of Organizers
+        """
+        from .event import Organizer
+
+        if request and self.has_active_staff_session(request.session.session_key):
+            return Organizer.objects.all()
+
+        return Organizer.objects.filter(
+            id__in=self.teams.values_list('organizer', flat=True)
+        )
+
     @scopes_disabled()
     def get_organizers_with_permission(self, permission, request=None):
         """

src/pretix/base/models/checkin.py

@@ -188,6 +188,7 @@ class CheckinList(LoggedModel):
         # * in pretix.helpers.jsonlogic_boolalg
         # * in checkinrules.js
         # * in libpretixsync
+        # * in pretixscan-ios (in the future)
         top_level_operators = {
             '<', '<=', '>', '>=', '==', '!=', 'inList', 'isBefore', 'isAfter', 'or', 'and'
         }
@@ -195,7 +196,8 @@ class CheckinList(LoggedModel):
             'buildTime', 'objectList', 'lookup', 'var',
         }
         allowed_vars = {
-            'product', 'variation', 'now', 'entries_number', 'entries_today', 'entries_days'
+            'product', 'variation', 'now', 'now_isoweekday', 'entries_number', 'entries_today', 'entries_days',
+            'minutes_since_last_entry', 'minutes_since_first_entry',
         }
         if not rules or not isinstance(rules, dict):
             return rules

src/pretix/base/models/devices.py

@@ -156,6 +156,9 @@ class Device(LoggedModel):
         null=True,
         blank=False
     )
+    info = models.JSONField(
+        null=True, blank=True,
+    )
 
     objects = ScopedManager(organizer='organizer')
 

src/pretix/base/models/discount.py

@@ -0,0 +1,368 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+
+from collections import defaultdict
+from decimal import Decimal
+from itertools import groupby
+from typing import Dict, Optional, Tuple
+
+from django.core.exceptions import ValidationError
+from django.core.validators import MinValueValidator
+from django.db import models
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
+from django_scopes import ScopedManager
+
+from pretix.base.decimal import round_decimal
+from pretix.base.models import fields
+from pretix.base.models.base import LoggedModel
+
+
+class Discount(LoggedModel):
+    SUBEVENT_MODE_MIXED = 'mixed'
+    SUBEVENT_MODE_SAME = 'same'
+    SUBEVENT_MODE_DISTINCT = 'distinct'
+    SUBEVENT_MODE_CHOICES = (
+        (SUBEVENT_MODE_MIXED, pgettext_lazy('subevent', 'Dates can be mixed without limitation')),
+        (SUBEVENT_MODE_SAME, pgettext_lazy('subevent', 'All matching products must be for the same date')),
+        (SUBEVENT_MODE_DISTINCT, pgettext_lazy('subevent', 'Each matching product must be for a different date')),
+    )
+
+    event = models.ForeignKey(
+        'Event',
+        on_delete=models.CASCADE,
+        related_name='discounts',
+    )
+    active = models.BooleanField(
+        verbose_name=_("Active"),
+        default=True,
+    )
+    internal_name = models.CharField(
+        verbose_name=_("Internal name"),
+        max_length=255
+    )
+    position = models.PositiveIntegerField(
+        default=0,
+        verbose_name=_("Position")
+    )
+    sales_channels = fields.MultiStringField(
+        verbose_name=_('Sales channels'),
+        default=['web'],
+        blank=False,
+    )
+
+    available_from = models.DateTimeField(
+        verbose_name=_("Available from"),
+        null=True,
+        blank=True,
+    )
+    available_until = models.DateTimeField(
+        verbose_name=_("Available until"),
+        null=True,
+        blank=True,
+    )
+
+    subevent_mode = models.CharField(
+        verbose_name=_('Event series handling'),
+        max_length=50,
+        default=SUBEVENT_MODE_MIXED,
+        choices=SUBEVENT_MODE_CHOICES,
+    )
+
+    condition_all_products = models.BooleanField(
+        default=True,
+        verbose_name=_("Apply to all products (including newly created ones)")
+    )
+    condition_limit_products = models.ManyToManyField(
+        'Item',
+        verbose_name=_("Apply to specific products"),
+        blank=True
+    )
+    condition_apply_to_addons = models.BooleanField(
+        default=True,
+        verbose_name=_("Apply to add-on products"),
+        help_text=_("Discounts never apply to bundled products"),
+    )
+    condition_ignore_voucher_discounted = models.BooleanField(
+        default=False,
+        verbose_name=_("Ignore products discounted by a voucher"),
+        help_text=_("If this option is checked, products that already received a discount through a voucher will not "
+                    "be considered for this discount. However, products that use a voucher only to e.g. unlock a "
+                    "hidden product or gain access to sold-out quota will still receive the discount."),
+    )
+    condition_min_count = models.PositiveIntegerField(
+        verbose_name=_('Minimum number of matching products'),
+        default=0,
+    )
+    condition_min_value = models.DecimalField(
+        verbose_name=_('Minimum gross value of matching products'),
+        decimal_places=2,
+        max_digits=10,
+        default=Decimal('0.00'),
+    )
+
+    benefit_discount_matching_percent = models.DecimalField(
+        verbose_name=_('Percentual discount on matching products'),
+        decimal_places=2,
+        max_digits=10,
+        default=Decimal('0.00'),
+        validators=[MinValueValidator(Decimal('0.00'))],
+    )
+    benefit_only_apply_to_cheapest_n_matches = models.PositiveIntegerField(
+        verbose_name=_('Apply discount only to this number of matching products'),
+        help_text=_(
+            'This option allows you to create discounts of the type "buy X get Y reduced/for free". For example, if '
+            'you set "Minimum number of matching products" to four and this value to two, the customer\'s cart will be '
+            'split into groups of four tickets and the cheapest two tickets within every group will be discounted. If '
+            'you want to grant the discount on all matching products, keep this field empty.'
+        ),
+        null=True,
+        blank=True,
+        validators=[MinValueValidator(1)],
+    )
+
+    # more feature ideas:
+    # - max_usages_per_order
+    # - promote_to_user_if_almost_satisfied
+    # - require_customer_account
+
+    objects = ScopedManager(organizer='event__organizer')
+
+    class Meta:
+        ordering = ('position', 'id')
+
+    def __str__(self):
+        return self.internal_name
+
+    @property
+    def sortkey(self):
+        return self.position, self.id
+
+    def __lt__(self, other) -> bool:
+        return self.sortkey < other.sortkey
+
+    @classmethod
+    def validate_config(cls, data):
+        # We forbid a few combinations of settings, because we don't think they are neccessary and at the same
+        # time they introduce edge cases, in which it becomes almost impossible to compute the discount optimally
+        # and also very hard to understand for the user what is going on.
+        if data.get('condition_min_count') and data.get('condition_min_value'):
+            raise ValidationError(
+                _('You can either set a minimum number of matching products or a minimum value, not both.')
+            )
+
+        if not data.get('condition_min_count') and not data.get('condition_min_value'):
+            raise ValidationError(
+                _('You need to either set a minimum number of matching products or a minimum value.')
+            )
+
+        if data.get('condition_min_value') and data.get('benefit_only_apply_to_cheapest_n_matches'):
+            raise ValidationError(
+                _('You cannot apply the discount only to some of the matched products if you are matching '
+                  'on a minimum value.')
+            )
+
+        if data.get('subevent_mode') == cls.SUBEVENT_MODE_DISTINCT and data.get('condition_min_value'):
+            raise ValidationError(
+                _('You cannot apply the discount only to bookings of different dates if you are matching '
+                  'on a minimum value.')
+            )
+
+    def allow_delete(self):
+        return not self.orderposition_set.exists()
+
+    def clean(self):
+        super().clean()
+        Discount.validate_config({
+            'condition_min_count': self.condition_min_count,
+            'condition_min_value': self.condition_min_value,
+            'benefit_only_apply_to_cheapest_n_matches': self.benefit_only_apply_to_cheapest_n_matches,
+            'subevent_mode': self.subevent_mode,
+        })
+
+    def _apply_min_value(self, positions, idx_group, result):
+        if self.condition_min_value and sum(positions[idx][2] for idx in idx_group) < self.condition_min_value:
+            return
+
+        if self.condition_min_count or self.benefit_only_apply_to_cheapest_n_matches:
+            raise ValueError('Validation invariant violated.')
+
+        for idx in idx_group:
+            previous_price = positions[idx][2]
+            new_price = round_decimal(
+                previous_price * (Decimal('100.00') - self.benefit_discount_matching_percent) / Decimal('100.00'),
+                self.event.currency,
+            )
+            result[idx] = new_price
+
+    def _apply_min_count(self, positions, idx_group, result):
+        if len(idx_group) < self.condition_min_count:
+            return
+
+        if not self.condition_min_count or self.condition_min_value:
+            raise ValueError('Validation invariant violated.')
+
+        if self.benefit_only_apply_to_cheapest_n_matches:
+            if not self.condition_min_count:
+                raise ValueError('Validation invariant violated.')
+
+            idx_group = sorted(idx_group, key=lambda idx: (positions[idx][2], -idx))  # sort by line_price
+
+            # Prevent over-consuming of items, i.e. if our discount is "buy 2, get 1 free", we only
+            # want to match multiples of 3
+            consume_idx = idx_group[:len(idx_group) // self.condition_min_count * self.condition_min_count]
+            benefit_idx = idx_group[:len(idx_group) // self.condition_min_count * self.benefit_only_apply_to_cheapest_n_matches]
+        else:
+            consume_idx = idx_group
+            benefit_idx = idx_group
+
+        for idx in benefit_idx:
+            previous_price = positions[idx][2]
+            new_price = round_decimal(
+                previous_price * (Decimal('100.00') - self.benefit_discount_matching_percent) / Decimal('100.00'),
+                self.event.currency,
+            )
+            result[idx] = new_price
+
+        for idx in consume_idx:
+            result.setdefault(idx, positions[idx][2])
+
+    def apply(self, positions: Dict[int, Tuple[int, Optional[int], Decimal, bool, Decimal]]) -> Dict[int, Decimal]:
+        """
+        Tries to apply this discount to a cart
+
+        :param positions: Dictionary mapping IDs to tuples of the form
+                          ``(item_id, subevent_id, line_price_gross, is_addon_to, voucher_discount)``.
+                          Bundled positions may not be included.
+
+        :return: A dictionary mapping keys from the input dictionary to new prices. All positions
+                 contained in this dictionary are considered "consumed" and should not be considered
+                 by other discounts.
+        """
+        result = {}
+
+        if not self.active:
+            return result
+
+        limit_products = set()
+        if not self.condition_all_products:
+            limit_products = {p.pk for p in self.condition_limit_products.all()}
+
+        # First, filter out everything not even covered by our product scope
+        initial_candidates = [
+            idx
+            for idx, (item_id, subevent_id, line_price_gross, is_addon_to, voucher_discount) in positions.items()
+            if (
+                (self.condition_all_products or item_id in limit_products) and
+                (self.condition_apply_to_addons or not is_addon_to) and
+                (not self.condition_ignore_voucher_discounted or voucher_discount is None or voucher_discount == Decimal('0.00'))
+            )
+        ]
+
+        if self.subevent_mode == self.SUBEVENT_MODE_MIXED:  # also applies to non-series events
+            if self.condition_min_count:
+                self._apply_min_count(positions, initial_candidates, result)
+            else:
+                self._apply_min_value(positions, initial_candidates, result)
+
+        elif self.subevent_mode == self.SUBEVENT_MODE_SAME:
+            def key(idx):
+                return positions[idx][1]  # subevent_id
+
+            # Build groups of candidates with the same subevent, then apply our regular algorithm
+            # to each group
+
+            _groups = groupby(sorted(initial_candidates, key=key), key=key)
+            candidate_groups = [list(g) for k, g in _groups]
+
+            for g in candidate_groups:
+                if self.condition_min_count:
+                    self._apply_min_count(positions, g, result)
+                else:
+                    self._apply_min_value(positions, g, result)
+
+        elif self.subevent_mode == self.SUBEVENT_MODE_DISTINCT:
+            if self.condition_min_value:
+                raise ValueError('Validation invariant violated.')
+
+            # Build optimal groups of candidates with distinct subevents, then apply our regular algorithm
+            # to each group. Optimal, in this case, means:
+            # - First try to build as many groups of size condition_min_count as possible while trying to
+            #   balance out the cheapest products so that they are not all in the same group
+            # - Then add remaining positions to existing groups if possible
+            candidate_groups = []
+
+            # Build a list of subevent IDs in descending order of frequency
+            subevent_to_idx = defaultdict(list)
+            for idx, p in positions.items():
+                subevent_to_idx[p[1]].append(idx)
+            for v in subevent_to_idx.values():
+                v.sort(key=lambda idx: positions[idx][2])
+            subevent_order = sorted(list(subevent_to_idx.keys()), key=lambda s: len(subevent_to_idx[s]), reverse=True)
+
+            # Build groups of exactly condition_min_count distinct subevents
+            current_group = []
+            while True:
+                # Build a list of candidates, which is a list of all positions belonging to a subevent of the
+                # maximum cardinality, where the cardinality of a subevent is defined as the number of tickets
+                # for that subevent that are not yet part of any group
+                candidates = []
+                cardinality = None
+                for se, l in subevent_to_idx.items():
+                    l = [ll for ll in l if ll not in current_group]
+                    if cardinality and len(l) != cardinality:
+                        continue
+                    if se not in {positions[idx][1] for idx in current_group}:
+                        candidates += l
+                        cardinality = len(l)
+
+                if not candidates:
+                    break
+
+                # Sort the list by prices, then pick one. For "buy 2 get 1 free" we apply a "pick 1 from the start
+                # and 2 from the end" scheme to optimize price distribution among groups
+                candidates = sorted(candidates, key=lambda idx: positions[idx][2])
+                if len(current_group) < (self.benefit_only_apply_to_cheapest_n_matches or 0):
+                    candidate = candidates[0]
+                else:
+                    candidate = candidates[-1]
+
+                current_group.append(candidate)
+
+                # Only add full groups to the list of groups
+                if len(current_group) >= max(self.condition_min_count, 1):
+                    candidate_groups.append(current_group)
+                    for c in current_group:
+                        subevent_to_idx[positions[c][1]].remove(c)
+                    current_group = []
+
+            # Distribute "leftovers"
+            for se in subevent_order:
+                if subevent_to_idx[se]:
+                    for group in candidate_groups:
+                        if se not in {positions[idx][1] for idx in group}:
+                            group.append(subevent_to_idx[se].pop())
+                            if not subevent_to_idx[se]:
+                                break
+
+            for g in candidate_groups:
+                self._apply_min_count(positions, g, result)
+        return result

src/pretix/base/models/event.py

@@ -700,8 +700,8 @@ class Event(EventMixin, LoggedModel):
 
         from ..signals import event_copy_data
         from . import (
-            Item, ItemAddOn, ItemBundle, ItemCategory, ItemMetaValue, Question,
-            Quota,
+            Discount, Item, ItemAddOn, ItemBundle, ItemCategory, ItemMetaValue,
+            Question, Quota,
         )
 
         #  Note: avoid self.set_active_plugins(), it causes trouble e.g. for the badges plugin.
@@ -723,7 +723,7 @@ class Event(EventMixin, LoggedModel):
             tax_map[t.pk] = t
             t.pk = None
             t.event = self
-            t.save()
+            t.save(force_insert=True)
             t.log_action('pretix.object.cloned')
 
         category_map = {}
@@ -731,7 +731,7 @@ class Event(EventMixin, LoggedModel):
             category_map[c.pk] = c
             c.pk = None
             c.event = self
-            c.save()
+            c.save(force_insert=True)
             c.log_action('pretix.object.cloned')
 
         item_meta_properties_map = {}
@@ -739,7 +739,7 @@ class Event(EventMixin, LoggedModel):
             item_meta_properties_map[imp.pk] = imp
             imp.pk = None
             imp.event = self
-            imp.save()
+            imp.save(force_insert=True)
             imp.log_action('pretix.object.cloned')
 
         item_map = {}
@@ -760,7 +760,7 @@ class Event(EventMixin, LoggedModel):
             if i.grant_membership_type and other.organizer_id != self.organizer_id:
                 i.grant_membership_type = None
 
-            i.save()
+            i.save(force_insert=True)
             i.log_action('pretix.object.cloned')
 
             if require_membership_types and other.organizer_id == self.organizer_id:
@@ -770,19 +770,19 @@ class Event(EventMixin, LoggedModel):
                 variation_map[v.pk] = v
                 v.pk = None
                 v.item = i
-                v.save()
+                v.save(force_insert=True)
 
         for imv in ItemMetaValue.objects.filter(item__event=other).prefetch_related('item', 'property'):
             imv.pk = None
             imv.property = item_meta_properties_map[imv.property.pk]
             imv.item = item_map[imv.item.pk]
-            imv.save()
+            imv.save(force_insert=True)
 
         for ia in ItemAddOn.objects.filter(base_item__event=other).prefetch_related('base_item', 'addon_category'):
             ia.pk = None
             ia.base_item = item_map[ia.base_item.pk]
             ia.addon_category = category_map[ia.addon_category.pk]
-            ia.save()
+            ia.save(force_insert=True)
 
         for ia in ItemBundle.objects.filter(base_item__event=other).prefetch_related('base_item', 'bundled_item', 'bundled_variation'):
             ia.pk = None
@@ -790,7 +790,7 @@ class Event(EventMixin, LoggedModel):
             ia.bundled_item = item_map[ia.bundled_item.pk]
             if ia.bundled_variation:
                 ia.bundled_variation = variation_map[ia.bundled_variation.pk]
-            ia.save()
+            ia.save(force_insert=True)
 
         quota_map = {}
         for q in Quota.objects.filter(event=other, subevent__isnull=True).prefetch_related('items', 'variations'):
@@ -801,7 +801,7 @@ class Event(EventMixin, LoggedModel):
             q.pk = None
             q.event = self
             q.closed = False
-            q.save()
+            q.save(force_insert=True)
             q.log_action('pretix.object.cloned')
             for i in items:
                 if i.pk in item_map:
@@ -810,6 +810,16 @@ class Event(EventMixin, LoggedModel):
                 q.variations.add(variation_map[v.pk])
             self.items.filter(hidden_if_available_id=oldid).update(hidden_if_available=q)
 
+        for d in Discount.objects.filter(event=other).prefetch_related('condition_limit_products'):
+            items = list(d.condition_limit_products.all())
+            d.pk = None
+            d.event = self
+            d.save(force_insert=True)
+            d.log_action('pretix.object.cloned')
+            for i in items:
+                if i.pk in item_map:
+                    d.condition_limit_products.add(item_map[i.pk])
+
         question_map = {}
         for q in Question.objects.filter(event=other).prefetch_related('items', 'options'):
             items = list(q.items.all())
@@ -817,7 +827,7 @@ class Event(EventMixin, LoggedModel):
             question_map[q.pk] = q
             q.pk = None
             q.event = self
-            q.save()
+            q.save(force_insert=True)
             q.log_action('pretix.object.cloned')
 
             for i in items:
@@ -825,7 +835,7 @@ class Event(EventMixin, LoggedModel):
             for o in opts:
                 o.pk = None
                 o.question = q
-                o.save()
+                o.save(force_insert=True)
 
         for q in self.questions.filter(dependency_question__isnull=False):
             q.dependency_question = question_map[q.dependency_question_id]
@@ -835,10 +845,10 @@ class Event(EventMixin, LoggedModel):
             if isinstance(rules, dict):
                 for k, v in rules.items():
                     if k == 'lookup':
-                        if v[0] == 'product':
-                            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) if int(v[1]) in variation_map else "0"
+                        if rules[k][0] == 'product':
+                            rules[k][1] = str(item_map.get(int(v[1]), 0).pk) if int(v[1]) in item_map else "0"
+                        elif rules[k][0] == 'variation':
+                            rules[k][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):
@@ -854,7 +864,7 @@ class Event(EventMixin, LoggedModel):
             rules = cl.rules
             _walk_rules(rules)
             cl.rules = rules
-            cl.save()
+            cl.save(force_insert=True)
             cl.log_action('pretix.object.cloned')
             for i in items:
                 cl.limit_products.add(item_map[i.pk])
@@ -863,21 +873,25 @@ class Event(EventMixin, LoggedModel):
             if other.seating_plan.organizer_id == self.organizer_id:
                 self.seating_plan = other.seating_plan
             else:
-                self.organizer.seating_plans.create(name=other.seating_plan.name, layout=other.seating_plan.layout)
+                sp = other.seating_plan
+                sp.pk = None
+                sp.organizer = self.organizer
+                sp.save(force_insert=True)
+                self.seating_plan = sp
             self.save()
 
         for m in other.seat_category_mappings.filter(subevent__isnull=True):
             m.pk = None
             m.event = self
             m.product = item_map[m.product_id]
-            m.save()
+            m.save(force_insert=True)
 
         for s in other.seats.filter(subevent__isnull=True):
             s.pk = None
             s.event = self
             if s.product_id:
                 s.product = item_map[s.product_id]
-            s.save()
+            s.save(force_insert=True)
 
         has_custom_style = other.settings.presale_css_file or other.settings.presale_widget_css_file
         skip_settings = (

src/pretix/base/models/fields.py

@@ -52,7 +52,10 @@ class MultiStringField(TextField):
         if isinstance(value, (list, tuple)):
             return DELIMITER + DELIMITER.join(value) + DELIMITER
         elif value is None:
-            return ""
+            if self.null:
+                return None
+            else:
+                return ""
         raise TypeError("Invalid data type passed.")
 
     def get_prep_lookup(self, lookup_type, value):  # NOQA
@@ -78,6 +81,8 @@ class MultiStringField(TextField):
             return MultiStringContains
         elif lookup_name == 'icontains':
             return MultiStringIContains
+        elif lookup_name == 'isnull':
+            return builtin_lookups.IsNull
         raise NotImplementedError(
             "Lookup '{}' doesn't work with MultiStringField".format(lookup_name),
         )

src/pretix/base/models/log.py

@@ -138,8 +138,8 @@ class LogEntry(models.Model):
     @cached_property
     def display_object(self):
         from . import (
-            Event, Item, ItemCategory, Order, Question, Quota, SubEvent,
-            TaxRule, Voucher,
+            Discount, Event, Item, ItemCategory, Order, Question, Quota,
+            SubEvent, TaxRule, Voucher,
         )
 
         try:
@@ -202,6 +202,16 @@ class LogEntry(models.Model):
                 }),
                 'val': escape(co.name),
             }
+        elif isinstance(co, Discount):
+            a_text = _('Discount {val}')
+            a_map = {
+                'href': reverse('control:event.items.discounts.edit', kwargs={
+                    'event': self.event.slug,
+                    'organizer': self.event.organizer.slug,
+                    'discount': co.id
+                }),
+                'val': escape(co.internal_name),
+            }
         elif isinstance(co, ItemCategory):
             a_text = _('Category {val}')
             a_map = {

src/pretix/base/models/orders.py

@@ -638,12 +638,13 @@ class Order(LockModel, LoggedModel):
                 return False
         if self.user_cancel_deadline and now() > self.user_cancel_deadline:
             return False
-        if self.status == Order.STATUS_PENDING:
-            return self.event.settings.cancel_allow_user
-        elif self.status == Order.STATUS_PAID:
+
+        if self.status == Order.STATUS_PAID or self.payment_refund_sum > Decimal('0.00'):
             if self.total == Decimal('0.00'):
                 return self.event.settings.cancel_allow_user
             return self.event.settings.cancel_allow_user_paid
+        elif self.status == Order.STATUS_PENDING:
+            return self.event.settings.cancel_allow_user
         return False
 
     def propose_auto_refunds(self, amount: Decimal, payments: list=None):
@@ -905,10 +906,10 @@ class Order(LockModel, LoggedModel):
                 if force:
                     continue
 
-                if op.voucher and op.voucher.budget is not None and op.price_before_voucher is not None:
+                if op.voucher and op.voucher.budget is not None and op.voucher_budget_use:
                     if op.voucher not in v_budget:
                         v_budget[op.voucher] = op.voucher.budget - op.voucher.budget_used()
-                    disc = op.price_before_voucher - op.price
+                    disc = op.voucher_budget_use
                     if disc > v_budget[op.voucher]:
                         raise Quota.QuotaExceededException(error_messages['voucher_budget'].format(
                             voucher=op.voucher.code
@@ -1274,9 +1275,6 @@ class AbstractPosition(models.Model):
         verbose_name=_("Variation"),
         on_delete=models.PROTECT
     )
-    price_before_voucher = models.DecimalField(
-        decimal_places=2, max_digits=10, null=True,
-    )
     price = models.DecimalField(
         decimal_places=2, max_digits=10,
         verbose_name=_("Price")
@@ -1313,6 +1311,10 @@ class AbstractPosition(models.Model):
     )
     is_bundled = models.BooleanField(default=False)
 
+    discount = models.ForeignKey(
+        'Discount', null=True, blank=True, on_delete=models.RESTRICT
+    )
+
     company = models.CharField(max_length=255, blank=True, verbose_name=_('Company name'), null=True)
     street = models.TextField(verbose_name=_('Address'), blank=True, null=True)
     zipcode = models.CharField(max_length=30, verbose_name=_('ZIP code'), blank=True, null=True)
@@ -1330,6 +1332,10 @@ class AbstractPosition(models.Model):
         else:
             return {}
 
+    @property
+    def item_and_variation(self):
+        return self.item, self.variation
+
     @meta_info_data.setter
     def meta_info_data(self, d):
         self.meta_info = json.dumps(d)
@@ -2155,6 +2161,9 @@ class OrderPosition(AbstractPosition):
         related_name='all_positions',
         on_delete=models.PROTECT
     )
+    voucher_budget_use = models.DecimalField(
+        max_digits=10, decimal_places=2, null=True, blank=True,
+    )
     tax_rate = models.DecimalField(
         max_digits=7, decimal_places=2,
         verbose_name=_('Tax rate')
@@ -2227,6 +2236,8 @@ class OrderPosition(AbstractPosition):
                 else:
                     setattr(op, f.name, getattr(cartpos, f.name))
             op._calculate_tax()
+            if cartpos.voucher:
+                op.voucher_budget_use = cartpos.listed_price - cartpos.price_after_voucher
             op.positionid = i + 1
             op.save()
             ops.append(op)
@@ -2575,12 +2586,25 @@ class CartPosition(AbstractPosition):
         verbose_name=_("Expiration date"),
         db_index=True
     )
-    includes_tax = models.BooleanField(
-        default=True
+
+    tax_rate = models.DecimalField(
+        max_digits=7, decimal_places=2, default=Decimal('0.00'),
+        verbose_name=_('Tax rate')
     )
-    override_tax_rate = models.DecimalField(
-        max_digits=10, decimal_places=2,
-        null=True, blank=True
+    listed_price = models.DecimalField(
+        decimal_places=2, max_digits=10, null=True,
+    )
+    price_after_voucher = models.DecimalField(
+        decimal_places=2, max_digits=10, null=True,
+    )
+    custom_price_input = models.DecimalField(
+        decimal_places=2, max_digits=10, null=True,
+    )
+    custom_price_input_is_net = models.BooleanField(
+        default=False,
+    )
+    line_price_gross = models.DecimalField(
+        decimal_places=2, max_digits=10, null=True,
     )
 
     objects = ScopedManager(organizer='event__organizer')
@@ -2594,21 +2618,66 @@ class CartPosition(AbstractPosition):
             self.item.id, self.variation.id if self.variation else 0, self.cart_id
         )
 
-    @property
-    def tax_rate(self):
-        if self.includes_tax:
-            if self.override_tax_rate is not None:
-                return self.override_tax_rate
-            return self.item.tax(self.price, base_price_is='gross').rate
-        else:
-            return Decimal('0.00')
-
     @property
     def tax_value(self):
-        if self.includes_tax:
-            return self.item.tax(self.price, override_tax_rate=self.override_tax_rate, base_price_is='gross').tax
+        net = round_decimal(self.price - (self.price * (1 - 100 / (100 + self.tax_rate))),
+                            self.event.currency)
+        return self.price - net
+
+    def update_listed_price_and_voucher(self, voucher_only=False, max_discount=None):
+        from pretix.base.services.pricing import (
+            get_listed_price, is_included_for_free,
+        )
+
+        if voucher_only:
+            listed_price = self.listed_price
         else:
-            return Decimal('0.00')
+            if self.addon_to_id and is_included_for_free(self.item, self.addon_to):
+                listed_price = Decimal('0.00')
+            else:
+                listed_price = get_listed_price(self.item, self.variation, self.subevent)
+
+        if self.voucher:
+            price_after_voucher = self.voucher.calculate_price(listed_price, max_discount)
+        else:
+            price_after_voucher = listed_price
+
+        if self.is_bundled:
+            bundle = self.addon_to.item.bundles.filter(bundled_item=self.item, bundled_variation=self.variation).first()
+            if bundle:
+                listed_price = bundle.designated_price
+                price_after_voucher = bundle.designated_price
+
+        if listed_price != self.listed_price or price_after_voucher != self.price_after_voucher:
+            self.listed_price = listed_price
+            self.price_after_voucher = price_after_voucher
+            self.save(update_fields=['listed_price', 'price_after_voucher'])
+
+    def migrate_free_price_if_necessary(self):
+        # Migrate from pre-discounts position
+        if self.item.free_price and self.custom_price_input is None:
+            custom_price = self.price
+            if custom_price > 100000000:
+                raise ValueError('price_too_high')
+            self.custom_price_input = custom_price
+            self.custom_price_input_is_net = not False
+            self.save(update_fields=['custom_price_input', 'custom_price_input_is_net'])
+
+    def update_line_price(self, invoice_address, bundled_positions):
+        from pretix.base.services.pricing import get_line_price
+
+        line_price = get_line_price(
+            price_after_voucher=self.price_after_voucher,
+            custom_price_input=self.custom_price_input,
+            custom_price_input_is_net=self.custom_price_input_is_net,
+            tax_rule=self.item.tax_rule,
+            invoice_address=invoice_address,
+            bundled_sum=sum([b.price_after_voucher for b in bundled_positions]),
+        )
+        if line_price.gross != self.line_price_gross or line_price.rate != self.tax_rate:
+            self.line_price_gross = line_price.gross
+            self.tax_rate = line_price.rate
+            self.save(update_fields=['line_price_gross', 'tax_rate'])
 
 
 class InvoiceAddress(models.Model):

src/pretix/base/models/vouchers.py

@@ -39,7 +39,7 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.validators import MinLengthValidator
 from django.db import connection, models
-from django.db.models import F, OuterRef, Q, Subquery, Sum
+from django.db.models import OuterRef, Q, Subquery, Sum
 from django.db.models.functions import Coalesce
 from django.utils.crypto import get_random_string
 from django.utils.timezone import now
@@ -530,6 +530,8 @@ class Voucher(LoggedModel):
         original price will be returned.
         """
         if self.value is not None:
+            if not isinstance(self.value, Decimal):
+                self.value = Decimal(self.value)
             if self.price_mode == 'set':
                 p = self.value
             elif self.price_mode == 'subtract':
@@ -569,21 +571,21 @@ class Voucher(LoggedModel):
     def annotate_budget_used_orders(cls, qs):
         opq = OrderPosition.objects.filter(
             voucher_id=OuterRef('pk'),
-            price_before_voucher__isnull=False,
+            voucher_budget_use__isnull=False,
             order__status__in=[
                 Order.STATUS_PAID,
                 Order.STATUS_PENDING
             ]
-        ).order_by().values('voucher_id').annotate(s=Sum(F('price_before_voucher') - F('price'))).values('s')
+        ).order_by().values('voucher_id').annotate(s=Sum('voucher_budget_use')).values('s')
         return qs.annotate(budget_used_orders=Coalesce(Subquery(opq, output_field=models.DecimalField(max_digits=10, decimal_places=2)), Decimal('0.00')))
 
     def budget_used(self):
         ops = OrderPosition.objects.filter(
             voucher=self,
-            price_before_voucher__isnull=False,
+            voucher_budget_use__isnull=False,
             order__status__in=[
                 Order.STATUS_PAID,
                 Order.STATUS_PENDING
             ]
-        ).aggregate(s=Sum(F('price_before_voucher') - F('price')))['s'] or Decimal('0.00')
+        ).aggregate(s=Sum('voucher_budget_use'))['s'] or Decimal('0.00')
         return ops

src/pretix/base/payment.py

@@ -955,6 +955,8 @@ class BoxOfficeProvider(BasePaymentProvider):
         return {
             "pos_id": payment.info_data.get('pos_id', None),
             "receipt_id": payment.info_data.get('receipt_id', None),
+            "payment_type": payment.info_data.get('payment_type', None),
+            "payment_data": payment.info_data.get('payment_data', {}),
         }
 
     def payment_control_render(self, request, payment) -> str:

src/pretix/base/pdf.py

@@ -37,6 +37,7 @@ import hashlib
 import itertools
 import logging
 import os
+import re
 import subprocess
 import tempfile
 import uuid
@@ -48,12 +49,14 @@ from arabic_reshaper import ArabicReshaper
 from bidi.algorithm import get_display
 from django.conf import settings
 from django.contrib.staticfiles import finders
+from django.db.models import Max, Min
 from django.dispatch import receiver
 from django.utils.formats import date_format
 from django.utils.functional import SimpleLazyObject
 from django.utils.html import conditional_escape
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
+from i18nfield.strings import LazyI18nString
 from PyPDF2 import PdfFileReader
 from pytz import timezone
 from reportlab.graphics import renderPDF
@@ -202,6 +205,11 @@ DEFAULT_VARIABLES = OrderedDict((
         "editor_sample": 'foo@bar.com',
         "evaluate": lambda op, order, ev: op.attendee_email or (op.addon_to.attendee_email if op.addon_to else '')
     }),
+    ("pseudonymization_id", {
+        "label": _("Pseudonymization ID (lead scanning)"),
+        "editor_sample": "GG89JUJDTA",
+        "evaluate": lambda orderposition, order, event: orderposition.pseudonymization_id,
+    }),
     ("event_name", {
         "label": _("Event name"),
         "editor_sample": _("Sample event name"),
@@ -387,30 +395,41 @@ DEFAULT_VARIABLES = OrderedDict((
     ("seat", {
         "label": _("Seat: Full name"),
         "editor_sample": _("Ground floor, Row 3, Seat 4"),
-        "evaluate": lambda op, order, ev: str(op.seat if op.seat else
+        "evaluate": lambda op, order, ev: str(get_seat(op) if get_seat(op) else
                                               _('General admission') if ev.seating_plan_id is not None else "")
     }),
     ("seat_zone", {
         "label": _("Seat: zone"),
         "editor_sample": _("Ground floor"),
-        "evaluate": lambda op, order, ev: str(op.seat.zone_name if op.seat else
+        "evaluate": lambda op, order, ev: str(get_seat(op).zone_name if get_seat(op) else
                                               _('General admission') if ev.seating_plan_id is not None else "")
     }),
     ("seat_row", {
         "label": _("Seat: row"),
         "editor_sample": "3",
-        "evaluate": lambda op, order, ev: str(op.seat.row_name if op.seat else "")
+        "evaluate": lambda op, order, ev: str(get_seat(op).row_name if get_seat(op) else "")
     }),
     ("seat_number", {
         "label": _("Seat: seat number"),
         "editor_sample": 4,
-        "evaluate": lambda op, order, ev: str(op.seat.seat_number if op.seat else "")
+        "evaluate": lambda op, order, ev: str(get_seat(op).seat_number if get_seat(op) else "")
     }),
     ("first_scan", {
         "label": _("Date and time of first scan"),
         "editor_sample": _("2017-05-31 19:00"),
         "evaluate": lambda op, order, ev: get_first_scan(op)
     }),
+    ("giftcard_issuance_date", {
+
+        "label": _("Gift card: Issuance date"),
+        "editor_sample": _("2017-05-31"),
+        "evaluate": lambda op, order, ev: get_giftcard_issuance(op, ev)
+    }),
+    ("giftcard_expiry_date", {
+        "label": _("Gift card: Expiration date"),
+        "editor_sample": _("2017-05-31"),
+        "evaluate": lambda op, order, ev: get_giftcard_expiry(op, ev)
+    }),
 ))
 DEFAULT_IMAGES = OrderedDict([])
 
@@ -485,10 +504,17 @@ def variables_from_questions(sender, *args, **kwargs):
     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),
+            'editor_sample': _('<Answer: {question}>').format(question=q.question),
+            'evaluate': partial(get_answer, question_id=q.pk),
+            'migrate_from': 'question_{}'.format(q.pk)
+        }
         d['question_{}'.format(q.pk)] = {
             'label': _('Question: {question}').format(question=q.question),
             'editor_sample': _('<Answer: {question}>').format(question=q.question),
-            'evaluate': partial(get_answer, question_id=q.pk)
+            'evaluate': partial(get_answer, question_id=q.pk),
+            'hidden': True,
         }
     return d
 
@@ -546,6 +572,24 @@ def get_variables(event):
     return v
 
 
+def get_giftcard_expiry(op: OrderPosition, ev):
+    if not op.item.issue_giftcard:
+        return ""  # performance optimization
+    m = op.issued_gift_cards.aggregate(m=Min('expires'))['m']
+    if not m:
+        return ""
+    return date_format(m.astimezone(ev.timezone), "SHORT_DATE_FORMAT")
+
+
+def get_giftcard_issuance(op: OrderPosition, ev):
+    if not op.item.issue_giftcard:
+        return ""  # performance optimization
+    m = op.issued_gift_cards.aggregate(m=Max('issuance'))['m']
+    if not m:
+        return ""
+    return date_format(m.astimezone(ev.timezone), "SHORT_DATE_FORMAT")
+
+
 def get_first_scan(op: OrderPosition):
     scans = list(op.checkins.all())
 
@@ -557,6 +601,14 @@ def get_first_scan(op: OrderPosition):
     return ""
 
 
+def get_seat(op: OrderPosition):
+    if op.seat_id:
+        return op.seat
+    if op.addon_to_id:
+        return op.addon_to.seat
+    return None
+
+
 reshaper = SimpleLazyObject(lambda: ArabicReshaper(configuration={
     'delete_harakat': True,
     'support_ligatures': False,
@@ -616,12 +668,14 @@ class Renderer:
                          preserveAspectRatio=True, anchor='n',
                          mask='auto')
 
-    def _draw_barcodearea(self, canvas: Canvas, op: OrderPosition, o: dict):
+    def _draw_barcodearea(self, canvas: Canvas, op: OrderPosition, order: Order, o: dict):
         content = o.get('content', 'secret')
         if content == 'secret':
+            # do not use get_text_content because it uses a shortened version of secret
+            # and does not deal with our default value here properly
             content = op.secret
-        elif content == 'pseudonymization_id':
-            content = op.pseudonymization_id
+        else:
+            content = self._get_text_content(op, order, o)
 
         level = 'H'
         if len(content) > 32:
@@ -648,20 +702,51 @@ class Renderer:
                 return self._get_text_content(op, order, o, True)
 
         ev = self._get_ev(op, order)
+
         if not o['content']:
             return '(error)'
-        if o['content'] == 'other':
-            return o['text']
+
+        if o['content'] == 'other' or o['content'] == 'other_i18n':
+            if o['content'] == 'other_i18n':
+                text = str(LazyI18nString(o['text_i18n']))
+            else:
+                text = o['text']
+
+            def replace(x):
+                print(x.group(1))
+                if x.group(1).startswith('itemmeta:'):
+                    return op.item.meta_data.get(x.group(1)[9:]) or ''
+                elif x.group(1).startswith('meta:'):
+                    return ev.meta_data.get(x.group(1)[5:]) or ''
+                elif x.group(1) not in self.variables:
+                    return x.group(0)
+                if x.group(1) == 'secret':
+                    # Do not use shortened version
+                    return op.secret
+
+                try:
+                    return self.variables[x.group(1)]['evaluate'](op, order, ev)
+                except:
+                    logger.exception('Failed to process variable.')
+                    return '(error)'
+
+            # We do not use str.format like in emails so we (a) can evaluate lazily and (b) can re-implement this
+            # 1:1 on other platforms that render PDFs through our API (libpretixprint)
+            return re.sub(r'\{([a-zA-Z0-9:_]+)\}', replace, text)
+
         elif o['content'].startswith('itemmeta:'):
             return op.item.meta_data.get(o['content'][9:]) or ''
+
         elif o['content'].startswith('meta:'):
             return ev.meta_data.get(o['content'][5:]) or ''
+
         elif o['content'] in self.variables:
             try:
                 return self.variables[o['content']]['evaluate'](op, order, ev)
             except:
                 logger.exception('Failed to process variable.')
                 return '(error)'
+
         return ''
 
     def _draw_imagearea(self, canvas: Canvas, op: OrderPosition, order: Order, o: dict):
@@ -754,20 +839,30 @@ class Renderer:
             p.drawOn(canvas, 0, -h - ad[1])
         canvas.restoreState()
 
-    def draw_page(self, canvas: Canvas, order: Order, op: OrderPosition, show_page=True):
-        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":
-                self._draw_poweredby(canvas, op, o)
-            if self.bg_pdf:
-                canvas.setPageSize((self.bg_pdf.getPage(0).mediaBox[2], self.bg_pdf.getPage(0).mediaBox[3]))
-        if show_page:
-            canvas.showPage()
+    def draw_page(self, canvas: Canvas, order: Order, op: OrderPosition, show_page=True, only_page=None):
+        page_count = self.bg_pdf.getNumPages()
+
+        if not only_page and not show_page:
+            raise ValueError("only_page=None and show_page=False cannot be combined")
+
+        for page in range(page_count):
+            if only_page and only_page != page + 1:
+                continue
+            for o in self.layout:
+                if o.get('page', 1) != page + 1:
+                    continue
+                if o['type'] == "barcodearea":
+                    self._draw_barcodearea(canvas, op, order, 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":
+                    self._draw_poweredby(canvas, op, o)
+                if self.bg_pdf:
+                    canvas.setPageSize((self.bg_pdf.getPage(page).mediaBox[2], self.bg_pdf.getPage(page).mediaBox[3]))
+            if show_page:
+                canvas.showPage()
 
     def render_background(self, buffer, title=_('Ticket')):
         if settings.PDFTK:
@@ -780,7 +875,7 @@ class Renderer:
                 subprocess.run([
                     settings.PDFTK,
                     os.path.join(d, 'front.pdf'),
-                    'background',
+                    'multibackground',
                     os.path.join(d, 'back.pdf'),
                     'output',
                     os.path.join(d, 'out.pdf'),
@@ -794,8 +889,8 @@ class Renderer:
             new_pdf = PdfFileReader(buffer)
             output = PdfFileWriter()
 
-            for page in new_pdf.pages:
-                bg_page = copy.copy(self.bg_pdf.getPage(0))
+            for i, page in enumerate(new_pdf.pages):
+                bg_page = copy.copy(self.bg_pdf.getPage(i))
                 bg_page.mergePage(page)
                 output.addPage(bg_page)
 

src/pretix/base/secrets.py

@@ -247,7 +247,7 @@ def assign_ticket_secret(event, position, force_invalidate_if_revokation_list_us
         **kwargs
     )
     changed = position.secret != secret
-    if position.secret and changed and gen.use_revocation_list:
+    if position.secret and changed and gen.use_revocation_list and position.pk:
         position.revoked_secrets.create(event=event, secret=position.secret)
     position.secret = secret
     if save and changed:

src/pretix/base/services/cancelevent.py

@@ -214,8 +214,8 @@ def cancel_event(self, event: Event, subevent: int, auto_refund: bool,
             refund_amount = o.payment_refund_sum
 
             try:
-                if auto_refund:
-                    _try_auto_refund(o.pk, manual_refund=manual_refund, allow_partial=True,
+                if auto_refund or manual_refund:
+                    _try_auto_refund(o.pk, auto_refund=auto_refund, manual_refund=manual_refund, allow_partial=True,
                                      source=OrderRefund.REFUND_SOURCE_ADMIN, refund_as_giftcard=refund_as_giftcard,
                                      giftcard_expires=giftcard_expires, giftcard_conditions=giftcard_conditions,
                                      comment=gettext('Event canceled'))
@@ -272,8 +272,8 @@ def cancel_event(self, event: Event, subevent: int, auto_refund: bool,
             ocm.commit()
             refund_amount = o.payment_refund_sum - o.total
 
-            if auto_refund:
-                _try_auto_refund(o.pk, manual_refund=manual_refund, allow_partial=True,
+            if auto_refund or manual_refund:
+                _try_auto_refund(o.pk, auto_refund=auto_refund, manual_refund=manual_refund, allow_partial=True,
                                  source=OrderRefund.REFUND_SOURCE_ADMIN, refund_as_giftcard=refund_as_giftcard,
                                  giftcard_expires=giftcard_expires, giftcard_conditions=giftcard_conditions,
                                  comment=gettext('Event canceled'))

src/pretix/base/services/cart.py

@@ -54,11 +54,14 @@ from pretix.base.models import (
 )
 from pretix.base.models.event import SubEvent
 from pretix.base.models.orders import OrderFee
-from pretix.base.models.tax import TAXED_ZERO, TaxedPrice, TaxRule
+from pretix.base.models.tax import TaxRule
 from pretix.base.reldate import RelativeDateWrapper
 from pretix.base.services.checkin import _save_answers
 from pretix.base.services.locking import LockTimeoutException, NoLockManager
-from pretix.base.services.pricing import get_price
+from pretix.base.services.pricing import (
+    apply_discounts, get_line_price, get_listed_price, get_price,
+    is_included_for_free,
+)
 from pretix.base.services.quotas import QuotaAvailability
 from pretix.base.services.tasks import ProfiledEventTask
 from pretix.base.settings import PERSON_NAME_SCHEMES, LazyI18nStringList
@@ -145,13 +148,15 @@ error_messages = {
 
 
 class CartManager:
-    AddOperation = namedtuple('AddOperation', ('count', 'item', 'variation', 'price', 'voucher', 'quotas',
-                                               'addon_to', 'subevent', 'includes_tax', 'bundled', 'seat',
-                                               'price_before_voucher'))
+    AddOperation = namedtuple('AddOperation', ('count', 'item', 'variation', 'voucher', 'quotas',
+                                               'addon_to', 'subevent', 'bundled', 'seat', 'listed_price',
+                                               'price_after_voucher', 'custom_price_input',
+                                               'custom_price_input_is_net'))
     RemoveOperation = namedtuple('RemoveOperation', ('position',))
-    VoucherOperation = namedtuple('VoucherOperation', ('position', 'voucher', 'price'))
-    ExtendOperation = namedtuple('ExtendOperation', ('position', 'count', 'item', 'variation', 'price', 'voucher',
-                                                     'quotas', 'subevent', 'seat', 'price_before_voucher'))
+    VoucherOperation = namedtuple('VoucherOperation', ('position', 'voucher', 'price_after_voucher'))
+    ExtendOperation = namedtuple('ExtendOperation', ('position', 'count', 'item', 'variation', 'voucher',
+                                                     'quotas', 'subevent', 'seat', 'listed_price',
+                                                     'price_after_voucher'))
     order = {
         RemoveOperation: 10,
         VoucherOperation: 15,
@@ -178,8 +183,8 @@ class CartManager:
 
     @property
     def positions(self):
-        return CartPosition.objects.filter(
-            Q(cart_id=self.cart_id) & Q(event=self.event)
+        return self.event.cartposition_set.filter(
+            Q(cart_id=self.cart_id)
         ).select_related('item', 'subevent')
 
     def _is_seated(self, item, subevent):
@@ -390,7 +395,6 @@ class CartManager:
             'addons'
         ).order_by('-is_bundled')
         err = None
-        changed_prices = {}
         for cp in expired:
             removed_positions = {op.position.pk for op in self._operations if isinstance(op, self.RemoveOperation)}
             if cp.pk in removed_positions or (cp.addon_to_id and cp.addon_to_id in removed_positions):
@@ -401,40 +405,16 @@ class CartManager:
             if cp.is_bundled:
                 bundle = cp.addon_to.item.bundles.filter(bundled_item=cp.item, bundled_variation=cp.variation).first()
                 if bundle:
-                    price = bundle.designated_price or 0
+                    listed_price = bundle.designated_price or 0
                 else:
-                    price = cp.price
-
-                changed_prices[cp.pk] = price
-
-                if not cp.includes_tax:
-                    price = self._get_price(cp.item, cp.variation, cp.voucher, price, cp.subevent,
-                                            force_custom_price=True, cp_is_net=False)
-                    price = TaxedPrice(net=price.net, gross=price.net, rate=0, tax=0, name='')
-                else:
-                    price = self._get_price(cp.item, cp.variation, cp.voucher, price, cp.subevent,
-                                            force_custom_price=True)
-                pbv = TAXED_ZERO
+                    listed_price = cp.price
+                price_after_voucher = listed_price
             else:
-                bundled_sum = Decimal('0.00')
-                if not cp.addon_to_id:
-                    for bundledp in cp.addons.all():
-                        if bundledp.is_bundled:
-                            bundledprice = changed_prices.get(bundledp.pk, bundledp.price)
-                            bundled_sum += bundledprice
-
-                if not cp.includes_tax:
-                    price = self._get_price(cp.item, cp.variation, cp.voucher, cp.price, cp.subevent,
-                                            cp_is_net=True, bundled_sum=bundled_sum)
-                    price = TaxedPrice(net=price.net, gross=price.net, rate=Decimal('0'), tax=Decimal('0'), name='')
-                    pbv = self._get_price(cp.item, cp.variation, None, cp.price, cp.subevent,
-                                          cp_is_net=True, bundled_sum=bundled_sum)
-                    pbv = TaxedPrice(net=pbv.net, gross=pbv.net, rate=Decimal('0'), tax=Decimal('0'), name='')
+                listed_price = get_listed_price(cp.item, cp.variation, cp.subevent)
+                if cp.voucher:
+                    price_after_voucher = cp.voucher.calculate_price(listed_price)
                 else:
-                    price = self._get_price(cp.item, cp.variation, cp.voucher, cp.price, cp.subevent,
-                                            bundled_sum=bundled_sum)
-                    pbv = self._get_price(cp.item, cp.variation, None, cp.price, cp.subevent,
-                                          bundled_sum=bundled_sum)
+                    price_after_voucher = listed_price
 
             quotas = list(cp.quotas)
             if not quotas:
@@ -450,7 +430,8 @@ class CartManager:
 
             op = self.ExtendOperation(
                 position=cp, item=cp.item, variation=cp.variation, voucher=cp.voucher, count=1,
-                price=price, quotas=quotas, subevent=cp.subevent, seat=cp.seat, price_before_voucher=pbv
+                quotas=quotas, subevent=cp.subevent, seat=cp.seat, listed_price=listed_price,
+                price_after_voucher=price_after_voucher,
             )
             self._check_item_constraints(op)
 
@@ -489,26 +470,22 @@ class CartManager:
             if p.is_bundled:
                 continue
 
-            bundled_sum = Decimal('0.00')
-            if not p.addon_to_id:
-                for bundledp in p.addons.all():
-                    if bundledp.is_bundled:
-                        bundledprice = bundledp.price
-                        bundled_sum += bundledprice
-
-            price = self._get_price(p.item, p.variation, voucher, None, p.subevent, bundled_sum=bundled_sum)
-            """
-            if price.gross > p.price:
-                continue
-            """
+            if p.listed_price is None:
+                if p.addon_to_id and is_included_for_free(p.item, p.addon_to):
+                    listed_price = Decimal('0.00')
+                else:
+                    listed_price = get_listed_price(p.item, p.variation, p.subevent)
+            else:
+                listed_price = p.listed_price
+            price_after_voucher = voucher.calculate_price(listed_price)
 
             voucher_use_diff[voucher] += 1
-            ops.append((p.price - price.gross, self.VoucherOperation(p, voucher, price)))
+            ops.append((listed_price - price_after_voucher, self.VoucherOperation(p, voucher, price_after_voucher)))
 
         # If there are not enough voucher usages left for the full cart, let's apply them in the order that benefits
         # the user the most.
         ops.sort(key=lambda k: k[0], reverse=True)
-        self._operations += [k[1] for k in ops]\
+        self._operations += [k[1] for k in ops]
 
         if not voucher_use_diff:
             raise CartError(error_messages['voucher_no_match'])
@@ -575,7 +552,6 @@ class CartManager:
 
             # Fetch bundled items
             bundled = []
-            bundled_sum = Decimal('0.00')
             db_bundles = list(item.bundles.all())
             self._update_items_cache([b.bundled_item_id for b in db_bundles], [b.bundled_variation_id for b in db_bundles])
             for bundle in db_bundles:
@@ -595,28 +571,49 @@ class CartManager:
                 else:
                     bundle_quotas = []
 
-                if bundle.designated_price:
-                    bprice = self._get_price(bitem, bvar, None, bundle.designated_price, subevent, force_custom_price=True,
-                                             cp_is_net=False)
-                else:
-                    bprice = TAXED_ZERO
-                bundled_sum += bundle.designated_price * bundle.count
-
                 bop = self.AddOperation(
-                    count=bundle.count, item=bitem, variation=bvar, price=bprice,
-                    voucher=None, quotas=bundle_quotas, addon_to='FAKE', subevent=subevent,
-                    includes_tax=bool(bprice.rate), bundled=[], seat=None, price_before_voucher=bprice,
+                    count=bundle.count,
+                    item=bitem,
+                    variation=bvar,
+                    voucher=None,
+                    quotas=bundle_quotas,
+                    addon_to='FAKE',
+                    subevent=subevent,
+                    bundled=[],
+                    seat=None,
+                    listed_price=bundle.designated_price,
+                    price_after_voucher=bundle.designated_price,
+                    custom_price_input=None,
+                    custom_price_input_is_net=False,
                 )
                 self._check_item_constraints(bop, operations)
                 bundled.append(bop)
 
-            price = self._get_price(item, variation, voucher, i.get('price'), subevent, bundled_sum=bundled_sum)
-            pbv = self._get_price(item, variation, None, i.get('price'), subevent, bundled_sum=bundled_sum)
+            listed_price = get_listed_price(item, variation, subevent)
+            if voucher:
+                price_after_voucher = voucher.calculate_price(listed_price)
+            else:
+                price_after_voucher = listed_price
+            custom_price = None
+            if item.free_price and i.get('price'):
+                custom_price = Decimal(str(i.get('price')).replace(",", "."))
+                if custom_price > 100000000:
+                    raise ValueError('price_too_high')
 
             op = self.AddOperation(
-                count=i['count'], item=item, variation=variation, price=price, voucher=voucher, quotas=quotas,
-                addon_to=False, subevent=subevent, includes_tax=bool(price.rate), bundled=bundled, seat=seat,
-                price_before_voucher=pbv
+                count=i['count'],
+                item=item,
+                variation=variation,
+                voucher=voucher,
+                quotas=quotas,
+                addon_to=False,
+                subevent=subevent,
+                bundled=bundled,
+                seat=seat,
+                listed_price=listed_price,
+                price_after_voucher=price_after_voucher,
+                custom_price_input=custom_price,
+                custom_price_input_is_net=self.event.settings.display_net_prices,
             )
             self._check_item_constraints(op, operations)
             operations.append(op)
@@ -707,16 +704,27 @@ class CartManager:
             input_addons[cp.id][a['item'], a['variation']] = a.get('count', 1)
             selected_addons[cp.id, item.category_id][a['item'], a['variation']] = a.get('count', 1)
 
-            if price_included[cp.pk].get(item.category_id):
-                price = TAXED_ZERO
+            if is_included_for_free(item, cp):
+                listed_price = Decimal('0.00')
             else:
-                price = self._get_price(item, variation, None, a.get('price'), cp.subevent)
+                listed_price = get_listed_price(item, variation, cp.subevent)
+            custom_price = None
+            if item.free_price and a.get('price'):
+                custom_price = Decimal(str(a.get('price')).replace(",", "."))
+                if custom_price > 100000000:
+                    raise ValueError('price_too_high')
 
             # Fix positions with wrong price (TODO: happens out-of-cartmanager-transaction and therefore a little hacky)
             for ca in current_addons[cp][a['item'], a['variation']]:
-                if ca.price != price.gross:
-                    ca.price = price.gross
-                    ca.save(update_fields=['price'])
+                if ca.listed_price != listed_price:
+                    ca.listed_price = ca.listed_price
+                    ca.price_after_voucher = ca.price_after_voucher
+                    ca.save(update_fields=['listed_price', 'price_after_voucher'])
+                if ca.custom_price_input != custom_price:
+                    ca.custom_price_input = custom_price
+                    ca.custom_price_input_is_net = self.event.settings.display_net_prices
+                    ca.price_after_voucher = ca.price_after_voucher
+                    ca.save(update_fields=['custom_price_input', 'custom_price_input'])
 
             if a.get('count', 1) > len(current_addons[cp][a['item'], a['variation']]):
                 # This add-on is new, add it to the cart
@@ -725,9 +733,18 @@ class CartManager:
 
                 op = self.AddOperation(
                     count=a.get('count', 1) - len(current_addons[cp][a['item'], a['variation']]),
-                    item=item, variation=variation, price=price, voucher=None, quotas=quotas,
-                    addon_to=cp, subevent=cp.subevent, includes_tax=bool(price.rate), bundled=[], seat=None,
-                    price_before_voucher=None
+                    item=item,
+                    variation=variation,
+                    voucher=None,
+                    quotas=quotas,
+                    addon_to=cp,
+                    subevent=cp.subevent,
+                    bundled=[],
+                    seat=None,
+                    listed_price=listed_price,
+                    price_after_voucher=listed_price,
+                    custom_price_input=custom_price,
+                    custom_price_input_is_net=self.event.settings.display_net_prices,
                 )
                 self._check_item_constraints(op, operations)
                 operations.append(op)
@@ -972,13 +989,31 @@ class CartManager:
                         err = err or error_messages['seat_unavailable']
 
                     for k in range(available_count):
+                        line_price = get_line_price(
+                            price_after_voucher=op.price_after_voucher,
+                            custom_price_input=op.custom_price_input,
+                            custom_price_input_is_net=op.custom_price_input_is_net,
+                            tax_rule=op.item.tax_rule,
+                            invoice_address=self.invoice_address,
+                            bundled_sum=sum([pp.count * pp.price_after_voucher for pp in op.bundled]),
+                        )
                         cp = CartPosition(
-                            event=self.event, item=op.item, variation=op.variation,
-                            price=op.price.gross, expires=self._expiry, cart_id=self.cart_id,
-                            voucher=op.voucher, addon_to=op.addon_to if op.addon_to else None,
-                            subevent=op.subevent, includes_tax=op.includes_tax, seat=op.seat,
-                            override_tax_rate=op.price.rate,
-                            price_before_voucher=op.price_before_voucher.gross if op.price_before_voucher is not None else None
+                            event=self.event,
+                            item=op.item,
+                            variation=op.variation,
+                            expires=self._expiry,
+                            cart_id=self.cart_id,
+                            voucher=op.voucher,
+                            addon_to=op.addon_to if op.addon_to else None,
+                            subevent=op.subevent,
+                            seat=op.seat,
+                            listed_price=op.listed_price,
+                            price_after_voucher=op.price_after_voucher,
+                            custom_price_input=op.custom_price_input,
+                            custom_price_input_is_net=op.custom_price_input_is_net,
+                            line_price_gross=line_price.gross,
+                            tax_rate=line_price.tax,
+                            price=line_price.gross,
                         )
                         if self.event.settings.attendee_names_asked:
                             scheme = PERSON_NAME_SCHEMES.get(self.event.settings.name_scheme)
@@ -1007,12 +1042,26 @@ class CartManager:
                         if op.bundled:
                             cp.save()  # Needs to be in the database already so we have a PK that we can reference
                             for b in op.bundled:
+                                bline_price = (
+                                    b.item.tax_rule or TaxRule(rate=Decimal('0.00'))
+                                ).tax(b.listed_price, base_price_is='gross', invoice_address=self.invoice_address)  # todo compare with previous behaviour
                                 for j in range(b.count):
                                     new_cart_positions.append(CartPosition(
-                                        event=self.event, item=b.item, variation=b.variation,
-                                        price=b.price.gross, expires=self._expiry, cart_id=self.cart_id,
-                                        voucher=None, addon_to=cp, override_tax_rate=b.price.rate,
-                                        subevent=b.subevent, includes_tax=b.includes_tax, is_bundled=True
+                                        event=self.event,
+                                        item=b.item,
+                                        variation=b.variation,
+                                        expires=self._expiry, cart_id=self.cart_id,
+                                        voucher=None,
+                                        addon_to=cp,
+                                        subevent=b.subevent,
+                                        listed_price=b.listed_price,
+                                        price_after_voucher=b.price_after_voucher,
+                                        custom_price_input=b.custom_price_input,
+                                        custom_price_input_is_net=b.custom_price_input_is_net,
+                                        line_price_gross=bline_price.gross,
+                                        tax_rate=bline_price.tax,
+                                        price=bline_price.gross,
+                                        is_bundled=True
                                     ))
 
                         new_cart_positions.append(cp)
@@ -1024,11 +1073,11 @@ class CartManager:
                         op.position.delete()
                     elif available_count == 1:
                         op.position.expires = self._expiry
-                        op.position.price = op.price.gross
-                        if op.price_before_voucher is not None:
-                            op.position.price_before_voucher = op.price_before_voucher.gross
+                        op.position.listed_price = op.listed_price
+                        op.position.price_after_voucher = op.price_after_voucher
+                        # op.position.price will be updated by recompute_final_prices_and_taxes()
                         try:
-                            op.position.save(force_update=True)
+                            op.position.save(force_update=True, update_fields=['expires', 'listed_price', 'price_after_voucher'])
                         except DatabaseError:
                             # Best effort... The position might have been deleted in the meantime!
                             pass
@@ -1046,10 +1095,10 @@ class CartManager:
                         # be expected
                         continue
 
-                op.position.price_before_voucher = op.position.price
-                op.position.price = op.price.gross
+                op.position.price_after_voucher = op.price_after_voucher
                 op.position.voucher = op.voucher
-                op.position.save()
+                # op.posiiton.price will be set in recompute_final_prices_and_taxes
+                op.position.save(update_fields=['price_after_voucher', 'voucher'])
                 vouchers_ok[op.voucher] -= 1
 
         for p in new_cart_positions:
@@ -1074,6 +1123,35 @@ class CartManager:
 
         return False
 
+    def recompute_final_prices_and_taxes(self):
+        positions = sorted(list(self.positions), key=lambda op: -(op.addon_to_id or 0))
+        diff = Decimal('0.00')
+        for cp in positions:
+            if cp.listed_price is None:
+                # migration from old system? also used in unit tests
+                cp.update_listed_price_and_voucher()
+                cp.migrate_free_price_if_necessary()
+
+            cp.update_line_price(self.invoice_address, [b for b in positions if b.addon_to_id == cp.pk and b.is_bundled])
+
+        discount_results = apply_discounts(
+            self.event,
+            self._sales_channel,
+            [
+                (cp.item_id, cp.subevent_id, cp.line_price_gross, bool(cp.addon_to), cp.is_bundled, cp.listed_price - cp.price_after_voucher)
+                for cp in positions
+            ]
+        )
+
+        for cp, (new_price, discount) in zip(positions, discount_results):
+            if cp.price != new_price or cp.discount_id != (discount.pk if discount else None):
+                diff += new_price - cp.price
+                cp.price = new_price
+                cp.discount = discount
+                cp.save(update_fields=['price', 'discount'])
+
+        return diff
+
     def commit(self):
         self._check_presale_dates()
         self._check_max_cart_size()
@@ -1091,33 +1169,11 @@ class CartManager:
                 self.now_dt = now_dt
                 self._extend_expiry_of_valid_existing_positions()
                 err = self._perform_operations() or err
+                self.recompute_final_prices_and_taxes()
             if err:
                 raise CartError(err)
 
 
-def update_tax_rates(event: Event, cart_id: str, invoice_address: InvoiceAddress):
-    positions = CartPosition.objects.filter(
-        cart_id=cart_id, event=event
-    ).select_related('item', 'item__tax_rule')
-    totaldiff = Decimal('0.00')
-    for pos in positions:
-        if not pos.item.tax_rule:
-            continue
-        rate = pos.item.tax_rule.tax_rate_for(invoice_address)
-
-        if pos.tax_rate != rate:
-            if not pos.item.tax_rule.keep_gross_if_rate_changes:
-                current_net = pos.price - pos.tax_value
-                new_gross = pos.item.tax(current_net, base_price_is='net', invoice_address=invoice_address).gross
-                totaldiff += new_gross - pos.price
-                pos.price = new_gross
-            pos.includes_tax = rate != Decimal('0.00')
-            pos.override_tax_rate = rate
-            pos.save(update_fields=['price', 'includes_tax', 'override_tax_rate'])
-
-    return totaldiff
-
-
 def get_fees(event, request, total, invoice_address, provider, positions):
     from pretix.presale.views.cart import cart_session
 

src/pretix/base/services/checkin.py

@@ -41,8 +41,8 @@ import pytz
 from django.core.files import File
 from django.db import IntegrityError, transaction
 from django.db.models import (
-    BooleanField, Count, ExpressionWrapper, F, IntegerField, OuterRef, Q,
-    Subquery, Value,
+    BooleanField, Count, ExpressionWrapper, F, IntegerField, Max, Min,
+    OuterRef, Q, Subquery, Value,
 )
 from django.db.models.functions import Coalesce, TruncDate
 from django.dispatch import receiver
@@ -60,7 +60,7 @@ from pretix.helpers.jsonlogic import Logic
 from pretix.helpers.jsonlogic_boolalg import convert_to_dnf
 from pretix.helpers.jsonlogic_query import (
     Equal, GreaterEqualThan, GreaterThan, InList, LowerEqualThan, LowerThan,
-    tolerance,
+    MinutesSince, tolerance,
 )
 
 
@@ -210,19 +210,60 @@ def _logic_explain(rules, ev, rule_data):
         elif var == 'product' or var == 'variation':
             var_weights[vname] = (1000, 0)
             var_texts[vname] = _('Ticket type not allowed')
-        elif var in ('entries_number', 'entries_today', 'entries_days'):
+        elif var in ('entries_number', 'entries_today', 'entries_days', 'minutes_since_last_entry', 'minutes_since_first_entry', 'now_isoweekday'):
             w = {
+                'minutes_since_first_entry': 80,
+                'minutes_since_last_entry': 90,
                 'entries_days': 100,
                 'entries_number': 120,
                 'entries_today': 140,
+                'now_isoweekday': 210,
+            }
+            operator_weights = {
+                '==': 2,
+                '<': 1,
+                '<=': 1,
+                '>': 1,
+                '>=': 1,
+                '!=': 3,
             }
             l = {
+                'minutes_since_last_entry': _('time since last entry'),
+                'minutes_since_first_entry': _('time since first entry'),
                 'entries_days': _('number of days with an entry'),
                 'entries_number': _('number of entries'),
                 'entries_today': _('number of entries today'),
+                'now_isoweekday': _('week day'),
             }
             compare_to = rhs[0]
-            var_weights[vname] = (w[var], abs(compare_to - rule_data[var]))
+            penalty = 0
+
+            if var in ('minutes_since_last_entry', 'minutes_since_first_entry'):
+                is_comparison_to_minus_one = (
+                    (operator == '<' and compare_to <= 0) or
+                    (operator == '<=' and compare_to < 0) or
+                    (operator == '>=' and compare_to < 0) or
+                    (operator == '>' and compare_to <= 0) or
+                    (operator == '==' and compare_to == -1) or
+                    (operator == '!=' and compare_to == -1)
+                )
+                if is_comparison_to_minus_one:
+                    # These are "technical" comparisons without real meaning, we don't want to show them.
+                    penalty = 1000
+
+            var_weights[vname] = (w[var] + operator_weights.get(operator, 0) + penalty, abs(compare_to - rule_data[var]))
+
+            if var == 'now_isoweekday':
+                compare_to = {
+                    1: _('Monday'),
+                    2: _('Tuesday'),
+                    3: _('Wednesday'),
+                    4: _('Thursday'),
+                    5: _('Friday'),
+                    6: _('Saturday'),
+                    7: _('Sunday'),
+                }.get(compare_to, compare_to)
+
             if operator == '==':
                 var_texts[vname] = _('{variable} is not {value}').format(variable=l[var], value=compare_to)
             elif operator in ('<', '<='):
@@ -231,6 +272,7 @@ def _logic_explain(rules, ev, rule_data):
                 var_texts[vname] = _('Minimum {variable} exceeded').format(variable=l[var])
             elif operator == '!=':
                 var_texts[vname] = _('{variable} is {value}').format(variable=l[var], value=compare_to)
+
         else:
             raise ValueError(f'Unknown variable {var}')
 
@@ -289,6 +331,11 @@ class LazyRuleVars:
     def now(self):
         return self._dt
 
+    @property
+    def now_isoweekday(self):
+        tz = self._clist.event.timezone
+        return self._dt.astimezone(tz).isoweekday()
+
     @property
     def product(self):
         return self._position.item_id
@@ -315,6 +362,30 @@ class LazyRuleVars:
                 day=TruncDate('datetime', tzinfo=tz)
             ).values('day').distinct().count()
 
+    @cached_property
+    def minutes_since_last_entry(self):
+        tz = self._clist.event.timezone
+        with override(tz):
+            last_entry = self._position.checkins.filter(list=self._clist, type=Checkin.TYPE_ENTRY).order_by('datetime').last()
+            if last_entry is None:
+                # Returning "None" would be "correct", but the handling of "None" in JSON logic is inconsistent
+                # between platforms (None<1 is true on some, but not all), we rather choose something that is at least
+                # consistent.
+                return -1
+            return (now() - last_entry.datetime).total_seconds() // 60
+
+    @cached_property
+    def minutes_since_first_entry(self):
+        tz = self._clist.event.timezone
+        with override(tz):
+            last_entry = self._position.checkins.filter(list=self._clist, type=Checkin.TYPE_ENTRY).order_by('datetime').first()
+            if last_entry is None:
+                # Returning "None" would be "correct", but the handling of "None" in JSON logic is inconsistent
+                # between platforms (None<1 is true on some, but not all), we rather choose something that is at least
+                # consistent.
+                return -1
+            return (now() - last_entry.datetime).total_seconds() // 60
+
 
 class SQLLogic:
     """
@@ -399,6 +470,8 @@ class SQLLogic:
         elif operator == 'var':
             if values[0] == 'now':
                 return Value(now().astimezone(pytz.UTC))
+            elif values[0] == 'now_isoweekday':
+                return Value(now().astimezone(self.list.event.timezone).isoweekday())
             elif values[0] == 'product':
                 return F('item_id')
             elif values[0] == 'variation':
@@ -450,6 +523,38 @@ class SQLLogic:
                     Value(0),
                     output_field=IntegerField()
                 )
+            elif values[0] == 'minutes_since_last_entry':
+                sq_last_entry = Subquery(
+                    Checkin.objects.filter(
+                        position_id=OuterRef('pk'),
+                        type=Checkin.TYPE_ENTRY,
+                        list_id=self.list.pk,
+                    ).values('position_id').order_by().annotate(
+                        m=Max('datetime')
+                    ).values('m')
+                )
+
+                return Coalesce(
+                    MinutesSince(sq_last_entry),
+                    Value(-1),
+                    output_field=IntegerField()
+                )
+            elif values[0] == 'minutes_since_first_entry':
+                sq_last_entry = Subquery(
+                    Checkin.objects.filter(
+                        position_id=OuterRef('pk'),
+                        type=Checkin.TYPE_ENTRY,
+                        list_id=self.list.pk,
+                    ).values('position_id').order_by().annotate(
+                        m=Min('datetime')
+                    ).values('m')
+                )
+
+                return Coalesce(
+                    MinutesSince(sq_last_entry),
+                    Value(-1),
+                    output_field=IntegerField()
+                )
         else:
             raise ValueError(f'Unknown operator {operator}')
 

src/pretix/base/services/orders.py

@@ -35,6 +35,7 @@
 
 import json
 import logging
+import sys
 from collections import Counter, defaultdict, namedtuple
 from datetime import datetime, time, timedelta
 from decimal import Decimal
@@ -53,7 +54,7 @@ from django.db.transaction import get_connection
 from django.dispatch import receiver
 from django.utils.functional import cached_property
 from django.utils.timezone import make_aware, now
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext as _, gettext_lazy
 from django_scopes import scopes_disabled
 
 from pretix.api.models import OAuthApplication
@@ -68,7 +69,6 @@ from pretix.base.models import (
     Voucher,
 )
 from pretix.base.models.event import SubEvent
-from pretix.base.models.items import ItemBundle
 from pretix.base.models.orders import (
     InvoiceAddress, OrderFee, OrderRefund, generate_secret,
 )
@@ -86,7 +86,9 @@ from pretix.base.services.mail import SendMailException
 from pretix.base.services.memberships import (
     create_membership, validate_memberships_in_order,
 )
-from pretix.base.services.pricing import get_price
+from pretix.base.services.pricing import (
+    apply_discounts, get_listed_price, get_price,
+)
 from pretix.base.services.quotas import QuotaAvailability
 from pretix.base.services.tasks import ProfiledEventTask, ProfiledTask
 from pretix.base.signals import (
@@ -384,7 +386,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, cancel_invoice=True):
+                  cancellation_fee=None, keep_fees=None, cancel_invoice=True, comment=None):
     """
     Mark this order as canceled
     :param order: The order to change
@@ -481,7 +483,7 @@ def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device
                     Voucher.objects.filter(pk=position.voucher.pk).update(redeemed=Greatest(0, F('redeemed') - 1))
 
         order.log_action('pretix.event.order.canceled', user=user, auth=api_token or oauth_application or device,
-                         data={'cancellation_fee': cancellation_fee})
+                         data={'cancellation_fee': cancellation_fee, 'comment': comment})
         order.cancellation_requests.all().delete()
 
         order.create_transactions()
@@ -489,7 +491,7 @@ def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device
         if send_mail:
             email_template = order.event.settings.mail_text_order_canceled
             with language(order.locale, order.event.settings.region):
-                email_context = get_email_context(event=order.event, order=order)
+                email_context = get_email_context(event=order.event, order=order, comment=comment or "")
                 email_subject = _('Order canceled: %(code)s') % {'code': order.code}
                 try:
                     order.send_mail(
@@ -565,7 +567,8 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
     _check_date(event, now_dt)
 
     products_seen = Counter()
-    changed_prices = {}
+    q_avail = Counter()
+    v_avail = Counter()
     v_budget = {}
     deleted_positions = set()
     seats_seen = set()
@@ -582,6 +585,8 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
             cp.delete()
 
     sorted_positions = sorted(positions, key=lambda s: -int(s.is_bundled))
+
+    # Check availability
     for i, cp in enumerate(sorted_positions):
         if cp.pk in deleted_positions:
             continue
@@ -601,29 +606,17 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
             break
 
         if cp.voucher:
-            redeemed_in_carts = CartPosition.objects.filter(
-                Q(voucher=cp.voucher) & Q(event=event) & Q(expires__gte=now_dt)
-            ).exclude(pk=cp.pk)
-            v_avail = cp.voucher.max_usages - cp.voucher.redeemed - redeemed_in_carts.count()
-            if v_avail < 1:
+            if cp.voucher not in v_avail:
+                redeemed_in_carts = CartPosition.objects.filter(
+                    Q(voucher=cp.voucher) & Q(event=event) & Q(expires__gte=now_dt)
+                ).exclude(cart_id=cp.cart_id)
+                v_avail[cp.voucher] = cp.voucher.max_usages - cp.voucher.redeemed - redeemed_in_carts.count()
+            v_avail[cp.voucher] -= 1
+            if v_avail[cp.voucher] < 0:
                 err = err or error_messages['voucher_redeemed']
                 delete(cp)
                 continue
 
-            if cp.voucher.budget is not None:
-                if cp.voucher not in v_budget:
-                    v_budget[cp.voucher] = cp.voucher.budget - cp.voucher.budget_used()
-                disc = cp.price_before_voucher - cp.price
-                if disc > v_budget[cp.voucher]:
-                    new_disc = max(0, v_budget[cp.voucher])
-                    cp.price = cp.price + (disc - new_disc)
-                    cp.save()
-                    err = err or error_messages['voucher_budget_used']
-                    v_budget[cp.voucher] -= new_disc
-                    continue
-                else:
-                    v_budget[cp.voucher] -= disc
-
         if cp.subevent and cp.subevent.presale_start and now_dt < cp.subevent.presale_start:
             err = err or error_messages['some_subevent_not_started']
             delete(cp)
@@ -662,7 +655,6 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
                 cp.voucher is None or not cp.voucher.show_hidden_items or not cp.voucher.applies_to(cp.item, cp.variation)
         ) and not cp.is_bundled:
             delete(cp)
-            cp.delete()
             err = error_messages['voucher_required']
             break
 
@@ -671,56 +663,14 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
             # time, since we absolutely can not overbook a seat.
             if not cp.seat.is_available(ignore_cart=cp, ignore_voucher_id=cp.voucher_id, sales_channel=sales_channel):
                 err = err or error_messages['seat_unavailable']
-                cp.delete()
+                delete(cp)
                 continue
 
         if cp.expires >= now_dt and not cp.voucher:
             # Other checks are not necessary
             continue
 
-        max_discount = None
-        if cp.price_before_voucher is not None and cp.voucher in v_budget:
-            current_discount = cp.price_before_voucher - cp.price
-            max_discount = max(v_budget[cp.voucher] + current_discount, 0)
-
-        try:
-            if cp.is_bundled:
-                try:
-                    bundle = cp.addon_to.item.bundles.get(bundled_item=cp.item, bundled_variation=cp.variation)
-                    bprice = bundle.designated_price or 0
-                except ItemBundle.DoesNotExist:
-                    bprice = cp.price
-                except ItemBundle.MultipleObjectsReturned:
-                    raise OrderError("Invalid product configuration (duplicate bundle)")
-                price = get_price(cp.item, cp.variation, cp.voucher, bprice, cp.subevent, custom_price_is_net=False,
-                                  custom_price_is_tax_rate=cp.override_tax_rate,
-                                  invoice_address=address, force_custom_price=True, max_discount=max_discount)
-                pbv = get_price(cp.item, cp.variation, None, bprice, cp.subevent, custom_price_is_net=False,
-                                custom_price_is_tax_rate=cp.override_tax_rate,
-                                invoice_address=address, force_custom_price=True, max_discount=max_discount)
-                changed_prices[cp.pk] = bprice
-            else:
-                bundled_sum = Decimal('0.00')
-                if not cp.addon_to_id:
-                    for bundledp in cp.addons.all():
-                        if bundledp.is_bundled:
-                            bundled_sum += changed_prices.get(bundledp.pk, bundledp.price)
-
-                price = get_price(cp.item, cp.variation, cp.voucher, cp.price, cp.subevent, custom_price_is_net=False,
-                                  addon_to=cp.addon_to, invoice_address=address, bundled_sum=bundled_sum,
-                                  max_discount=max_discount, custom_price_is_tax_rate=cp.override_tax_rate)
-                pbv = get_price(cp.item, cp.variation, None, cp.price, cp.subevent, custom_price_is_net=False,
-                                addon_to=cp.addon_to, invoice_address=address, bundled_sum=bundled_sum,
-                                max_discount=max_discount, custom_price_is_tax_rate=cp.override_tax_rate)
-        except TaxRule.SaleNotAllowed:
-            err = err or error_messages['country_blocked']
-            cp.delete()
-            continue
-
-        if max_discount is not None:
-            v_budget[cp.voucher] = v_budget[cp.voucher] + current_discount - (pbv.gross - price.gross)
-
-        if price is False or len(quotas) == 0:
+        if len(quotas) == 0:
             err = err or error_messages['unavailable']
             delete(cp)
             continue
@@ -742,42 +692,88 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
                 delete(cp)
                 continue
 
-        if pbv is not None and pbv.gross != price.gross:
-            cp.price_before_voucher = pbv.gross
-        else:
-            cp.price_before_voucher = None
-
-        if price.gross != cp.price and not (cp.item.free_price and cp.price > price.gross):
-            cp.price = price.gross
-            cp.includes_tax = bool(price.rate)
-            cp.save()
-            err = err or error_messages['price_changed']
-            continue
-
         quota_ok = True
 
         ignore_all_quotas = cp.expires >= now_dt or (
-            cp.voucher and (cp.voucher.allow_ignore_quota or (cp.voucher.block_quota and cp.voucher.quota is None)))
+            cp.voucher and (
+                cp.voucher.allow_ignore_quota or (cp.voucher.block_quota and cp.voucher.quota is None)
+            )
+        )
 
         if not ignore_all_quotas:
             for quota in quotas:
                 if cp.voucher and cp.voucher.block_quota and cp.voucher.quota_id == quota.pk:
                     continue
-                avail = quota.availability(now_dt)
-                if avail[0] != Quota.AVAILABILITY_OK:
-                    # This quota is sold out/currently unavailable, so do not sell this at all
+                if quota not in q_avail:
+                    avail = quota.availability(now_dt)
+                    q_avail[quota] = avail[1] if avail[1] is not None else sys.maxsize
+                q_avail[quota] -= 1
+                if q_avail[quota] < 0:
                     err = err or error_messages['unavailable']
                     quota_ok = False
                     break
 
-        if quota_ok:
-            cp.expires = now_dt + timedelta(
-                minutes=event.settings.get('reservation_time', as_type=int))
-            cp.save()
-        else:
+        if not quota_ok:
             # Sorry, can't let you keep that!
             delete(cp)
 
+    # Check prices
+    sorted_positions = [cp for cp in sorted_positions if cp.pk and cp.pk not in deleted_positions]
+    old_total = sum(cp.price for cp in sorted_positions)
+    for i, cp in enumerate(sorted_positions):
+        if cp.listed_price is None:
+            # migration from pre-discount cart positions
+            cp.update_listed_price_and_voucher(max_discount=None)
+            cp.migrate_free_price_if_necessary()
+
+        # deal with max discount
+        max_discount = None
+        if cp.voucher and cp.voucher.budget is not None:
+            if cp.voucher not in v_budget:
+                v_budget[cp.voucher] = cp.voucher.budget - cp.voucher.budget_used()
+            max_discount = max(v_budget[cp.voucher], 0)
+
+        if cp.expires < now_dt or cp.listed_price is None:
+            # Guarantee on listed price is expired
+            cp.update_listed_price_and_voucher(max_discount=max_discount)
+        elif cp.voucher:
+            cp.update_listed_price_and_voucher(max_discount=max_discount, voucher_only=True)
+
+        if max_discount is not None:
+            v_budget[cp.voucher] = v_budget[cp.voucher] - (cp.listed_price - cp.price_after_voucher)
+
+        try:
+            cp.update_line_price(address, [b for b in sorted_positions if b.addon_to_id == cp.pk and b.is_bundled and b.pk and b.pk not in deleted_positions])
+        except TaxRule.SaleNotAllowed:
+            err = err or error_messages['country_blocked']
+            delete(cp)
+            continue
+
+    sorted_positions = [cp for cp in sorted_positions if cp.pk and cp.pk not in deleted_positions]
+    discount_results = apply_discounts(
+        event,
+        sales_channel,
+        [
+            (cp.item_id, cp.subevent_id, cp.line_price_gross, bool(cp.addon_to), cp.is_bundled, cp.listed_price - cp.price_after_voucher)
+            for cp in sorted_positions
+        ]
+    )
+    for cp, (new_price, discount) in zip(sorted_positions, discount_results):
+        if cp.price != new_price or cp.discount_id != (discount.pk if discount else None):
+            cp.price = new_price
+            cp.discount = discount
+            cp.save(update_fields=['price', 'discount'])
+
+    new_total = sum(cp.price for cp in sorted_positions)
+    if old_total != new_total:
+        err = err or error_messages['price_changed']
+
+    # Store updated positions
+    for cp in sorted_positions:
+        cp.expires = now_dt + timedelta(
+            minutes=event.settings.get('reservation_time', as_type=int))
+        cp.save()
+
     if err:
         raise OrderError(err, errargs)
 
@@ -934,7 +930,7 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
 def _order_placed_email(event: Event, order: Order, pprov: BasePaymentProvider, email_template, log_entry: str,
                         invoice, payment: OrderPayment, is_free=False):
     email_context = get_email_context(event=event, order=order, payment=payment if pprov else None)
-    email_subject = _('Your order: %(code)s') % {'code': order.code}
+    email_subject = gettext_lazy('Your order: {code}')
     try:
         order.send_mail(
             email_subject, email_template, email_context,
@@ -952,7 +948,7 @@ def _order_placed_email(event: Event, order: Order, pprov: BasePaymentProvider,
 
 def _order_placed_email_attendee(event: Event, order: Order, position: OrderPosition, email_template, log_entry: str, is_free=False):
     email_context = get_email_context(event=event, order=order, position=position)
-    email_subject = _('Your event registration: %(code)s') % {'code': order.code}
+    email_subject = gettext_lazy('Your event registration: {code}')
 
     try:
         position.send_mail(
@@ -1467,7 +1463,7 @@ class OrderChangeManager:
         if self.order.event.settings.invoice_include_free or position.price != Decimal('0.00'):
             self._invoice_dirty = True
 
-    def add_position(self, item: Item, variation: ItemVariation, price: Decimal, addon_to: Order = None,
+    def add_position(self, item: Item, variation: ItemVariation, price: Decimal, addon_to: OrderPosition = None,
                      subevent: SubEvent = None, seat: Seat = None, membership: Membership = None):
         if isinstance(seat, str):
             if not seat:
@@ -1492,6 +1488,8 @@ class OrderChangeManager:
 
         if price is None:
             raise OrderError(self.error_messages['product_invalid'])
+        if item.variations.exists() and not variation:
+            raise OrderError(self.error_messages['product_without_variation'])
         if not addon_to and item.category and item.category.is_addon:
             raise OrderError(self.error_messages['addon_to_required'])
         if addon_to:
@@ -1527,6 +1525,8 @@ class OrderChangeManager:
             self._invoice_dirty = True
 
         self._operations.append(self.SplitOperation(position))
+        for a in position.addons.all():
+            self._operations.append(self.SplitOperation(a))
 
     def set_addons(self, addons):
         if self._operations:
@@ -1854,16 +1854,14 @@ class OrderChangeManager:
                 op.position.item = op.item
                 op.position.variation = op.variation
                 op.position._calculate_tax()
-                if op.position.price_before_voucher is not None and op.position.voucher and not op.position.addon_to_id:
-                    op.position.price_before_voucher = max(
-                        op.position.price,
-                        get_price(
-                            op.position.item, op.position.variation,
-                            subevent=op.position.subevent,
-                            custom_price=op.position.price,
-                            invoice_address=self._invoice_address
-                        ).gross
-                    )
+
+                if op.position.voucher_budget_use is not None and op.position.voucher and not op.position.addon_to_id:
+                    listed_price = get_listed_price(op.position.item, op.position.variation, op.position.subevent)
+                    if not op.position.item.tax_rule or op.position.item.tax_rule.price_includes_tax:
+                        price_after_voucher = max(op.position.price, op.position.voucher.calculate_price(listed_price))
+                    else:
+                        price_after_voucher = max(op.position.price - op.position.tax_value, op.position.voucher.calculate_price(listed_price))
+                    op.position.voucher_budget_use = max(listed_price - price_after_voucher, Decimal('0.00'))
                 assign_ticket_secret(
                     event=self.event, position=op.position, force_invalidate=False, save=False
                 )
@@ -1904,16 +1902,13 @@ class OrderChangeManager:
                 assign_ticket_secret(
                     event=self.event, position=op.position, force_invalidate=False, save=False
                 )
-                if op.position.price_before_voucher is not None and op.position.voucher and not op.position.addon_to_id:
-                    op.position.price_before_voucher = max(
-                        op.position.price,
-                        get_price(
-                            op.position.item, op.position.variation,
-                            subevent=op.position.subevent,
-                            custom_price=op.position.price,
-                            invoice_address=self._invoice_address
-                        ).gross
-                    )
+                if op.position.voucher_budget_use is not None and op.position.voucher and not op.position.addon_to_id:
+                    listed_price = get_listed_price(op.position.item, op.position.variation, op.position.subevent)
+                    if not op.position.item.tax_rule or op.position.item.tax_rule.price_includes_tax:
+                        price_after_voucher = max(op.position.price, op.position.voucher.calculate_price(listed_price))
+                    else:
+                        price_after_voucher = max(op.position.price - op.position.tax_value, op.position.voucher.calculate_price(listed_price))
+                    op.position.voucher_budget_use = max(listed_price - price_after_voucher, Decimal('0.00'))
                 op.position.save()
             elif isinstance(op, self.AddFeeOperation):
                 self.order.log_action('pretix.event.order.changed.addfee', user=self.user, auth=self.auth, data={
@@ -2383,7 +2378,8 @@ def perform_order(self, event: Event, payment_provider: str, positions: List[str
 _unset = object()
 
 
-def _try_auto_refund(order, manual_refund=False, allow_partial=False, source=OrderRefund.REFUND_SOURCE_BUYER,
+def _try_auto_refund(order, auto_refund=True, manual_refund=False, allow_partial=False,
+                     source=OrderRefund.REFUND_SOURCE_BUYER,
                      refund_as_giftcard=False, giftcard_expires=_unset, giftcard_conditions=None, comment=None):
     notify_admin = False
     error = False
@@ -2393,9 +2389,9 @@ def _try_auto_refund(order, manual_refund=False, allow_partial=False, source=Ord
     if refund_amount <= Decimal('0.00'):
         return
 
+    can_auto_refund_sum = 0
+
     if refund_as_giftcard:
-        proposals = {}
-        can_auto_refund = True
         can_auto_refund_sum = refund_amount
         with transaction.atomic():
             giftcard = order.event.organizer.issued_gift_cards.create(
@@ -2435,42 +2431,41 @@ def _try_auto_refund(order, manual_refund=False, allow_partial=False, source=Ord
                 if r.state != OrderRefund.REFUND_STATE_DONE:
                     notify_admin = True
 
-    else:
+    elif auto_refund:
         proposals = order.propose_auto_refunds(refund_amount)
         can_auto_refund_sum = sum(proposals.values())
-        can_auto_refund = (allow_partial and can_auto_refund_sum) or can_auto_refund_sum == refund_amount
-    if can_auto_refund:
-        for p, value in proposals.items():
-            with transaction.atomic():
-                r = order.refunds.create(
-                    payment=p,
-                    source=source,
-                    state=OrderRefund.REFUND_STATE_CREATED,
-                    amount=value,
-                    comment=comment,
-                    provider=p.provider
-                )
-                order.log_action('pretix.event.order.refund.created', {
-                    'local_id': r.local_id,
-                    'provider': r.provider,
-                })
-
-            try:
-                r.payment_provider.execute_refund(r)
-            except PaymentException as e:
+        if (allow_partial and can_auto_refund_sum) or can_auto_refund_sum == refund_amount:
+            for p, value in proposals.items():
                 with transaction.atomic():
-                    r.state = OrderRefund.REFUND_STATE_FAILED
-                    r.save()
-                    order.log_action('pretix.event.order.refund.failed', {
+                    r = order.refunds.create(
+                        payment=p,
+                        source=source,
+                        state=OrderRefund.REFUND_STATE_CREATED,
+                        amount=value,
+                        comment=comment,
+                        provider=p.provider
+                    )
+                    order.log_action('pretix.event.order.refund.created', {
                         'local_id': r.local_id,
                         'provider': r.provider,
-                        'error': str(e)
                     })
-                error = True
-                notify_admin = True
-            else:
-                if r.state not in (OrderRefund.REFUND_STATE_TRANSIT, OrderRefund.REFUND_STATE_DONE):
+
+                try:
+                    r.payment_provider.execute_refund(r)
+                except PaymentException as e:
+                    with transaction.atomic():
+                        r.state = OrderRefund.REFUND_STATE_FAILED
+                        r.save()
+                        order.log_action('pretix.event.order.refund.failed', {
+                            'local_id': r.local_id,
+                            'provider': r.provider,
+                            'error': str(e)
+                        })
+                    error = True
                     notify_admin = True
+                else:
+                    if r.state not in (OrderRefund.REFUND_STATE_TRANSIT, OrderRefund.REFUND_STATE_DONE):
+                        notify_admin = True
 
     if refund_amount - can_auto_refund_sum > Decimal('0.00'):
         if manual_refund:
@@ -2502,15 +2497,15 @@ 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,
-                 cancel_invoice=True):
+                 device=None, cancellation_fee=None, try_auto_refund=False, refund_as_giftcard=False,
+                 email_comment=None, refund_comment=None, cancel_invoice=True):
     try:
         try:
             ret = _cancel_order(order, user, send_mail, api_token, device, oauth_application,
-                                cancellation_fee, cancel_invoice=cancel_invoice)
+                                cancellation_fee, cancel_invoice=cancel_invoice, comment=email_comment)
             if try_auto_refund:
                 _try_auto_refund(order, refund_as_giftcard=refund_as_giftcard,
-                                 comment=comment)
+                                 comment=refund_comment)
             return ret
         except LockTimeoutException:
             self.retry()

src/pretix/base/services/pricing.py

@@ -20,39 +20,30 @@
 # <https://www.gnu.org/licenses/>.
 #
 from decimal import Decimal
+from typing import List, Optional, Tuple
+
+from django.db.models import Q
+from django.utils.timezone import now
 
 from pretix.base.decimal import round_decimal
 from pretix.base.models import (
     AbstractPosition, InvoiceAddress, Item, ItemAddOn, ItemVariation, Voucher,
 )
-from pretix.base.models.event import SubEvent
+from pretix.base.models.event import Event, SubEvent
 from pretix.base.models.tax import TAXED_ZERO, TaxedPrice, TaxRule
 
 
 def get_price(item: Item, variation: ItemVariation = None,
               voucher: Voucher = None, custom_price: Decimal = None,
               subevent: SubEvent = None, custom_price_is_net: bool = False,
-              custom_price_is_tax_rate: Decimal=None,
+              custom_price_is_tax_rate: Decimal = None,
               addon_to: AbstractPosition = None, invoice_address: InvoiceAddress = None,
               force_custom_price: bool = False, bundled_sum: Decimal = Decimal('0.00'),
               max_discount: Decimal = None, tax_rule=None) -> TaxedPrice:
-    if addon_to:
-        try:
-            iao = addon_to.item.addons.get(addon_category_id=item.category_id)
-            if iao.price_included:
-                return TAXED_ZERO
-        except ItemAddOn.DoesNotExist:
-            pass
+    if is_included_for_free(item, addon_to):
+        return TAXED_ZERO
 
-    price = item.default_price
-    if subevent and item.pk in subevent.item_price_overrides:
-        price = subevent.item_price_overrides[item.pk]
-
-    if variation is not None:
-        if variation.default_price is not None:
-            price = variation.default_price
-        if subevent and variation.pk in subevent.var_price_overrides:
-            price = subevent.var_price_overrides[variation.pk]
+    price = get_listed_price(item, variation, subevent)
 
     if voucher:
         price = voucher.calculate_price(price, max_discount=max_discount)
@@ -85,10 +76,10 @@ def get_price(item: Item, variation: ItemVariation = None,
         price = tax_rule.tax(price, invoice_address=invoice_address)
 
         if custom_price_is_net:
-            price = tax_rule.tax(max(custom_price, price.net), base_price_is='net',
+            price = tax_rule.tax(max(custom_price, price.net), base_price_is='net', override_tax_rate=price.rate,
                                  invoice_address=invoice_address, subtract_from_gross=bundled_sum)
         else:
-            price = tax_rule.tax(max(custom_price, price.gross), base_price_is='gross', gross_price_is_tax_rate=custom_price_is_tax_rate,
+            price = tax_rule.tax(max(custom_price, price.gross), base_price_is='gross', override_tax_rate=price.rate,
                                  invoice_address=invoice_address, subtract_from_gross=bundled_sum)
     else:
         price = tax_rule.tax(price, invoice_address=invoice_address, subtract_from_gross=bundled_sum)
@@ -98,3 +89,83 @@ def get_price(item: Item, variation: ItemVariation = None,
     price.tax = price.gross - price.net
 
     return price
+
+
+def is_included_for_free(item: Item, addon_to: AbstractPosition):
+    if addon_to:
+        try:
+            iao = addon_to.item.addons.get(addon_category_id=item.category_id)
+            if iao.price_included:
+                return True
+        except ItemAddOn.DoesNotExist:
+            pass
+    return False
+
+
+def get_listed_price(item: Item, variation: ItemVariation = None, subevent: SubEvent = None) -> Decimal:
+    price = item.default_price
+    if subevent and item.pk in subevent.item_price_overrides:
+        price = subevent.item_price_overrides[item.pk]
+
+    if variation is not None:
+        if variation.default_price is not None:
+            price = variation.default_price
+        if subevent and variation.pk in subevent.var_price_overrides:
+            price = subevent.var_price_overrides[variation.pk]
+
+    return price
+
+
+def get_line_price(price_after_voucher: Decimal, custom_price_input: Decimal, custom_price_input_is_net: bool,
+                   tax_rule: TaxRule, invoice_address: InvoiceAddress, bundled_sum: Decimal) -> TaxedPrice:
+    if not tax_rule:
+        tax_rule = TaxRule(
+            name='',
+            rate=Decimal('0.00'),
+            price_includes_tax=True,
+            eu_reverse_charge=False,
+        )
+    if custom_price_input:
+        price = tax_rule.tax(price_after_voucher, invoice_address=invoice_address)
+
+        if custom_price_input_is_net:
+            price = tax_rule.tax(max(custom_price_input, price.net), base_price_is='net', override_tax_rate=price.rate,
+                                 invoice_address=invoice_address, subtract_from_gross=bundled_sum)
+        else:
+            price = tax_rule.tax(max(custom_price_input, price.gross), base_price_is='gross', override_tax_rate=price.rate,
+                                 invoice_address=invoice_address, subtract_from_gross=bundled_sum)
+    else:
+        price = tax_rule.tax(price_after_voucher, invoice_address=invoice_address, subtract_from_gross=bundled_sum)
+
+    return price
+
+
+def apply_discounts(event: Event, sales_channel: str,
+                    positions: List[Tuple[int, Optional[int], Decimal, bool, bool]]) -> List[Decimal]:
+    """
+    Applies any dynamic discounts to a cart
+
+    :param event: Event the cart belongs to
+    :param sales_channel: Sales channel the cart was created with
+    :param positions: Tuple of the form ``(item_id, subevent_id, line_price_gross, is_addon_to, is_bundled, voucher_discount)``
+    :return: A list of ``(new_gross_price, discount)`` tuples in the same order as the input
+    """
+    new_prices = {}
+
+    discount_qs = event.discounts.filter(
+        Q(available_from__isnull=True) | Q(available_from__lte=now()),
+        Q(available_until__isnull=True) | Q(available_until__gte=now()),
+        sales_channels__contains=sales_channel,
+        active=True,
+    ).prefetch_related('condition_limit_products').order_by('position', 'pk')
+    for discount in discount_qs:
+        result = discount.apply({
+            idx: (item_id, subevent_id, line_price_gross, is_addon_to, voucher_discount)
+            for idx, (item_id, subevent_id, line_price_gross, is_addon_to, is_bundled, voucher_discount) in enumerate(positions)
+            if not is_bundled and idx not in new_prices
+        })
+        for k in result.keys():
+            result[k] = (result[k], discount)
+        new_prices.update(result)
+
+    return [new_prices.get(idx, (p[2], None)) for idx, p in enumerate(positions)]

src/pretix/base/settings.py

@@ -86,9 +86,9 @@ def primary_font_kwargs():
     from pretix.presale.style import get_fonts
 
     choices = [('Open Sans', 'Open Sans')]
-    choices += [
-        (a, {"title": a, "data": v}) for a, v in get_fonts().items()
-    ]
+    choices += sorted([
+        (a, {"title": a, "data": v}) for a, v in get_fonts().items() if not v.get('pdf_only', False)
+    ], key=lambda a: a[0])
     return {
         'choices': choices,
     }
@@ -101,7 +101,6 @@ def restricted_plugin_kwargs():
         (p.module, p.name) for p in get_all_plugins(None)
         if (
             not p.name.startswith('.') and
-            getattr(p, 'visible', True) and
             getattr(p, 'restricted', False) and
             not hasattr(p, 'is_available')  # this means you should not really use restricted and is_available
         )
@@ -556,9 +555,11 @@ DEFAULTS = {
         'serializer_class': serializers.IntegerField,
         'serializer_kwargs': dict(
             min_value=0,
+            max_value=60 * 24 * 7,
         ),
         'form_kwargs': dict(
             min_value=0,
+            max_value=60 * 24 * 7,
             label=_("Reservation period"),
             required=True,
             help_text=_("The number of minutes the items in a user's cart are reserved for this user."),
@@ -1196,7 +1197,20 @@ DEFAULTS = {
             help_text=_("If you ask for a phone number, explain why you do so and what you will use the phone number for.")
         )
     },
-
+    'show_checkin_number_user': {
+        'default': 'False',
+        'type': bool,
+        'serializer_class': serializers.BooleanField,
+        'form_class': forms.BooleanField,
+        'form_kwargs': dict(
+            label=_("Show number of check-ins to customer"),
+            help_text=_('With this option enabled, your customers will be able how many times they entered '
+                        'the event. This is usually not necessary, but might be useful in combination with tickets '
+                        'that are usable a specific number of times, so customers can see how many times they have '
+                        'already been used. Exits or failed scans will not be counted, and the user will not see '
+                        'the different check-in lists.'),
+        )
+    },
     'ticket_download': {
         'default': 'False',
         'type': bool,
@@ -1902,6 +1916,8 @@ Your {event} team"""))
 
 your order {code} for {event} has been canceled.
 
+{comment}
+
 You can view the details of your order at
 {url}
 

src/pretix/base/signals.py

@@ -399,7 +399,10 @@ 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 the first argument. In contrast to ``order_changed``, this signal is sent out if information
+of an order or any of it's position is changed that concerns user input, such as attendee names,
+invoice addresses or question answers. If the order changes in a material way, such as changed
+products, prices, or tax rates, ``order_changed`` is used instead.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
@@ -409,7 +412,10 @@ 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 the first argument. In contrast to ``modified``, this signal is sent out if the order or
+any of its positions changes in a material way, such as changed products, prices, or tax rates,
+``order_changed`` is used instead. If "only" user input is changed, such as attendee names,
+invoice addresses or question answers, ``order_modified`` is used instead.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """

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

@@ -90,13 +90,16 @@
                         {% for groupkey, positions in cart %}
                             <tr>
                                 <td>
-                                    {% if not groupkey.4 %} {# is addon #}
+                                    {% if not groupkey.4 %} {# is not addon #}
                                         {{ positions|length }}x
                                     {% endif %}
                                 </td>
                                 <td>
                                     {% if groupkey.4 %} {# is addon #}
                                         +
+                                        {% if positions|length > 1 %}
+                                            {{ positions|length }}x
+                                        {% endif %}
                                     {% endif %}
                                     {{ groupkey.0.name }}{% if groupkey.1 %} – {{ groupkey.1.value }}{% endif %}
                                     {% if groupkey.2 %} {# subevent #}

src/pretix/base/timeline.py

@@ -217,6 +217,30 @@ def timeline_for_event(event, subevent=None):
                     })
                 ))
 
+    for d in event.discounts.filter(Q(available_from__isnull=False) | Q(available_until__isnull=False)):
+        if d.available_from:
+            tl.append(TimelineEvent(
+                event=event, subevent=subevent,
+                datetime=d.available_from,
+                description=pgettext_lazy('timeline', 'Discount "{name}" becomes active').format(name=str(d)),
+                edit_url=reverse('control:event.items.discounts.edit', kwargs={
+                    'event': event.slug,
+                    'organizer': event.organizer.slug,
+                    'discount': d.pk,
+                })
+            ))
+        if d.available_until:
+            tl.append(TimelineEvent(
+                event=event, subevent=subevent,
+                datetime=d.available_until,
+                description=pgettext_lazy('timeline', 'Discount "{name}" becomes inactive').format(name=str(d)),
+                edit_url=reverse('control:event.items.discounts.edit', kwargs={
+                    'event': event.slug,
+                    'organizer': event.organizer.slug,
+                    'discount': d.pk,
+                })
+            ))
+
     for p in event.items.filter(Q(available_from__isnull=False) | Q(available_until__isnull=False)):
         if p.available_from:
             tl.append(TimelineEvent(

src/pretix/base/views/mixins.py

@@ -58,7 +58,7 @@ class BaseQuestionsViewMixin:
     def _positions_for_questions(self):
         raise NotImplementedError()
 
-    def get_question_override_sets(self, position):
+    def get_question_override_sets(self, position, index):
         return []
 
     def question_form_kwargs(self, cr):
@@ -72,7 +72,7 @@ class BaseQuestionsViewMixin:
         submitted at once.
         """
         formlist = []
-        for cr in self._positions_for_questions:
+        for idx, cr in enumerate(self._positions_for_questions):
             cartpos = cr if isinstance(cr, CartPosition) else None
             orderpos = cr if isinstance(cr, OrderPosition) else None
 
@@ -96,7 +96,7 @@ class BaseQuestionsViewMixin:
                 ))
             )
 
-            override_sets = self.get_question_override_sets(cr)
+            override_sets = self.get_question_override_sets(cr, idx)
             for overrides in override_sets:
                 for question_name, question_field in form.fields.items():
                     if hasattr(question_field, 'question'):

src/pretix/control/forms/discounts.py

@@ -0,0 +1,109 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from decimal import Decimal
+
+from django import forms
+from django.utils.translation import gettext_lazy as _
+
+from pretix.base.channels import get_all_sales_channels
+from pretix.base.forms import I18nModelForm
+from pretix.base.forms.widgets import SplitDateTimePickerWidget
+from pretix.base.models import Discount
+from pretix.control.forms import ItemMultipleChoiceField, SplitDateTimeField
+
+
+class DiscountForm(I18nModelForm):
+    class Meta:
+        model = Discount
+        localized_fields = '__all__'
+        fields = [
+            'active',
+            'internal_name',
+            'sales_channels',
+            'available_from',
+            'available_until',
+            'subevent_mode',
+            'condition_all_products',
+            'condition_limit_products',
+            'condition_min_count',
+            'condition_min_value',
+            'condition_apply_to_addons',
+            'condition_ignore_voucher_discounted',
+            'benefit_discount_matching_percent',
+            'benefit_only_apply_to_cheapest_n_matches',
+        ]
+        field_classes = {
+            'available_from': SplitDateTimeField,
+            'available_until': SplitDateTimeField,
+            'condition_limit_products': ItemMultipleChoiceField,
+        }
+        widgets = {
+            'subevent_mode': forms.RadioSelect,
+            'available_from': SplitDateTimePickerWidget(),
+            'available_until': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_available_from_0'}),
+            'condition_limit_products': forms.CheckboxSelectMultiple(attrs={
+                'data-inverse-dependency': '<[name$=all_products]',
+                'class': 'scrolling-multiple-choice',
+            }),
+            'benefit_only_apply_to_cheapest_n_matches': forms.NumberInput(
+                attrs={
+                    'data-display-dependency': '#id_condition_min_count',
+                }
+            )
+        }
+
+    def __init__(self, *args, **kwargs):
+        self.event = kwargs['event']
+        super().__init__(*args, **kwargs)
+
+        self.fields['sales_channels'] = forms.MultipleChoiceField(
+            label=_('Sales channels'),
+            required=True,
+            choices=(
+                (c.identifier, c.verbose_name) for c in get_all_sales_channels().values()
+                if c.discounts_supported
+            ),
+            widget=forms.CheckboxSelectMultiple,
+        )
+        self.fields['condition_limit_products'].queryset = self.event.items.all()
+        self.fields['condition_min_count'].required = False
+        self.fields['condition_min_count'].widget.is_required = False
+        self.fields['condition_min_value'].required = False
+        self.fields['condition_min_value'].widget.is_required = False
+
+        if not self.event.has_subevents:
+            del self.fields['subevent_mode']
+
+    def clean(self):
+        d = super().clean()
+        if d.get('condition_min_value') and d.get('benefit_only_apply_to_cheapest_n_matches'):
+            # field is hidden by JS
+            d['benefit_only_apply_to_cheapest_n_matches'] = None
+        if d.get('subevent_mode') == Discount.SUBEVENT_MODE_DISTINCT and d.get('condition_min_value'):
+            # field is hidden by JS
+            d['condition_min_value'] = Decimal('0.00')
+
+        if d.get('condition_min_count') is None:
+            d['condition_min_count'] = 0
+        if d.get('condition_min_value') is None:
+            d['condition_min_value'] = Decimal('0.00')
+        return d

src/pretix/control/forms/event.py

@@ -523,6 +523,7 @@ class EventSettingsForm(SettingsForm):
         'last_order_modification_date',
         'allow_modifications_after_checkin',
         'checkout_show_copy_answers_button',
+        'show_checkin_number_user',
         'primary_color',
         'theme_color_success',
         'theme_color_danger',
@@ -1074,7 +1075,7 @@ class MailSettingsForm(SettingsForm):
         'mail_text_order_free': ['event', 'order'],
         'mail_text_order_free_attendee': ['event', 'order', 'position'],
         'mail_text_order_changed': ['event', 'order'],
-        'mail_text_order_canceled': ['event', 'order'],
+        'mail_text_order_canceled': ['event', 'order', 'comment'],
         'mail_text_order_expire_warning': ['event', 'order'],
         'mail_text_order_custom_mail': ['event', 'order'],
         'mail_text_download_reminder': ['event', 'order'],

src/pretix/control/forms/filter.py

@@ -255,7 +255,6 @@ class OrderFilterForm(FilterForm):
                 | Q(pk__in=matching_invoices)
                 | Q(pk__in=matching_positions)
                 | Q(pk__in=matching_invoice_addresses)
-                | Q(pk__in=matching_invoices)
             )
             for recv, q in order_search_filter_q.send(sender=getattr(self, 'event', None), query=u):
                 mainq = mainq | q
@@ -1860,11 +1859,11 @@ class VoucherFilterForm(FilterForm):
         for i in self.event.items.prefetch_related('variations').all():
             variations = list(i.variations.all())
             if variations:
-                choices.append((str(i.pk), _('{product} – Any variation').format(product=i.name)))
+                choices.append((str(i.pk), _('{product} – Any variation').format(product=str(i))))
                 for v in variations:
-                    choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (i.name, v.value)))
+                    choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (str(i), v.value)))
             else:
-                choices.append((str(i.pk), i.name))
+                choices.append((str(i.pk), str(i)))
         for q in self.event.quotas.all():
             choices.append(('q-%d' % q.pk, _('Any product in quota "{quota}"').format(quota=q)))
         self.fields['itemvar'].choices = choices
@@ -2121,7 +2120,7 @@ class CheckinFilterForm(FilterForm):
         self.event = kwargs.pop('event')
         super().__init__(*args, **kwargs)
 
-        self.fields['device'].queryset = self.event.organizer.devices.all()
+        self.fields['device'].queryset = self.event.organizer.devices.all().order_by('device_id')
         self.fields['gate'].queryset = self.event.organizer.gates.all()
 
         self.fields['checkin_list'].queryset = self.event.checkin_lists.all()
@@ -2142,11 +2141,11 @@ class CheckinFilterForm(FilterForm):
         for i in self.event.items.prefetch_related('variations').all():
             variations = list(i.variations.all())
             if variations:
-                choices.append((str(i.pk), _('{product} – Any variation').format(product=i.name)))
+                choices.append((str(i.pk), _('{product} – Any variation').format(product=str(i))))
                 for v in variations:
-                    choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (i.name, v.value)))
+                    choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (str(i), v.value)))
             else:
-                choices.append((str(i.pk), i.name))
+                choices.append((str(i.pk), str(i)))
         self.fields['itemvar'].choices = choices
 
     def filter_qs(self, qs):

src/pretix/control/forms/item.py

@@ -434,6 +434,9 @@ class ItemCreateForm(I18nModelForm):
         if self.cleaned_data.get('copy_from'):
             for question in self.cleaned_data['copy_from'].questions.all():
                 question.items.add(instance)
+                question.log_action('pretix.event.question.changed', user=self.user, data={
+                    'item_added': self.instance.pk
+                })
             for a in self.cleaned_data['copy_from'].addons.all():
                 instance.addons.create(addon_category=a.addon_category, min_count=a.min_count, max_count=a.max_count,
                                        price_included=a.price_included, position=a.position,
@@ -563,7 +566,7 @@ class ItemUpdateForm(I18nModelForm):
             if d['tax_rule'] and d['tax_rule'].rate > 0:
                 self.add_error(
                     'tax_rule',
-                    _("Gift card products should not be associated with non-zero tax rates since sales tax will be applied when the gift card is redeemed.")
+                    _("Gift card products should use a tax rule with a rate of 0 percent since sales tax will be applied when the gift card is redeemed.")
                 )
             if d['admission']:
                 self.add_error(

src/pretix/control/forms/orders.py

@@ -167,6 +167,12 @@ class CancelForm(ForceQuotaConfirmationForm):
         initial=True,
         required=False
     )
+    comment = forms.CharField(
+        label=_('Comment (will be sent to the user)'),
+        help_text=_('Will be included in the notification email when the respective placeholder is present in the '
+                    'configured email text.'),
+        required=False,
+    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -482,6 +488,9 @@ class OrderPositionChangeForm(forms.Form):
         self.fields['tax_rule'].queryset = instance.event.tax_rules.all()
         self.fields['tax_rule'].label_from_instance = self.taxrule_label_from_instance
 
+        if instance.addon_to_id:
+            del self.fields['operation_split']
+
         if not instance.seat and not (
                 instance.item.seat_category_mappings.filter(subevent=instance.subevent).exists()
         ):
@@ -746,16 +755,17 @@ class EventCancelForm(forms.Form):
     auto_refund = forms.BooleanField(
         label=_('Automatically refund money if possible'),
         initial=True,
-        required=False
+        required=False,
+        help_text=_('Only available for payment method that support automatic refunds.')
     )
     manual_refund = forms.BooleanField(
-        label=_('Create manual refund if the payment method does not support automatic refunds'),
-        widget=forms.CheckboxInput(attrs={'data-display-dependency': '#id_auto_refund'}),
+        label=_('Create refund in the manual refund to-do list'),
         initial=True,
         required=False,
-        help_text=_('If checked, all payments with a payment method not supporting automatic refunds will be on your '
-                    'manual refund to-do list. Do not check if you want to refund some of the orders by offsetting '
-                    'with different orders or issuing gift cards.')
+        help_text=_('Manual refunds will be created which will be listed in the manual refund to-do list. '
+                    'When combined with the automatic refund functionally, only payments with a payment method not '
+                    'supporting automatic refunds will be on your manual refund to-do list. Do not check if you want '
+                    'to refund some of the orders by offsetting with different orders or issuing gift cards.')
     )
     refund_as_giftcard = forms.BooleanField(
         label=_('Refund order value to a gift card instead instead of the original payment method'),
@@ -840,7 +850,7 @@ class EventCancelForm(forms.Form):
             label=_("Subject"),
             required=True,
             widget_kwargs={'attrs': {'data-display-dependency': '#id_send'}},
-            initial=_('Canceled: {event}'),
+            initial=LazyI18nString.from_gettext(gettext_noop('Canceled: {event}')),
             widget=I18nTextInput,
             locales=self.event.settings.get('locales'),
         )
@@ -866,7 +876,7 @@ class EventCancelForm(forms.Form):
         self.fields['send_waitinglist_subject'] = I18nFormField(
             label=_("Subject"),
             required=True,
-            initial=_('Canceled: {event}'),
+            initial=LazyI18nString.from_gettext(gettext_noop('Canceled: {event}')),
             widget=I18nTextInput,
             widget_kwargs={'attrs': {'data-display-dependency': '#id_send_waitinglist'}},
             locales=self.event.settings.get('locales'),

src/pretix/control/forms/organizer.py

@@ -39,6 +39,7 @@ from django import forms
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db.models import Q
+from django.forms.utils import ErrorDict
 from django.utils.crypto import get_random_string
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
@@ -268,6 +269,69 @@ class DeviceForm(forms.ModelForm):
         }
 
 
+class DeviceBulkEditForm(forms.ModelForm):
+
+    def __init__(self, *args, **kwargs):
+        organizer = kwargs.pop('organizer')
+        self.mixed_values = kwargs.pop('mixed_values')
+        self.queryset = kwargs.pop('queryset')
+        super().__init__(*args, **kwargs)
+        self.fields['limit_events'].queryset = organizer.events.all().order_by(
+            '-has_subevents', '-date_from'
+        )
+        self.fields['gate'].queryset = organizer.gates.all()
+
+    def clean(self):
+        d = super().clean()
+        if self.prefix + '__events' in self.data.getlist('_bulk') and not d['all_events'] and not d['limit_events']:
+            raise ValidationError(_('Your device will not have access to anything, please select some events.'))
+
+        return d
+
+    class Meta:
+        model = Device
+        fields = ['all_events', 'limit_events', 'security_profile', 'gate']
+        widgets = {
+            'limit_events': forms.CheckboxSelectMultiple(attrs={
+                'data-inverse-dependency': '#id_all_events',
+                'class': 'scrolling-multiple-choice scrolling-multiple-choice-large',
+            }),
+        }
+        field_classes = {
+            'limit_events': SafeEventMultipleChoiceField
+        }
+
+    def save(self, commit=True):
+        objs = list(self.queryset)
+        fields = set()
+
+        check_map = {
+            'all_events': '__events',
+            'limit_events': '__events',
+        }
+        for k in self.fields:
+            cb_val = self.prefix + check_map.get(k, k)
+            if cb_val not in self.data.getlist('_bulk'):
+                continue
+
+            fields.add(k)
+            for obj in objs:
+                if k == 'limit_events':
+                    getattr(obj, k).set(self.cleaned_data[k])
+                else:
+                    setattr(obj, k, self.cleaned_data[k])
+
+        if fields:
+            Device.objects.bulk_update(objs, [f for f in fields if f != 'limit_events'], 200)
+
+    def full_clean(self):
+        if len(self.data) == 0:
+            # form wasn't submitted
+            self._errors = ErrorDict()
+            return
+        super().full_clean()
+
+
 class OrganizerSettingsForm(SettingsForm):
     timezone = forms.ChoiceField(
         choices=((a, a) for a in common_timezones),

src/pretix/control/forms/vouchers.py

@@ -385,6 +385,12 @@ class VoucherBulkForm(VoucherForm):
         if vouchers.exists():
             raise ValidationError(_('A voucher with one of these codes already exists.'))
 
+        codes_seen = set()
+        for c in data['codes']:
+            if c in codes_seen:
+                raise ValidationError(_('The voucher code {code} appears in your list twice.').format(code=c))
+            codes_seen.add(c)
+
         if data.get('send') and not all([data.get('send_subject'), data.get('send_message'), data.get('send_recipients')]):
             raise ValidationError(_('If vouchers should be sent by email, subject, message and recipients need to be specified.'))
 

src/pretix/control/logdisplay.py

@@ -341,13 +341,12 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
         'pretix.event.order.paid': _('The order has been marked as paid.'),
         'pretix.event.order.cancellationrequest.deleted': _('The cancellation request has been deleted.'),
         'pretix.event.order.refunded': _('The order has been refunded.'),
-        'pretix.event.order.canceled': _('The order has been canceled.'),
         'pretix.event.order.reactivated': _('The order has been reactivated.'),
         'pretix.event.order.deleted': _('The test mode order {code} has been deleted.'),
         'pretix.event.order.placed': _('The order has been created.'),
         'pretix.event.order.placed.require_approval': _('The order requires approval before it can continue to be processed.'),
         'pretix.event.order.approved': _('The order has been approved.'),
-        'pretix.event.order.denied': _('The order has been denied.'),
+        'pretix.event.order.denied': _('The order has been denied (comment: "{comment}").'),
         'pretix.event.order.contact.changed': _('The email address has been changed from "{old_email}" '
                                                 'to "{new_email}".'),
         'pretix.event.order.contact.confirmed': _('The email address has been confirmed to be working (the user clicked on a link '
@@ -423,6 +422,7 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
         'pretix.voucher.added': _('The voucher has been created.'),
         'pretix.voucher.sent': _('The voucher has been sent to {recipient}.'),
         'pretix.voucher.added.waitinglist': _('The voucher has been created and sent to a person on the waiting list.'),
+        'pretix.voucher.expired.waitinglist': _('The voucher has been set to expire because the recipient removed themselves from the waiting list.'),
         'pretix.voucher.changed': _('The voucher has been changed.'),
         'pretix.voucher.deleted': _('The voucher has been deleted.'),
         'pretix.voucher.redeemed': _('The voucher has been redeemed in order {order_code}.'),
@@ -449,6 +449,9 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
         'pretix.event.question.added': _('The question has been added.'),
         'pretix.event.question.deleted': _('The question has been deleted.'),
         'pretix.event.question.changed': _('The question has been changed.'),
+        'pretix.event.discount.added': _('The discount has been added.'),
+        'pretix.event.discount.deleted': _('The discount has been deleted.'),
+        'pretix.event.discount.changed': _('The discount has been changed.'),
         'pretix.event.taxrule.added': _('The tax rule has been added.'),
         'pretix.event.taxrule.deleted': _('The tax rule has been deleted.'),
         'pretix.event.taxrule.changed': _('The tax rule has been changed.'),
@@ -531,6 +534,27 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
             bleach.clean(logentry.parsed_data.get('msg'), tags=[], strip=True)
         )
 
+    if logentry.action_type == 'pretix.event.order.canceled':
+        comment = logentry.parsed_data.get('comment')
+        if comment:
+            return _('The order has been canceled (comment: "{comment}").').format(comment=comment)
+        else:
+            return _('The order has been canceled.')
+
+    if logentry.action_type in ('pretix.control.views.checkin.reverted', 'pretix.event.checkin.reverted'):
+        if 'list' in data:
+            try:
+                checkin_list = sender.checkin_lists.get(pk=data.get('list')).name
+            except CheckinList.DoesNotExist:
+                checkin_list = _("(unknown)")
+        else:
+            checkin_list = _("(unknown)")
+
+        return _('The check-in of position #{posid} on list "{list}" has been reverted.').format(
+            posid=data.get('positionid'),
+            list=checkin_list,
+        )
+
     if sender and logentry.action_type.startswith('pretix.event.checkin'):
         return _display_checkin(sender, logentry)
 
@@ -559,20 +583,6 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
             list=checkin_list
         )
 
-    if logentry.action_type in ('pretix.control.views.checkin.reverted', 'pretix.event.checkin.reverted'):
-        if 'list' in data:
-            try:
-                checkin_list = sender.checkin_lists.get(pk=data.get('list')).name
-            except CheckinList.DoesNotExist:
-                checkin_list = _("(unknown)")
-        else:
-            checkin_list = _("(unknown)")
-
-        return _('The check-in of position #{posid} on list "{list}" has been reverted.').format(
-            posid=data.get('positionid'),
-            list=checkin_list,
-        )
-
     if logentry.action_type == 'pretix.team.member.added':
         return _('{user} has been added to the team.').format(user=data.get('email'))
 

src/pretix/control/middleware.py

@@ -142,6 +142,18 @@ class PermissionMiddleware:
             return redirect(reverse('control:user.settings.2fa'))
 
         if 'event' in url.kwargs and 'organizer' in url.kwargs:
+            if url.kwargs['organizer'] == '-' and url.kwargs['event'] == '-':
+                # This is a hack that just takes the user to ANY event. It's useful to link to features in support
+                # or documentation.
+                ev = request.user.get_events_with_any_permission().order_by('-date_from').first()
+                if not ev:
+                    raise Http404(_("The selected event was not found or you "
+                                    "have no permission to administrate it."))
+                k = dict(url.kwargs)
+                k['organizer'] = ev.organizer.slug
+                k['event'] = ev.slug
+                return redirect(reverse(url.view_name, kwargs=k, args=url.args))
+
             with scope(organizer=None):
                 request.event = Event.objects.filter(
                     slug=url.kwargs['event'],
@@ -157,6 +169,17 @@ class PermissionMiddleware:
             else:
                 request.eventpermset = request.user.get_event_permission_set(request.organizer, request.event)
         elif 'organizer' in url.kwargs:
+            if url.kwargs['organizer'] == '-':
+                # This is a hack that just takes the user to ANY organizer. It's useful to link to features in support
+                # or documentation.
+                org = request.user.get_organizers_with_any_permission().first()
+                if not org:
+                    raise Http404(_("The selected organizer was not found or you "
+                                    "have no permission to administrate it."))
+                k = dict(url.kwargs)
+                k['organizer'] = org.slug
+                return redirect(reverse(url.view_name, kwargs=k, args=url.args))
+
             request.organizer = Organizer.objects.filter(
                 slug=url.kwargs['organizer'],
             ).first()

src/pretix/control/navigation.py

@@ -186,6 +186,14 @@ def get_event_navigation(request: HttpRequest):
                     }),
                     'active': 'event.items.questions' in url.url_name,
                 },
+                {
+                    'label': _('Discounts'),
+                    'url': reverse('control:event.items.discounts', kwargs={
+                        'event': request.event.slug,
+                        'organizer': request.event.organizer.slug,
+                    }),
+                    'active': 'event.items.discounts' in url.url_name,
+                },
             ]
         })
 

src/pretix/control/templates/pretixcontrol/boxoffice/payment.html

@@ -57,7 +57,11 @@
         {% endif %}
     {% elif payment_info.payment_type == "izettle" %}
         <dt>{% trans "Payment provider" %}</dt>
-        <dd>iZettle</dd>
+        <dd>Zettle</dd>
+        {% if payment_info.payment_data.reference %}
+            <dt>{% trans "Payment reference" %}</dt>
+            <dd>{{ payment_info.payment_data.reference }}</dd>
+        {% endif %}
         <dt>{% trans "Payment Application" %}</dt>
         <dd>{{ payment_info.payment_data.applicationName }}</dd>
         <dt>{% trans "Card Entry Mode" %}</dt>

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

@@ -93,6 +93,17 @@
                         </div>
 
                     </div>
+                    <div class="alert alert-info" v-if="missingItems.length">
+                        <p>
+                            {% trans "Your rule always filters by product or variation, but the following products or variations are not contained in any of your rule parts so people with these tickets will not get in:" %}
+                        </p>
+                        <ul>
+                            <li v-for="h in missingItems">{{ "{" }}{h}{{ "}" }}</li>
+                        </ul>
+                        <p>
+                            {% trans "Please double-check if this was intentional." %}
+                        </p>
+                    </div>
                 </div>
                 <div class="disabled-withoutjs sr-only">
                     {{ form.rules }}
@@ -105,6 +116,7 @@
             </button>
         </div>
     </form>
+    {{ items|json_script:"items" }}
 
     {% compress js %}
         <script type="text/javascript" src="{% static "vuejs/vue.js" %}"></script>
@@ -118,6 +130,7 @@
         <script type="text/javascript" src="{% static "d3/d3-transition.v2.js" %}"></script>
         <script type="text/javascript" src="{% static "d3/d3-drag.v2.js" %}"></script>
         <script type="text/javascript" src="{% static "d3/d3-zoom.v2.js" %}"></script>
+        <script type="text/javascript" src="{% static "pretixcontrol/js/ui/checkinrules/jsonlogic-boolalg.js" %}"></script>
         <script type="text/vue" src="{% static 'pretixcontrol/js/ui/checkinrules/datetimefield.vue' %}"></script>
         <script type="text/vue" src="{% static 'pretixcontrol/js/ui/checkinrules/timefield.vue' %}"></script>
         <script type="text/vue" src="{% static 'pretixcontrol/js/ui/checkinrules/lookup-select2.vue' %}"></script>

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

@@ -56,7 +56,7 @@
             {% endfor %}
         </div>
         <p class="">
-            <a href="{% url "control:events" %}?ordering=date_from&status=-date_to" class="">
+            <a href="{% url "control:events" %}?ordering=date_from&status=date_past" class="">
                 {% trans "View all recent events" %}
             </a>
         </p>

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

@@ -0,0 +1,36 @@
+{% load i18n %}
+{% if show_meta %}
+    {% if plugin.author %}
+        <p class="meta text-muted">
+            {% blocktrans trimmed with a=plugin.author %}
+                by <em>{{ a }}</em>
+            {% endblocktrans %}</p>
+    {% endif %}
+{% endif %}
+<p>{{ plugin.description|safe }}</p>
+{% if plugin.restricted and plugin.module not in request.event.settings.allowed_restricted_plugins %}
+    <p class="text-muted">
+        <span class="fa fa-info-circle" aria-hidden="true"></span>
+        {% trans "This plugin needs to be enabled by a system administrator for your account." %}
+    </p>
+{% endif %}
+{% if plugin.app.compatibility_errors %}
+    <div class="alert alert-warning">
+        {% trans "This plugin cannot be enabled for the following reasons:" %}
+        <ul>
+            {% for e in plugin.app.compatibility_errors %}
+                <li>{{ e }}</li>
+            {% endfor %}
+        </ul>
+    </div>
+{% endif %}
+{% if plugin.app.compatibility_warnings %}
+    <div class="alert alert-warning">
+        {% trans "This plugin reports the following problems:" %}
+        <ul>
+            {% for e in plugin.app.compatibility_warnings %}
+                <li>{{ e }}</li>
+            {% endfor %}
+        </ul>
+    </div>
+{% endif %}

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

@@ -1,8 +1,15 @@
 {% extends "pretixcontrol/event/settings_base.html" %}
 {% load i18n %}
+{% load static %}
 {% load bootstrap3 %}
 {% block inside %}
-    <h1>{% trans "Installed plugins" %}</h1>
+    <h1>{% trans "Available plugins" %}</h1>
+    <p>
+        {% blocktrans trimmed %}
+            On this page, you can choose plugins you want to enable for your event. Plugins might bring additional
+            software functionality, connect your event to third-party services, or apply other forms of customizations.
+        {% endblocktrans %}
+    </p>
     <form action="" method="post" class="form-horizontal form-plugins">
         {% csrf_token %}
         {% if "success" in request.GET %}
@@ -11,71 +18,71 @@
             </div>
         {% endif %}
         <div class="tabbed-form">
-            {% for cat, catlabel, plist in plugins %}
+            {% for cat, catlabel, plist, has_pictures in plugins %}
                 <fieldset>
                     <legend>{{ catlabel }}</legend>
-                    <div class="table-responsive">
-                        <table class="table">
-                            {% for plugin in plist %}
-                                <tr class="{% if plugin.app.compatibility_errors %}warning{% elif plugin.module in plugins_active %}success{% else %}default{% endif %}">
-                                    <td>
-                                        <strong>{{ plugin.name }}</strong>
-                                        {% if plugin.author %}
-                                            <p class="meta text-muted">
-                                                {% blocktrans trimmed with v=plugin.version a=plugin.author %}
-                                                    Version {{ v }} by <em>{{ a }}</em>
-                                                {% endblocktrans %}</p>
-                                        {% else %}
-                                            <p class="meta text-muted">
-                                                {% blocktrans trimmed with v=plugin.version a=plugin.author %}
-                                                    Version {{ v }}
-                                                {% endblocktrans %}</p>
+                    <div class="plugin-list">
+                        {% for plugin in plist %}
+                            <div class="plugin-container {% if plugin.featured %}featured-plugin{% endif %}">
+                            {% if plugin.featured %}
+                               <div class="panel panel-default">
+                                    <div class="panel-body">
+                            {% endif %}
+                                        <div class="plugin-text">
+                                        {% if plugin.featured or plugin.experimental %}
+                                            <p class="text-muted">
+                                            {% if plugin.featured %}
+                                                <span class="fa fa-thumbs-up" aria-hidden="true"></span>
+                                                {% trans "Top recommendation" %}
+                                            {% endif %}
+                                            {% if plugin.experimental %}
+                                                <span class="fa fa-flask" aria-hidden="true"></span>
+                                                {% trans "Experimental feature" %}
+                                            {% endif %}
+                                            </p>
                                         {% endif %}
-                                        <p>{{ plugin.description }}</p>
-                                        {% if plugin.restricted and plugin.module not in request.event.settings.allowed_restricted_plugins %}
-                                            <span class="text-muted">
-                                                {% trans "This plugin needs to be enabled by a system administrator for your account." %}
-                                            </span>
+                                        {% if plugin.picture %}
+                                            <p><img src="{% static plugin.picture %}" class="plugin-picture"></p>
                                         {% endif %}
+                                            <h4>
+                                                {{ plugin.name }}
+                                                {% if show_meta %}
+                                                    <span class="text-muted text-sm">{{ plugin.version }}</span>
+                                                {% endif %}
+                                                {% if plugin.module in plugins_active %}
+                                                    <span class="label label-success">
+                                                        <span class="fa fa-check" aria-hidden="true"></span>
+                                                        {% trans "Active" %}
+                                                    </span>
+                                                {% endif %}
+                                            </h4>
+                                            {% include "pretixcontrol/event/fragment_plugin_description.html" with plugin=plugin %}
+                                        </div>
                                         {% if plugin.app.compatibility_errors %}
-                                            <div class="alert alert-warning">
-                                                {% trans "This plugin cannot be enabled for the following reasons:" %}
-                                                <ul>
-                                                    {% for e in plugin.app.compatibility_errors %}
-                                                        <li>{{ e }}</li>
-                                                    {% endfor %}
-                                                </ul>
+                                            <div class="plugin-action">
+                                                <span class="text-muted">{% trans "Incompatible" %}</span>
+                                            </div>
+                                        {% elif plugin.restricted and plugin.module not in request.event.settings.allowed_restricted_plugins %}
+                                            <div class="plugin-action">
+                                                <span class="text-muted">{% trans "Not available" %}</span>
+                                            </div>
+                                        {% elif plugin.module in plugins_active %}
+                                            <div class="plugin-action flip">
+                                                <button class="btn btn-default{% if plugin.featured %} btn-lg{% endif %}" name="plugin:{{ plugin.module }}"
+                                                        value="disable">{% trans "Disable" %}</button>
+                                            </div>
+                                        {% else %}
+                                            <div class="plugin-action flip">
+                                                <button class="btn btn-primary{% if plugin.featured %} btn-lg{% endif %}" name="plugin:{{ plugin.module }}"
+                                                        value="enable">{% trans "Enable" %}</button>
                                             </div>
                                         {% endif %}
-                                        {% if plugin.app.compatibility_warnings %}
-                                            <div class="alert alert-warning">
-                                                {% trans "This plugin reports the following problems:" %}
-                                                <ul>
-                                                    {% for e in plugin.app.compatibility_warnings %}
-                                                        <li>{{ e }}</li>
-                                                    {% endfor %}
-                                                </ul>
-                                            </div>
-                                        {% endif %}
-                                    </td>
-                                    <td class="text-right flip" width="20%">
-                                        {% if plugin.app.compatibility_errors %}
-                                            <button class="btn disabled btn-block btn-default"
-                                                    disabled="disabled">{% trans "Incompatible" %}</button>
-                                            {% elif plugin.restricted and plugin.module not in request.event.settings.allowed_restricted_plugins %}
-                                            <button class="btn disabled btn-block btn-default"
-                                                    disabled="disabled">{% trans "Not available" %}</button>
-                                            {% elif plugin.module in plugins_active %}
-                                            <button class="btn btn-default btn-block" name="plugin:{{ plugin.module }}"
-                                                    value="disable">{% trans "Disable" %}</button>
-                                        {% else %}
-                                            <button class="btn btn-default btn-block" name="plugin:{{ plugin.module }}"
-                                                    value="enable">{% trans "Enable" %}</button>
-                                        {% endif %}
-                                    </td>
-                                </tr>
-                            {% endfor %}
-                        </table>
+                            {% if plugin.featured %}
+                                    </div>
+                                </div>
+                            {% endif %}
+                            </div>
+                        {% endfor %}
                     </div>
                 </fieldset>
             {% endfor %}

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

@@ -221,6 +221,7 @@
                 {% bootstrap_field sform.show_items_outside_presale_period layout="control" %}
                 {% bootstrap_field sform.last_order_modification_date layout="control" %}
                 {% bootstrap_field sform.allow_modifications_after_checkin layout="control" %}
+                {% bootstrap_field sform.show_checkin_number_user layout="control" %}
             </fieldset>
             <fieldset>
                 <legend>{% trans "Display" %}</legend>

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

@@ -20,6 +20,11 @@
                         <div class="form-group">
                             <label class="col-md-3 control-label">{% trans "Product type" %}</label>
                             <div class="col-md-9">
+                                {% for e in form.errors.admission %}
+                                    <div class="alert alert-danger has-error">
+                                        {{ e }}
+                                    </div>
+                                {% endfor %}
                                 <div class="big-radio radio">
                                     <label>
                                         <input type="radio" value="on" name="{{ form.admission.html_name }}" {% if form.admission.value %}checked{% endif %}>

src/pretix/control/templates/pretixcontrol/items/discount.html

@@ -0,0 +1,74 @@
+{% extends "pretixcontrol/items/base.html" %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% block title %}{% trans "Automatic discount" %}{% endblock %}
+{% block inside %}
+    <h1>{% trans "Automatic discount" %}</h1>
+    <form action="" method="post" class="form-horizontal">
+        {% csrf_token %}
+        {% bootstrap_form_errors form %}
+        <div class="row">
+            <div class="col-xs-12{% if discount %} col-lg-10{% endif %}">
+                <fieldset>
+                    <legend>{% trans "General information" %}</legend>
+                    {% bootstrap_field form.active layout="control" %}
+                    {% bootstrap_field form.internal_name layout="control" %}
+                    {% bootstrap_field form.available_from layout="control" %}
+                    {% bootstrap_field form.available_until layout="control" %}
+                    {% bootstrap_field form.sales_channels layout="control" %}
+                </fieldset>
+                <fieldset>
+                    <legend>{% trans "Condition" context "discount" %}</legend>
+                    {% bootstrap_field form.condition_all_products layout="control" %}
+                    {% bootstrap_field form.condition_limit_products layout="control" %}
+                    {% bootstrap_field form.condition_apply_to_addons layout="control" %}
+                    {% bootstrap_field form.condition_ignore_voucher_discounted layout="control" %}
+                    {% if form.subevent_mode %}
+                        {% bootstrap_field form.subevent_mode layout="control" %}
+                    {% endif %}
+                    <div class="form-group form-alternatives">
+                        <label class="col-md-3 control-label">
+                            {% trans "Minimum cart content" %}<br>
+                            <span class="optional">{% trans "Optional" %}</span>
+                        </label>
+                        <div class="col-md-4">
+                            {% bootstrap_field form.condition_min_count form_group_class="" %}
+                        </div>
+                        <div class="col-md-1 text-center condition-or" data-display-dependency="#id_subevent_mode_2" data-inverse>
+                            <div class="hr">
+                                <div class="sep">
+                                    <div class="sepText">{% trans "OR" %}</div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-4" data-display-dependency="#id_subevent_mode_2" data-inverse>
+                            {% bootstrap_field form.condition_min_value form_group_class="" %}
+                        </div>
+                    </div>
+                </fieldset>
+                <fieldset>
+                    <legend>{% trans "Benefit" context "discount" %}</legend>
+                    {% bootstrap_field form.benefit_discount_matching_percent layout="control" addon_after="%" %}
+                    {% bootstrap_field form.benefit_only_apply_to_cheapest_n_matches layout="control" %}
+                </fieldset>
+            </div>
+            {% if discount %}
+                <div class="col-xs-12 col-lg-2">
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <h3 class="panel-title">
+                                {% trans "Discount history" %}
+                            </h3>
+                        </div>
+                        {% include "pretixcontrol/includes/logs.html" with obj=discount %}
+                    </div>
+                </div>
+            {% endif %}
+        </div>
+        <div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
+        </div>
+    </form>
+{% endblock %}

src/pretix/control/templates/pretixcontrol/items/discount_delete.html

@@ -0,0 +1,41 @@
+{% extends "pretixcontrol/items/base.html" %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% block title %}{% trans "Delete discount" %}{% endblock %}
+{% block inside %}
+    <h1>{% trans "Delete discount" %}</h1>
+    <form action="" method="post" class="form-horizontal">
+        {% csrf_token %}
+        {% if not possible and not item.active %}
+            <p>{% blocktrans %}You cannot delete the discount <strong>{{ discount }}</strong> because it already has
+                been used as part of an order.{% endblocktrans %}</p>
+            <div class="form-group submit-group">
+                <a href="{% url "control:event.discounts" organizer=request.event.organizer.slug event=request.event.slug %}"
+                   class="btn btn-default btn-cancel">
+                    {% trans "Cancel" %}
+                </a>
+                <div class="clearfix"></div>
+            </div>
+        {% else %}
+            {% if possible %}
+                <p>{% blocktrans trimmed with name=discount.internal_name %}
+                    Are you sure you want to delete the discount <strong>{{ name }}</strong>?
+                {% endblocktrans %}</p>
+            {% else %}
+                <p>{% blocktrans trimmed with name=discount.internal_name %}
+                    You cannot delete the discount <strong>{{ name }}</strong> because it already has been used as part
+                    of an order, but you can deactivate it.
+                {% endblocktrans %}</p>
+            {% endif %}
+            <div class="form-group submit-group">
+                <a href="{% url "control:event.items.discounts" organizer=request.event.organizer.slug event=request.event.slug %}"
+                   class="btn btn-default btn-cancel">
+                    {% trans "Cancel" %}
+                </a>
+                <button type="submit" class="btn btn-danger btn-save">
+                    {% if possible %}{% trans "Delete" %}{% else %}{% trans "Deactivate" %}{% endif %}
+                </button>
+            </div>
+        {% endif %}
+    </form>
+{% endblock %}

src/pretix/control/templates/pretixcontrol/items/discounts.html

@@ -0,0 +1,147 @@
+{% extends "pretixcontrol/items/base.html" %}
+{% load i18n %}
+{% block title %}{% trans "Automatic discounts" %}{% endblock %}
+{% block inside %}
+    <h1>{% trans "Automatic discounts" %}</h1>
+    <p>
+        {% blocktrans trimmed %}
+            With automatic discounts, you can automatically apply a discount to purchases from your customers based
+            on certain conditions. For example, you can create group discounts like "get 20% off if you buy 3 or more
+            tickets" or "buy 2 tickets, get 1 free".
+        {% endblocktrans %}
+    </p>
+    <p>
+        {% blocktrans trimmed %}
+            Automatic discounts are available to all customers as long as they are active. If you want to offer special
+            prices only to specific customers, you can use vouchers instead. If you want to offer discounts across
+            multiple purchases ("buy a package of 10 you can turn into individual tickets later"), you can use
+            customer accounts and memberships instead.
+        {% endblocktrans %}
+    </p>
+    <p>
+        {% blocktrans trimmed %}
+            Discounts are only automatically applied during an initial purchase. They are not applied if an existing
+            order is changed through any of the available options.
+        {% endblocktrans %}
+    </p>
+    <p>
+        {% blocktrans trimmed %}
+            Every product in the cart can only be affected by one discount. If you have overlapping discounts, the
+            first one in the order of the list below will apply.
+        {% endblocktrans %}
+    </p>
+    {% if discounts|length == 0 %}
+        <div class="empty-collection">
+            <p>
+                {% blocktrans trimmed %}
+                    You haven't created any discounts yet.
+                {% endblocktrans %}
+            </p>
+
+            <a href="{% url "control:event.items.discounts.add" organizer=request.event.organizer.slug event=request.event.slug %}"
+               class="btn btn-primary btn-lg"><i class="fa fa-plus"></i> {% trans "Create a new discount" %}</a>
+        </div>
+    {% else %}
+        <p>
+            <a href="{% url "control:event.items.discounts.add" organizer=request.event.organizer.slug event=request.event.slug %}"
+               class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new discount" %}
+            </a>
+        </p>
+        <form method="post">
+            {% csrf_token %}
+            <div class="table-responsive">
+                <table class="table table-hover table-quotas">
+                    <thead>
+                    <tr>
+                        <th>{% trans "Internal name" %}</th>
+                        <th></th>
+                        <th></th>
+                        <th>{% trans "Products" %}</th>
+                        <th class="action-col-2"></th>
+                        <th class="action-col-2"></th>
+                    </tr>
+                    </thead>
+                    <tbody data-dnd-url="{% url "control:event.items.discounts.reorder" organizer=request.event.organizer.slug event=request.event.slug %}">
+                    {% for d in discounts %}
+                        <tr data-dnd-id="{{ d.id }}">
+                            <td>
+                                {% if d.active %}
+                                   <strong>
+                                {% else %}
+                                    <del>
+                                {% endif %}
+                                    <a  href="{% url "control:event.items.discounts.edit" organizer=request.event.organizer.slug event=request.event.slug discount=d.id %}">
+                                    {{ d.internal_name }}</a>
+                                {% if d.active %}
+                                    </strong>
+                                {% else %}
+                                    </del>
+                                {% endif %}
+                            </td>
+                            <td>
+                                {% for k, c in sales_channels.items %}
+                                    {% if k in d.sales_channels %}
+                                        <span class="fa fa-fw fa-{{ c.icon }} text-muted"
+                                              data-toggle="tooltip" title="{% trans c.verbose_name %}"></span>
+                                    {% else %}
+                                    {% endif %}
+                                {% endfor %}
+                            </td>
+                            <td>
+                                {% if d.available_from or d.available_until %}
+                                    {% if not d.is_available_by_time %}
+                                        <span class="label label-danger" data-toggle="tooltip"
+                                              title="{% trans "Currently unavailable since a limited timeframe for this product has been set" %}">
+                                            <span class="fa fa-clock-o fa-fw" data-toggle="tooltip">
+                                            </span>
+                                        </span>
+                                    {% else %}
+                                        <span class="fa fa-clock-o fa-fw text-muted" data-toggle="tooltip"
+                                              title="{% trans "Only available in a limited timeframe" %}">
+                                        </span>
+                                    {% endif %}
+                                {% endif %}
+                            </td>
+                            <td>
+                                {% if d.condition_all_products %}
+                                    <em>{% trans "All" %}</em>
+                                {% else %}
+                                    <ul>
+                                        {% for item in d.condition_limit_products.all %}
+                                            <li>
+                                                <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.id %}">{{ item }}</a>
+                                            </li>
+                                        {% endfor %}
+                                    </ul>
+                                {% endif %}
+                            </td>
+                            <td>
+                                <button formaction="{% url "control:event.items.discounts.up" organizer=request.event.organizer.slug event=request.event.slug discount=d.id %}"
+                                        class="btn btn-default btn-sm sortable-up"
+                                        {% if forloop.counter0 == 0 and not page_obj.has_previous %}
+                                        disabled{% endif %}><i class="fa fa-arrow-up"></i></button>
+                                <button formaction="{% url "control:event.items.discounts.down" organizer=request.event.organizer.slug event=request.event.slug discount=d.id %}"
+                                        class="btn btn-default btn-sm sortable-down"
+                                        {% if forloop.revcounter0 == 0 and not page_obj.has_next %} disabled{% endif %}>
+                                    <i class="fa fa-arrow-down"></i></button>
+                                <span class="dnd-container"></span>
+                            </td>
+                            <td class="text-right flip">
+                                <a href="{% url "control:event.items.discounts.edit" organizer=request.event.organizer.slug event=request.event.slug discount=d.id %}"
+                                   class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
+                                <a href="{% url "control:event.items.discounts.add" organizer=request.event.organizer.slug event=request.event.slug %}?copy_from={{ d.id }}"
+                                   class="btn btn-sm btn-default" title="{% trans "Clone" %}" data-toggle="tooltip">
+                                    <span class="fa fa-copy"></span>
+                                </a>
+                                <a href="{% url "control:event.items.discounts.delete" organizer=request.event.organizer.slug event=request.event.slug discount=d.id %}"
+                                   class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </form>
+        {% include "pretixcontrol/pagination.html" %}
+    {% endif %}
+{% endblock %}

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

@@ -1,6 +1,7 @@
 {% extends "pretixcontrol/event/base.html" %}
 {% load i18n %}
 {% load bootstrap3 %}
+{% load money %}
 {% block title %}
     {% trans "Cancel order" %}
 {% endblock %}
@@ -22,13 +23,22 @@
         {% csrf_token %}
         <input type="hidden" name="status" value="c"/>
         {% bootstrap_form_errors form %}
+        {% if form.cancellation_fee %}
+            {% if fee %}
+                {% with fee|money:request.event.currency as f %}
+                    <p>{% blocktrans trimmed with fee="<strong>"|add:f|add:"</strong>"|safe %}
+                        The configured cancellation fee for a self-service cancellation would be {{ fee }} for this
+                        order, but for a cancellation performed by you, you need to set the cancellation fee here:
+                    {% endblocktrans %}</p>
+                {% endwith %}
+            {% endif %}
+            {% bootstrap_field form.cancellation_fee layout='' %}
+        {% endif %}
         {% bootstrap_field form.send_email layout='' %}
+        {% bootstrap_field form.comment layout='' %}
         {% if form.cancel_invoice %}
             {% bootstrap_field form.cancel_invoice layout='' %}
         {% endif %}
-        {% if form.cancellation_fee %}
-            {% bootstrap_field form.cancellation_fee layout='' %}
-        {% endif %}
         <div class="row checkout-button-row">
             <div class="col-md-4">
                 <a class="btn btn-block btn-default btn-lg"

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

@@ -202,10 +202,12 @@
                         </div>
 
                         {% bootstrap_field position.form.operation_cancel layout='inline' %}
-                        {% bootstrap_field position.form.operation_split layout='inline' %}
+                        {% if position.form.operation_split %}
+                            {% bootstrap_field position.form.operation_split layout='inline' %}
+                        {% endif %}
                         {% if position.addons.exists %}
                             <em class="text-danger">
-                                {% trans "Removing this position will also remove all add-ons to this position." %}
+                                {% trans "Removing or splitting this position will also remove or split all add-ons to this position." %}
                             </em>
                         {% endif %}
                     </div>

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

@@ -387,7 +387,7 @@
                                 {% if line.voucher %}
                                     <br/><span class="fa fa-tags fa-fw"></span> {% trans "Voucher code used:" %}
                                     <a
-                                            {% if line.price_before_voucher|default_if_none:"NONE" != "NONE" %}data-toggle="tooltip" title="{% blocktrans trimmed with price=line.price_before_voucher|money:request.event.currency %}Original price: {{ price }}{% endblocktrans %}"{% endif %}
+                                            {% if line.voucher.budget and line.voucher_budget_use|default_if_none:"NONE" != "NONE" %}data-toggle="tooltip" title="{% blocktrans trimmed with amount=line.voucher_budget_use|money:request.event.currency %}Used {{ amount }} discount from budget{% endblocktrans %}"{% endif %}
                                             href="{% url "control:event.voucher" event=request.event.slug organizer=request.event.organizer.slug voucher=line.voucher.pk %}">
                                         {{ line.voucher.code }}
                                     </a>
@@ -406,6 +406,15 @@
                                         {{ line.used_membership }}
                                     </a>
                                 {% endif %}
+                                {% if line.discount %}
+                                    <br />
+                                    <span class="text-success discounted" data-toggle="tooltip" title="{% trans "The price of this product was reduced because of an automatic discount or this product was part of the discount calculation for a different product in this order." %}">
+                                        <span class="fa fa-percent fa-fw" aria-hidden="true"></span>
+                                        <a href="{% url "control:event.items.discounts.edit" organizer=request.event.organizer.slug event=request.event.slug discount=line.discount.id %}">
+                                            {{ line.discount.internal_name }}
+                                        </a>
+                                    </span>
+                                {% endif %}
                                 {% if not line.canceled %}
                                     <div class="position-buttons">
                                         {% if line.generate_ticket %}

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

@@ -8,6 +8,7 @@
 {% block content %}
     <h1>
         {% trans "Refund order" %}
+        <small class="text-muted">{{ full_refund|money:request.event.currency }}</small>
         <a class="btn btn-link btn-lg"
                 href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
             {% blocktrans trimmed with order=order.code %}

src/pretix/control/templates/pretixcontrol/orders/export.html

@@ -11,7 +11,8 @@
         {% endif %}
     </h1>
     {% for e in exporters %}
-        <details class="panel panel-default" {% if "identifier" in request.GET or "exporter" in request.POST %}open{% endif %}>
+        <details class="panel panel-default"
+            {% if request.GET.identifier == e.identifier or request.POST.exporter == e.identifier %}open{% endif %}>
             <summary class="panel-heading">
                 <h3 class="panel-title">
                     {{ e.verbose_name }}

src/pretix/control/templates/pretixcontrol/organizers/device_bulk_edit.html

@@ -0,0 +1,46 @@
+{% extends "pretixcontrol/organizers/base.html" %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% block inner %}
+    <h1>
+        {% trans "Change multiple devices" %}
+        <small>
+            {% blocktrans trimmed with number=devices.count %}
+                {{ number }} selected
+            {% endblocktrans %}
+        </small>
+    </h1>
+    <form class="form-horizontal" action="" method="post">
+        {% csrf_token %}
+        {% bootstrap_form_errors form %}
+        <div class="hidden">
+            {% for d in devices %}
+                <input type="hidden" name="device" value="{{ d.pk }}">
+            {% endfor %}
+        </div>
+        <fieldset>
+            <legend>{% trans "General" %}</legend>
+            <div class="bulk-edit-field-group">
+                <label class="field-toggle">
+                    <input type="checkbox" name="_bulk" value="{{ form.prefix }}__events" {% if form.prefix|add:"__events" in bulk_selected %}checked{% endif %}>
+                    {% trans "change" context "form_bulk" %}
+                </label>
+                <div class="field-content">
+                    {% bootstrap_field form.all_events layout="control" %}
+                    {% bootstrap_field form.limit_events layout="control" %}
+                </div>
+            </div>
+        </fieldset>
+        <p>&nbsp;</p>
+        <fieldset>
+            <legend>{% trans "Advanced settings" %}</legend>
+            {% bootstrap_field form.security_profile layout="bulkedit" %}
+            {% bootstrap_field form.gate layout="bulkedit" %}
+        </fieldset>
+        <div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
+        </div>
+    </form>
+{% endblock %}