Add Transaction.source flag

.github/workflows/docs.yml

@@ -14,13 +14,10 @@ on:
       - 'src/pretix/static/**'
       - 'src/tests/**'
 
-permissions:
-  contents: read  #  to fetch code (actions/checkout)
-
 jobs:
   spelling:
     name: Spellcheck
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.8
@@ -34,7 +31,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system packages
-        run: sudo apt update && sudo apt install enchant-2 hunspell aspell-en
+        run: sudo apt update && sudo apt install enchant hunspell aspell-en
       - name: Install Dependencies
         run: pip3 install -Ur requirements.txt
         working-directory: ./doc

.github/workflows/strings.yml

@@ -12,12 +12,9 @@ on:
       - 'doc/**'
       - 'src/pretix/locale/**'
 
-permissions:
-  contents: read  #  to fetch code (actions/checkout)
-
 jobs:
   compile:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     name: Check gettext syntax
     steps:
       - uses: actions/checkout@v2
@@ -43,7 +40,7 @@ jobs:
         run: python manage.py compilejsi18n
         working-directory: ./src
   spelling:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     name: Spellcheck
     steps:
       - uses: actions/checkout@v2
@@ -58,7 +55,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system packages
-        run: sudo apt update && sudo apt install enchant-2 hunspell hunspell-de-de aspell-en aspell-de
+        run: sudo apt update && sudo apt install enchant hunspell hunspell-de-de aspell-en aspell-de
       - name: Install Dependencies
         run: pip3 install -e ".[dev]"
         working-directory: ./src

.github/workflows/style.yml

@@ -12,13 +12,10 @@ on:
       - 'src/pretix/locale/**'
       - 'src/pretix/static/**'
 
-permissions:
-  contents: read  #  to fetch code (actions/checkout)
-
 jobs:
   isort:
     name: isort
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.8
@@ -39,7 +36,7 @@ jobs:
         working-directory: ./src
   flake:
     name: flake8
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.8
@@ -60,7 +57,7 @@ jobs:
         working-directory: ./src
   licenseheader:
     name: licenseheaders
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.8

.github/workflows/tests.yml

@@ -12,26 +12,23 @@ on:
       - 'doc/**'
       - 'src/pretix/locale/**'
 
-permissions:
-  contents: read  #  to fetch code (actions/checkout)
-
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     name: Tests
     strategy:
       matrix:
-        python-version: ["3.7", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9"]
         database: [sqlite, postgres, mysql]
         exclude:
           - database: mysql
-            python-version: "3.10"
+            python-version: "3.8"
           - database: mysql
             python-version: "3.9"
           - database: sqlite
             python-version: "3.7"
           - database: sqlite
-            python-version: "3.10"
+            python-version: "3.8"
     steps:
       - uses: actions/checkout@v2
       - uses: getong/mariadb-action@v1.1
@@ -58,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
@@ -79,4 +76,4 @@ jobs:
         with:
           file: src/coverage.xml
           fail_ci_if_error: true
-        if: matrix.database == 'postgres' && matrix.python-version == '3.10'
+        if: matrix.database == 'postgres' && matrix.python-version == '3.8'

doc/admin/config.rst

@@ -117,9 +117,6 @@ Example::
 ``loglevel``
     Set console and file log level (``DEBUG``, ``INFO``, ``WARNING``, ``ERROR`` or ``CRITICAL``). Defaults to ``INFO``.
 
-``request_id_header``
-    Specifies the name of a header that should be used for logging request IDs. Off by default.
-
 Locale settings
 ---------------
 
@@ -399,9 +396,9 @@ The two ``transport_options`` entries can be omitted in most cases.
 If they are present they need to be a valid JSON dictionary.
 For possible entries in that dictionary see the `Celery documentation`_.
 
-To use redis with sentinels set the broker or backend to ``sentinel://sentinel_host_1:26379;sentinel_host_2:26379/0``
+To use redis with sentinels set the broker or backend to ``sentinel://sentinel_host_1:26379;sentinal_host_2:26379/0``
 and the respective transport_options to ``{"master_name":"mymaster"}``.
-If your redis instances behind the sentinel have a password use ``sentinel://:my_password@sentinel_host_1:26379;sentinel_host_2:26379/0``.
+If your redis instances behind the sentinel have a password use ``sentinel://:my_password@sentinel_host_1:26379;sentinal_host_2:26379/0``.
 If your redis sentinels themselves have a password set the transport_options to ``{"master_name":"mymaster","sentinel_kwargs":{"password":"my_password"}}``.
 
 Sentry

doc/api/resources/carts.rst

@@ -43,6 +43,10 @@ seat                                  objects                    The assigned se
 └ seat_guid                           string                     Identifier of the seat within the seating plan
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 3.0
+
+   This ``seat`` attribute has been added.
+
 .. versionchanged:: 4.14
 
    This ``is_bundled`` attribute has been added and the cart creation endpoints have been updated.

doc/api/resources/checkinlists.rst

@@ -39,6 +39,23 @@ exit_all_at                           datetime                   Automatically c
 addon_match                           boolean                    If ``true``, tickets on this list can be redeemed by scanning their parent ticket if this still leads to an unambiguous match.
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 3.9
+
+    The ``subevent`` attribute may now be ``null`` inside event series. The ``allow_multiple_entries``,
+    ``allow_entry_after_exit``, and ``rules`` attributes have been added.
+
+.. versionchanged:: 3.11
+
+    The ``subevent_match`` and ``exclude`` query parameters have been added.
+
+.. versionchanged:: 3.12
+
+    The ``exit_all_at`` attribute has been added.
+
+.. versionchanged:: 3.17
+
+    The ``ends_after`` and ``expand`` query parameters have been added.
+
 .. versionchanged:: 4.12
 
     The ``addon_match`` attribute has been added.

doc/api/resources/events.rst

@@ -52,9 +52,34 @@ sales_channels                        list                       A list of sales
 ===================================== ========================== =======================================================
 
 
+.. versionchanged:: 3.3
+
+   The attributes ``geo_lat`` and ``geo_lon`` have been added.
+
+.. versionchanged:: 3.4
+
+   The attribute ``timezone`` has been added.
+
+.. versionchanged:: 3.7
+
+   The attribute ``item_meta_properties`` has been added.
+
+.. versionchanged:: 3.12
+
+   The attribute ``valid_keys`` has been added.
+
+.. versionchanged:: 3.14
+
+    The attribute ``sales_channels`` has been added.
+
+
 Endpoints
 ---------
 
+.. versionchanged:: 3.3
+
+    The events resource can now be filtered by meta data attributes.
+
 .. versionchanged:: 4.0
 
     The ``clone_from`` parameter has been added to the event creation endpoint.
@@ -542,6 +567,10 @@ information about the properties.
 .. warning:: This API is intended for advanced users. Even though we take care to validate your input, you will be
              able to break your event using this API by creating situations of conflicting settings. Please take care.
 
+.. versionchanged:: 3.6
+
+   Initial support for settings has been added to the API.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/settings/
 
    Get current values of event settings.

doc/api/resources/exporters.rst

@@ -6,6 +6,10 @@ Data exporters
 pretix and it's plugins include a number of data exporters that allow you to bulk download various data from pretix in
 different formats. This page shows you how to use these exporters through the API.
 
+.. versionchanged:: 3.13
+
+   This feature has been added to the API.
+
 .. warning::
 
    While we consider the methods listed on this page to be a stable API, the availability and specific input field

doc/api/resources/giftcards.rst

@@ -40,6 +40,10 @@ text                                  string                     Custom text of
 Endpoints
 ---------
 
+.. versionadded:: 3.14
+
+   The transaction list endpoint was added.
+
 .. http:get:: /api/v1/organizers/(organizer)/giftcards/
 
    Returns a list of all gift cards issued by a given organizer.
@@ -253,6 +257,10 @@ Endpoints
         "value": "15.37"
       }
 
+   .. versionchanged:: 3.5
+
+      This endpoint now returns status code ``409`` if the transaction would lead to a negative gift card value.
+
    :param organizer: The ``slug`` field of the organizer to modify
    :param id: The ``id`` field of the gift card to modify
    :query boolean include_accepted: Also show gift cards issued by other organizers that are accepted by this organizer.

doc/api/resources/invoices.rst

@@ -108,6 +108,16 @@ internal_reference                    string                     Customer's refe
 ===================================== ========================== =======================================================
 
 
+.. versionchanged:: 3.4
+
+   The attribute ``lines.number`` has been added.
+
+.. versionchanged:: 3.17
+
+   The attribute ``invoice_to_*``, ``invoice_from_*``, ``custom_field``, ``lines.item``, ``lines.variation``, ``lines.event_date_from``,
+   ``lines.event_date_to``, and ``lines.attendee_name`` have been added.
+   ``refers`` now returns an invoice number including the prefix.
+
 .. versionchanged:: 4.1
 
    The attributes ``fee_type`` and ``fee_internal_type`` have been added.

doc/api/resources/items.rst

@@ -146,6 +146,14 @@ bundles                               list of objects            Definition of b
 meta_data                             object                     Values set for event-specific meta data parameters.
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 3.7
+
+   The attribute ``meta_data`` has been added.
+
+.. versionchanged:: 3.10
+
+   The attribute ``multi_allowed`` has been added to ``addons``.
+
 .. versionchanged:: 4.0
 
    The attributes ``require_membership``, ``require_membership_types``, ``grant_membership_type``, ``grant_membership_duration_like_event``,

doc/api/resources/orders.rst

@@ -98,6 +98,30 @@ last_modified                         datetime                   Last modificati
 ===================================== ========================== =======================================================
 
 
+.. versionchanged:: 3.5
+
+   The ``order.fees.canceled`` attribute has been added.
+
+.. versionchanged:: 3.8
+
+   The ``reactivate`` operation has been added.
+
+.. versionchanged:: 3.10
+
+   The ``search`` query parameter has been added.
+
+.. versionchanged:: 3.11
+
+   The ``exclude`` and ``subevent_after`` query parameter has been added.
+
+.. versionchanged:: 3.13
+
+   The ``subevent_before`` query parameter has been added.
+
+.. versionchanged:: 3.14
+
+   The ``phone`` attribute has been added.
+
 .. versionchanged:: 4.0
 
    The ``customer`` attribute has been added.
@@ -118,10 +142,6 @@ last_modified                         datetime                   Last modificati
 
    The ``order.fees.id`` attribute has been added.
 
-.. versionchanged:: 4.15
-
-   The ``include`` query parameter has been added.
-
 
 .. _order-position-resource:
 
@@ -158,7 +178,6 @@ tax_rule                              integer                    The ID of the u
 secret                                string                     Secret code printed on the tickets for validation
 addon_to                              integer                    Internal ID of the position this position is an add-on for (or ``null``)
 subevent                              integer                    ID of the date inside an event series this position belongs to (or ``null``).
-discount                              integer                    ID of a discount that has been used during the creation of this position in some way (or ``null``).
 pseudonymization_id                   string                     A random ID, e.g. for use in lead scanning apps
 checkins                              list of objects            List of **successful** check-ins with this ticket
 ├ id                                  integer                    Internal ID of the check-in event
@@ -186,6 +205,27 @@ pdf_data                              object                     Data object req
                                                                  ``pdf_data=true`` query parameter to your request.
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 3.3
+
+  The ``url`` of a ticket ``download`` can now also return a ``text/uri-list`` instead of a file. See
+  :ref:`order-position-ticket-download` for details.
+
+.. versionchanged:: 3.5
+
+  The attribute ``canceled`` has been added.
+
+.. versionchanged:: 3.8
+
+  The attributes ``company``, ``street``, ``zipcode``, ``city``, ``country``, and ``state`` have been added.
+
+.. versionchanged:: 3.9
+
+  The ``checkin.type`` attribute has been added.
+
+.. versionchanged:: 3.16
+
+   Answers to file questions are now returned as an URL.
+
 .. _order-payment-resource:
 
 Order payment resource
@@ -232,20 +272,15 @@ created                               datetime                   Date and time o
 comment                               string                     Reason for refund (shown to the customer in some cases, can be ``null``).
 execution_date                        datetime                   Date and time of completion of this refund (or ``null``)
 provider                              string                     Identification string of the payment provider
-details                               object                     Refund-specific information. This is a dictionary
-                                                                 with various fields that can be different between
-                                                                 payment providers, versions, payment states, etc. If
-                                                                 you read this field, you always need to be able to
-                                                                 deal with situations where values that you expect are
-                                                                 missing. Mostly, the field contains various IDs that
-                                                                 can be used for matching with other systems. If a
-                                                                 payment provider does not implement this feature,
-                                                                 the object is empty.
 ===================================== ========================== =======================================================
 
 List of all orders
 ------------------
 
+.. versionchanged:: 3.5
+
+   The ``include_canceled_positions`` and ``include_canceled_fees`` query parameters have been added.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orders/
 
    Returns a list of all orders within a given event.
@@ -336,7 +371,6 @@ List of all orders
                 "secret": "z3fsn8jyufm5kpk768q69gkbyr5f4h6w",
                 "addon_to": null,
                 "subevent": null,
-                "discount": null,
                 "pseudonymization_id": "MQLJvANO3B",
                 "seat": null,
                 "checkins": [
@@ -413,7 +447,6 @@ List of all orders
    :query datetime subevent_after: Only return orders that contain a ticket for a subevent taking place after the given date. This is an exclusive after, and it considers the **end** of the subevent (or its start, if the end is not set).
    :query datetime subevent_before: Only return orders that contain a ticket for a subevent taking place after the given date. This is an exclusive before, and it considers the **start** of the subevent.
    :query string exclude: Exclude a field from the output, e.g. ``fees`` or ``positions.downloads``. Can be used as a performance optimization. Can be passed multiple times.
-   :query string include: Include only the given field in the output, e.g. ``fees`` or ``positions.downloads``. Can be used as a performance optimization. Can be passed multiple times. ``include`` is applied before ``exclude``, so ``exclude`` takes precedence.
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
    :resheader X-Page-Generated: The server time at the beginning of the operation. If you're using this API to fetch
@@ -425,6 +458,10 @@ List of all orders
 Fetching individual orders
 --------------------------
 
+.. versionchanged:: 3.5
+
+   The ``include_canceled_positions`` and ``include_canceled_fees`` query parameters have been added.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/
 
    Returns information on one order, identified by its order code.
@@ -509,7 +546,6 @@ Fetching individual orders
             "secret": "z3fsn8jyufm5kpk768q69gkbyr5f4h6w",
             "addon_to": null,
             "subevent": null,
-            "discount": null,
             "pseudonymization_id": "MQLJvANO3B",
             "seat": null,
             "checkins": [
@@ -999,6 +1035,10 @@ Creating orders
 Order state operations
 ----------------------
 
+.. versionchanged:: 3.12
+
+   The ``mark_paid`` operation now takes a ``send_email`` parameter.
+
 .. http:post:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/mark_paid/
 
    Marks a pending or expired order as successfully paid.
@@ -1400,6 +1440,10 @@ Sending e-mails
 List of all order positions
 ---------------------------
 
+.. versionchanged:: 3.5
+
+   The ``include_canceled_positions`` and ``include_canceled_fees`` query parameters have been added.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/
 
    Returns a list of all order positions within a given event.
@@ -1443,7 +1487,6 @@ List of all order positions
             "tax_rule": null,
             "tax_value": "0.00",
             "secret": "z3fsn8jyufm5kpk768q69gkbyr5f4h6w",
-            "discount": null,
             "pseudonymization_id": "MQLJvANO3B",
             "seat": null,
             "addon_to": null,
@@ -1554,7 +1597,6 @@ Fetching individual positions
         "secret": "z3fsn8jyufm5kpk768q69gkbyr5f4h6w",
         "addon_to": null,
         "subevent": null,
-        "discount": null,
         "pseudonymization_id": "MQLJvANO3B",
         "seat": null,
         "checkins": [
@@ -1654,6 +1696,10 @@ Order position ticket download
 Manipulating individual positions
 ---------------------------------
 
+.. versionchanged:: 3.15
+
+   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.
@@ -1960,6 +2006,14 @@ otherwise, such as splitting an order or changing fees.
 Order payment endpoints
 -----------------------
 
+.. versionchanged:: 3.6
+
+   Payments can now be created through the API.
+
+.. versionchanged:: 3.12
+
+   The ``confirm`` operation now takes a ``send_email`` parameter.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/orders/(code)/payments/
 
    Returns a list of all payments for an order.
@@ -2265,7 +2319,6 @@ Order refund endpoints
             "created": "2017-12-01T10:00:00Z",
             "execution_date": "2017-12-04T12:13:12Z",
             "comment": "Cancellation",
-            "details": {},
             "provider": "banktransfer"
           }
         ]
@@ -2309,7 +2362,6 @@ Order refund endpoints
         "created": "2017-12-01T10:00:00Z",
         "execution_date": "2017-12-04T12:13:12Z",
         "comment": "Cancellation",
-        "details": {},
         "provider": "banktransfer"
       }
 
@@ -2367,7 +2419,6 @@ Order refund endpoints
         "created": "2017-12-01T10:00:00Z",
         "execution_date": null,
         "comment": "Cancellation",
-        "details": {},
         "provider": "manual"
       }
 
@@ -2497,6 +2548,10 @@ Revoked ticket secrets
 
 With some non-default ticket secret generation methods, a list of revoked ticket secrets is required for proper validation.
 
+.. versionchanged:: 3.12
+
+   Added revocation lists.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/revokedsecrets/
 
    Returns a list of all revoked secrets within a given event.

doc/api/resources/organizers.rst

@@ -109,6 +109,10 @@ information about the properties.
 .. warning:: This API is intended for advanced users. Even though we take care to validate your input, you will be
              able to break your shops using this API by creating situations of conflicting settings. Please take care.
 
+.. versionchanged:: 3.14
+
+   Initial support for settings has been added to the API.
+
 .. http:get:: /api/v1/organizers/(organizer)/settings/
 
    Get current values of organizer settings.

doc/api/resources/questions.rst

@@ -76,9 +76,26 @@ dependency_value                      string                     An old version
                                                                  for one value. **Deprecated.**
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 3.5
+
+  The attribute ``help_text`` has been added.
+
+.. versionchanged:: 3.14
+
+  The attributes ``valid_*`` have been added.
+
+.. versionchanged:: 3.18
+
+  The attribute ``valid_file_portrait`` have been added.
+
 Endpoints
 ---------
 
+.. versionchanged:: 1.15
+
+   The questions endpoint has been extended by the filter queries ``ask_during_checkin``, ``requred``, and
+   ``identifier``.
+
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/questions/
 
    Returns a list of all questions within a given event.

doc/api/resources/quotas.rst

@@ -36,6 +36,10 @@ available_number                      integer                    Number of avail
                                                                  slightly out of date. ``null`` means unlimited.
 ===================================== ========================== =======================================================
 
+.. versionchanged:: 3.10
+
+   The attribute ``release_after_exit`` has been added.
+
 .. versionchanged:: 4.1
 
     The ``with_availability`` query parameter has been added.

doc/api/resources/subevents.rst

@@ -59,13 +59,29 @@ seat_category_mapping                 object                     An object mappi
 last_modified                         datetime                   Last modification of this object
 ===================================== ========================== =======================================================
 
-.. versionchanged:: 4.15
+.. versionchanged:: 3.3
 
-    The ``search`` query parameter has been added to filter sub-events by their name or location in any language.
+   The attributes ``geo_lat`` and ``geo_lon`` have been added.
+
+.. versionchanged:: 3.10
+
+   The ``disabled`` attribute has been added to ``item_price_overrides`` and ``variation_price_overrides``.
+
+.. versionchanged:: 3.12
+
+   The ``last_modified`` attribute has been added.
+
+.. versionchanged:: 3.18
+
+   The ``available_from``/``available_until`` attributes have been added to ``item_price_overrides`` and ``variation_price_overrides``.
 
 Endpoints
 ---------
 
+.. versionchanged:: 3.3
+
+    The sub-events resource can now be filtered by meta data attributes.
+
 .. versionchanged:: 4.1
 
     The ``with_availability_for`` parameter has been added.
@@ -131,7 +147,6 @@ Endpoints
    :query is_future: If set to ``true`` (``false``), only events that happen currently or in the future are (not) returned.
    :query is_past: If set to ``true`` (``false``), only events that are over are (not) returned.
    :query ends_after: If set to a date and time, only events that happen during of after the given time are returned.
-   :query search: Only return events matching a given search query.
    :param organizer: The ``slug`` field of a valid organizer
    :param event: The ``slug`` field of the main event
    :query datetime modified_since: Only return objects that have changed since the given date. Be careful: This does not

doc/api/resources/vouchers.rst

@@ -19,8 +19,6 @@ max_usages                            integer                    The maximum num
                                                                  redeemed (default: 1).
 redeemed                              integer                    The number of times this voucher already has been
                                                                  redeemed.
-min_usages                            integer                    The minimum number of times this voucher must be
-                                                                 redeemed on first usage (default: 1).
 valid_until                           datetime                   The voucher expiration date (or ``null``).
 block_quota                           boolean                    If ``true``, quota is blocked for this voucher.
 allow_ignore_quota                    boolean                    If ``true``, this voucher can be redeemed even if a
@@ -50,6 +48,10 @@ show_hidden_items                     boolean                    Only if set to
 ===================================== ========================== =======================================================
 
 
+.. versionchanged:: 3.4
+
+   The attribute ``seat`` has been added.
+
 Endpoints
 ---------
 

doc/api/resources/waitinglist.rst

@@ -30,6 +30,12 @@ subevent                              integer                    ID of the date
 ===================================== ========================== =======================================================
 
 
+.. versionchanged:: 1.15
+
+   The write operations ``POST``, ``PATCH``, ``PUT``, and ``DELETE`` have been added as well as a method to send out
+   vouchers.
+
+
 Endpoints
 ---------
 

doc/development/api/general.rst

@@ -38,7 +38,7 @@ Frontend
 
 
 .. automodule:: pretix.presale.signals
-   :members: order_info, order_info_top, order_meta_from_request
+   :members: order_info, order_info_top, order_meta_from_request, order_source_from_request
 
 Request flow
 """"""""""""

doc/development/api/payment.rst

@@ -126,8 +126,6 @@ The provider class
 
    .. automethod:: api_payment_details
 
-   .. automethod:: api_refund_details
-
    .. automethod:: matching_id
 
    .. automethod:: shred_payment_info
@@ -138,10 +136,6 @@ The provider class
 
    .. autoattribute:: is_meta
 
-   .. autoattribute:: execute_payment_needs_user
-
-   .. autoattribute:: multi_use_supported
-
    .. autoattribute:: test_mode_message
 
    .. autoattribute:: requires_invoice_immediately

doc/development/implementation/permissions.rst

@@ -184,6 +184,11 @@ Most of these methods work identically on :class:`pretix.base.models.TeamAPIToke
 Staff sessions
 --------------
 
+.. versionchanged:: 1.14
+
+   In 1.14, the ``User.is_superuser`` attribute has been deprecated and statically set to return ``False``. Staff
+   sessions have been newly introduced.
+
 System administrators of a pretix instance are identified by the ``is_staff`` attribute on the user model. By default,
 the regular permission rules apply for users with ``is_staff = True``. The only difference is that such users can
 temporarily turn on "staff mode" via a button in the user interface that grants them **all permissions** as long as

doc/user/events/widget.rst

@@ -447,4 +447,8 @@ Hosted or pretix Enterprise are active, you can pass the following fields:
     </script>
 
 
+.. versionchanged:: 3.6
+
+   Dynamically opening the widget has been added in pretix 3.6.
+
 .. _Let's Encrypt: https://letsencrypt.org/

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.15.0"
+__version__ = "4.14.1.dev0"

src/pretix/api/auth/devicesecurity.py

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

src/pretix/api/exception.py

@@ -19,17 +19,11 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-import logging
-
-import ujson
-from rest_framework import exceptions
 from rest_framework.response import Response
 from rest_framework.views import exception_handler, status
 
 from pretix.base.services.locking import LockTimeoutException
 
-logger = logging.getLogger(__name__)
-
 
 def custom_exception_handler(exc, context):
     response = exception_handler(exc, context)
@@ -43,7 +37,4 @@ def custom_exception_handler(exc, context):
             }
         )
 
-    if isinstance(exc, exceptions.APIException):
-        logger.info(f'API Exception [{exc.status_code}]: {ujson.dumps(exc.detail)}')
-
     return response

src/pretix/api/serializers/cart.py

@@ -237,14 +237,12 @@ class CartPositionCreateSerializer(BaseCartPositionCreateSerializer):
             for addon_data in addons_data:
                 addon_data['addon_to'] = cp
                 addon_data['is_bundled'] = False
-                addon_data['cart_id'] = cp.cart_id
                 super().create(addon_data)
 
         if bundled_data:
             for bundle_data in bundled_data:
                 bundle_data['addon_to'] = cp
                 bundle_data['is_bundled'] = True
-                bundle_data['cart_id'] = cp.cart_id
                 super().create(bundle_data)
 
         return cp

src/pretix/api/serializers/event.py

@@ -411,8 +411,7 @@ class CloneEventSerializer(EventSerializer):
         has_subevents = validated_data.pop('has_subevents', None)
         tz = validated_data.pop('timezone', None)
         sales_channels = validated_data.pop('sales_channels', None)
-        date_admission = validated_data.pop('date_admission', None)
-        new_event = super().create({**validated_data, 'plugins': None})
+        new_event = super().create(validated_data)
 
         event = Event.objects.filter(slug=self.context['event'], organizer=self.context['organizer'].pk).first()
         new_event.copy_data_from(event)
@@ -427,10 +426,6 @@ class CloneEventSerializer(EventSerializer):
             new_event.sales_channels = sales_channels
         if has_subevents is not None:
             new_event.has_subevents = has_subevents
-        if has_subevents is not None:
-            new_event.has_subevents = has_subevents
-        if date_admission is not None:
-            new_event.date_admission = date_admission
         new_event.save()
         if tz:
             new_event.settings.timezone = tz
@@ -760,9 +755,6 @@ class EventSettingsSerializer(SettingsSerializer):
         'invoice_logo_image',
         'cancel_allow_user',
         'cancel_allow_user_until',
-        'cancel_allow_user_unpaid_keep',
-        'cancel_allow_user_unpaid_keep_fees',
-        'cancel_allow_user_unpaid_keep_percentage',
         'cancel_allow_user_paid',
         'cancel_allow_user_paid_until',
         'cancel_allow_user_paid_keep',

src/pretix/api/serializers/item.py

@@ -184,8 +184,6 @@ class ItemSerializer(I18nAwareModelSerializer):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields['default_price'].allow_null = False
-        self.fields['default_price'].required = True
         if not self.read_only:
             self.fields['require_membership_types'].queryset = self.context['event'].organizer.membership_types.all()
             self.fields['grant_membership_type'].queryset = self.context['event'].organizer.membership_types.all()

src/pretix/api/serializers/order.py

@@ -29,7 +29,6 @@ import pycountry
 from django.conf import settings
 from django.core.files import File
 from django.db.models import F, Q
-from django.utils.encoding import force_str
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy
 from django_countries.fields import Country
@@ -62,25 +61,14 @@ from pretix.base.services.pricing import (
 )
 from pretix.base.settings import COUNTRIES_WITH_STATE_IN_ADDRESS
 from pretix.base.signals import register_ticket_outputs
-from pretix.helpers.countries import CachedCountries
 from pretix.multidomain.urlreverse import build_absolute_uri
 
 logger = logging.getLogger(__name__)
 
 
 class CompatibleCountryField(serializers.Field):
-    countries = CachedCountries()
-    default_error_messages = {
-        'invalid_choice': gettext_lazy('"{input}" is not a valid choice.')
-    }
-
     def to_internal_value(self, data):
-        country = self.countries.alpha2(data)
-        if data and not country:
-            country = self.countries.by_name(force_str(data))
-            if not country:
-                self.fail("invalid_choice", input=data)
-        return {self.field_name: Country(country)}
+        return {self.field_name: Country(data)}
 
     def to_representation(self, instance: InvoiceAddress):
         if instance.country:
@@ -422,13 +410,13 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
     class Meta:
         model = OrderPosition
         fields = ('id', 'order', 'positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
-                  'company', 'street', 'zipcode', 'city', 'country', 'state', 'discount',
+                  'company', 'street', 'zipcode', 'city', 'country', 'state',
                   'attendee_email', 'voucher', 'tax_rate', 'tax_value', 'secret', 'addon_to', 'subevent', 'checkins',
                   'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat', 'canceled')
         read_only_fields = (
             'id', 'order', 'positionid', 'item', 'variation', 'price', 'voucher', 'tax_rate', 'tax_value', 'secret',
             'addon_to', 'subevent', 'checkins', 'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data',
-            'seat', 'canceled', 'discount',
+            'seat', 'canceled'
         )
 
     def __init__(self, *args, **kwargs):
@@ -565,22 +553,12 @@ class OrderPaymentSerializer(I18nAwareModelSerializer):
                   'details')
 
 
-class RefundDetailsField(serializers.Field):
-    def to_representation(self, value: OrderRefund):
-        pp = value.payment_provider
-        if not pp:
-            return {}
-        return pp.api_refund_details(value)
-
-
 class OrderRefundSerializer(I18nAwareModelSerializer):
     payment = SlugRelatedField(slug_field='local_id', read_only=True)
-    details = RefundDetailsField(source='*', allow_null=True, read_only=True)
 
     class Meta:
         model = OrderRefund
-        fields = ('local_id', 'state', 'source', 'amount', 'payment', 'created', 'execution_date', 'comment', 'provider',
-                  'details')
+        fields = ('local_id', 'state', 'source', 'amount', 'payment', 'created', 'execution_date', 'comment', 'provider')
 
 
 class OrderURLField(serializers.URLField):
@@ -622,23 +600,6 @@ class OrderSerializer(I18nAwareModelSerializer):
         if not self.context['pdf_data']:
             self.fields['positions'].child.fields.pop('pdf_data', None)
 
-        includes = set(self.context['include'])
-        if includes:
-            for fname, field in list(self.fields.items()):
-                if fname in includes:
-                    continue
-                elif hasattr(field, 'child'):
-                    found_any = False
-                    for childfname, childfield in list(field.child.fields.items()):
-                        if f'{fname}.{childfname}' not in includes:
-                            field.child.fields.pop(childfname)
-                        else:
-                            found_any = True
-                    if not found_any:
-                        self.fields.pop(fname)
-                else:
-                    self.fields.pop(fname)
-
         for exclude_field in self.context['exclude']:
             p = exclude_field.split('.')
             if p[0] in self.fields:
@@ -760,7 +721,7 @@ class OrderPositionCreateSerializer(I18nAwareModelSerializer):
     class Meta:
         model = OrderPosition
         fields = ('positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts', 'attendee_email',
-                  'company', 'street', 'zipcode', 'city', 'country', 'state', 'is_bundled',
+                  'company', 'street', 'zipcode', 'city', 'country', 'state',
                   'secret', 'addon_to', 'subevent', 'answers', 'seat', 'voucher')
 
     def __init__(self, *args, **kwargs):
@@ -1417,7 +1378,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                 state=OrderPayment.PAYMENT_STATE_CREATED
             )
 
-        order.create_transactions(is_new=True, fees=fees, positions=pos_map.values())
+        order.create_transactions(is_new=True, fees=fees, positions=pos_map.values(), source=self.context['source'])
         return order
 
 

src/pretix/api/serializers/voucher.py

@@ -61,7 +61,7 @@ class VoucherSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = Voucher
-        fields = ('id', 'code', 'max_usages', 'redeemed', 'min_usages', 'valid_until', 'block_quota',
+        fields = ('id', 'code', 'max_usages', 'redeemed', 'valid_until', 'block_quota',
                   'allow_ignore_quota', 'price_mode', 'value', 'item', 'variation', 'quota',
                   'tag', 'comment', 'subevent', 'show_hidden_items', 'seat')
         read_only_fields = ('id', 'redeemed')

src/pretix/api/utils.py

@@ -0,0 +1,14 @@
+from pretix.api.models import OAuthAccessToken
+from pretix.base.models import Device, TeamAPIToken
+
+
+def get_api_source(request):
+    if isinstance(request.auth, Device):
+        return "pretix.api", f"device:{request.auth.pk}"
+    elif isinstance(request.auth, TeamAPIToken):
+        return "pretix.api", f"token:{request.auth.pk}"
+    elif isinstance(request.auth, OAuthAccessToken):
+        return "pretix.api", f"oauth.app:{request.auth.application.pk}"
+    elif request.user.is_authenticated:
+        return "pretix.api", f"user:{request.user.pk}"
+    return "pretix.api", None

src/pretix/api/views/cart.py

@@ -92,11 +92,6 @@ class CartPositionViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnly
     def perform_create(self, serializer):
         raise NotImplementedError()
 
-    @transaction.atomic()
-    def perform_destroy(self, instance):
-        instance.addons.all().delete()
-        instance.delete()
-
     def _require_locking(self, quota_diff, voucher_use_diff, seat_diff):
         if voucher_use_diff or seat_diff:
             # If any vouchers or seats are used, we lock to make sure we don't redeem them to often

src/pretix/api/views/event.py

@@ -33,7 +33,6 @@
 # License for the specific language governing permissions and limitations under the License.
 
 import django_filters
-from django.conf import settings
 from django.db import transaction
 from django.db.models import Prefetch, ProtectedError, Q
 from django.utils.timezone import now
@@ -242,17 +241,13 @@ class EventViewSet(viewsets.ModelViewSet):
             except Event.DoesNotExist:
                 raise ValidationError('Event to copy from was not found')
 
-        # Ensure that .installed() is only called when we NOT clone
-        plugins = serializer.validated_data.pop('plugins', None)
-        serializer.validated_data['plugins'] = None
-
         new_event = serializer.save(organizer=self.request.organizer)
 
         if copy_from:
             new_event.copy_data_from(copy_from)
 
-            if plugins is not None:
-                new_event.set_active_plugins(plugins)
+            if 'plugins' in serializer.validated_data:
+                new_event.set_active_plugins(serializer.validated_data['plugins'])
             if 'is_public' in serializer.validated_data:
                 new_event.is_public = serializer.validated_data['is_public']
             if 'testmode' in serializer.validated_data:
@@ -261,17 +256,12 @@ class EventViewSet(viewsets.ModelViewSet):
                 new_event.sales_channels = serializer.validated_data['sales_channels']
             if 'has_subevents' in serializer.validated_data:
                 new_event.has_subevents = serializer.validated_data['has_subevents']
-            if 'date_admission' in serializer.validated_data:
-                new_event.date_admission = serializer.validated_data['date_admission']
             new_event.save()
             if 'timezone' in serializer.validated_data:
                 new_event.settings.timezone = serializer.validated_data['timezone']
         else:
             serializer.instance.set_defaults()
 
-            new_event.set_active_plugins(plugins if plugins is not None else settings.PRETIX_PLUGINS_DEFAULT.split(','))
-            new_event.save(update_fields=['plugins'])
-
         serializer.instance.log_action(
             'pretix.event.added',
             user=self.request.user,
@@ -332,7 +322,6 @@ with scopes_disabled():
         ends_after = django_filters.rest_framework.IsoDateTimeFilter(method='ends_after_qs')
         modified_since = django_filters.IsoDateTimeFilter(field_name='last_modified', lookup_expr='gte')
         sales_channel = django_filters.rest_framework.CharFilter(method='sales_channel_qs')
-        search = django_filters.rest_framework.CharFilter(method='search_qs')
 
         class Meta:
             model = SubEvent
@@ -368,12 +357,6 @@ with scopes_disabled():
         def sales_channel_qs(self, queryset, name, value):
             return queryset.filter(event__sales_channels__contains=value)
 
-        def search_qs(self, queryset, name, value):
-            return queryset.filter(
-                Q(name__icontains=i18ncomp(value))
-                | Q(location__icontains=i18ncomp(value))
-            )
-
 
 class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
     serializer_class = SubEventSerializer

src/pretix/api/views/order.py

@@ -61,7 +61,7 @@ from pretix.api.serializers.orderchange import (
     OrderPositionCreateForExistingOrderSerializer,
     OrderPositionInfoPatchSerializer,
 )
-from pretix.api.views import RichOrderingFilter
+from pretix.api.utils import get_api_source
 from pretix.base.i18n import language
 from pretix.base.models import (
     CachedCombinedTicket, CachedTicket, Checkin, Device, EventMetaValue,
@@ -191,7 +191,7 @@ class OrderViewSet(viewsets.ModelViewSet):
         ctx['event'] = self.request.event
         ctx['pdf_data'] = self.request.query_params.get('pdf_data', 'false') == 'true'
         ctx['exclude'] = self.request.query_params.getlist('exclude')
-        ctx['include'] = self.request.query_params.getlist('include')
+        ctx['source'] = get_api_source(self.request)
         return ctx
 
     def get_queryset(self):
@@ -392,7 +392,8 @@ class OrderViewSet(viewsets.ModelViewSet):
                 oauth_application=request.auth.application if isinstance(request.auth, OAuthAccessToken) else None,
                 send_mail=send_mail,
                 email_comment=comment,
-                cancellation_fee=cancellation_fee
+                cancellation_fee=cancellation_fee,
+                source=get_api_source(request),
             )
         except OrderError as e:
             return Response(
@@ -416,6 +417,7 @@ class OrderViewSet(viewsets.ModelViewSet):
                 order,
                 user=request.user if request.user.is_authenticated else None,
                 auth=request.auth if isinstance(request.auth, (Device, TeamAPIToken, OAuthAccessToken)) else None,
+                source=get_api_source(request),
             )
         except OrderError as e:
             return Response(
@@ -435,6 +437,7 @@ class OrderViewSet(viewsets.ModelViewSet):
                 user=request.user if request.user.is_authenticated else None,
                 auth=request.auth if isinstance(request.auth, (Device, TeamAPIToken, OAuthAccessToken)) else None,
                 send_mail=send_mail,
+                source=get_api_source(request),
             )
         except Quota.QuotaExceededException as e:
             return Response({'detail': str(e)}, status=status.HTTP_400_BAD_REQUEST)
@@ -455,6 +458,7 @@ class OrderViewSet(viewsets.ModelViewSet):
                 auth=request.auth if isinstance(request.auth, (Device, TeamAPIToken, OAuthAccessToken)) else None,
                 send_mail=send_mail,
                 comment=comment,
+                source=get_api_source(request),
             )
         except OrderError as e:
             return Response({'detail': str(e)}, status=status.HTTP_400_BAD_REQUEST)
@@ -493,6 +497,7 @@ class OrderViewSet(viewsets.ModelViewSet):
             order,
             user=request.user if request.user.is_authenticated else None,
             auth=request.auth,
+            source=get_api_source(request),
         )
         return self.retrieve(request, [], **kwargs)
 
@@ -510,6 +515,7 @@ class OrderViewSet(viewsets.ModelViewSet):
             order,
             user=request.user if request.user.is_authenticated else None,
             auth=(request.auth if isinstance(request.auth, (TeamAPIToken, OAuthAccessToken, Device)) else None),
+            source=get_api_source(request),
         )
         return self.retrieve(request, [], **kwargs)
 
@@ -681,33 +687,28 @@ class OrderViewSet(viewsets.ModelViewSet):
                 )
                 if order.require_approval:
                     email_template = request.event.settings.mail_text_order_placed_require_approval
-                    subject_template = request.event.settings.mail_subject_order_placed_require_approval
                     log_entry = 'pretix.event.order.email.order_placed_require_approval'
                     email_attendees = False
                 elif free_flow:
                     email_template = request.event.settings.mail_text_order_free
-                    subject_template = request.event.settings.mail_subject_order_free
                     log_entry = 'pretix.event.order.email.order_free'
                     email_attendees = request.event.settings.mail_send_order_free_attendee
                     email_attendees_template = request.event.settings.mail_text_order_free_attendee
-                    subject_attendees_template = request.event.settings.mail_subject_order_free_attendee
                 else:
                     email_template = request.event.settings.mail_text_order_placed
-                    subject_template = request.event.settings.mail_subject_order_placed
                     log_entry = 'pretix.event.order.email.order_placed'
                     email_attendees = request.event.settings.mail_send_order_placed_attendee
                     email_attendees_template = request.event.settings.mail_text_order_placed_attendee
-                    subject_attendees_template = request.event.settings.mail_subject_order_placed_attendee
 
                 _order_placed_email(
-                    request.event, order, email_template, subject_template,
-                    log_entry, invoice, [payment] if payment else [], is_free=free_flow
+                    request.event, order, payment.payment_provider if payment else None, email_template,
+                    log_entry, invoice, payment, is_free=free_flow
                 )
                 if email_attendees:
                     for p in order.positions.all():
                         if p.addon_to_id is None and p.attendee_email and p.attendee_email != order.email:
-                            _order_placed_email_attendee(request.event, order, p, email_attendees_template, subject_attendees_template,
-                                                         log_entry, is_free=free_flow)
+                            _order_placed_email_attendee(request.event, order, p, email_attendees_template, log_entry,
+                                                         is_free=free_flow)
 
                 if not free_flow and order.status == Order.STATUS_PAID and payment:
                     payment._send_paid_mail(invoice, None, '')
@@ -937,7 +938,7 @@ with scopes_disabled():
 class OrderPositionViewSet(viewsets.ModelViewSet):
     serializer_class = OrderPositionSerializer
     queryset = OrderPosition.all.none()
-    filter_backends = (DjangoFilterBackend, RichOrderingFilter)
+    filter_backends = (DjangoFilterBackend, OrderingFilter)
     ordering = ('order__datetime', 'positionid')
     ordering_fields = ('order__code', 'order__datetime', 'positionid', 'attendee_name', 'order__status',)
     filterset_class = OrderPositionFilter
@@ -1491,7 +1492,8 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
                 if mark_refunded:
                     mark_order_refunded(payment.order,
                                         user=self.request.user if self.request.user.is_authenticated else None,
-                                        auth=self.request.auth)
+                                        auth=self.request.auth,
+                                        source=get_api_source(self.request))
                 else:
                     payment.order.status = Order.STATUS_PENDING
                     payment.order.set_expires(
@@ -1564,7 +1566,7 @@ class RefundViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
             mark_refunded = request.data.get('mark_canceled', False)
         if mark_refunded:
             mark_order_refunded(refund.order, user=self.request.user if self.request.user.is_authenticated else None,
-                                auth=self.request.auth)
+                                auth=self.request.auth, source=get_api_source(self.request))
         elif not (refund.order.status == Order.STATUS_PAID and refund.order.pending_sum <= 0):
             refund.order.status = Order.STATUS_PENDING
             refund.order.set_expires(
@@ -1611,23 +1613,13 @@ class RefundViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
                 user=request.user if request.user.is_authenticated else None,
                 auth=request.auth
             )
-
-            if r.state in (OrderRefund.REFUND_STATE_DONE, OrderRefund.REFUND_STATE_CANCELED, OrderRefund.REFUND_STATE_FAILED):
-                r.order.log_action(
-                    f'pretix.event.order.refund.{r.state}', {
-                        'local_id': r.local_id,
-                        'provider': r.provider,
-                    },
-                    user=request.user if request.user.is_authenticated else None,
-                    auth=request.auth
-                )
-
             if mark_refunded:
                 try:
                     mark_order_refunded(
                         r.order,
                         user=request.user if request.user.is_authenticated else None,
                         auth=(request.auth if request.auth else None),
+                        source=get_api_source(self.request),
                     )
                 except OrderError as e:
                     raise ValidationError(str(e))

src/pretix/base/email.py

@@ -320,18 +320,13 @@ def get_email_context(**kwargs):
     return ctx
 
 
-def _placeholder_payments(order, payments):
-    d = []
-    for payment in payments:
-        if 'payment' in inspect.signature(payment.payment_provider.order_pending_mail_render).parameters:
-            d.append(str(payment.payment_provider.order_pending_mail_render(order, payment)))
-        else:
-            d.append(str(payment.payment_provider.order_pending_mail_render(order)))
-    d = [line for line in d if line.strip()]
-    if d:
-        return '\n\n'.join(d)
+def _placeholder_payment(order, payment):
+    if not payment:
+        return None
+    if 'payment' in inspect.signature(payment.payment_provider.order_pending_mail_render).parameters:
+        return str(payment.payment_provider.order_pending_mail_render(order, payment))
     else:
-        return ''
+        return str(payment.payment_provider.order_pending_mail_render(order))
 
 
 def get_best_name(position_or_address, parts=False):
@@ -622,7 +617,7 @@ def base_placeholders(sender, **kwargs):
             _('An individual text with a reason can be inserted here.'),
         ),
         SimpleFunctionalMailTextPlaceholder(
-            'payment_info', ['order', 'payments'], _placeholder_payments,
+            'payment_info', ['order', 'payment'], _placeholder_payment,
             _('The amount has been charged to your card.'),
         ),
         SimpleFunctionalMailTextPlaceholder(

src/pretix/base/exporters/orderlist.py

@@ -303,8 +303,6 @@ class OrderListExporter(MultiSheetListExporter):
             for id, vn in payment_methods:
                 headers.append(_('Paid by {method}').format(method=vn))
 
-        # get meta_data labels from first cached event
-        headers += next(iter(self.event_object_cache.values())).meta_data.keys()
         yield headers
 
         full_fee_sum_cache = {
@@ -418,7 +416,6 @@ class OrderListExporter(MultiSheetListExporter):
                         payment_sum_cache.get((order.id, id), Decimal('0.00')) -
                         refund_sum_cache.get((order.id, id), Decimal('0.00'))
                     )
-            row += self.event_object_cache[order.event_id].meta_data.values()
             yield row
 
     def iterate_fees(self, form_data: dict):
@@ -468,9 +465,6 @@ class OrderListExporter(MultiSheetListExporter):
 
         headers.append(_('External customer ID'))
         headers.append(_('Payment providers'))
-
-        # get meta_data labels from first cached event
-        headers += next(iter(self.event_object_cache.values())).meta_data.keys()
         yield headers
 
         yield self.ProgressSetTotal(total=qs.count())
@@ -518,7 +512,6 @@ class OrderListExporter(MultiSheetListExporter):
                 str(self.providers.get(p, p)) for p in sorted(set((op.payment_providers or '').split(',')))
                 if p and p != 'free'
             ]))
-            row += self.event_object_cache[order.event_id].meta_data.values()
             yield row
 
     def iterate_positions(self, form_data: dict):
@@ -540,7 +533,6 @@ class OrderListExporter(MultiSheetListExporter):
             'order', 'order__invoice_address', 'order__customer', 'item', 'variation',
             'voucher', 'tax_rule'
         ).prefetch_related(
-            'subevent', 'subevent__meta_values',
             'answers', 'answers__question', 'answers__options'
         )
         if form_data['paid_only']:
@@ -632,10 +624,6 @@ class OrderListExporter(MultiSheetListExporter):
             _('Payment providers'),
         ]
 
-        # get meta_data labels from first cached event
-        meta_data_labels = next(iter(self.event_object_cache.values())).meta_data.keys()
-        if has_subevents:
-            headers += meta_data_labels
         yield headers
 
         all_ids = list(base_qs.order_by('order__datetime', 'positionid').values_list('pk', flat=True))
@@ -759,12 +747,6 @@ class OrderListExporter(MultiSheetListExporter):
                     str(self.providers.get(p, p)) for p in sorted(set((op.payment_providers or '').split(',')))
                     if p and p != 'free'
                 ]))
-
-                if has_subevents:
-                    if op.subevent:
-                        row += op.subevent.meta_data.values()
-                    else:
-                        row += [''] * len(meta_data_labels)
                 yield row
 
     def get_filename(self):

src/pretix/base/invoice.py

@@ -23,7 +23,6 @@ import logging
 from collections import defaultdict
 from decimal import Decimal
 from io import BytesIO
-from itertools import groupby
 from typing import Tuple
 
 import bleach
@@ -555,47 +554,31 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
                 pgettext('invoice', 'Amount'),
             )]
 
-        def _group_key(line):
-            return (line.description, line.tax_rate, line.tax_name, line.net_value, line.gross_value, line.subevent_id,
-                    line.event_date_from, line.event_date_to)
-
         total = Decimal('0.00')
-        for (description, tax_rate, tax_name, net_value, gross_value, *ignored), lines in groupby(self.invoice.lines.all(), key=_group_key):
-            lines = list(lines)
+        for line in self.invoice.lines.all():
             if has_taxes:
-                if len(lines) > 1:
-                    single_price_line = pgettext('invoice', 'Single price: {net_price} net / {gross_price} gross').format(
-                        net_price=money_filter(net_value, self.invoice.event.currency),
-                        gross_price=money_filter(gross_value, self.invoice.event.currency),
-                    )
-                    description = description + "\n" + single_price_line
                 tdata.append((
                     Paragraph(
-                        bleach.clean(description, tags=['br']).strip().replace('<br>', '<br/>').replace('\n', '<br />\n'),
+                        bleach.clean(line.description, tags=['br']).strip().replace('<br>', '<br/>').replace('\n', '<br />\n'),
                         self.stylesheet['Normal']
                     ),
-                    str(len(lines)),
-                    localize(tax_rate) + " %",
-                    money_filter(net_value * len(lines), self.invoice.event.currency),
-                    money_filter(gross_value * len(lines), self.invoice.event.currency),
+                    "1",
+                    localize(line.tax_rate) + " %",
+                    money_filter(line.net_value, self.invoice.event.currency),
+                    money_filter(line.gross_value, self.invoice.event.currency),
                 ))
             else:
-                if len(lines) > 1:
-                    single_price_line = pgettext('invoice', 'Single price: {price}').format(
-                        price=money_filter(gross_value, self.invoice.event.currency),
-                    )
-                    description = description + "\n" + single_price_line
                 tdata.append((
                     Paragraph(
-                        bleach.clean(description, tags=['br']).strip().replace('<br>', '<br/>').replace('\n', '<br />\n'),
+                        bleach.clean(line.description, tags=['br']).strip().replace('<br>', '<br/>').replace('\n', '<br />\n'),
                         self.stylesheet['Normal']
                     ),
-                    str(len(lines)),
-                    money_filter(gross_value * len(lines), self.invoice.event.currency),
+                    "1",
+                    money_filter(line.gross_value, self.invoice.event.currency),
                 ))
-            taxvalue_map[tax_rate, tax_name] += (gross_value - net_value) * len(lines)
-            grossvalue_map[tax_rate, tax_name] += gross_value * len(lines)
-            total += gross_value * len(lines)
+            taxvalue_map[line.tax_rate, line.tax_name] += line.tax_value
+            grossvalue_map[line.tax_rate, line.tax_name] += line.gross_value
+            total += line.gross_value
 
         if has_taxes:
             tdata.append([

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

@@ -103,8 +103,6 @@ class Command(BaseCommand):
 
             with language(locale), override(timezone):
                 for receiver, response in signal_result:
-                    if not response:
-                        return None
                     ex = response(e, o, report_status)
                     if ex.identifier == options['export_provider']:
                         params = json.loads(options.get('parameters') or '{}')

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

@@ -79,9 +79,9 @@ class Command(BaseCommand):
                 if settings.SENTRY_ENABLED:
                     from sentry_sdk import capture_exception
                     capture_exception(err)
-                    self.stdout.write(self.style.ERROR(f'ERROR {name}: {str(err)}\n'))
+                    self.stdout.write(self.style.ERROR(f'ERROR runperiodic {str(err)}\n'))
                 else:
-                    self.stdout.write(self.style.ERROR(f'ERROR {name}: {str(err)}\n'))
+                    self.stdout.write(self.style.ERROR(f'ERROR runperiodic {str(err)}\n'))
                     traceback.print_exc()
             else:
                 if options.get('verbosity') > 1:

src/pretix/base/migrations/0223_auto_20221019_0950.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.2 on 2022-10-19 09:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0222_alter_question_unique_together'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='transaction',
+            name='source_identifier',
+            field=models.CharField(db_index=True, max_length=190, null=True),
+        ),
+        migrations.AddField(
+            model_name='transaction',
+            name='source_type',
+            field=models.CharField(db_index=True, max_length=190, null=True),
+        ),
+    ]

src/pretix/base/migrations/0223_voucher_min_usages.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.12 on 2022-10-12 09:13
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0222_alter_question_unique_together'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='voucher',
-            name='min_usages',
-            field=models.PositiveIntegerField(default=1),
-        ),
-    ]

src/pretix/base/migrations/0224_eventmetaproperty_filter_allowed.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.16 on 2022-11-14 11:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0223_voucher_min_usages'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='eventmetaproperty',
-            name='filter_allowed',
-            field=models.BooleanField(default=True),
-        ),
-    ]

src/pretix/base/migrations/0225_orderpayment_process_initiated.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.16 on 2022-11-17 15:27
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0224_eventmetaproperty_filter_allowed'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='orderpayment',
-            name='process_initiated',
-            field=models.BooleanField(null=True),
-        ),
-    ]

src/pretix/base/models/customers.py

@@ -262,7 +262,7 @@ class Customer(LoggedModel):
         ) + '?id=' + self.identifier + '&token=' + token
         mail(
             self.email,
-            self.organizer.settings.mail_subject_customer_registration,
+            _('Activate your account at {organizer}').format(organizer=self.organizer.name),
             self.organizer.settings.mail_text_customer_registration,
             ctx,
             locale=self.locale,

src/pretix/base/models/event.py

@@ -590,7 +590,6 @@ class Event(EventMixin, LoggedModel):
         self.settings.event_list_type = 'calendar'
         self.settings.invoice_email_attachment = True
         self.settings.name_scheme = 'given_family'
-        self.settings.payment_banktransfer_invoice_immediately = True
 
     @property
     def social_image(self):
@@ -1580,11 +1579,6 @@ class EventMetaProperty(LoggedModel):
         verbose_name=_("Valid values"),
         help_text=_("If you keep this empty, any value is allowed. Otherwise, enter one possible value per line.")
     )
-    filter_allowed = models.BooleanField(
-        default=True, verbose_name=_("Can be used for filtering"),
-        help_text=_("This field will be shown to filter events or reports in the backend, and it can also be used "
-                    "for hidden filter parameters in the frontend (e.g. using the widget).")
-    )
 
     def full_clean(self, exclude=None, validate_unique=True):
         super().full_clean(exclude, validate_unique)

src/pretix/base/models/items.py

@@ -581,15 +581,18 @@ class Item(LoggedModel):
     def tax(self, price=None, base_price_is='auto', currency=None, invoice_address=None, override_tax_rate=None, include_bundled=False):
         price = price if price is not None else self.default_price
 
-        bundled_sum = Decimal('0.00')
-        bundled_sum_net = Decimal('0.00')
-        bundled_sum_tax = Decimal('0.00')
+        if not self.tax_rule:
+            t = TaxedPrice(gross=price, net=price, tax=Decimal('0.00'),
+                           rate=Decimal('0.00'), name='')
+        else:
+            t = self.tax_rule.tax(price, base_price_is=base_price_is, invoice_address=invoice_address,
+                                  override_tax_rate=override_tax_rate, currency=currency or self.event.currency)
+
         if include_bundled:
             for b in self.bundles.all():
                 if b.designated_price and b.bundled_item.tax_rule_id != self.tax_rule_id:
                     if b.bundled_variation:
-                        bprice = b.bundled_variation.tax(b.designated_price * b.count,
-                                                         base_price_is='gross',
+                        bprice = b.bundled_variation.tax(b.designated_price * b.count, base_price_is='gross',
                                                          invoice_address=invoice_address,
                                                          currency=currency)
                     else:
@@ -597,23 +600,17 @@ class Item(LoggedModel):
                                                     invoice_address=invoice_address,
                                                     base_price_is='gross',
                                                     currency=currency)
-                    bundled_sum += bprice.gross
-                    bundled_sum_net += bprice.net
-                    bundled_sum_tax += bprice.tax
-
-        if not self.tax_rule:
-            t = TaxedPrice(gross=price - bundled_sum, net=price - bundled_sum, tax=Decimal('0.00'),
-                           rate=Decimal('0.00'), name='')
-        else:
-            t = self.tax_rule.tax(price, base_price_is=base_price_is, invoice_address=invoice_address,
-                                  override_tax_rate=override_tax_rate, currency=currency or self.event.currency,
-                                  subtract_from_gross=bundled_sum)
-
-        if bundled_sum:
-            t.name = "MIXED!"
-            t.gross += bundled_sum
-            t.net += bundled_sum_net
-            t.tax += bundled_sum_tax
+                    if not self.tax_rule:
+                        compare_price = TaxedPrice(gross=b.designated_price * b.count, net=b.designated_price * b.count,
+                                                   tax=Decimal('0.00'), rate=Decimal('0.00'), name='')
+                    else:
+                        compare_price = self.tax_rule.tax(b.designated_price * b.count,
+                                                          override_tax_rate=override_tax_rate,
+                                                          invoice_address=invoice_address,
+                                                          currency=currency)
+                    t.net += bprice.net - compare_price.net
+                    t.tax += bprice.tax - compare_price.tax
+                    t.name = "MIXED!"
 
         return t
 
@@ -1384,10 +1381,8 @@ class Question(LoggedModel):
         if self.type == Question.TYPE_CHOICE:
             if isinstance(answer, QuestionOption):
                 return answer
-            if not isinstance(answer, (int, str)):
-                raise ValidationError(_('Invalid input type.'))
             q = Q(identifier=answer)
-            if isinstance(answer, int) or (isinstance(answer, str) and answer.isdigit()):
+            if isinstance(answer, int) or answer.isdigit():
                 q |= Q(pk=answer)
             o = self.options.filter(q).first()
             if not o:

src/pretix/base/models/orders.py

@@ -564,30 +564,17 @@ class Order(LockModel, LoggedModel):
     @cached_property
     def user_cancel_fee(self):
         fee = Decimal('0.00')
-        if self.status == Order.STATUS_PAID:
-            if self.event.settings.cancel_allow_user_paid_keep_fees:
-                fee += self.fees.filter(
-                    fee_type__in=(OrderFee.FEE_TYPE_PAYMENT, OrderFee.FEE_TYPE_SHIPPING, OrderFee.FEE_TYPE_SERVICE,
-                                  OrderFee.FEE_TYPE_CANCELLATION)
-                ).aggregate(
-                    s=Sum('value')
-                )['s'] or 0
-            if self.event.settings.cancel_allow_user_paid_keep_percentage:
-                fee += self.event.settings.cancel_allow_user_paid_keep_percentage / Decimal('100.0') * (self.total - fee)
-            if self.event.settings.cancel_allow_user_paid_keep:
-                fee += self.event.settings.cancel_allow_user_paid_keep
-        else:
-            if self.event.settings.cancel_allow_user_unpaid_keep_fees:
-                fee += self.fees.filter(
-                    fee_type__in=(OrderFee.FEE_TYPE_PAYMENT, OrderFee.FEE_TYPE_SHIPPING, OrderFee.FEE_TYPE_SERVICE,
-                                  OrderFee.FEE_TYPE_CANCELLATION)
-                ).aggregate(
-                    s=Sum('value')
-                )['s'] or 0
-            if self.event.settings.cancel_allow_user_unpaid_keep_percentage:
-                fee += self.event.settings.cancel_allow_user_unpaid_keep_percentage / Decimal('100.0') * (self.total - fee)
-            if self.event.settings.cancel_allow_user_unpaid_keep:
-                fee += self.event.settings.cancel_allow_user_unpaid_keep
+        if self.event.settings.cancel_allow_user_paid_keep_fees:
+            fee += self.fees.filter(
+                fee_type__in=(OrderFee.FEE_TYPE_PAYMENT, OrderFee.FEE_TYPE_SHIPPING, OrderFee.FEE_TYPE_SERVICE,
+                              OrderFee.FEE_TYPE_CANCELLATION)
+            ).aggregate(
+                s=Sum('value')
+            )['s'] or 0
+        if self.event.settings.cancel_allow_user_paid_keep_percentage:
+            fee += self.event.settings.cancel_allow_user_paid_keep_percentage / Decimal('100.0') * (self.total - fee)
+        if self.event.settings.cancel_allow_user_paid_keep:
+            fee += self.event.settings.cancel_allow_user_paid_keep
         return round_decimal(min(fee, self.total), self.event.currency)
 
     @property
@@ -655,12 +642,10 @@ class Order(LockModel, LoggedModel):
         if self.user_cancel_deadline and now() > self.user_cancel_deadline:
             return False
 
-        if 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.payment_refund_sum > Decimal('0.00'):
-            return False
         elif self.status == Order.STATUS_PENDING:
             return self.event.settings.cancel_allow_user
         return False
@@ -1042,7 +1027,7 @@ class Order(LockModel, LoggedModel):
         with language(self.locale, self.event.settings.region):
             email_template = self.event.settings.mail_text_resend_link
             email_context = get_email_context(event=self.event, order=self)
-            email_subject = self.event.settings.mail_subject_resend_link
+            email_subject = _('Your order: %(code)s') % {'code': self.code}
             self.send_mail(
                 email_subject, email_template, email_context,
                 'pretix.event.order.email.resend', user=user, auth=auth,
@@ -1056,10 +1041,13 @@ class Order(LockModel, LoggedModel):
                 continue
             yield op
 
-    def create_transactions(self, is_new=False, positions=None, fees=None, dt_now=None, migrated=False,
-                            _backfill_before_cancellation=False, save=True):
+    def create_transactions(self, *, source=None, is_new=False, positions=None, fees=None,
+                            dt_now=None, migrated=False, _backfill_before_cancellation=False, save=True):
         dt_now = dt_now or now()
 
+        if source is not None and (not isinstance(source, tuple) or len(source) != 2 or not all(isinstance(a, str) or a is None for a in source)):
+            return ValueError("source needs to be a 2-tuple of (source_type(str), source_identifier(str))")
+
         # Count the transactions we already have
         current_transaction_count = Counter()
         if not is_new:
@@ -1104,6 +1092,8 @@ class Order(LockModel, LoggedModel):
                     tax_value=taxvalue,
                     fee_type=feetype,
                     internal_type=internaltype,
+                    source_type=source[0] if source else None,
+                    source_identifier=source[1] if source else None,
                 ))
         create.sort(key=lambda t: (0 if t.count < 0 else 1, t.positionid or 0))
         if save:
@@ -1509,9 +1499,6 @@ class OrderPayment(models.Model):
     :type info: str
     :param fee: The ``OrderFee`` object used to track the fee for this order.
     :type fee: pretix.base.models.OrderFee
-    :param process_initiated: Only for internal use inside pretix.presale to check which payments have started
-                              the execution process.
-    :type process_initiated: bool
     """
     PAYMENT_STATE_CREATED = 'created'
     PAYMENT_STATE_PENDING = 'pending'
@@ -1562,9 +1549,6 @@ class OrderPayment(models.Model):
         null=True, blank=True, related_name='payments', on_delete=models.SET_NULL
     )
     migrated = models.BooleanField(default=False)
-    process_initiated = models.BooleanField(
-        null=True  # null = created before this field was introduced
-    )
 
     objects = ScopedManager(organizer='order__event__organizer')
 
@@ -1594,7 +1578,7 @@ class OrderPayment(models.Model):
         return self.order.event.get_payment_providers(cached=True).get(self.provider)
 
     @transaction.atomic()
-    def _mark_paid_inner(self, force, count_waitinglist, user, auth, ignore_date=False, overpaid=False):
+    def _mark_paid_inner(self, force, count_waitinglist, user, auth, ignore_date=False, overpaid=False, source=None):
         from pretix.base.signals import order_paid
         can_be_paid = self.order._can_be_paid(count_waitinglist=count_waitinglist, ignore_date=ignore_date, force=force)
         if can_be_paid is not True:
@@ -1617,7 +1601,9 @@ class OrderPayment(models.Model):
             self.order.log_action('pretix.event.order.overpaid', {}, user=user, auth=auth)
         order_paid.send(self.order.event, order=self.order)
         if status_change:
-            self.order.create_transactions()
+            self.order.create_transactions(
+                source=source or ('pretix.payment', None),
+            )
 
     def fail(self, info=None, user=None, auth=None, log_data=None):
         """
@@ -1651,7 +1637,7 @@ class OrderPayment(models.Model):
         }, user=user, auth=auth)
 
     def confirm(self, count_waitinglist=True, send_mail=True, force=False, user=None, auth=None, mail_text='',
-                ignore_date=False, lock=True, payment_date=None):
+                ignore_date=False, lock=True, payment_date=None, source=None):
         """
         Marks the payment as complete. If possible, this also marks the order as paid if no further
         payment is required
@@ -1714,10 +1700,11 @@ class OrderPayment(models.Model):
             ))
             return
 
-        self._mark_order_paid(count_waitinglist, send_mail, force, user, auth, mail_text, ignore_date, lock, payment_sum - refund_sum)
+        self._mark_order_paid(count_waitinglist, send_mail, force, user, auth, mail_text, ignore_date, lock, payment_sum - refund_sum,
+                              source)
 
     def _mark_order_paid(self, count_waitinglist=True, send_mail=True, force=False, user=None, auth=None, mail_text='',
-                         ignore_date=False, lock=True, payment_refund_sum=0):
+                         ignore_date=False, lock=True, payment_refund_sum=0, source=None):
         from pretix.base.services.invoices import (
             generate_invoice, invoice_qualified,
         )
@@ -1731,7 +1718,7 @@ class OrderPayment(models.Model):
 
         with lockfn():
             self._mark_paid_inner(force, count_waitinglist, user, auth, overpaid=payment_refund_sum > self.order.total,
-                                  ignore_date=ignore_date)
+                                  ignore_date=ignore_date, source=source)
 
         invoice = None
         if invoice_qualified(self.order):
@@ -1759,8 +1746,8 @@ class OrderPayment(models.Model):
 
         with language(self.order.locale, self.order.event.settings.region):
             email_template = self.order.event.settings.mail_text_order_paid_attendee
-            email_subject = self.order.event.settings.mail_subject_order_paid_attendee
             email_context = get_email_context(event=self.order.event, order=self.order, position=position)
+            email_subject = _('Event registration confirmed: %(code)s') % {'code': self.order.code}
             try:
                 position.send_mail(
                     email_subject, email_template, email_context,
@@ -1777,8 +1764,8 @@ class OrderPayment(models.Model):
 
         with language(self.order.locale, self.order.event.settings.region):
             email_template = self.order.event.settings.mail_text_order_paid
-            email_subject = self.order.event.settings.mail_subject_order_paid
             email_context = get_email_context(event=self.order.event, order=self.order, payment_info=mail_text)
+            email_subject = _('Payment received for your order: %(code)s') % {'code': self.order.code}
             try:
                 self.order.send_mail(
                     email_subject, email_template, email_context,
@@ -2458,7 +2445,7 @@ class OrderPosition(AbstractPosition):
         with language(self.order.locale, self.order.event.settings.region):
             email_template = self.event.settings.mail_text_resend_link
             email_context = get_email_context(event=self.order.event, order=self.order, position=self)
-            email_subject = self.event.settings.mail_subject_resend_link
+            email_subject = _('Your event registration: %(code)s') % {'code': self.order.code}
             self.send_mail(
                 email_subject, email_template, email_context,
                 'pretix.event.order.email.resend', user=user, auth=auth,
@@ -2504,6 +2491,8 @@ class Transaction(models.Model):
 
     :param id: ID of the transaction
     :param order: Order the transaction belongs to
+    :param source_type: Functionality that caused the transaction to be created, usually the name of a module or plugin
+    :param source_identifier: Identifier of the entity that caused the transaction to be created, as defined by the module or plugin noted in ``source_type``.
     :param datetime: Date and time of the transaction
     :param migrated: Whether this object was reconstructed because the order was created before transactions where introduced
     :param positionid: Affected Position ID, in case this transaction represents a change in an order position
@@ -2526,6 +2515,12 @@ class Transaction(models.Model):
         related_name='transactions',
         on_delete=models.PROTECT
     )
+    source_type = models.CharField(
+        max_length=190, db_index=True, null=True, blank=True
+    )
+    source_identifier = models.CharField(
+        max_length=190, db_index=True, null=True, blank=True
+    )
     created = models.DateTimeField(
         auto_now_add=True,
         db_index=True,
@@ -2743,7 +2738,6 @@ class CartPosition(AbstractPosition):
             tax_rule=self.item.tax_rule,
             invoice_address=invoice_address,
             bundled_sum=sum([b.price_after_voucher for b in bundled_positions]),
-            is_bundled=self.is_bundled,
         )
         if line_price.gross != self.line_price_gross or line_price.rate != self.tax_rate:
             self.line_price_gross = line_price.gross

src/pretix/base/models/vouchers.py

@@ -137,8 +137,6 @@ class Voucher(LoggedModel):
     :type max_usages: int
     :param redeemed: The number of times this voucher already has been redeemed
     :type redeemed: int
-    :param min_usages: The minimum number of times this voucher must be redeemed
-    :type min_usages: int
     :param valid_until: The expiration date of this voucher (optional)
     :type valid_until: datetime
     :param block_quota: If set to true, this voucher will reserve quota for its holder
@@ -201,14 +199,6 @@ class Voucher(LoggedModel):
         verbose_name=_("Redeemed"),
         default=0
     )
-    min_usages = models.PositiveIntegerField(
-        verbose_name=_("Minimum usages"),
-        help_text=_("If set to more than one, the voucher must be redeemed for this many products when it is used for "
-                    "the first time. On later usages, it can also be used for lower numbers of products. Note that "
-                    "this means that the total number of usages in some cases can be lower than this limit, e.g. in "
-                    "case of cancellations."),
-        default=1
-    )
     budget = models.DecimalField(
         verbose_name=_("Maximum discount budget"),
         help_text=_("This is the maximum monetary amount that will be discounted using this voucher across all usages. "
@@ -360,10 +350,6 @@ class Voucher(LoggedModel):
                     'redeemed': redeemed
                 }
             )
-        if data.get('max_usages', 1) < data.get('min_usages', 1):
-            raise ValidationError(
-                _('The maximum number of usages may not be lower than the minimum number of usages.'),
-            )
 
     @staticmethod
     def clean_subevent(data, event):
@@ -478,7 +464,7 @@ class Voucher(LoggedModel):
         if quota:
             raise ValidationError(_('You need to choose a specific product if you select a seat.'))
 
-        if data.get('max_usages', 1) > 1 or data.get('min_usages', 1) > 1:
+        if data.get('max_usages', 1) > 1:
             raise ValidationError(_('Seat-specific vouchers can only be used once.'))
 
         if item and seat.product != item:
@@ -581,10 +567,6 @@ class Voucher(LoggedModel):
         else:
             return bool(subevent.seating_plan) if subevent else self.event.seating_plan
 
-    @property
-    def min_usages_remaining(self):
-        return max(1, self.min_usages - self.redeemed)
-
     @classmethod
     def annotate_budget_used_orders(cls, qs):
         opq = OrderPosition.objects.filter(

src/pretix/base/models/waitinglist.py

@@ -216,7 +216,7 @@ class WaitingListEntry(LoggedModel):
         with language(self.locale, self.event.settings.region):
             mail(
                 self.email,
-                self.event.settings.mail_subject_waiting_list,
+                _('You have been selected from the waitinglist for {event}').format(event=str(self.event)),
                 self.event.settings.mail_text_waiting_list,
                 get_email_context(event=self.event, waiting_list_entry=self),
                 self.event,

src/pretix/base/payment.py

@@ -63,13 +63,14 @@ from pretix.base.models import (
     OrderRefund, Quota,
 )
 from pretix.base.reldate import RelativeDateField, RelativeDateWrapper
+from pretix.base.services.cart import get_fees
 from pretix.base.settings import SettingsSandbox
 from pretix.base.signals import register_payment_providers
 from pretix.base.templatetags.money import money_filter
 from pretix.base.templatetags.rich_text import rich_text
 from pretix.helpers.countries import CachedCountries
 from pretix.helpers.money import DecimalTextInput
-from pretix.multidomain.urlreverse import build_absolute_uri
+from pretix.multidomain.urlreverse import build_absolute_uri, eventreverse
 from pretix.presale.views import get_cart, get_cart_total
 from pretix.presale.views.cart import cart_session, get_or_create_cart_id
 
@@ -137,48 +138,6 @@ class BasePaymentProvider:
         """
         return self.settings.get('_enabled', as_type=bool)
 
-    @property
-    def multi_use_supported(self) -> bool:
-        """
-        Returns whether or whether not this payment provider supports being used multiple times in the same
-        checkout, or in addition to a different payment provider. This is usually only useful for payment providers
-        that represent gift cards, i.e. payment methods with an upper limit per payment instrument that can usually
-        be combined with other instruments.
-
-        If you set this property to ``True``, the behavior of how pretix interacts with your payment provider changes
-        and you will need to respect the following rules:
-
-        - ``payment_form_render`` must not depend on session state, it must always allow a user to add a new payment.
-           Editing a payment is not possible, but pretix will give users an option to delete it.
-
-        - Returning ``True`` from ``checkout_prepare`` is no longer enough. Instead, you must *also* call
-          ``pretix.base.services.cart.add_payment_to_cart(request, provider, min_value, max_value, info_data)``
-          to add the payment to the session. You are still allowed to do a redirect from ``checkout_prepare`` and then
-          call this function upon return.
-
-        - Unlike in the general case, when ``checkout_prepare`` is called, the ``cart['total']`` parameter will _not yet_
-          include payment fees charged by your provider as we don't yet know the amount of the charge, so you need to
-          take care of that yourself when setting your maximum amount.
-
-        - ``payment_is_valid_session`` will not be called during checkout, don't rely on it. If you called
-          ``add_payment_to_cart``, we'll trust the payment is okay and your next chance to change that will be
-          ``execute_payment``.
-
-        The changed behavior currently only affects the behavior during initial checkout (i.e. ``checkout_prepare``),
-        for ``payment_prepare`` the regular behavior applies and you are expected to just modify the amount of the
-        ``OrderPayment`` object if you need to.
-        """
-        return False
-
-    @property
-    def execute_payment_needs_user(self) -> bool:
-        """
-        Set this to ``True`` if your ``execute_payment`` function needs to be triggered by a user request, i.e. either
-        needs the ``request`` object or might require a browser redirect. If this is ``False``, you will not receive
-        a ``request`` and may not redirect since execute_payment might be called server-side.
-        """
-        return True
-
     @property
     def test_mode_message(self) -> str:
         """
@@ -615,7 +574,7 @@ class BasePaymentProvider:
         ctx = {'request': request, 'form': form}
         return template.render(ctx)
 
-    def checkout_confirm_render(self, request, order: Order=None, info_data: dict=None) -> str:
+    def checkout_confirm_render(self, request, order: Order=None) -> str:
         """
         If the user has successfully filled in their payment data, they will be redirected
         to a confirmation page which lists all details of their order for a final review.
@@ -625,9 +584,7 @@ class BasePaymentProvider:
         In most cases, this should include a short summary of the user's input and
         a short explanation on how the payment process will continue.
 
-        :param request: The current HTTP request.
         :param order: Only set when this is a change to a new payment method for an existing order.
-        :param info_data: The ``info_data`` dictionary you set during ``add_payment_to_cart`` (only filled if ``multi_use_supported`` is set)
         """
         raise NotImplementedError()  # NOQA
 
@@ -661,10 +618,6 @@ class BasePaymentProvider:
         .. IMPORTANT:: If this is called, the user has not yet confirmed their order.
            You may NOT do anything which actually moves money.
 
-        Note: The behavior of this method changes significantly when you set
-              ``multi_use_supported``. Please refer to the ``multi_use_supported`` documentation
-              for more information.
-
         :param cart: This dictionary contains at least the following keys:
 
             positions:
@@ -704,9 +657,9 @@ class BasePaymentProvider:
         You will be passed an :py:class:`pretix.base.models.OrderPayment` object that contains
         the amount of money that should be paid.
 
-        If you need any special behavior, you can return a string containing the URL the user will be redirected to.
-        If you are done with your process you should return the user to the order's detail page. Redirection is not
-        allowed if you set ``execute_payment_needs_user`` to ``True``.
+        If you need any special behavior, you can return a string
+        containing the URL the user will be redirected to. If you are done with your process
+        you should return the user to the order's detail page.
 
         If the payment is completed, you should call ``payment.confirm()``. Please note that this might
         raise a ``Quota.QuotaExceededException`` if (and only if) the payment term of this order is over and
@@ -718,7 +671,7 @@ class BasePaymentProvider:
 
         On errors, you should raise a ``PaymentException``.
 
-        :param request: A HTTP request, except if ``execute_payment_needs_user`` is ``False``
+        :param order: The order object
         :param payment: An ``OrderPayment`` instance
         """
         return None
@@ -924,15 +877,6 @@ class BasePaymentProvider:
         """
         return {}
 
-    def api_refund_details(self, refund: OrderRefund):
-        """
-        Will be called to populate the ``details`` parameter of the refund in the REST API.
-
-        :param refund: The refund in question.
-        :return: A serializable dictionary
-        """
-        return {}
-
     def matching_id(self, payment: OrderPayment):
         """
         Will be called to get an ID for matching this payment when comparing pretix records with records of an external
@@ -952,7 +896,6 @@ class FreeOrderProvider(BasePaymentProvider):
     is_implicit = True
     is_enabled = True
     identifier = "free"
-    execute_payment_needs_user = False
 
     def checkout_confirm_render(self, request: HttpRequest) -> str:
         return _("No payment is required as this order only includes products which are free of charge.")
@@ -1016,9 +959,6 @@ class BoxOfficeProvider(BasePaymentProvider):
             "payment_data": payment.info_data.get('payment_data', {}),
         }
 
-    def api_refund_details(self, refund: OrderRefund):
-        return self.api_payment_details(refund)
-
     def payment_control_render(self, request, payment) -> str:
         if not payment.info:
             return
@@ -1039,7 +979,6 @@ class BoxOfficeProvider(BasePaymentProvider):
 class ManualPayment(BasePaymentProvider):
     identifier = 'manual'
     verbose_name = _('Manual payment')
-    execute_payment_needs_user = False
 
     @property
     def test_mode_message(self):
@@ -1180,42 +1119,18 @@ class OffsettingProvider(BasePaymentProvider):
 
 class GiftCardPayment(BasePaymentProvider):
     identifier = "giftcard"
-    priority = 10
-    multi_use_supported = True
-    execute_payment_needs_user = False
     verbose_name = _("Gift card")
-
-    @property
-    def public_name(self) -> str:
-        return str(self.settings.get("public_name", as_type=LazyI18nString)) or _(
-            "Gift card"
-        )
+    priority = 10
 
     @property
     def settings_form_fields(self):
-        fields = [
-            (
-                "public_name",
-                I18nFormField(
-                    label=_("Payment method name"), widget=I18nTextInput, required=False
-                ),
-            ),
-            (
-                "public_description",
-                I18nFormField(
-                    label=_("Payment method description"), widget=I18nTextarea, required=False
-                ),
-            ),
-        ]
-
-        f = OrderedDict(fields + list(super().settings_form_fields.items()))
+        f = super().settings_form_fields
         del f['_fee_abs']
         del f['_fee_percent']
         del f['_fee_reverse_calc']
         del f['_total_min']
         del f['_total_max']
         del f['_invoice_text']
-        f.move_to_end("_enabled", last=False)
         return f
 
     @property
@@ -1229,14 +1144,10 @@ class GiftCardPayment(BasePaymentProvider):
         return super().order_change_allowed(order) and self.event.organizer.has_gift_cards
 
     def payment_form_render(self, request: HttpRequest, total: Decimal) -> str:
-        return get_template('pretixcontrol/giftcards/checkout.html').render({
-            'request': request,
-        })
+        return get_template('pretixcontrol/giftcards/checkout.html').render({})
 
-    def checkout_confirm_render(self, request, order=None, info_data=None) -> str:
-        return get_template('pretixcontrol/giftcards/checkout_confirm.html').render({
-            'info_data': info_data,
-        })
+    def checkout_confirm_render(self, request) -> str:
+        return get_template('pretixcontrol/giftcards/checkout_confirm.html').render({})
 
     def refund_control_render(self, request, refund) -> str:
         from .models import GiftCard
@@ -1280,9 +1191,6 @@ class GiftCardPayment(BasePaymentProvider):
             }
         }
 
-    def api_refund_details(self, refund: OrderRefund):
-        return self.api_payment_details(refund)
-
     def payment_partial_refund_supported(self, payment: OrderPayment) -> bool:
         return True
 
@@ -1290,8 +1198,6 @@ class GiftCardPayment(BasePaymentProvider):
         return True
 
     def checkout_prepare(self, request: HttpRequest, cart: Dict[str, Any]) -> Union[bool, str, None]:
-        from pretix.base.services.cart import add_payment_to_cart
-
         for p in get_cart(request):
             if p.item.issue_giftcard:
                 messages.error(request, _("You cannot pay with gift cards when buying a gift card."))
@@ -1300,7 +1206,7 @@ class GiftCardPayment(BasePaymentProvider):
         cs = cart_session(request)
         try:
             gc = self.event.organizer.accepted_gift_cards.get(
-                secret=request.POST.get("giftcard").strip()
+                secret=request.POST.get("giftcard")
             )
             if gc.currency != self.event.currency:
                 messages.error(request, _("This gift card does not support this currency."))
@@ -1317,22 +1223,34 @@ class GiftCardPayment(BasePaymentProvider):
             if gc.value <= Decimal("0.00"):
                 messages.error(request, _("All credit on this gift card has been used."))
                 return
+            if 'gift_cards' not in cs:
+                cs['gift_cards'] = []
+            elif gc.pk in cs['gift_cards']:
+                messages.error(request, _("This gift card is already used for your payment."))
+                return
+            cs['gift_cards'] = cs['gift_cards'] + [gc.pk]
 
-            for p in cs.get('payments', []):
-                if p['provider'] == self.identifier and p['info_data']['gift_card'] == gc.pk:
-                    messages.error(request, _("This gift card is already used for your payment."))
-                    return
-
-            add_payment_to_cart(
-                request,
-                self,
-                max_value=gc.value,
-                info_data={
-                    'gift_card': gc.pk,
-                    'gift_card_secret': gc.secret,
-                }
+            total = sum(p.total for p in cart['positions'])
+            # Recompute fees. Some plugins, e.g. pretix-servicefees, change their fee schedule if a gift card is
+            # applied.
+            fees = get_fees(
+                self.event, request, total, cart['invoice_address'], cs.get('payment'),
+                cart['raw']
             )
-            return True
+            total += sum([f.value for f in fees])
+            remainder = total
+            if remainder > Decimal('0.00'):
+                del cs['payment']
+                messages.success(request, _("Your gift card has been applied, but {} still need to be paid. Please select a payment method.").format(
+                    money_filter(remainder, self.event.currency)
+                ))
+            else:
+                messages.success(request, _("Your gift card has been applied."))
+
+            kwargs = {'step': 'payment'}
+            if request.resolver_match and 'cart_namespace' in request.resolver_match.kwargs:
+                kwargs['cart_namespace'] = request.resolver_match.kwargs['cart_namespace']
+            return eventreverse(self.event, 'presale:event.checkout', kwargs=kwargs)
         except GiftCard.DoesNotExist:
             if self.event.vouchers.filter(code__iexact=request.POST.get("giftcard")).exists():
                 messages.warning(request, _("You entered a voucher instead of a gift card. Vouchers can only be entered on the first page of the shop below "
@@ -1350,7 +1268,7 @@ class GiftCardPayment(BasePaymentProvider):
 
         try:
             gc = self.event.organizer.accepted_gift_cards.get(
-                secret=request.POST.get("giftcard").strip()
+                secret=request.POST.get("giftcard")
             )
             if gc.currency != self.event.currency:
                 messages.error(request, _("This gift card does not support this currency."))
@@ -1369,7 +1287,6 @@ class GiftCardPayment(BasePaymentProvider):
                 return
             payment.info_data = {
                 'gift_card': gc.pk,
-                'gift_card_secret': gc.secret,
                 'retry': True
             }
             payment.amount = min(payment.amount, gc.value)
@@ -1377,7 +1294,7 @@ class GiftCardPayment(BasePaymentProvider):
 
             return True
         except GiftCard.DoesNotExist:
-            if self.event.vouchers.filter(code__iexact=request.POST.get("giftcard").strip()).exists():
+            if self.event.vouchers.filter(code__iexact=request.POST.get("giftcard")).exists():
                 messages.warning(request, _("You entered a voucher instead of a gift card. Vouchers can only be entered on the first page of the shop below "
                                             "the product selection."))
             else:
@@ -1386,45 +1303,36 @@ class GiftCardPayment(BasePaymentProvider):
             messages.error(request, _("This gift card can not be redeemed since its code is not unique. Please contact the organizer of this event."))
 
     def execute_payment(self, request: HttpRequest, payment: OrderPayment) -> str:
-        for p in payment.order.positions.all():
+        # This method will only be called when retrying payments, e.g. after a payment_prepare call. It is not called
+        # during the order creation phase because this payment provider is a special case.
+        for p in payment.order.positions.all():  # noqa - just a safeguard
             if p.item.issue_giftcard:
                 raise PaymentException(_("You cannot pay with gift cards when buying a gift card."))
 
         gcpk = payment.info_data.get('gift_card')
-        if not gcpk:
+        if not gcpk or not payment.info_data.get('retry'):
             raise PaymentException("Invalid state, should never occur.")
-        try:
-            with transaction.atomic():
-                try:
-                    gc = GiftCard.objects.select_for_update().get(pk=gcpk)
-                except GiftCard.DoesNotExist:
-                    raise PaymentException(_("This gift card does not support this currency."))
-                if gc.currency != self.event.currency:  # noqa - just a safeguard
-                    raise PaymentException(_("This gift card does not support this currency."))
-                if not gc.accepted_by(self.event.organizer):
-                    raise PaymentException(_("This gift card is not accepted by this event organizer."))
-                if payment.amount > gc.value:
-                    raise PaymentException(_("This gift card was used in the meantime. Please try again."))
-                if gc.testmode and not payment.order.testmode:
-                    raise PaymentException(_("This gift card can only be used in test mode."))
-                if not gc.testmode and payment.order.testmode:
-                    raise PaymentException(_("Only test gift cards can be used in test mode."))
-                if gc.expires and gc.expires < now():
-                    raise PaymentException(_("This gift card is no longer valid."))
-
-                trans = gc.transactions.create(
-                    value=-1 * payment.amount,
-                    order=payment.order,
-                    payment=payment
-                )
-                payment.info_data = {
-                    'gift_card': gc.pk,
-                    'transaction_id': trans.pk,
-                }
-                payment.confirm()
-        except PaymentException as e:
-            payment.fail(info={'error': str(e)})
-            raise e
+        with transaction.atomic():
+            gc = GiftCard.objects.select_for_update().get(pk=gcpk)
+            if gc.currency != self.event.currency:  # noqa - just a safeguard
+                raise PaymentException(_("This gift card does not support this currency."))
+            if not gc.accepted_by(self.event.organizer):  # noqa - just a safeguard
+                raise PaymentException(_("This gift card is not accepted by this event organizer."))
+            if payment.amount > gc.value:  # noqa - just a safeguard
+                raise PaymentException(_("This gift card was used in the meantime. Please try again."))
+            if gc.expires and gc.expires < now():  # noqa - just a safeguard
+                messages.error(request, _("This gift card is no longer valid."))
+                return
+            trans = gc.transactions.create(
+                value=-1 * payment.amount,
+                order=payment.order,
+                payment=payment
+            )
+            payment.info_data = {
+                'gift_card': gc.pk,
+                'transaction_id': trans.pk,
+            }
+            payment.confirm()
 
     def payment_is_valid_session(self, request: HttpRequest) -> bool:
         return True

src/pretix/base/pdf.py

@@ -40,7 +40,6 @@ import os
 import re
 import subprocess
 import tempfile
-import unicodedata
 import uuid
 from collections import OrderedDict
 from functools import partial
@@ -828,13 +827,6 @@ class Renderer:
         if o['italic']:
             font += ' I'
 
-        try:
-            ad = getAscentDescent(font, float(o['fontsize']))
-        except KeyError:  # font not known, fall back
-            logger.warning(f'Use of unknown font "{font}"')
-            font = 'Open Sans'
-            ad = getAscentDescent(font, float(o['fontsize']))
-
         align_map = {
             'left': TA_LEFT,
             'center': TA_CENTER,
@@ -861,12 +853,10 @@ class Renderer:
         except:
             logger.exception('Reshaping/Bidi fixes failed on string {}'.format(repr(text)))
 
-        # reportlab does not support unicode combination characters
-        text = unicodedata.normalize("NFKC", text)
-
         p = Paragraph(text, style=style)
         w, h = p.wrapOn(canvas, float(o['width']) * mm, 1000 * mm)
         # p_size = p.wrap(float(o['width']) * mm, 1000 * mm)
+        ad = getAscentDescent(font, float(o['fontsize']))
         canvas.saveState()
         # The ascent/descent offsets here are not really proven to be correct, they're just empirical values to get
         # reportlab render similarly to browser canvas.

src/pretix/base/services/cancelevent.py

@@ -210,7 +210,8 @@ def cancel_event(self, event: Event, subevent: int, auto_refund: bool,
                         fee += min(p.price, Decimal(keep_fee_per_ticket))
             fee = round_decimal(min(fee, o.payment_refund_sum), event.currency)
 
-            _cancel_order(o.pk, user, send_mail=False, cancellation_fee=fee, keep_fees=keep_fee_objects)
+            _cancel_order(o.pk, user, send_mail=False, cancellation_fee=fee, keep_fees=keep_fee_objects,
+                          source=("pretix.cancelevent", None))
             refund_amount = o.payment_refund_sum
 
             try:

src/pretix/base/services/cart.py

@@ -31,7 +31,7 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
-import uuid
+
 from collections import Counter, defaultdict, namedtuple
 from datetime import datetime, time, timedelta
 from decimal import Decimal
@@ -110,11 +110,6 @@ error_messages = {
                              'positions have been removed from your cart.'),
     'price_too_high': _('The entered price is to high.'),
     'voucher_invalid': _('This voucher code is not known in our database.'),
-    'voucher_min_usages': _('The voucher code "%(voucher)s" can only be used if you select at least %(number)s '
-                            'matching products.'),
-    'voucher_min_usages_removed': _('The voucher code "%(voucher)s" can only be used if you select at least '
-                                    '%(number)s matching products. We have therefore removed some positions from '
-                                    'your cart that can no longer be purchased like this.'),
     'voucher_redeemed': _('This voucher code has already been used the maximum number of times allowed.'),
     'voucher_redeemed_cart': _('This voucher code is currently locked since it is already contained in a cart. This '
                                'might mean that someone else is redeeming this voucher right now, or that you tried '
@@ -195,7 +190,7 @@ class CartManager:
     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', 'voucher_ignored'))
+                                               'custom_price_input_is_net'))
     RemoveOperation = namedtuple('RemoveOperation', ('position',))
     VoucherOperation = namedtuple('VoucherOperation', ('position', 'voucher', 'price_after_voucher'))
     ExtendOperation = namedtuple('ExtendOperation', ('position', 'count', 'item', 'variation', 'voucher',
@@ -330,16 +325,12 @@ class CartManager:
                 (isinstance(op, self.ExtendOperation) and op.position.is_bundled)
             ):
                 if op.item.require_voucher and op.voucher is None:
-                    if getattr(op, 'voucher_ignored', False):
-                        raise CartError(error_messages['voucher_redeemed'])
                     raise CartError(error_messages['voucher_required'])
 
                 if (
                     (op.item.hide_without_voucher or (op.variation and op.variation.hide_without_voucher)) and
                     (op.voucher is None or not op.voucher.show_hidden_items)
                 ):
-                    if getattr(op, 'voucher_ignored', False):
-                        raise CartError(error_messages['voucher_redeemed'])
                     raise CartError(error_messages['voucher_required'])
 
             if not op.item.is_available() or (op.variation and not op.variation.is_available()):
@@ -453,15 +444,12 @@ class CartManager:
             if cp.is_bundled:
                 bundle = cp.addon_to.item.bundles.filter(bundled_item=cp.item, bundled_variation=cp.variation).first()
                 if bundle:
-                    listed_price = bundle.designated_price or Decimal('0.00')
+                    listed_price = bundle.designated_price or 0
                 else:
                     listed_price = cp.price
                 price_after_voucher = listed_price
             else:
-                if cp.addon_to_id and is_included_for_free(cp.item, cp.addon_to):
-                    listed_price = Decimal('0.00')
-                else:
-                    listed_price = get_listed_price(cp.item, cp.variation, cp.subevent)
+                listed_price = get_listed_price(cp.item, cp.variation, cp.subevent)
                 if cp.voucher:
                     price_after_voucher = cp.voucher.calculate_price(listed_price)
                 else:
@@ -487,7 +475,7 @@ class CartManager:
             self._check_item_constraints(op)
 
             if cp.voucher:
-                self._voucher_use_diff[cp.voucher] += 2
+                self._voucher_use_diff[cp.voucher] += 1
 
             self._operations.append(op)
         return err
@@ -536,15 +524,6 @@ class CartManager:
             voucher_use_diff[voucher] += 1
             ops.append((listed_price - price_after_voucher, self.VoucherOperation(p, voucher, price_after_voucher)))
 
-        for voucher, cnt in list(voucher_use_diff.items()):
-            if 0 < cnt < voucher.min_usages_remaining:
-                raise CartError(
-                    _(error_messages['voucher_min_usages']) % {
-                        'voucher': voucher.code,
-                        'number': voucher.min_usages_remaining,
-                    }
-                )
-
         # 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)
@@ -593,7 +572,6 @@ class CartManager:
             item = self._items_cache[i['item']]
             variation = self._variations_cache[i['variation']] if i['variation'] is not None else None
             voucher = None
-            voucher_ignored = False
 
             if i.get('voucher'):
                 try:
@@ -603,24 +581,6 @@ class CartManager:
                 else:
                     voucher_use_diff[voucher] += i['count']
 
-                    if i.get('voucher_ignore_if_redeemed', False):
-                        # This is a special case handling for when a user clicks "+" on an existing line in their cart
-                        # that has a voucher attached. If the voucher still has redemptions left, we'll add another line
-                        # with the same voucher, but if it does not we silently continue as if there was no voucher,
-                        # leading to either a higher-priced ticket or an error. Still, this leads to less error cases
-                        # than either of the possible default assumptions.
-                        predicted_redeemed_after = (
-                            voucher.redeemed +
-                            CartPosition.objects.filter(voucher=voucher, expires__gte=self.now_dt).count() +
-                            self._voucher_use_diff[voucher] +
-                            voucher_use_diff[voucher]
-                        )
-                        if predicted_redeemed_after > voucher.max_usages:
-                            i.pop('voucher')
-                            voucher_ignored = True
-                            voucher = None
-                            voucher_use_diff[voucher] -= i['count']
-
             # Fetch all quotas. If there are no quotas, this item is not allowed to be sold.
             quotas = list(item.quotas.filter(subevent=subevent)
                           if variation is None else variation.quotas.filter(subevent=subevent))
@@ -667,7 +627,6 @@ class CartManager:
                     price_after_voucher=bundle.designated_price,
                     custom_price_input=None,
                     custom_price_input_is_net=False,
-                    voucher_ignored=False,
                 )
                 self._check_item_constraints(bop, operations)
                 bundled.append(bop)
@@ -697,7 +656,6 @@ class CartManager:
                 price_after_voucher=price_after_voucher,
                 custom_price_input=custom_price,
                 custom_price_input_is_net=self.event.settings.display_net_prices,
-                voucher_ignored=voucher_ignored,
             )
             self._check_item_constraints(op, operations)
             operations.append(op)
@@ -829,7 +787,6 @@ class CartManager:
                     price_after_voucher=listed_price,
                     custom_price_input=custom_price,
                     custom_price_input_is_net=self.event.settings.display_net_prices,
-                    voucher_ignored=False,
                 )
                 self._check_item_constraints(op, operations)
                 operations.append(op)
@@ -958,41 +915,6 @@ class CartManager:
                     )
         return err
 
-    def _check_min_per_voucher(self):
-        vouchers = Counter()
-        for p in self.positions:
-            vouchers[p.voucher] += 1
-        for op in self._operations:
-            if isinstance(op, self.AddOperation):
-                vouchers[op.voucher] += op.count
-            elif isinstance(op, self.RemoveOperation):
-                vouchers[op.position.voucher] -= 1
-
-        err = None
-        for voucher, count in vouchers.items():
-            if not voucher or count == 0:
-                continue
-            if count < voucher.min_usages_remaining:
-                self._operations = [o for o in self._operations if not (
-                    isinstance(o, self.AddOperation) and o.voucher and o.voucher.pk == voucher.pk
-                )]
-                removals = [o.position.pk for o in self._operations if isinstance(o, self.RemoveOperation)]
-                for p in self.positions:
-                    if p.voucher_id == voucher.pk and p.pk not in removals:
-                        self._operations.append(self.RemoveOperation(position=p))
-                        err = _(error_messages['voucher_min_usages_removed']) % {
-                            'voucher': voucher.code,
-                            'number': voucher.min_usages_remaining,
-                        }
-                if not err:
-                    raise CartError(
-                        _(error_messages['voucher_min_usages']) % {
-                            'voucher': voucher.code,
-                            'number': voucher.min_usages_remaining,
-                        }
-                    )
-        return err
-
     def _perform_operations(self):
         vouchers_ok = self._get_voucher_availability()
         quotas_ok = _get_quota_availability(self._quota_diff, self.now_dt)
@@ -1249,7 +1171,6 @@ class CartManager:
 
         err = self._delete_out_of_timeframe()
         err = self.extend_expired_positions() or err
-        err = err or self._check_min_per_voucher()
 
         lockfn = NoLockManager
         if self._require_locking():
@@ -1265,71 +1186,44 @@ class CartManager:
                 raise CartError(err)
 
 
-def add_payment_to_cart(request, provider, min_value: Decimal=None, max_value: Decimal=None, info_data: dict=None):
-    """
-    :param request: The current HTTP request context.
-    :param provider: The instance of your payment provider.
-    :param min_value: The minimum value this payment instrument supports, or ``None`` for unlimited.
-    :param max_value: The maximum value this payment instrument supports, or ``None`` for unlimited. Highly discouraged
-                      to use for payment providers which charge a payment fee, as this can be very user-unfriendly if
-                      users need a second payment method just for the payment fee of the first method.
-    :param info_data: A dictionary of information that will be passed through to the ``OrderPayment.info_data`` attribute.
-    :return:
-    """
+def get_fees(event, request, total, invoice_address, provider, positions):
     from pretix.presale.views.cart import cart_session
 
-    cs = cart_session(request)
-    cs.setdefault('payments', [])
-
-    cs['payments'].append({
-        'id': str(uuid.uuid4()),
-        'provider': provider.identifier,
-        'multi_use_supported': provider.multi_use_supported,
-        'min_value': str(min_value) if min_value is not None else None,
-        'max_value': str(max_value) if max_value is not None else None,
-        'info_data': info_data or {},
-    })
-
-
-def get_fees(event, request, total, invoice_address, payments, positions):
-    if payments and not isinstance(payments, list):
-        raise TypeError("payments must now be a list")
-
     fees = []
     for recv, resp in fee_calculation_for_cart.send(sender=event, request=request, invoice_address=invoice_address,
-                                                    total=total, positions=positions, payment_requests=payments):
+                                                    total=total, positions=positions):
         if resp:
             fees += resp
 
     total = total + sum(f.value for f in fees)
 
-    if total != 0 and payments:
-        total_remaining = total
-        for p in payments:
-            # This algorithm of treating min/max values and fees needs to stay in sync between the following
-            # places in the code base:
-            # - pretix.base.services.cart.get_fees
-            # - pretix.base.services.orders._get_fees
-            # - pretix.presale.views.CartMixin.current_selected_payments
-            if p.get('min_value') and total_remaining < Decimal(p['min_value']):
+    cs = cart_session(request)
+    if cs.get('gift_cards'):
+        gcs = cs['gift_cards']
+        gc_qs = event.organizer.accepted_gift_cards.filter(pk__in=cs.get('gift_cards'), currency=event.currency)
+        for gc in gc_qs:
+            if gc.testmode != event.testmode:
+                gcs.remove(gc.pk)
                 continue
+            fval = Decimal(gc.value)  # TODO: don't require an extra query
+            fval = min(fval, total)
+            if fval > 0:
+                total -= fval
+                fees.append(OrderFee(
+                    fee_type=OrderFee.FEE_TYPE_GIFTCARD,
+                    internal_type='giftcard',
+                    description=gc.secret,
+                    value=-1 * fval,
+                    tax_rate=Decimal('0.00'),
+                    tax_value=Decimal('0.00'),
+                    tax_rule=TaxRule.zero()
+                ))
+        cs['gift_cards'] = gcs
 
-            to_pay = total_remaining
-            if p.get('max_value') and to_pay > Decimal(p['max_value']):
-                to_pay = min(to_pay, Decimal(p['max_value']))
-
-            pprov = event.get_payment_providers(cached=True).get(p['provider'])
-            if not pprov:
-                continue
-
-            payment_fee = pprov.calculate_fee(to_pay)
-            total_remaining += payment_fee
-            to_pay += payment_fee
-
-            if p.get('max_value') and to_pay > Decimal(p['max_value']):
-                to_pay = min(to_pay, Decimal(p['max_value']))
-
-            total_remaining -= to_pay
+    if provider and total != 0:
+        provider = event.get_payment_providers().get(provider)
+        if provider:
+            payment_fee = provider.calculate_fee(total)
 
             if payment_fee:
                 payment_fee_tax_rule = event.settings.tax_rate_default or TaxRule.zero()

src/pretix/base/services/invoices.py

@@ -452,19 +452,17 @@ def build_preview_invoice_pdf(event):
 
         if event.tax_rules.exists():
             for i, tr in enumerate(event.tax_rules.all()):
-                for j in range(150):
-                    tax = tr.tax(Decimal('100.00'), base_price_is='gross')
-                    InvoiceLine.objects.create(
-                        invoice=invoice, description=_("Sample product {}").format(i + 1),
-                        gross_value=tax.gross, tax_value=tax.tax,
-                        tax_rate=tax.rate
-                    )
-        else:
-            for i in range(150):
+                tax = tr.tax(Decimal('100.00'), base_price_is='gross')
                 InvoiceLine.objects.create(
-                    invoice=invoice, description=_("Sample product A"),
-                    gross_value=100, tax_value=0, tax_rate=0
+                    invoice=invoice, description=_("Sample product {}").format(i + 1),
+                    gross_value=tax.gross, tax_value=tax.tax,
+                    tax_rate=tax.rate
                 )
+        else:
+            InvoiceLine.objects.create(
+                invoice=invoice, description=_("Sample product A"),
+                gross_value=100, tax_value=0, tax_rate=0
+            )
 
         return event.invoice_renderer.generate(invoice)
 

src/pretix/base/services/locking.py

@@ -163,7 +163,7 @@ def lock_event_redis(event):
     retries = 5
     for i in range(retries):
         try:
-            if lock.acquire(blocking=False):
+            if lock.acquire(False):
                 return True
         except RedisError:
             logger.exception('Error locking an event')

src/pretix/base/services/mail.py

@@ -63,7 +63,6 @@ from django.utils.timezone import now, override
 from django.utils.translation import gettext as _, pgettext
 from django_scopes import scope, scopes_disabled
 from i18nfield.strings import LazyI18nString
-from text_unidecode import unidecode
 
 from pretix.base.email import ClassicMailRenderer
 from pretix.base.i18n import language
@@ -197,7 +196,7 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
         else:
             sender = formataddr((settings.PRETIX_INSTANCE_NAME, sender))
 
-        subject = raw_subject = str(subject).replace('\n', ' ').replace('\r', '')[:900]
+        subject = raw_subject = str(subject)
         signature = ""
 
         bcc = []
@@ -432,9 +431,8 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
                                     }
                                 )
                         if attach_ical:
-                            fname = re.sub('[^a-zA-Z0-9 ]', '-', unidecode(pgettext('attachment_filename', 'Calendar invite')))
                             for i, cal in enumerate(get_private_icals(event, [position] if position else order.positions.all())):
-                                email.attach('{}{}.ics'.format(fname, f'-{i + 1}' if i > 0 else ''), cal.serialize(), 'text/calendar')
+                                email.attach('event-{}.ics'.format(i), cal.serialize(), 'text/calendar')
 
             email = email_filter.send_chained(event, 'message', message=email, order=order, user=user)
 

src/pretix/base/services/orderimport.py

@@ -195,7 +195,8 @@ def import_orders(event: Event, fileid: str, settings: dict, locale: str, user)
                         user=user,
                         data={'source': 'import'}
                     )
-                    save_transactions += o.create_transactions(is_new=True, fees=[], positions=o._positions, save=False)
+                    save_transactions += o.create_transactions(is_new=True, fees=[], positions=o._positions, save=False,
+                                                               source=('pretix.orderimport', None))
                 Transaction.objects.bulk_create(save_transactions)
 
             for o in orders:

src/pretix/base/services/orders.py

@@ -54,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
@@ -74,7 +74,7 @@ from pretix.base.models.orders import (
 )
 from pretix.base.models.organizer import TeamAPIToken
 from pretix.base.models.tax import TAXED_ZERO, TaxedPrice, TaxRule
-from pretix.base.payment import PaymentException
+from pretix.base.payment import BasePaymentProvider, PaymentException
 from pretix.base.reldate import RelativeDateWrapper
 from pretix.base.secrets import assign_ticket_secret
 from pretix.base.services import tickets
@@ -115,8 +115,6 @@ error_messages = {
               'server was too busy. Please try again.'),
     'not_started': _('The booking period for this event has not yet started.'),
     'ended': _('The booking period has ended.'),
-    'voucher_min_usages': _('The voucher code "%(voucher)s" can only be used if you select at least %(number)s '
-                            'matching products.'),
     'voucher_invalid': _('The voucher code used for one of the items in your cart is not known in our database.'),
     'voucher_redeemed': _('The voucher code used for one of the items in your cart has already been used the maximum '
                           'number of times allowed. We removed this item from your cart.'),
@@ -150,7 +148,7 @@ def mark_order_paid(*args, **kwargs):
     raise NotImplementedError("This method is no longer supported since pretix 1.17.")
 
 
-def reactivate_order(order: Order, force: bool=False, user: User=None, auth=None):
+def reactivate_order(order: Order, force: bool=False, user: User=None, auth=None, source=None):
     """
     Reactivates a canceled order. If ``force`` is not set to ``True``, this will fail if there is not
     enough quota.
@@ -191,7 +189,7 @@ def reactivate_order(order: Order, force: bool=False, user: User=None, auth=None
                     for m in position.granted_memberships.all():
                         m.canceled = False
                         m.save()
-                order.create_transactions()
+                order.create_transactions(source=source)
         else:
             raise OrderError(is_available)
 
@@ -204,7 +202,7 @@ def reactivate_order(order: Order, force: bool=False, user: User=None, auth=None
         generate_invoice(order)
 
 
-def extend_order(order: Order, new_date: datetime, force: bool=False, user: User=None, auth=None):
+def extend_order(order: Order, new_date: datetime, force: bool=False, user: User=None, auth=None, source=None):
     """
     Extends the deadline of an order. If the order is already expired, the quota will be checked to
     see if this is actually still possible. If ``force`` is set to ``True``, the result of this check
@@ -233,7 +231,7 @@ def extend_order(order: Order, new_date: datetime, force: bool=False, user: User
             num_invoices = order.invoices.filter(is_cancellation=False).count()
             if num_invoices > 0 and order.invoices.filter(is_cancellation=True).count() >= num_invoices and invoice_qualified(order):
                 generate_invoice(order)
-            order.create_transactions()
+            order.create_transactions(source=source)
 
     if order.status == Order.STATUS_PENDING:
         change(was_expired=False)
@@ -247,16 +245,17 @@ def extend_order(order: Order, new_date: datetime, force: bool=False, user: User
 
 
 @transaction.atomic
-def mark_order_refunded(order, user=None, auth=None, api_token=None):
+def mark_order_refunded(order, user=None, auth=None, api_token=None, source=None):
     oautha = auth.pk if isinstance(auth, OAuthApplication) else None
     device = auth.pk if isinstance(auth, Device) else None
     api_token = (api_token.pk if api_token else None) or (auth if isinstance(auth, TeamAPIToken) else None)
     return _cancel_order(
-        order.pk, user.pk if user else None, send_mail=False, api_token=api_token, device=device, oauth_application=oautha
+        order.pk, user.pk if user else None, send_mail=False, api_token=api_token, device=device, oauth_application=oautha,
+        source=source
     )
 
 
-def mark_order_expired(order, user=None, auth=None):
+def mark_order_expired(order, user=None, auth=None, source=None):
     """
     Mark this order as expired. This sets the payment status and returns the order object.
     :param order: The order to change
@@ -275,13 +274,13 @@ def mark_order_expired(order, user=None, auth=None):
         i = order.invoices.filter(is_cancellation=False).last()
         if i and not i.refered.exists():
             generate_cancellation(i)
-        order.create_transactions()
+        order.create_transactions(source=source)
 
     order_expired.send(order.event, order=order)
     return order
 
 
-def approve_order(order, user=None, send_mail: bool=True, auth=None, force=False):
+def approve_order(order, user=None, send_mail: bool=True, auth=None, force=False, source=None):
     """
     Mark this order as approved
     :param order: The order to change
@@ -294,7 +293,7 @@ def approve_order(order, user=None, send_mail: bool=True, auth=None, force=False
         order.require_approval = False
         order.set_expires(now(), order.event.subevents.filter(id__in=[p.subevent_id for p in order.positions.all()]))
         order.save(update_fields=['require_approval', 'expires'])
-        order.create_transactions()
+        order.create_transactions(source=source)
 
         order.log_action('pretix.event.order.approved', user=user, auth=auth)
         if order.total == Decimal('0.00'):
@@ -324,10 +323,10 @@ def approve_order(order, user=None, send_mail: bool=True, auth=None, force=False
         with language(order.locale, order.event.settings.region):
             if order.total == Decimal('0.00'):
                 email_template = order.event.settings.mail_text_order_approved_free
-                email_subject = order.event.settings.mail_subject_order_approved_free
+                email_subject = _('Order approved and confirmed: %(code)s') % {'code': order.code}
             else:
                 email_template = order.event.settings.mail_text_order_approved
-                email_subject = order.event.settings.mail_subject_order_approved
+                email_subject = _('Order approved and awaiting payment: %(code)s') % {'code': order.code}
 
             email_context = get_email_context(event=order.event, order=order)
             try:
@@ -343,7 +342,7 @@ def approve_order(order, user=None, send_mail: bool=True, auth=None, force=False
     return order.pk
 
 
-def deny_order(order, comment='', user=None, send_mail: bool=True, auth=None):
+def deny_order(order, comment='', user=None, send_mail: bool=True, auth=None, source=None):
     """
     Mark this order as canceled
     :param order: The order to change
@@ -367,15 +366,15 @@ def deny_order(order, comment='', user=None, send_mail: bool=True, auth=None):
         for position in order.positions.all():
             if position.voucher:
                 Voucher.objects.filter(pk=position.voucher.pk).update(redeemed=Greatest(0, F('redeemed') - 1))
-        order.create_transactions()
+        order.create_transactions(source=source)
 
     order_denied.send(order.event, order=order)
 
     if send_mail:
         email_template = order.event.settings.mail_text_order_denied
-        email_subject = order.event.settings.mail_subject_order_denied
         email_context = get_email_context(event=order.event, order=order, comment=comment)
         with language(order.locale, order.event.settings.region):
+            email_subject = _('Order denied: %(code)s') % {'code': order.code}
             try:
                 order.send_mail(
                     email_subject, email_template, email_context,
@@ -388,7 +387,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, comment=None):
+                  cancellation_fee=None, keep_fees=None, cancel_invoice=True, comment=None, source=None):
     """
     Mark this order as canceled
     :param order: The order to change
@@ -462,13 +461,9 @@ def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device
                     f._calculate_tax()
                     f.save()
 
-                if cancellation_fee > order.total:
-                    raise OrderError(_('The cancellation fee cannot be higher than the total amount of this order.'))
-                elif order.payment_refund_sum < cancellation_fee:
-                    order.status = Order.STATUS_PENDING
-                    order.set_expires()
-                else:
-                    order.status = Order.STATUS_PAID
+                if order.payment_refund_sum < cancellation_fee:
+                    raise OrderError(_('The cancellation fee cannot be higher than the payment credit of this order.'))
+                order.status = Order.STATUS_PAID
                 order.total = cancellation_fee
                 order.cancellation_date = now()
                 order.save(update_fields=['status', 'cancellation_date', 'total'])
@@ -492,13 +487,13 @@ def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device
                          data={'cancellation_fee': cancellation_fee, 'comment': comment})
         order.cancellation_requests.all().delete()
 
-        order.create_transactions()
+        order.create_transactions(source=source)
 
         if send_mail:
+            email_template = order.event.settings.mail_text_order_canceled
             with language(order.locale, order.event.settings.region):
-                email_template = order.event.settings.mail_text_order_canceled
-                email_subject = order.event.settings.mail_subject_order_canceled
                 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(
                         email_subject, email_template, email_context,
@@ -575,7 +570,6 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
     products_seen = Counter()
     q_avail = Counter()
     v_avail = Counter()
-    v_usages = Counter()
     v_budget = {}
     deleted_positions = set()
     seats_seen = set()
@@ -613,7 +607,6 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
             break
 
         if cp.voucher:
-            v_usages[cp.voucher] += 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)
@@ -725,13 +718,6 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
             # Sorry, can't let you keep that!
             delete(cp)
 
-    for voucher, cnt in v_usages.items():
-        if 0 < cnt < voucher.min_usages_remaining:
-            raise OrderError(error_messages['voucher_min_usages'], {
-                'voucher': voucher.code,
-                'number': voucher.min_usages_remaining,
-            })
-
     # 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)
@@ -793,75 +779,68 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
         raise OrderError(err, errargs)
 
 
-def _get_fees(positions: List[CartPosition], payment_requests: List[dict], address: InvoiceAddress,
-              meta_info: dict, event: Event, require_approval=False):
+def _get_fees(positions: List[CartPosition], payment_provider: BasePaymentProvider, address: InvoiceAddress,
+              meta_info: dict, event: Event, gift_cards: List[GiftCard]):
     fees = []
     total = sum([c.price for c in positions])
 
-    gift_cards = []  # for backwards compatibility
-    for p in payment_requests:
-        if p['provider'] == 'giftcard':
-            gift_cards.append(GiftCard.objects.get(pk=p['info_data']['gift_card']))
-
-    for recv, resp in order_fee_calculation.send(sender=event, invoice_address=address, total=total, payment_requests=payment_requests,
+    for recv, resp in order_fee_calculation.send(sender=event, invoice_address=address, total=total,
                                                  meta_info=meta_info, positions=positions, gift_cards=gift_cards):
         if resp:
             fees += resp
     total += sum(f.value for f in fees)
 
-    total_remaining = total
-    for p in payment_requests:
-        # This algorithm of treating min/max values and fees needs to stay in sync between the following
-        # places in the code base:
-        # - pretix.base.services.cart.get_fees
-        # - pretix.base.services.orders._get_fees
-        # - pretix.presale.views.CartMixin.current_selected_payments
-        if p.get('min_value') and total_remaining < Decimal(p['min_value']):
-            p['payment_amount'] = Decimal('0.00')
-            continue
+    gift_card_values = {}
+    for gc in gift_cards:
+        fval = Decimal(gc.value)  # TODO: don't require an extra query
+        fval = min(fval, total)
+        if fval > 0:
+            total -= fval
+            gift_card_values[gc] = fval
 
-        to_pay = total_remaining
-        if p.get('max_value') and to_pay > Decimal(p['max_value']):
-            to_pay = min(to_pay, Decimal(p['max_value']))
+    if payment_provider:
+        payment_fee = payment_provider.calculate_fee(total)
+    else:
+        payment_fee = 0
+    pf = None
+    if payment_fee:
+        pf = OrderFee(fee_type=OrderFee.FEE_TYPE_PAYMENT, value=payment_fee,
+                      internal_type=payment_provider.identifier)
+        fees.append(pf)
 
-        payment_fee = p['pprov'].calculate_fee(to_pay)
-        total_remaining += payment_fee
-        to_pay += payment_fee
-
-        if p.get('max_value') and to_pay > Decimal(p['max_value']):
-            to_pay = min(to_pay, Decimal(p['max_value']))
-
-        total_remaining -= to_pay
-
-        p['payment_amount'] = to_pay
-        if payment_fee:
-            pf = OrderFee(fee_type=OrderFee.FEE_TYPE_PAYMENT, value=payment_fee,
-                          internal_type=p['pprov'].identifier)
-            fees.append(pf)
-            p['fee'] = pf
-
-    if total_remaining != Decimal('0.00') and not require_approval:
-        raise OrderError(_("The selected payment methods do not cover the total balance."))
-
-    return fees
+    return fees, pf, gift_card_values
 
 
 def _create_order(event: Event, email: str, positions: List[CartPosition], now_dt: datetime,
-                  payment_requests: List[dict], locale: str=None, address: InvoiceAddress=None,
-                  meta_info: dict=None, sales_channel: str='web', shown_total=None,
-                  customer=None):
-    payments = []
+                  payment_provider: BasePaymentProvider, locale: str=None, address: InvoiceAddress=None,
+                  meta_info: dict=None, sales_channel: str='web', gift_cards: list=None, shown_total=None,
+                  customer=None, source=None):
+    p = None
     sales_channel = get_all_sales_channels()[sales_channel]
 
     with transaction.atomic():
+        checked_gift_cards = []
+        if gift_cards:
+            gc_qs = GiftCard.objects.select_for_update().filter(pk__in=gift_cards)
+            for gc in gc_qs:
+                if gc.currency != event.currency:
+                    raise OrderError(_("This gift card does not support this currency."))
+                if gc.testmode and not event.testmode:
+                    raise OrderError(_("This gift card can only be used in test mode."))
+                if not gc.testmode and event.testmode:
+                    raise OrderError(_("Only test gift cards can be used in test mode."))
+                if not gc.accepted_by(event.organizer):
+                    raise OrderError(_("This gift card is not accepted by this event organizer."))
+                checked_gift_cards.append(gc)
+        if checked_gift_cards and any(c.item.issue_giftcard for c in positions):
+            raise OrderError(_("You cannot pay with gift cards when buying a gift card."))
 
         try:
             validate_memberships_in_order(customer, positions, event, lock=True, testmode=event.testmode)
         except ValidationError as e:
             raise OrderError(e.message)
 
-        require_approval = any(p.requires_approval(invoice_address=address) for p in positions)
-        fees = _get_fees(positions, payment_requests, address, meta_info, event, require_approval=require_approval)
+        fees, pf, gift_card_values = _get_fees(positions, payment_provider, address, meta_info, event, checked_gift_cards)
         total = pending_sum = sum([c.price for c in positions]) + sum([c.value for c in fees])
 
         order = Order(
@@ -874,7 +853,7 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
             total=total,
             testmode=True if sales_channel.testmode_supported and event.testmode else False,
             meta_info=json.dumps(meta_info or {}),
-            require_approval=require_approval,
+            require_approval=any(p.requires_approval(invoice_address=address) for p in positions),
             sales_channel=sales_channel.identifier,
             customer=customer,
         )
@@ -898,11 +877,28 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
                 fee.tax_rule = None  # TODO: deprecate
             fee.save()
 
+        for gc, val in gift_card_values.items():
+            p = order.payments.create(
+                state=OrderPayment.PAYMENT_STATE_CONFIRMED,
+                provider='giftcard',
+                amount=val,
+                fee=pf
+            )
+            trans = gc.transactions.create(
+                value=-1 * val,
+                order=order,
+                payment=p
+            )
+            p.info_data = {
+                'gift_card': gc.pk,
+                'transaction_id': trans.pk,
+            }
+            p.save()
+            pending_sum -= val
+
         # Safety check: Is the amount we're now going to charge the same amount the user has been shown when they
         # pressed "Confirm purchase"? If not, we should better warn the user and show the confirmation page again.
-        # We used to have a *known* case where this happened is if a gift card is used in two concurrent sessions,
-        # but this is now a payment error instead. So currently this code branch is usually only triggered by bugs
-        # in other places (e.g. tax calculation).
+        # The only *known* case where this happens is if a gift card is used in two concurrent sessions.
         if shown_total is not None:
             if Decimal(shown_total) != pending_sum:
                 raise OrderError(
@@ -911,20 +907,16 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
                       'check the prices below and try again.')
                 )
 
-        if payment_requests and not order.require_approval:
-            for p in payment_requests:
-                if not p.get('multi_use_supported') or p['payment_amount'] > Decimal('0.00'):
-                    payments.append(order.payments.create(
-                        state=OrderPayment.PAYMENT_STATE_CREATED,
-                        provider=p['provider'],
-                        amount=p['payment_amount'],
-                        fee=p.get('fee'),
-                        info=json.dumps(p['info_data']),
-                        process_initiated=False,
-                    ))
+        if payment_provider and not order.require_approval:
+            p = order.payments.create(
+                state=OrderPayment.PAYMENT_STATE_CREATED,
+                provider=payment_provider.identifier,
+                amount=pending_sum,
+                fee=pf
+            )
 
         orderpositions = OrderPosition.transform_cart_positions(positions, order)
-        order.create_transactions(positions=orderpositions, fees=fees, is_new=True)
+        order.create_transactions(positions=orderpositions, fees=fees, is_new=True, source=source, dt_now=now_dt)
         order.log_action('pretix.event.order.placed')
         if order.require_approval:
             order.log_action('pretix.event.order.placed.require_approval')
@@ -933,15 +925,16 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
                 order.log_action('pretix.event.order.consent', data={'msg': msg})
 
     order_placed.send(event, order=order)
-    return order, payments
+    return order, p
 
 
-def _order_placed_email(event: Event, order: Order, email_template, subject_template,
-                        log_entry: str, invoice, payments: List[OrderPayment], is_free=False):
-    email_context = get_email_context(event=event, order=order, payments=payments)
+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 = gettext_lazy('Your order: {code}')
     try:
         order.send_mail(
-            subject_template, email_template, email_context,
+            email_subject, email_template, email_context,
             log_entry,
             invoices=[invoice] if invoice and event.settings.invoice_email_attachment else [],
             attach_tickets=True,
@@ -954,13 +947,13 @@ def _order_placed_email(event: Event, order: Order, email_template, subject_temp
         logger.exception('Order received email could not be sent')
 
 
-def _order_placed_email_attendee(event: Event, order: Order, position: OrderPosition, email_template, subject_template,
-                                 log_entry: str, is_free=False):
+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 = gettext_lazy('Your event registration: {code}')
 
     try:
         position.send_mail(
-            subject_template, email_template, email_context,
+            email_subject, email_template, email_context,
             log_entry,
             invoices=[],
             attach_tickets=True,
@@ -973,13 +966,15 @@ def _order_placed_email_attendee(event: Event, order: Order, position: OrderPosi
         logger.exception('Order received email could not be sent to attendee')
 
 
-def _perform_order(event: Event, payment_requests: List[dict], position_ids: List[str],
+def _perform_order(event: Event, payment_provider: str, position_ids: List[str],
                    email: str, locale: str, address: int, meta_info: dict=None, sales_channel: str='web',
-                   shown_total=None, customer=None):
-    for p in payment_requests:
-        p['pprov'] = event.get_payment_providers(cached=True)[p['provider']]
-        if not p['pprov']:
+                   gift_cards: list=None, shown_total=None, customer=None, source=None):
+    if payment_provider:
+        pprov = event.get_payment_providers().get(payment_provider)
+        if not pprov:
             raise OrderError(error_messages['internal'])
+    else:
+        pprov = None
 
     if customer:
         customer = event.organizer.customers.get(pk=customer)
@@ -1009,17 +1004,8 @@ def _perform_order(event: Event, payment_requests: List[dict], position_ids: Lis
         id__in=position_ids, event=event
     )
 
-    validate_order.send(
-        event,
-        payment_provider=payment_requests[0]['provider'] if payment_requests else None,  # only for backwards compatibility
-        payments=payment_requests,
-        email=email,
-        positions=positions,
-        locale=locale,
-        invoice_address=addr,
-        meta_info=meta_info,
-        customer=customer,
-    )
+    validate_order.send(event, payment_provider=pprov, email=email, positions=positions, locale=locale,
+                        invoice_address=addr, meta_info=meta_info, customer=customer)
 
     lockfn = NoLockManager
     locked = False
@@ -1039,28 +1025,21 @@ def _perform_order(event: Event, payment_requests: List[dict], position_ids: Lis
         if len(position_ids) != len(positions):
             raise OrderError(error_messages['internal'])
         _check_positions(event, now_dt, positions, address=addr, sales_channel=sales_channel, customer=customer)
-        order, payment_objs = _create_order(event, email, positions, now_dt, payment_requests,
-                                            locale=locale, address=addr, meta_info=meta_info, sales_channel=sales_channel,
-                                            shown_total=shown_total, customer=customer)
+        order, payment = _create_order(event, email, positions, now_dt, pprov,
+                                       locale=locale, address=addr, meta_info=meta_info, sales_channel=sales_channel,
+                                       gift_cards=gift_cards, shown_total=shown_total, customer=customer, source=source)
 
-        free_order_flow = (
-            payment_objs and
-            any(p['provider'] == 'free' for p in payment_requests) and
-            order.pending_sum == Decimal('0.00') and
-            not order.require_approval
-        )
+        free_order_flow = payment and payment_provider == 'free' and order.pending_sum == Decimal('0.00') and not order.require_approval
         if free_order_flow:
             try:
-                for p in payment_objs:
-                    if p.provider == 'free':
-                        p.confirm(send_mail=False, lock=not locked)
+                payment.confirm(send_mail=False, lock=not locked)
             except Quota.QuotaExceededException:
                 pass
 
     invoice = order.invoices.last()  # Might be generated by plugin already
     if not invoice and invoice_qualified(order):
         if event.settings.get('invoice_generate') == 'True' or (
-                event.settings.get('invoice_generate') == 'paid' and any(p['pprov'].requires_invoice_immediately for p in payment_requests)):
+                event.settings.get('invoice_generate') == 'paid' and payment.payment_provider.requires_invoice_immediately):
             invoice = generate_invoice(
                 order,
                 trigger_pdf=not event.settings.invoice_email_attachment or not order.email
@@ -1070,63 +1049,32 @@ def _perform_order(event: Event, payment_requests: List[dict], position_ids: Lis
     if order.email:
         if order.require_approval:
             email_template = event.settings.mail_text_order_placed_require_approval
-            subject_template = event.settings.mail_subject_order_placed_require_approval
             log_entry = 'pretix.event.order.email.order_placed_require_approval'
 
             email_attendees = False
         elif free_order_flow:
             email_template = event.settings.mail_text_order_free
-            subject_template = event.settings.mail_subject_order_free
             log_entry = 'pretix.event.order.email.order_free'
 
             email_attendees = event.settings.mail_send_order_free_attendee
             email_attendees_template = event.settings.mail_text_order_free_attendee
-            subject_attendees_template = event.settings.mail_subject_order_free_attendee
         else:
             email_template = event.settings.mail_text_order_placed
-            subject_template = event.settings.mail_subject_order_placed
             log_entry = 'pretix.event.order.email.order_placed'
 
             email_attendees = event.settings.mail_send_order_placed_attendee
             email_attendees_template = event.settings.mail_text_order_placed_attendee
-            subject_attendees_template = event.settings.mail_subject_order_placed_attendee
 
         if sales_channel in event.settings.mail_sales_channel_placed_paid:
-            _order_placed_email(event, order, email_template, subject_template, log_entry, invoice, payment_objs,
+            _order_placed_email(event, order, pprov, email_template, log_entry, invoice, payment,
                                 is_free=free_order_flow)
             if email_attendees:
                 for p in order.positions.all():
                     if p.addon_to_id is None and p.attendee_email and p.attendee_email != order.email:
-                        _order_placed_email_attendee(event, order, p, email_attendees_template, subject_attendees_template, log_entry,
+                        _order_placed_email_attendee(event, order, p, email_attendees_template, log_entry,
                                                      is_free=free_order_flow)
 
-    warnings = []
-    any_failed = False
-    for p in payment_objs:
-        if not p.payment_provider.execute_payment_needs_user:
-            try:
-                p.process_initiated = True
-                p.save(update_fields=['process_initiated'])
-                resp = p.payment_provider.execute_payment(None, p)
-                if isinstance(resp, str):
-                    logger.warning('Payment provider returned URL from execute_payment even though execute_payment_needs_user is not set')
-            except PaymentException as e:
-                warnings.append(str(e))
-                any_failed = True
-            except Exception:
-                logger.exception('Error during payment attempt')
-
-    if any_failed:
-        # Cancel all other payments because their amount might be wrong now.
-        for p in payment_objs:
-            if p.state == OrderPayment.PAYMENT_STATE_CREATED:
-                p.state = OrderPayment.PAYMENT_STATE_CANCELED
-                p.save(update_fields=['state'])
-
-    return {
-        'order_id': order.id,
-        'warnings': warnings,
-    }
+    return order.id
 
 
 @receiver(signal=periodic_task)
@@ -1135,21 +1083,13 @@ def expire_orders(sender, **kwargs):
     event_id = None
     expire = None
 
-    qs = Order.objects.filter(
-        expires__lt=now(),
-        status=Order.STATUS_PENDING,
-        require_approval=False
-    ).exclude(
-        Exists(
-            OrderFee.objects.filter(order_id=OuterRef('pk'), fee_type=OrderFee.FEE_TYPE_CANCELLATION)
-        )
-    ).select_related('event').order_by('event_id')
-    for o in qs:
+    for o in Order.objects.filter(expires__lt=now(), status=Order.STATUS_PENDING,
+                                  require_approval=False).select_related('event').order_by('event_id'):
         if o.event_id != event_id:
             expire = o.event.settings.get('payment_term_expire_automatically', as_type=bool)
             event_id = o.event_id
         if expire:
-            mark_order_expired(o)
+            mark_order_expired(o, source=("pretix.periodic", None))
 
 
 @receiver(signal=periodic_task)
@@ -1185,9 +1125,9 @@ def send_expiry_warnings(sender, **kwargs):
                     email_template = settings.mail_text_order_expire_warning
                     email_context = get_email_context(event=o.event, order=o)
                     if settings.payment_term_expire_automatically:
-                        email_subject = settings.mail_subject_order_expire_warning
+                        email_subject = _('Your order is about to expire: %(code)s') % {'code': o.code}
                     else:
-                        email_subject = settings.mail_subject_order_pending_warning
+                        email_subject = _('Your order is pending payment: %(code)s') % {'code': o.code}
 
                     try:
                         o.send_mail(
@@ -1260,8 +1200,8 @@ def send_download_reminders(sender, **kwargs):
                 o.download_reminder_sent = True
                 o.save(update_fields=['download_reminder_sent'])
                 email_template = event.settings.mail_text_download_reminder
-                email_subject = event.settings.mail_subject_download_reminder
                 email_context = get_email_context(event=event, order=o)
+                email_subject = _('Your ticket is ready for download: %(code)s') % {'code': o.code}
                 try:
                     o.send_mail(
                         email_subject, email_template, email_context,
@@ -1284,7 +1224,6 @@ def send_download_reminders(sender, **kwargs):
                                 continue
                         if p.addon_to_id is None and p.attendee_email and p.attendee_email != o.email:
                             email_template = event.settings.mail_text_download_reminder_attendee
-                            email_subject = event.settings.mail_subject_download_reminder_attendee
                             email_context = get_email_context(event=event, order=o, position=p)
                             try:
                                 o.send_mail(
@@ -1300,7 +1239,7 @@ def notify_user_changed_order(order, user=None, auth=None, invoices=[]):
     with language(order.locale, order.event.settings.region):
         email_template = order.event.settings.mail_text_order_changed
         email_context = get_email_context(event=order.event, order=order)
-        email_subject = order.event.settings.mail_subject_order_changed
+        email_subject = _('Your order has been changed: %(code)s') % {'code': order.code}
         try:
             order.send_mail(
                 email_subject, email_template, email_context,
@@ -1343,7 +1282,7 @@ class OrderChangeManager:
     CancelFeeOperation = namedtuple('CancelFeeOperation', ('fee', 'price_diff'))
     RegenerateSecretOperation = namedtuple('RegenerateSecretOperation', ('position',))
 
-    def __init__(self, order: Order, user=None, auth=None, notify=True, reissue_invoice=True):
+    def __init__(self, order: Order, user=None, auth=None, notify=True, reissue_invoice=True, source=None):
         self.order = order
         self.user = user
         self.auth = auth
@@ -1358,6 +1297,7 @@ class OrderChangeManager:
         self.notify = notify
         self._invoice_dirty = False
         self._invoices = []
+        self.source = source
 
     def change_item(self, position: OrderPosition, item: Item, variation: Optional[ItemVariation]):
         if (not variation and item.has_variations) or (variation and variation.item_id != item.pk):
@@ -2393,9 +2333,9 @@ class OrderChangeManager:
                 self._reissue_invoice()
             self._clear_tickets_cache()
             self.order.touch()
-            self.order.create_transactions()
+            self.order.create_transactions(source=self.source)
             if self.split_order:
-                self.split_order.create_transactions()
+                self.split_order.create_transactions(source=self.source)
 
         if self.notify:
             notify_user_changed_order(
@@ -2428,14 +2368,14 @@ class OrderChangeManager:
 
 
 @app.task(base=ProfiledEventTask, bind=True, max_retries=5, default_retry_delay=1, throws=(OrderError,))
-def perform_order(self, event: Event, payments: List[dict], positions: List[str],
+def perform_order(self, event: Event, payment_provider: str, positions: List[str],
                   email: str=None, locale: str=None, address: int=None, meta_info: dict=None,
-                  sales_channel: str='web', shown_total=None, customer=None):
+                  sales_channel: str='web', gift_cards: list=None, shown_total=None, customer=None, source=None):
     with language(locale):
         try:
             try:
-                return _perform_order(event, payments, positions, email, locale, address, meta_info,
-                                      sales_channel, shown_total, customer)
+                return _perform_order(event, payment_provider, positions, email, locale, address, meta_info,
+                                      sales_channel, gift_cards, shown_total, customer, source=source)
             except LockTimeoutException:
                 self.retry()
         except (MaxRetriesExceededError, LockTimeoutException):
@@ -2565,11 +2505,12 @@ def _try_auto_refund(order, auto_refund=True, manual_refund=False, allow_partial
 @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,
-                 email_comment=None, refund_comment=None, cancel_invoice=True):
+                 email_comment=None, refund_comment=None, cancel_invoice=True, source=None):
     try:
         try:
             ret = _cancel_order(order, user, send_mail, api_token, device, oauth_application,
-                                cancellation_fee, cancel_invoice=cancel_invoice, comment=email_comment)
+                                cancellation_fee, cancel_invoice=cancel_invoice, comment=email_comment,
+                                source=source)
             if try_auto_refund:
                 _try_auto_refund(order, refund_as_giftcard=refund_as_giftcard,
                                  comment=refund_comment)
@@ -2581,7 +2522,7 @@ def cancel_order(self, order: int, user: int=None, send_mail: bool=True, api_tok
 
 
 def change_payment_provider(order: Order, payment_provider, amount=None, new_payment=None, create_log=True,
-                            recreate_invoices=True):
+                            recreate_invoices=True, source=None):
     if not get_connection().in_atomic_block:
         raise Exception('change_payment_provider should only be called in atomic transaction!')
 
@@ -2669,7 +2610,7 @@ def change_payment_provider(order: Order, payment_provider, amount=None, new_pay
             generate_cancellation(i)
             generate_invoice(order)
 
-    order.create_transactions()
+    order.create_transactions(source=source)
     return old_fee, new_fee, fee, new_payment
 
 

src/pretix/base/services/pricing.py

@@ -117,7 +117,7 @@ def get_listed_price(item: Item, variation: ItemVariation = None, subevent: SubE
 
 
 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, is_bundled=False) -> TaxedPrice:
+                   tax_rule: TaxRule, invoice_address: InvoiceAddress, bundled_sum: Decimal) -> TaxedPrice:
     if not tax_rule:
         tax_rule = TaxRule(
             name='',
@@ -135,8 +135,7 @@ def get_line_price(price_after_voucher: Decimal, custom_price_input: Decimal, cu
             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,
-                             base_price_is='gross' if is_bundled else 'auto')
+        price = tax_rule.tax(price_after_voucher, invoice_address=invoice_address, subtract_from_gross=bundled_sum)
 
     return price
 

src/pretix/base/services/stats.py

@@ -112,7 +112,7 @@ def dictsum(*dicts) -> dict:
 
 def order_overview(
         event: Event, subevent: SubEvent=None, date_filter='', date_from=None, date_until=None, fees=False,
-        admission_only=False, base_qs=None
+        admission_only=False
 ) -> Tuple[List[Tuple[ItemCategory, List[Item]]], Dict[str, Tuple[Decimal, Decimal]]]:
     items = event.items.all().select_related(
         'category',  # for re-grouping
@@ -120,7 +120,7 @@ def order_overview(
         'variations'
     ).order_by('category__position', 'category_id', 'position', 'name')
 
-    qs = OrderPosition.all if base_qs is None else base_qs
+    qs = OrderPosition.all
     if isinstance(subevent, (list, QuerySet)):
         qs = qs.filter(subevent__in=subevent)
     elif subevent:

src/pretix/base/settings.py

@@ -743,18 +743,6 @@ DEFAULTS = {
         'default': 'True',
         'type': bool
     },
-    'payment_giftcard_public_name': {
-        'default': LazyI18nString.from_gettext(gettext_noop('Gift card')),
-        'type': LazyI18nString
-    },
-    'payment_giftcard_public_description': {
-        'default': LazyI18nString.from_gettext(gettext_noop(
-            'If you have a gift card, please enter the gift card code here. If the gift card does not have '
-            'enough credit to pay for the full order, you will be shown this page again and you can either '
-            'redeem another gift card or select a different payment method for the difference.'
-        )),
-        'type': LazyI18nString
-    },
     'payment_resellers__restrict_to_sales_channels': {
         'default': ['resellers'],
         'type': list
@@ -1433,45 +1421,6 @@ DEFAULTS = {
             label=_("Customers can cancel their unpaid orders"),
         )
     },
-    'cancel_allow_user_unpaid_keep': {
-        'default': '0.00',
-        'type': Decimal,
-        'form_class': forms.DecimalField,
-        'serializer_class': serializers.DecimalField,
-        'serializer_kwargs': dict(
-            max_digits=10, decimal_places=2
-        ),
-        'form_kwargs': dict(
-            label=_("Charge a fixed cancellation fee"),
-            help_text=_("Only affects orders pending payments, a cancellation fee for free orders is never charged. "
-                        "Note that it will be your responsibility to claim the cancellation fee from the user."),
-        )
-    },
-    'cancel_allow_user_unpaid_keep_fees': {
-        'default': 'False',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_("Charge payment, shipping and service fees"),
-            help_text=_("Only affects orders pending payments, a cancellation fee for free orders is never charged. "
-                        "Note that it will be your responsibility to claim the cancellation fee from the user."),
-        )
-    },
-    'cancel_allow_user_unpaid_keep_percentage': {
-        'default': '0.00',
-        'type': Decimal,
-        'form_class': forms.DecimalField,
-        'serializer_class': serializers.DecimalField,
-        'serializer_kwargs': dict(
-            max_digits=10, decimal_places=2
-        ),
-        'form_kwargs': dict(
-            label=_("Charge a percentual cancellation fee"),
-            help_text=_("Only affects orders pending payments, a cancellation fee for free orders is never charged. "
-                        "Note that it will be your responsibility to claim the cancellation fee from the user."),
-        )
-    },
     'cancel_allow_user_until': {
         'default': None,
         'type': RelativeDateWrapper,
@@ -1759,14 +1708,6 @@ DEFAULTS = {
         'type': LazyI18nString,
         'default': ""
     },
-    'mail_subject_resend_link': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Your order: {code}")),
-    },
-    'mail_subject_resend_link_attendee': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Your event registration: {code}")),
-    },
     'mail_text_resend_link': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
@@ -1780,10 +1721,6 @@ You can change your order details and view the status of your order at
 Best regards,
 Your {event} team"""))
     },
-    'mail_subject_resend_all_links': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Your orders for {event}")),
-    },
     'mail_text_resend_all_links': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
@@ -1796,10 +1733,6 @@ The list is as follows:
 Best regards,
 Your {event} team"""))
     },
-    'mail_subject_order_free_attendee': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Your event registration: {code}")),
-    },
     'mail_text_order_free_attendee': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello {attendee_name},
@@ -1812,14 +1745,6 @@ You can view the details and status of your ticket here:
 Best regards,
 Your {event} team"""))
     },
-    'mail_send_order_free_attendee': {
-        'type': bool,
-        'default': 'False'
-    },
-    'mail_subject_order_free': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Your order: {code}")),
-    },
     'mail_text_order_free': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
@@ -1833,9 +1758,9 @@ You can change your order details and view the status of your order at
 Best regards,
 Your {event} team"""))
     },
-    'mail_subject_order_placed_require_approval': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Your order: {code}")),
+    'mail_send_order_free_attendee': {
+        'type': bool,
+        'default': 'False'
     },
     'mail_text_order_placed_require_approval': {
         'type': LazyI18nString,
@@ -1851,10 +1776,6 @@ You can change your order details and view the status of your order at
 Best regards,
 Your {event} team"""))
     },
-    'mail_subject_order_placed': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Your order: {code}")),
-    },
     'mail_text_order_placed': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
@@ -1898,10 +1819,6 @@ Your {event} team"""))
         'type': bool,
         'default': 'False'
     },
-    'mail_subject_order_placed_attendee': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Your event registration: {code}")),
-    },
     'mail_text_order_placed_attendee': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello {attendee_name},
@@ -1914,10 +1831,6 @@ You can view the details and status of your ticket here:
 Best regards,
 Your {event} team"""))
     },
-    'mail_subject_order_changed': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Your order has been changed: {code}")),
-    },
     'mail_text_order_changed': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
@@ -1930,10 +1843,6 @@ You can view the status of your order at
 Best regards,
 Your {event} team"""))
     },
-    'mail_subject_order_paid': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Payment received for your order: {code}")),
-    },
     'mail_text_order_paid': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
@@ -1952,10 +1861,6 @@ Your {event} team"""))
         'type': bool,
         'default': 'False'
     },
-    'mail_subject_order_paid_attendee': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Event registration confirmed: {code}")),
-    },
     'mail_text_order_paid_attendee': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello {attendee_name},
@@ -1983,14 +1888,6 @@ Your {event} team"""))
         'type': int,
         'default': '3'
     },
-    'mail_subject_order_expire_warning': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Your order is about to expire: {code}")),
-    },
-    'mail_subject_order_pending_warning': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Your order is pending payment: {code}")),
-    },
     'mail_text_order_expire_warning': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
@@ -2005,10 +1902,6 @@ You can view the payment information and the status of your order at
 Best regards,
 Your {event} team"""))
     },
-    'mail_subject_waiting_list': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("You have been selected from the waitinglist for {event}")),
-    },
     'mail_text_waiting_list': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
@@ -2038,10 +1931,6 @@ as possible to the next person on the waiting list:
 Best regards,
 Your {event} team"""))
     },
-    'mail_subject_order_canceled': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Order canceled: {code}")),
-    },
     'mail_text_order_canceled': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
@@ -2056,10 +1945,6 @@ You can view the details of your order at
 Best regards,
 Your {event} team"""))
     },
-    'mail_subject_order_approved': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Order approved and awaiting payment: {code}")),
-    },
     'mail_text_order_approved': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
@@ -2076,10 +1961,6 @@ You can select a payment method and perform the payment here:
 Best regards,
 Your {event} team"""))
     },
-    'mail_subject_order_approved_free': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Order approved and confirmed: {code}")),
-    },
     'mail_text_order_approved_free': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
@@ -2093,10 +1974,6 @@ You can change your order details and view the status of your order at
 Best regards,
 Your {event} team"""))
     },
-    'mail_subject_order_denied': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Order denied: {code}")),
-    },
     'mail_text_order_denied': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
@@ -2130,10 +2007,6 @@ Your {event} team"""))
         'type': bool,
         'default': 'False'
     },
-    'mail_subject_download_reminder_attendee': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Your ticket is ready for download: {code}")),
-    },
     'mail_text_download_reminder_attendee': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello {attendee_name},
@@ -2146,10 +2019,6 @@ Your {event} team"""))
     Best regards,
     Your {event} team"""))
     },
-    'mail_subject_download_reminder': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Your ticket is ready for download: {code}")),
-    },
     'mail_text_download_reminder': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
@@ -2162,10 +2031,6 @@ If you did not do so already, you can download your ticket here:
 Best regards,
 Your {event} team"""))
     },
-    'mail_subject_customer_registration': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Activate your account at {organizer}")),
-    },
     'mail_text_customer_registration': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello {name},
@@ -2184,10 +2049,6 @@ Best regards,
 
 Your {organizer} team"""))
     },
-    'mail_subject_customer_email_change': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Confirm email address for your account at {organizer}")),
-    },
     'mail_text_customer_email_change': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello {name},
@@ -2206,10 +2067,6 @@ Best regards,
 
 Your {organizer} team"""))
     },
-    'mail_subject_customer_reset': {
-        'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(gettext_noop("Set a new password for your account at {organizer}")),
-    },
     'mail_text_customer_reset': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(gettext_noop("""Hello {name},

src/pretix/base/signals.py

@@ -64,10 +64,6 @@ class EventPluginSignal(django.dispatch.Signal):
             # Send to all events!
             return True
 
-        # If sentry packed this in a wrapper, unpack that
-        if "sentry" in receiver.__module__:
-            receiver = receiver.__wrapped__
-
         # Find the Django application this belongs to
         searchpath = receiver.__module__
         core_module = any([searchpath.startswith(cm) for cm in settings.CORE_MODULES])
@@ -307,7 +303,7 @@ The ``sender`` keyword argument will contain an organizer.
 validate_order = EventPluginSignal(
 )
 """
-Arguments: ``payments``, ``positions``, ``email``, ``locale``, ``invoice_address``,
+Arguments: ``payment_provider``, ``positions``, ``email``, ``locale``, ``invoice_address``,
 ``meta_info``, ``customer``
 
 This signal is sent out when the user tries to confirm the order, before we actually create
@@ -316,9 +312,6 @@ but you can raise an OrderError with an appropriate exception message if you lik
 the order. We strongly discourage making changes to the order here.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
-
-**DEPRECTATION:** Stop listening to the ``payment_provider`` attribute, it will be removed
-in the future, as the ``payments`` attribute gives more information.
 """
 
 validate_cart = EventPluginSignal()
@@ -567,7 +560,7 @@ an OrderedDict of (setting name, form field).
 
 order_fee_calculation = EventPluginSignal()
 """
-Arguments: ``positions``, ``invoice_address``, ``meta_info``, ``total``, ``gift_cards``, ``payment_requests``
+Arguments: ``positions``, ``invoice_address``, ``meta_info``, ``total``, ``gift_cards``
 
 This signals allows you to add fees to an order while it is being created. You are expected to
 return a list of ``OrderFee`` objects that are not yet saved to the database
@@ -577,10 +570,8 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 argument will contain the cart positions and ``invoice_address`` the invoice address (useful for
 tax calculation). The argument ``meta_info`` contains the order's meta dictionary. The ``total``
 keyword argument will contain the total cart sum without any fees. You should not rely on this
-``total`` value for fee calculations as other fees might interfere. The ``gift_cards`` argument
-lists the gift cards in use.
-
-**DEPRECTATION:** Stop listening to the ``gift_cards`` attribute, it will be removed in the future.
+``total`` value for fee calculations as other fees might interfere. The ``gift_cards`` argument lists
+the gift cards in use.
 """
 
 order_fee_type_name = EventPluginSignal()

src/pretix/control/forms/event.py

@@ -666,9 +666,6 @@ class CancelSettingsForm(SettingsForm):
         'cancel_allow_user_until',
         'cancel_allow_user_paid',
         'cancel_allow_user_paid_until',
-        'cancel_allow_user_unpaid_keep',
-        'cancel_allow_user_unpaid_keep_fees',
-        'cancel_allow_user_unpaid_keep_percentage',
         'cancel_allow_user_paid_keep',
         'cancel_allow_user_paid_keep_fees',
         'cancel_allow_user_paid_keep_percentage',
@@ -930,11 +927,6 @@ class MailSettingsForm(SettingsForm):
         required=True,
         choices=[]
     )
-    mail_subject_order_placed = I18nFormField(
-        label=_("Subject sent to order contact address"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_order_placed = I18nFormField(
         label=_("Text sent to order contact address"),
         required=False,
@@ -946,22 +938,12 @@ class MailSettingsForm(SettingsForm):
                     'tickets, the following email will be sent out to the attendees.'),
         required=False,
     )
-    mail_subject_order_placed_attendee = I18nFormField(
-        label=_("Subject sent to attendees"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_order_placed_attendee = I18nFormField(
         label=_("Text sent to attendees"),
         required=False,
         widget=I18nTextarea,
     )
 
-    mail_subject_order_paid = I18nFormField(
-        label=_("Subject sent to order contact address"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_order_paid = I18nFormField(
         label=_("Text sent to order contact address"),
         required=False,
@@ -973,22 +955,12 @@ class MailSettingsForm(SettingsForm):
                     'tickets, the following email will be sent out to the attendees.'),
         required=False,
     )
-    mail_subject_order_paid_attendee = I18nFormField(
-        label=_("Subject sent to attendees"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_order_paid_attendee = I18nFormField(
         label=_("Text sent to attendees"),
         required=False,
         widget=I18nTextarea,
     )
 
-    mail_subject_order_free = I18nFormField(
-        label=_("Subject sent to order contact address"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_order_free = I18nFormField(
         label=_("Text sent to order contact address"),
         required=False,
@@ -1000,47 +972,22 @@ class MailSettingsForm(SettingsForm):
                     'tickets, the following email will be sent out to the attendees.'),
         required=False,
     )
-    mail_subject_order_free_attendee = I18nFormField(
-        label=_("Subject sent to attendees"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_order_free_attendee = I18nFormField(
         label=_("Text sent to attendees"),
         required=False,
         widget=I18nTextarea,
     )
 
-    mail_subject_order_changed = I18nFormField(
-        label=_("Subject"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_order_changed = I18nFormField(
         label=_("Text"),
         required=False,
         widget=I18nTextarea,
     )
-    mail_subject_resend_link = I18nFormField(
-        label=_("Subject (sent by admin)"),
-        required=False,
-        widget=I18nTextInput,
-    )
-    mail_subject_resend_link_attendee = I18nFormField(
-        label=_("Subject (sent by admin to attendee)"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_resend_link = I18nFormField(
         label=_("Text (sent by admin)"),
         required=False,
         widget=I18nTextarea,
     )
-    mail_subject_resend_all_links = I18nFormField(
-        label=_("Subject (requested by user)"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_resend_all_links = I18nFormField(
         label=_("Text (requested by user)"),
         required=False,
@@ -1058,31 +1005,11 @@ class MailSettingsForm(SettingsForm):
         required=False,
         widget=I18nTextarea,
     )
-    mail_subject_order_expire_warning = I18nFormField(
-        label=_("Subject (if order will expire automatically)"),
-        required=False,
-        widget=I18nTextInput,
-    )
-    mail_subject_order_pending_warning = I18nFormField(
-        label=_("Subject (if order will not expire automatically)"),
-        required=False,
-        widget=I18nTextInput,
-    )
-    mail_subject_waiting_list = I18nFormField(
-        label=_("Subject"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_waiting_list = I18nFormField(
         label=_("Text"),
         required=False,
         widget=I18nTextarea,
     )
-    mail_subject_order_canceled = I18nFormField(
-        label=_("Subject"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_order_canceled = I18nFormField(
         label=_("Text"),
         required=False,
@@ -1093,11 +1020,6 @@ class MailSettingsForm(SettingsForm):
         required=False,
         widget=I18nTextarea,
     )
-    mail_subject_download_reminder = I18nFormField(
-        label=_("Subject sent to order contact address"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_download_reminder = I18nFormField(
         label=_("Text sent to order contact address"),
         required=False,
@@ -1109,11 +1031,6 @@ class MailSettingsForm(SettingsForm):
                     'tickets, the following email will be sent out to the attendees.'),
         required=False,
     )
-    mail_subject_download_reminder_attendee = I18nFormField(
-        label=_("Subject sent to attendees"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_download_reminder_attendee = I18nFormField(
         label=_("Text sent to attendees"),
         required=False,
@@ -1126,90 +1043,50 @@ class MailSettingsForm(SettingsForm):
         help_text=_("This email will be sent out this many days before the order event starts. If the "
                     "field is empty, the mail will never be sent.")
     )
-    mail_subject_order_placed_require_approval = I18nFormField(
-        label=_("Subject for received order"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_order_placed_require_approval = I18nFormField(
-        label=_("Text for received order"),
+        label=_("Received order"),
         required=False,
         widget=I18nTextarea,
     )
-    mail_subject_order_approved = I18nFormField(
-        label=_("Subject for approved order"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_order_approved = I18nFormField(
-        label=_("Text for approved order"),
+        label=_("Approved order"),
         required=False,
         widget=I18nTextarea,
         help_text=_("This will only be sent out for non-free orders. Free orders will receive the free order "
                     "template from below instead."),
     )
-    mail_subject_order_approved_free = I18nFormField(
-        label=_("Subject for approved free order"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_order_approved_free = I18nFormField(
-        label=_("Text for approved free order"),
+        label=_("Approved free order"),
         required=False,
         widget=I18nTextarea,
         help_text=_("This will only be sent out for free orders. Non-free orders will receive the non-free order "
                     "template from above instead."),
     )
-    mail_subject_order_denied = I18nFormField(
-        label=_("Subject for denied order"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_order_denied = I18nFormField(
-        label=_("Text for denied order"),
+        label=_("Denied order"),
         required=False,
         widget=I18nTextarea,
     )
     base_context = {
-        'mail_text_order_placed': ['event', 'order', 'payments'],
-        'mail_subject_order_placed': ['event', 'order', 'payments'],
+        'mail_text_order_placed': ['event', 'order', 'payment'],
         'mail_text_order_placed_attendee': ['event', 'order', 'position'],
-        'mail_subject_order_placed_attendee': ['event', 'order', 'position'],
         'mail_text_order_placed_require_approval': ['event', 'order'],
-        'mail_subject_order_placed_require_approval': ['event', 'order'],
         'mail_text_order_approved': ['event', 'order'],
-        'mail_subject_order_approved': ['event', 'order'],
         'mail_text_order_approved_free': ['event', 'order'],
-        'mail_subject_order_approved_free': ['event', 'order'],
         'mail_text_order_denied': ['event', 'order', 'comment'],
-        'mail_subject_order_denied': ['event', 'order', 'comment'],
         'mail_text_order_paid': ['event', 'order', 'payment_info'],
-        'mail_subject_order_paid': ['event', 'order', 'payment_info'],
         'mail_text_order_paid_attendee': ['event', 'order', 'position'],
-        'mail_subject_order_paid_attendee': ['event', 'order', 'position'],
         'mail_text_order_free': ['event', 'order'],
-        'mail_subject_order_free': ['event', 'order'],
         'mail_text_order_free_attendee': ['event', 'order', 'position'],
-        'mail_subject_order_free_attendee': ['event', 'order', 'position'],
         'mail_text_order_changed': ['event', 'order'],
-        'mail_subject_order_changed': ['event', 'order'],
         'mail_text_order_canceled': ['event', 'order', 'comment'],
-        'mail_subject_order_canceled': ['event', 'order', 'comment'],
         'mail_text_order_expire_warning': ['event', 'order'],
-        'mail_subject_order_expire_warning': ['event', 'order'],
-        'mail_subject_order_pending_warning': ['event', 'order'],
         'mail_text_order_custom_mail': ['event', 'order'],
         'mail_text_download_reminder': ['event', 'order'],
-        'mail_subject_download_reminder': ['event', 'order'],
         'mail_text_download_reminder_attendee': ['event', 'order', 'position'],
-        'mail_subject_download_reminder_attendee': ['event', 'order', 'position'],
         'mail_text_resend_link': ['event', 'order'],
-        'mail_subject_resend_link': ['event', 'order'],
-        'mail_subject_resend_link_attendee': ['event', 'order'],
         'mail_text_waiting_list': ['event', 'waiting_list_entry'],
-        'mail_subject_waiting_list': ['event', 'waiting_list_entry'],
         'mail_text_resend_all_links': ['event', 'orders'],
-        'mail_subject_resend_all_links': ['event', 'orders'],
         'mail_attach_ical_description': ['event', 'event_or_subevent'],
     }
 

src/pretix/control/forms/filter.py

@@ -806,8 +806,7 @@ class OrderSearchFilterForm(OrderFilterForm):
         # We ignore superuser permissions here. This is intentional – we do not want to show super
         # users a form with all meta properties ever assigned.
         return EventMetaProperty.objects.filter(
-            organizer_id__in=self.request.user.teams.values_list('organizer', flat=True),
-            filter_allowed=True,
+            organizer_id__in=self.request.user.teams.values_list('organizer', flat=True)
         )
 
 
@@ -1546,13 +1545,12 @@ class EventFilterForm(FilterForm):
     @cached_property
     def meta_properties(self):
         if self.organizer:
-            return self.organizer.meta_properties.filter(filter_allowed=True)
+            return self.organizer.meta_properties.all()
         else:
             # We ignore superuser permissions here. This is intentional – we do not want to show super
             # users a form with all meta properties ever assigned.
             return EventMetaProperty.objects.filter(
-                organizer_id__in=self.request.user.teams.values_list('organizer', flat=True),
-                filter_allowed=True,
+                organizer_id__in=self.request.user.teams.values_list('organizer', flat=True)
             )
 
 

src/pretix/control/forms/item.py

@@ -38,9 +38,7 @@ from decimal import Decimal
 from urllib.parse import urlencode
 
 from django import forms
-from django.conf import settings
 from django.core.exceptions import ValidationError
-from django.core.files.uploadedfile import UploadedFile
 from django.db.models import Max
 from django.forms.formsets import DELETION_FIELD_NAME
 from django.urls import reverse
@@ -63,8 +61,7 @@ from pretix.base.models import (
 from pretix.base.models.items import ItemAddOn, ItemBundle, ItemMetaValue
 from pretix.base.signals import item_copy_data
 from pretix.control.forms import (
-    ItemMultipleChoiceField, SizeValidationMixin, SplitDateTimeField,
-    SplitDateTimePickerWidget,
+    ItemMultipleChoiceField, SplitDateTimeField, SplitDateTimePickerWidget,
 )
 from pretix.control.forms.widgets import Select2
 from pretix.helpers.models import modelcopy
@@ -587,14 +584,6 @@ class ItemUpdateForm(I18nModelForm):
                 )
         return d
 
-    def clean_picture(self):
-        value = self.cleaned_data.get('picture')
-        if isinstance(value, UploadedFile) and value.size > settings.FILE_UPLOAD_MAX_SIZE_IMAGE:
-            raise forms.ValidationError(_("Please do not upload files larger than {size}!").format(
-                size=SizeValidationMixin._sizeof_fmt(settings.FILE_UPLOAD_MAX_SIZE_IMAGE)
-            ))
-        return value
-
     class Meta:
         model = Item
         localized_fields = '__all__'
@@ -779,6 +768,10 @@ class ItemAddOnsFormSet(I18nFormSet):
                 if self._should_delete_form(form):
                     # This form is going to be deleted so any of its errors
                     # should not cause the entire formset to be invalid.
+                    try:
+                        categories.remove(form.cleaned_data['addon_category'].pk)
+                    except KeyError:
+                        pass
                     continue
 
             if 'addon_category' in form.cleaned_data:

src/pretix/control/forms/orders.py

@@ -158,7 +158,7 @@ class CancelForm(ForceQuotaConfirmationForm):
         localize=True,
         label=_('Keep a cancellation fee of'),
         help_text=_('If you keep a fee, all positions within this order will be canceled and the order will be reduced '
-                    'to a cancellation fee. Payment and shipping fees will be canceled as well, so include them '
+                    'to a paid cancellation fee. Payment and shipping fees will be canceled as well, so include them '
                     'in your cancellation fee if you want to keep them. Please always enter a gross value, '
                     'tax will be calculated automatically.'),
     )
@@ -176,19 +176,23 @@ class CancelForm(ForceQuotaConfirmationForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        change_decimal_field(self.fields['cancellation_fee'], self.instance.event.currency)
-        self.fields['cancellation_fee'].widget.attrs['placeholder'] = floatformat(
-            Decimal('0.00'),
-            settings.CURRENCY_PLACES.get(self.instance.event.currency, 2)
-        )
-        self.fields['cancellation_fee'].max_value = self.instance.total
+        prs = self.instance.payment_refund_sum
+        if prs > 0:
+            change_decimal_field(self.fields['cancellation_fee'], self.instance.event.currency)
+            self.fields['cancellation_fee'].widget.attrs['placeholder'] = floatformat(
+                Decimal('0.00'),
+                settings.CURRENCY_PLACES.get(self.instance.event.currency, 2)
+            )
+            self.fields['cancellation_fee'].max_value = prs
+        else:
+            del self.fields['cancellation_fee']
         if not self.instance.invoices.exists():
             del self.fields['cancel_invoice']
 
     def clean_cancellation_fee(self):
         val = self.cleaned_data['cancellation_fee'] or Decimal('0.00')
-        if val > self.instance.total:
-            raise ValidationError(_('The cancellation fee cannot be higher than the total amount of this order.'))
+        if val > self.instance.payment_refund_sum:
+            raise ValidationError(_('The cancellation fee cannot be higher than the payment credit of this order.'))
         return val
 
 

src/pretix/control/forms/organizer.py

@@ -45,9 +45,7 @@ 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
 from django_scopes.forms import SafeModelMultipleChoiceField
-from i18nfield.forms import (
-    I18nFormField, I18nFormSetMixin, I18nTextarea, I18nTextInput,
-)
+from i18nfield.forms import I18nFormField, I18nFormSetMixin, I18nTextarea
 from phonenumber_field.formfields import PhoneNumberField
 from pytz import common_timezones
 
@@ -182,7 +180,7 @@ class OrganizerUpdateForm(OrganizerForm):
 class EventMetaPropertyForm(forms.ModelForm):
     class Meta:
         model = EventMetaProperty
-        fields = ['name', 'default', 'required', 'protected', 'allowed_values', 'filter_allowed']
+        fields = ['name', 'default', 'required', 'protected', 'allowed_values']
         widgets = {
             'default': forms.TextInput()
         }
@@ -459,31 +457,16 @@ class MailSettingsForm(SettingsForm):
         }}
     )
 
-    mail_subject_customer_registration = I18nFormField(
-        label=_("Subject"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_customer_registration = I18nFormField(
         label=_("Text"),
         required=False,
         widget=I18nTextarea,
     )
-    mail_subject_customer_email_change = I18nFormField(
-        label=_("Subject"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_customer_email_change = I18nFormField(
         label=_("Text"),
         required=False,
         widget=I18nTextarea,
     )
-    mail_subject_customer_reset = I18nFormField(
-        label=_("Subject"),
-        required=False,
-        widget=I18nTextInput,
-    )
     mail_text_customer_reset = I18nFormField(
         label=_("Text"),
         required=False,
@@ -492,11 +475,8 @@ class MailSettingsForm(SettingsForm):
 
     base_context = {
         'mail_text_customer_registration': ['customer', 'url'],
-        'mail_subject_customer_registration': ['customer', 'url'],
         'mail_text_customer_email_change': ['customer', 'url'],
-        'mail_subject_customer_email_change': ['customer', 'url'],
         'mail_text_customer_reset': ['customer', 'url'],
-        'mail_subject_customer_reset': ['customer', 'url'],
     }
 
     def _get_sample_context(self, base_parameters):

src/pretix/control/forms/vouchers.py

@@ -72,7 +72,7 @@ class VoucherForm(I18nModelForm):
         localized_fields = '__all__'
         fields = [
             'code', 'valid_until', 'block_quota', 'allow_ignore_quota', 'value', 'tag',
-            'comment', 'max_usages', 'min_usages', 'price_mode', 'subevent', 'show_hidden_items', 'budget'
+            'comment', 'max_usages', 'price_mode', 'subevent', 'show_hidden_items', 'budget'
         ]
         field_classes = {
             'valid_until': SplitDateTimeField,
@@ -308,7 +308,7 @@ class VoucherBulkForm(VoucherForm):
         localized_fields = '__all__'
         fields = [
             'valid_until', 'block_quota', 'allow_ignore_quota', 'value', 'tag', 'comment',
-            'max_usages', 'min_usages', 'price_mode', 'subevent', 'show_hidden_items', 'budget'
+            'max_usages', 'price_mode', 'subevent', 'show_hidden_items', 'budget'
         ]
         field_classes = {
             'valid_until': SplitDateTimeField,
@@ -345,11 +345,8 @@ class VoucherBulkForm(VoucherForm):
         if ',' in raw or ';' in raw:
             if '@' in r[0]:
                 raise ValidationError(_('CSV input needs to contain a header row in the first line.'))
-            try:
-                dialect = csv.Sniffer().sniff(raw[:1024])
-                reader = csv.DictReader(StringIO(raw), dialect=dialect)
-            except csv.Error as e:
-                raise ValidationError(_('CSV parsing failed: {error}.').format(error=str(e)))
+            dialect = csv.Sniffer().sniff(raw[:1024])
+            reader = csv.DictReader(StringIO(raw), dialect=dialect)
             if 'email' not in reader.fieldnames:
                 raise ValidationError(_('CSV input needs to contain a field with the header "{header}".').format(header="email"))
             unknown_fields = [f for f in reader.fieldnames if f not in ('email', 'name', 'tag', 'number')]

src/pretix/control/forms/waitinglist.py

@@ -1,56 +0,0 @@
-#
-# This file is part of pretix (Community Edition).
-#
-# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-2021 rami.io GmbH and contributors
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
-# Public License as published by the Free Software Foundation in version 3 of the License.
-#
-# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
-# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
-# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
-# this file, see <https://pretix.eu/about/en/license>.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
-# <https://www.gnu.org/licenses/>.
-#
-from django.urls import reverse
-from django_scopes.forms import SafeModelChoiceField
-
-from pretix.base.forms import I18nModelForm
-from pretix.base.models import WaitingListEntry
-from pretix.control.forms.widgets import Select2
-
-
-class WaitingListEntryTransferForm(I18nModelForm):
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        if self.event.has_subevents:
-            self.fields['subevent'].required = True
-            self.fields['subevent'].queryset = self.event.subevents.all()
-            self.fields['subevent'].widget = Select2(
-                attrs={
-                    'data-model-select2': 'event',
-                    'data-select2-url': reverse('control:event.subevents.select2', kwargs={
-                        'event': self.event.slug,
-                        'organizer': self.event.organizer.slug,
-                    }),
-                }
-            )
-            self.fields['subevent'].widget.choices = self.fields['subevent'].choices
-
-    class Meta:
-        model = WaitingListEntry
-        fields = [
-            'subevent',
-        ]
-        field_classes = {
-            'subevent': SafeModelChoiceField,
-        }

src/pretix/control/logdisplay.py

@@ -487,7 +487,6 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
         'pretix.event.permissions.deleted': _('A user has been removed from the event team.'),
         'pretix.waitinglist.voucher': _('A voucher has been sent to a person on the waiting list.'),
         'pretix.event.orders.waitinglist.deleted': _('An entry has been removed from the waiting list.'),
-        'pretix.event.orders.waitinglist.transferred': _('An entry has been transferred to another waiting list.'),
         'pretix.event.orders.waitinglist.changed': _('An entry has been changed on the waiting list.'),
         'pretix.event.orders.waitinglist.added': _('An entry has been added to the waiting list.'),
         'pretix.team.created': _('The team has been created.'),

src/pretix/control/templates/pretixcontrol/auth/login_2fa.html

@@ -11,7 +11,7 @@
             {% trans "You configured your account to require authentication with a second medium, e.g. your phone. Please enter your verification code here:" %}
         </p>
         <div class="form-group">
-            <input class="form-control" name="token" placeholder="{% trans "Token" %}" autocomplete="one-time-code"
+            <input class="form-control" name="token" placeholder="{% trans "Token" %}"
                     type="text" required="required" autofocus="autofocus" id="webauthn-response">
         </div>
         <div class="sr-only alert alert-danger" id="webauthn-error">

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

@@ -116,12 +116,8 @@
     </form>
     {{ items|json_script:"items" }}
 
-    {% if DEBUG %}
-        <script type="text/javascript" src="{% static "vuejs/vue.js" %}"></script>
-    {% else %}
-        <script type="text/javascript" src="{% static "vuejs/vue.min.js" %}"></script>
-    {% endif %}
     {% compress js %}
+        <script type="text/javascript" src="{% static "vuejs/vue.js" %}"></script>
         <script type="text/javascript" src="{% static "d3/d3.v6.js" %}"></script>
         <script type="text/javascript" src="{% static "d3/d3-color.v2.js" %}"></script>
         <script type="text/javascript" src="{% static "d3/d3-dispatch.v2.js" %}"></script>
@@ -132,8 +128,6 @@
         <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>
-    {% endcompress %}
-    {% compress js %}
         <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>

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

@@ -11,9 +11,6 @@
                 <legend>{% trans "Unpaid or free orders" %}</legend>
                 {% bootstrap_field form.cancel_allow_user layout="control" %}
                 {% bootstrap_field form.cancel_allow_user_until layout="control" %}
-                {% bootstrap_field form.cancel_allow_user_unpaid_keep layout="control" %}
-                {% bootstrap_field form.cancel_allow_user_unpaid_keep_percentage layout="control" %}
-                {% bootstrap_field form.cancel_allow_user_unpaid_keep_fees layout="control" %}
             </fieldset>
             <fieldset>
                 <legend>{% trans "Paid orders" %}</legend>

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

@@ -88,37 +88,37 @@
                 <h4>{% trans "Text" %}</h4>
                 <div class="panel-group" id="questions_group">
                     {% blocktrans asvar title_placed_order %}Placed order{% endblocktrans %}
-                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_placed" title=title_placed_order items="mail_subject_order_placed,mail_text_order_placed,mail_send_order_placed_attendee,mail_subject_order_placed_attendee,mail_text_order_placed_attendee" exclude="mail_send_order_placed_attendee" %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_placed" title=title_placed_order items="mail_text_order_placed,mail_send_order_placed_attendee,mail_text_order_placed_attendee" exclude="mail_send_order_placed_attendee" %}
 
                     {% blocktrans asvar title_paid_order %}Paid order{% endblocktrans %}
-                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_paid" title=title_paid_order items="mail_subject_order_paid,mail_text_order_paid,mail_send_order_paid_attendee,mail_subject_order_paid_attendee,mail_text_order_paid_attendee" exclude="mail_send_order_paid_attendee" %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_paid" title=title_paid_order items="mail_text_order_paid,mail_send_order_paid_attendee,mail_text_order_paid_attendee" exclude="mail_send_order_paid_attendee" %}
 
                     {% blocktrans asvar title_free_order %}Free order{% endblocktrans %}
-                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_free" title=title_free_order items="mail_subject_order_free,mail_text_order_free,mail_send_order_free_attendee,mail_subject_order_free_attendee,mail_text_order_free_attendee" exclude="mail_send_order_free_attendee" %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_free" title=title_free_order items="mail_text_order_free,mail_send_order_free_attendee,mail_text_order_free_attendee" exclude="mail_send_order_free_attendee" %}
 
                     {% blocktrans asvar title_resend_link %}Resend link{% endblocktrans %}
-                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="resend_link" title=title_resend_link items="mail_subject_resend_link,mail_subject_resend_link_attendee,mail_text_resend_link,mail_subject_resend_all_links,mail_text_resend_all_links" %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="resend_link" title=title_resend_link items="mail_text_resend_link,mail_text_resend_all_links" %}
 
                     {% blocktrans asvar title_order_changed %}Order changed{% endblocktrans %}
-                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_changed" title=title_order_changed items="mail_subject_order_changed,mail_text_order_changed" %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_changed" title=title_order_changed items="mail_text_order_changed" %}
 
                     {% blocktrans asvar title_payment_reminder %}Payment reminder{% endblocktrans %}
-                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_expirew" title=title_payment_reminder items="mail_days_order_expire_warning,mail_subject_order_expire_warning,mail_subject_order_pending_warning,mail_text_order_expire_warning" exclude="mail_days_order_expire_warning" %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_expirew" title=title_payment_reminder items="mail_days_order_expire_warning,mail_text_order_expire_warning" exclude="mail_days_order_expire_warning" %}
 
                     {% blocktrans asvar title_waiting_list_notification %}Waiting list notification{% endblocktrans %}
-                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="waiting_list" title=title_waiting_list_notification items="mail_subject_waiting_list,mail_text_waiting_list" %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="waiting_list" title=title_waiting_list_notification items="mail_text_waiting_list" %}
 
                     {% blocktrans asvar title_order_canceled %}Order canceled{% endblocktrans %}
-                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_canceled" title=title_order_canceled items="mail_subject_order_canceled,mail_text_order_canceled" %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_canceled" title=title_order_canceled items="mail_text_order_canceled" %}
 
                     {% blocktrans asvar title_order_custom_mail %}Order custom mail{% endblocktrans %}
                     {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="custom_mail" title=title_order_custom_mail items="mail_text_order_custom_mail" %}
 
                     {% blocktrans asvar title_download_tickets_reminder %}Reminder to download tickets{% endblocktrans %}
-                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_download_tickets_reminder items="mail_days_download_reminder,mail_subject_download_reminder,mail_text_download_reminder,mail_send_download_reminder_attendee,mail_subject_download_reminder_attendee,mail_text_download_reminder_attendee,mail_sales_channel_download_reminder" exclude="mail_days_download_reminder,mail_send_download_reminder_attendee,mail_sales_channel_download_reminder" %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_download_tickets_reminder items="mail_days_download_reminder,mail_text_download_reminder,mail_send_download_reminder_attendee,mail_text_download_reminder_attendee,mail_sales_channel_download_reminder" exclude="mail_days_download_reminder,mail_send_download_reminder_attendee,mail_sales_channel_download_reminder" %}
 
                     {% blocktrans asvar title_require_approval %}Order approval process{% endblocktrans %}
-                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_require_approval  items="mail_subject_order_placed_require_approval,mail_text_order_placed_require_approval,mail_subject_order_approved,mail_text_order_approved,mail_subject_order_approved_free,mail_text_order_approved_free,mail_subject_order_denied,mail_text_order_denied" %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_require_approval  items="mail_text_order_placed_require_approval,mail_text_order_approved,mail_text_order_approved_free,mail_text_order_denied" %}
                 </div>
                 <h4>{% trans "Attachments" %}</h4>
                 {% bootstrap_field form.mail_attachment_new_order layout="control" %}

src/pretix/control/templates/pretixcontrol/giftcards/checkout.html

@@ -1,5 +1,10 @@
 {% load i18n %}
-{% load rich_text %}
 
-{{ request.event.settings.payment_giftcard_public_description|rich_text }}
+<p>
+    {% blocktrans %}
+        If you have a gift card, please enter the gift card code here. If the gift card does not have
+        enough credit to pay for the full order, you will be shown this page again and you can either
+        redeem another gift card or select a different payment method for the difference.
+    {% endblocktrans %}
+</p>
 <input name="giftcard" class="form-control" placeholder="{% trans "Gift card code" %}">

src/pretix/control/templates/pretixcontrol/giftcards/checkout_confirm.html

@@ -1,7 +1,8 @@
 {% load i18n %}
 
 <p>
-    {% blocktrans trimmed with card=info_data.gift_card_secret %}
-        Your gift card {{ card }} will be used to pay for this order.
+    {% blocktrans %}
+        Your gift card will be used to pay for this order. If the credit on the gift card is lower than the order total, you will be able to pay the
+        difference with a different payment method. If the credit is higher than the order total, you will be able to re-use the gift card in the future.
     {% endblocktrans %}
 </p>

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

@@ -190,13 +190,7 @@
                         </dd>
                         {% if order.status == "n" %}
                             <dt>{% trans "Expiry date" %}</dt>
-                            <dd>
-                                {{ order.expires|date:"SHORT_DATETIME_FORMAT" }}
-                                {% if has_cancellation_fee and request.event.settings.payment_term_expire_automatically %}
-                                    <span class="fa fa-warning text-danger" data-toggle="tooltip"
-                                          title="{% trans "This order will not expire automatically as it has an open cancellation fee." %}"></span>
-                                {% endif %}
-                            </dd>
+                            <dd>{{ order.expires|date:"SHORT_DATETIME_FORMAT" }}</dd>
                         {% endif %}
                         {% if request.organizer.settings.customer_accounts %}
                             <dt>{% trans "Customer account" %}</dt>

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

@@ -58,13 +58,13 @@
                 <legend>{% trans "E-mail content" %}</legend>
                 <div class="panel-group" id="questions_group">
                     {% blocktrans asvar title_customer_registration %}Customer account registration{% endblocktrans %}
-                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="customer_registration" title=title_customer_registration items="mail_subject_customer_registration,mail_text_customer_registration" %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="customer_registration" title=title_customer_registration items="mail_text_customer_registration" %}
 
                     {% blocktrans asvar title_email_change %}Customer account email change{% endblocktrans %}
-                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="email_change" title=title_email_change items="mail_subject_customer_email_change,mail_text_customer_email_change" %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="email_change" title=title_email_change items="mail_text_customer_email_change" %}
 
                     {% blocktrans asvar title_reset %}Customer account password reset{% endblocktrans %}
-                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="reset" title=title_reset items="mail_subject_customer_reset,mail_text_customer_reset" %}
+                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="reset" title=title_reset items="mail_text_customer_reset" %}
                 </div>
             </fieldset>
         </div>

src/pretix/control/templates/pretixcontrol/vouchers/bulk.html

@@ -73,7 +73,6 @@
             <legend>{% trans "Advanced settings" %}</legend>
             {% bootstrap_field form.block_quota layout="control" %}
             {% bootstrap_field form.allow_ignore_quota layout="control" %}
-            {% bootstrap_field form.min_usages layout="control" %}
             {% bootstrap_field form.budget addon_after=request.event.currency layout="control" %}
             {% bootstrap_field form.tag layout="control" %}
             {% bootstrap_field form.comment layout="control" %}

src/pretix/control/templates/pretixcontrol/vouchers/detail.html

@@ -85,7 +85,6 @@
                     <legend>{% trans "Advanced settings" %}</legend>
                     {% bootstrap_field form.block_quota layout="control" %}
                     {% bootstrap_field form.allow_ignore_quota layout="control" %}
-                    {% bootstrap_field form.min_usages layout="control" %}
                     {% bootstrap_field form.budget addon_after=request.event.currency layout="control" %}
                     {% bootstrap_field form.tag layout="control" %}
                     {% bootstrap_field form.comment layout="control" %}

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

@@ -242,13 +242,6 @@
                                     data-toggle="tooltip" title="{% trans "Move to the end of the list" %}">
                                     <span class="fa fa-thumbs-down"></span>
                                 </button>
-                                {% if request.event.has_subevents %}
-                                    <a href="{% url "control:event.orders.waitinglist.transfer" organizer=request.event.organizer.slug event=request.event.slug entry=e.id %}"
-                                       class="btn btn-default btn-sm" title="{% trans "Transfer to other date" context "subevent" %}"
-                                        data-toggle="tooltip">
-                                        <i class="fa fa-calendar" aria-hidden="true"></i>
-                                    </a>
-                                {% endif %}
                                 <a href="{% url "control:event.orders.waitinglist.delete" organizer=request.event.organizer.slug event=request.event.slug entry=e.id %}?next={{ request.get_full_path|urlencode }}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
                             {% else %}
                                 <button class="btn btn-default btn-sm disabled">
@@ -268,11 +261,9 @@
         {% if "can_change_orders" in request.eventpermset %}
             <div class="batch-select-actions">
                 <button type="submit" class="btn btn-danger btn-save" name="action" value="delete">
-                    <i class="fa fa-trash"></i>
-                    {% trans "Delete selected" %}
+                    <i class="fa fa-trash"></i>{% trans "Delete selected" %}
                 </button>
             </div>
-
         {% endif %}
     </form>
     {% include "pretixcontrol/pagination.html" %}

src/pretix/control/templates/pretixcontrol/waitinglist/transfer.html

@@ -1,23 +0,0 @@
-{% extends "pretixcontrol/event/base.html" %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% block title %}{% trans "Transfer entry" %}{% endblock %}
-{% block content %}
-    <h1>{% trans "Transfer entry" %}</h1>
-    <form action="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        <p>{% blocktrans trimmed context "subevent" %}
-            Please select the date to which the following waiting list entry should be
-            transferred: <strong>{{ entry }}</strong>?
-        {% endblocktrans %}</p>
-        {% bootstrap_field form.subevent layout="control" %}
-        <div class="form-group submit-group">
-            <a href="{% url "control:event.orders.waitinglist" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
-                {% trans "Cancel" %}
-            </a>
-            <button type="submit" class="btn btn-primary btn-save">
-                {% trans "Transfer" %}
-            </button>
-        </div>
-    </form>
-{% endblock %}

src/pretix/control/urls.py

@@ -401,8 +401,6 @@ urlpatterns = [
         re_path(r'^waitinglist/auto_assign$', waitinglist.AutoAssign.as_view(), name='event.orders.waitinglist.auto'),
         re_path(r'^waitinglist/(?P<entry>\d+)/delete$', waitinglist.EntryDelete.as_view(),
                 name='event.orders.waitinglist.delete'),
-        re_path(r'^waitinglist/(?P<entry>\d+)/transfer$', waitinglist.EntryTransfer.as_view(),
-                name='event.orders.waitinglist.transfer'),
         re_path(r'^checkins/$', checkin.CheckinListView.as_view(), name='event.orders.checkins'),
         re_path(r'^checkinlists/$', checkin.CheckinListList.as_view(), name='event.orders.checkinlists'),
         re_path(r'^checkinlists/add$', checkin.CheckinListCreate.as_view(), name='event.orders.checkinlists.add'),

src/pretix/control/views/auth.py

@@ -61,7 +61,6 @@ from pretix.base.forms.auth import (
 )
 from pretix.base.models import TeamInvite, U2FDevice, User, WebAuthnDevice
 from pretix.base.services.mail import SendMailException
-from pretix.helpers.http import redirect_to_url
 from pretix.helpers.webauthn import generate_challenge
 
 logger = logging.getLogger(__name__)
@@ -82,7 +81,7 @@ def process_login(request, user, keep_logged_in):
         twofa_url = reverse('control:auth.login.2fa')
         if next_url and url_has_allowed_host_and_scheme(next_url, allowed_hosts=None):
             twofa_url += '?next=' + quote(next_url)
-        return redirect_to_url(twofa_url)
+        return redirect(twofa_url)
     else:
         auth_login(request, user)
         request.session['pretix_auth_login_time'] = int(time.time())
@@ -111,7 +110,7 @@ def login(request):
     if request.user.is_authenticated:
         next_url = backend.get_next_url(request) or 'control:index'
         if next_url and url_has_allowed_host_and_scheme(next_url, allowed_hosts=None):
-            return redirect_to_url(next_url)
+            return redirect(next_url)
         return redirect(reverse('control:index'))
     if request.method == 'POST':
         form = LoginForm(backend=backend, data=request.POST, request=request)
@@ -137,8 +136,8 @@ def logout(request):
     if 'next' in request.GET and url_has_allowed_host_and_scheme(request.GET.get('next'), allowed_hosts=None):
         next += '?next=' + quote(request.GET.get('next'))
     if 'back' in request.GET and url_has_allowed_host_and_scheme(request.GET.get('back'), allowed_hosts=None):
-        return redirect_to_url(request.GET.get('back'))
-    return redirect_to_url(next)
+        return redirect(request.GET.get('back'))
+    return redirect(next)
 
 
 def register(request):
@@ -444,7 +443,7 @@ class Login2FAView(TemplateView):
             del request.session['pretix_auth_2fa_user']
             del request.session['pretix_auth_2fa_time']
             if "next" in request.GET and url_has_allowed_host_and_scheme(request.GET.get("next"), allowed_hosts=None):
-                return redirect_to_url(request.GET.get("next"))
+                return redirect(request.GET.get("next"))
             return redirect(reverse('control:index'))
         else:
             messages.error(request, _('Invalid code, please try again.'))

src/pretix/control/views/event.py

@@ -41,7 +41,6 @@ from decimal import Decimal
 from itertools import groupby
 from urllib.parse import urlsplit
 
-import bleach
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
@@ -387,7 +386,7 @@ class EventPlugins(EventSettingsViewMixin, EventPermissionRequiredMixin, Templat
                 if key.startswith("plugin:"):
                     module = key.split(":")[1]
                     if value == "enable" and module in plugins_available:
-                        if getattr(plugins_available[module].app, 'restricted', False):
+                        if getattr(plugins_available[module], 'restricted', False):
                             if module not in request.event.settings.allowed_restricted_plugins:
                                 continue
 
@@ -724,7 +723,7 @@ class MailSettingsPreview(EventPermissionRequiredMixin, View):
         if preview_item not in MailSettingsForm.base_context:
             return HttpResponseBadRequest(_('invalid item'))
 
-        regex = r"^" + re.escape(preview_item) + r"_(?P<idx>[\d]+)$"
+        regex = r"^" + re.escape(preview_item) + r"_(?P<idx>[\d+])$"
         msgs = {}
         for k, v in request.POST.items():
             # only accept allowed fields
@@ -733,12 +732,9 @@ class MailSettingsPreview(EventPermissionRequiredMixin, View):
                 idx = matched.group('idx')
                 if idx in self.supported_locale:
                     with language(self.supported_locale[idx], self.request.event.settings.region):
-                        if k.startswith('mail_subject_'):
-                            msgs[self.supported_locale[idx]] = bleach.clean(v).format_map(self.placeholders(preview_item))
-                        else:
-                            msgs[self.supported_locale[idx]] = markdown_compile_email(
-                                v.format_map(self.placeholders(preview_item))
-                            )
+                        msgs[self.supported_locale[idx]] = markdown_compile_email(
+                            v.format_map(self.placeholders(preview_item))
+                        )
 
         return JsonResponse({
             'item': preview_item,

src/pretix/control/views/mailsetup.py

@@ -32,7 +32,6 @@ from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
 
 from pretix.base import email
-from pretix.base.forms import SECRET_REDACTED
 from pretix.base.models import Event
 from pretix.base.services.mail import mail
 from pretix.control.forms.filter import OrganizerFilterForm
@@ -170,13 +169,6 @@ class MailSettingsSetupView(TemplateView):
             )
 
             if allow_save:
-                self.object.settings.smtp_use_custom = False
-                del self.object.settings.smtp_host
-                del self.object.settings.smtp_port
-                del self.object.settings.smtp_username
-                del self.object.settings.smtp_password
-                del self.object.settings.smtp_use_tls
-                del self.object.settings.smtp_use_ssl
                 for k, v in self.simple_form.cleaned_data.items():
                     self.object.settings.set(k, v)
                 self.log_action(self.simple_form.cleaned_data)
@@ -245,8 +237,7 @@ class MailSettingsSetupView(TemplateView):
 
             if request.POST.get('state') == 'save':
                 for k, v in self.smtp_form.cleaned_data.items():
-                    if v != SECRET_REDACTED:
-                        self.object.settings.set(k, v)
+                    self.object.settings.set(k, v)
                 self.object.settings.smtp_use_custom = True
                 self.log_action({**self.smtp_form.cleaned_data, 'smtp_use_custom': True})
                 messages.success(request, _('Your changes have been saved.'))

src/pretix/control/views/main.py

@@ -257,10 +257,7 @@ class EventWizard(SafeSessionWizardView):
     def done(self, form_list, form_dict, **kwargs):
         foundation_data = self.get_cleaned_data_for_step('foundation')
         basics_data = self.get_cleaned_data_for_step('basics')
-        try:
-            copy_data = self.get_cleaned_data_for_step('copy')
-        except KeyError:
-            copy_data = None
+        copy_data = self.get_cleaned_data_for_step('copy')
 
         with transaction.atomic(), language(basics_data['locale']):
             event = form_dict['basics'].instance
@@ -279,8 +276,7 @@ class EventWizard(SafeSessionWizardView):
                     t.limit_events.add(event)
                 elif event.organizer.settings.event_team_provisioning:
                     t = Team.objects.create(
-                        organizer=event.organizer,
-                        name=_('Team {event}').format(event=str(event.name)[:188] + "…" if len(str(event.name)) > 190 else str(event.name)),
+                        organizer=event.organizer, name=_('Team {event}').format(event=event.name),
                         can_change_event_settings=True, can_change_items=True,
                         can_view_orders=True, can_change_orders=True, can_view_vouchers=True,
                         can_change_vouchers=True

src/pretix/control/views/orders.py

@@ -293,7 +293,6 @@ class OrderDetail(OrderView):
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
         ctx['items'] = self.get_items()
-        ctx['has_cancellation_fee'] = any(f.fee_type == OrderFee.FEE_TYPE_CANCELLATION for f in ctx['items']['fees'])
         ctx['event'] = self.request.event
         ctx['payments'] = self.order.payments.order_by('-created')
         ctx['refunds'] = self.order.refunds.select_related('payment').order_by('-created')
@@ -558,7 +557,7 @@ class OrderApprove(OrderView):
     def post(self, *args, **kwargs):
         if self.order.require_approval:
             try:
-                approve_order(self.order, user=self.request.user)
+                approve_order(self.order, user=self.request.user, source=("pretix.control", f"user:{self.request.user.pk}"))
             except OrderError as e:
                 messages.error(self.request, str(e))
             else:
@@ -609,7 +608,8 @@ class OrderDeny(OrderView):
             try:
                 deny_order(self.order, user=self.request.user,
                            comment=self.request.POST.get('comment'),
-                           send_mail=self.request.POST.get('send_email') == 'on')
+                           send_mail=self.request.POST.get('send_email') == 'on',
+                           source=("pretix.control", f"user:{self.request.user.pk}"))
             except OrderError as e:
                 messages.error(self.request, str(e))
             else:
@@ -704,7 +704,7 @@ class OrderRefundProcess(OrderView):
 
             if self.order.status != Order.STATUS_CANCELED and self.order.positions.exists():
                 if self.request.POST.get("action") == "r":
-                    mark_order_refunded(self.order, user=self.request.user)
+                    mark_order_refunded(self.order, user=self.request.user, source=("pretix.control", f"user:{self.request.user.pk}"))
                 elif not (self.order.status == Order.STATUS_PAID and self.order.pending_sum <= 0):
                     self.order.status = Order.STATUS_PENDING
                     self.order.set_expires(
@@ -1072,7 +1072,7 @@ class OrderRefundView(OrderView):
                 if any_success:
                     if self.start_form.cleaned_data.get('action') == 'mark_refunded':
                         if self.order.cancel_allowed():
-                            mark_order_refunded(self.order, user=self.request.user)
+                            mark_order_refunded(self.order, user=self.request.user, source=("pretix.control", f"user:{self.request.user.pk}"))
                     elif self.start_form.cleaned_data.get('action') == 'mark_pending':
                         if not (self.order.status == Order.STATUS_PAID and self.order.pending_sum <= 0):
                             self.order.status = Order.STATUS_PENDING
@@ -1275,7 +1275,8 @@ class OrderTransition(OrderView):
                                  email_comment=self.mark_canceled_form.cleaned_data['comment'],
                                  send_mail=self.mark_canceled_form.cleaned_data['send_email'],
                                  cancel_invoice=self.mark_canceled_form.cleaned_data.get('cancel_invoice', True),
-                                 cancellation_fee=self.mark_canceled_form.cleaned_data.get('cancellation_fee'))
+                                 cancellation_fee=self.mark_canceled_form.cleaned_data.get('cancellation_fee'),
+                                 source=("pretix.control", f"user:{self.request.user.pk}"))
                 except OrderError as e:
                     messages.error(self.request, str(e))
                 else:
@@ -1298,7 +1299,7 @@ class OrderTransition(OrderView):
             else:
                 return self.get(self.request, *args, **kwargs)
         elif self.order.status == Order.STATUS_PENDING and to == 'e':
-            mark_order_expired(self.order, user=self.request.user)
+            mark_order_expired(self.order, user=self.request.user, source=("pretix.control", f"user:{self.request.user.pk}"))
             messages.success(self.request, _('The order has been marked as expired.'))
         return redirect(self.get_order_url())
 
@@ -1575,7 +1576,8 @@ class OrderReactivate(OrderView):
             reactivate_order(
                 self.order,
                 user=self.request.user,
-                force=self.reactivate_form.cleaned_data.get('force', False)
+                force=self.reactivate_form.cleaned_data.get('force', False),
+                source=("pretix.control", f"user:{self.request.user.pk}"),
             )
             messages.success(self.request, _('The order has been reactivated.'))
         except OrderError as e:

src/pretix/control/views/organizer.py

@@ -37,7 +37,6 @@ import re
 from datetime import timedelta
 from decimal import Decimal
 
-import bleach
 from django import forms
 from django.conf import settings
 from django.contrib import messages
@@ -205,7 +204,7 @@ class OrganizerDetail(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin
         ctx = super().get_context_data(**kwargs)
         ctx['filter_form'] = self.filter_form
         ctx['meta_fields'] = [
-            self.filter_form['meta_{}'.format(p.name)] for p in self.organizer.meta_properties.filter(filter_allowed=True)
+            self.filter_form['meta_{}'.format(p.name)] for p in self.organizer.meta_properties.all()
         ]
         return ctx
 
@@ -325,7 +324,7 @@ class MailSettingsPreview(OrganizerPermissionRequiredMixin, View):
         if preview_item not in MailSettingsForm.base_context:
             return HttpResponseBadRequest(_('invalid item'))
 
-        regex = r"^" + re.escape(preview_item) + r"_(?P<idx>[\d]+)$"
+        regex = r"^" + re.escape(preview_item) + r"_(?P<idx>[\d+])$"
         msgs = {}
         for k, v in request.POST.items():
             # only accept allowed fields
@@ -334,12 +333,9 @@ class MailSettingsPreview(OrganizerPermissionRequiredMixin, View):
                 idx = matched.group('idx')
                 if idx in self.supported_locale:
                     with language(self.supported_locale[idx], self.request.organizer.settings.region):
-                        if k.startswith('mail_subject_'):
-                            msgs[self.supported_locale[idx]] = bleach.clean(v).format_map(self.placeholders(preview_item))
-                        else:
-                            msgs[self.supported_locale[idx]] = markdown_compile_email(
-                                v.format_map(self.placeholders(preview_item))
-                            )
+                        msgs[self.supported_locale[idx]] = markdown_compile_email(
+                            v.format_map(self.placeholders(preview_item))
+                        )
 
         return JsonResponse({
             'item': preview_item,
@@ -2214,7 +2210,7 @@ class CustomerDetailView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMi
 
     def get_queryset(self):
         q = Q(customer=self.customer)
-        if self.request.organizer.settings.customer_accounts_link_by_email and self.customer.email:
+        if self.request.organizer.settings.customer_accounts_link_by_email:
             # This is safe because we only let customers with verified emails log in
             q |= Q(email__iexact=self.customer.email)
         qs = Order.objects.filter(
@@ -2240,7 +2236,7 @@ class CustomerDetailView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMi
             ) + '?id=' + self.customer.identifier + '&token=' + token
             mail(
                 self.customer.email,
-                self.request.organizer.settings.mail_subject_customer_reset,
+                _('Set a new password for your account at {organizer}').format(organizer=self.request.organizer.name),
                 self.request.organizer.settings.mail_text_customer_reset,
                 ctx,
                 locale=self.customer.locale,

src/pretix/control/views/user.py

@@ -71,7 +71,6 @@ from pretix.control.permissions import (
     AdministratorPermissionRequiredMixin, StaffMemberRequiredMixin,
 )
 from pretix.control.views.auth import get_u2f_appid
-from pretix.helpers.http import redirect_to_url
 from pretix.helpers.webauthn import generate_challenge, generate_ukey
 
 REAL_DEVICE_TYPES = (TOTPDevice, WebAuthnDevice, U2FDevice)
@@ -139,7 +138,7 @@ class ReauthView(TemplateView):
             request.session['pretix_auth_last_used'] = t
             next_url = get_auth_backends()[request.user.auth_backend].get_next_url(request)
             if next_url and url_has_allowed_host_and_scheme(next_url, allowed_hosts=None):
-                return redirect_to_url(next_url)
+                return redirect(next_url)
             return redirect(reverse('control:index'))
         else:
             messages.error(request, _('The password you entered was invalid, please try again.'))
@@ -154,7 +153,7 @@ class ReauthView(TemplateView):
             request.session['pretix_auth_login_time'] = t
             request.session['pretix_auth_last_used'] = t
             if next_url and url_has_allowed_host_and_scheme(next_url, allowed_hosts=None):
-                return redirect_to_url(next_url)
+                return redirect(next_url)
             return redirect(reverse('control:index'))
         return super().get(request, *args, **kwargs)
 
@@ -750,7 +749,7 @@ class StartStaffSession(StaffMemberRequiredMixin, RecentAuthenticationRequiredMi
             )
 
         if "next" in request.GET and url_has_allowed_host_and_scheme(request.GET.get("next"), allowed_hosts=None):
-            return redirect_to_url(request.GET.get("next"))
+            return redirect(request.GET.get("next"))
         else:
             return redirect(reverse("control:index"))
 

src/pretix/control/views/waitinglist.py

@@ -40,7 +40,7 @@ from django.db import transaction
 from django.db.models import F, Max, Min, Q, Sum
 from django.db.models.functions import Coalesce
 from django.http import Http404, HttpResponse, HttpResponseRedirect
-from django.shortcuts import get_object_or_404, redirect, render
+from django.shortcuts import redirect, render
 from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.http import is_safe_url
@@ -54,12 +54,9 @@ from pretix.base.models import Item, Quota, WaitingListEntry
 from pretix.base.models.waitinglist import WaitingListException
 from pretix.base.services.waitinglist import assign_automatically
 from pretix.base.views.tasks import AsyncAction
-from pretix.control.forms.waitinglist import WaitingListEntryTransferForm
 from pretix.control.permissions import EventPermissionRequiredMixin
 from pretix.control.views import PaginationMixin
 
-from . import UpdateView
-
 
 class AutoAssign(EventPermissionRequiredMixin, AsyncAction, View):
     task = assign_automatically
@@ -369,40 +366,3 @@ class EntryDelete(EventPermissionRequiredMixin, DeleteView):
             'event': self.request.event.slug,
             'organizer': self.request.event.organizer.slug
         })
-
-
-class EntryTransfer(EventPermissionRequiredMixin, UpdateView):
-    model = WaitingListEntry
-    template_name = 'pretixcontrol/waitinglist/transfer.html'
-    permission = 'can_change_orders'
-    form_class = WaitingListEntryTransferForm
-    context_object_name = 'entry'
-
-    def dispatch(self, request, *args, **kwargs):
-        if not self.request.event.has_subevents:
-            raise Http404(_("This is not an event series."))
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_object(self, queryset=None) -> WaitingListEntry:
-        return get_object_or_404(WaitingListEntry, pk=self.kwargs['entry'], event=self.request.event, voucher__isnull=True)
-
-    @transaction.atomic
-    def form_valid(self, form):
-        messages.success(self.request, _('The waitinglist entry has been transferred.'))
-        if form.has_changed():
-            self.object.log_action(
-                'pretix.event.order.waitinglist.transferred', user=self.request.user, data={
-                    k: form.cleaned_data.get(k) for k in form.changed_data
-                }
-            )
-        return super().form_valid(form)
-
-    def form_invalid(self, form):
-        messages.error(self.request, _('We could not save your changes. See below for details.'))
-        return super().form_invalid(form)
-
-    def get_success_url(self) -> str:
-        return reverse('control:event.orders.waitinglist', kwargs={
-            'event': self.request.event.slug,
-            'organizer': self.request.event.organizer.slug
-        })

src/pretix/helpers/countries.py

@@ -23,7 +23,8 @@ import pyuca
 from babel.core import Locale
 from django.core.cache import cache
 from django.utils import translation
-from django_countries import Countries
+from django.utils.encoding import force_str
+from django_countries import Countries, CountryTuple
 from django_countries.fields import CountryField
 from phonenumbers.data import _COUNTRY_CODE_TO_REGION_CODE
 
@@ -60,6 +61,22 @@ class CachedCountries(Countries):
         cache.set(cache_key, val, 3600 * 24 * 30)
         yield from val
 
+    def translate_pair(self, code: str, name=None):
+        # We need to temporarily override this function until
+        # https://github.com/SmileyChris/django-countries/issues/364
+        # is fixed
+        if name is None:
+            name = self.countries[code]
+        if isinstance(name, dict):
+            if "names" in name:
+                country_name: str = name["names"][0]
+            else:
+                country_name = name["name"]
+        else:
+            country_name = name
+        country_name = force_str(country_name)
+        return CountryTuple(code, country_name)
+
 
 class FastCountryField(CountryField):
     def __init__(self, *args, **kwargs):

src/pretix/helpers/http.py

@@ -20,9 +20,7 @@
 # <https://www.gnu.org/licenses/>.
 #
 from django.conf import settings
-from django.http import (
-    HttpResponsePermanentRedirect, HttpResponseRedirect, StreamingHttpResponse,
-)
+from django.http import StreamingHttpResponse
 
 
 class ChunkBasedFileResponse(StreamingHttpResponse):
@@ -42,8 +40,3 @@ def get_client_ip(request):
         if x_forwarded_for:
             ip = x_forwarded_for.split(',')[0]
     return ip
-
-
-def redirect_to_url(to, permanent=False):
-    redirect_class = HttpResponsePermanentRedirect if permanent else HttpResponseRedirect
-    return redirect_class(to)

src/pretix/helpers/logs.py

@@ -21,49 +21,9 @@
 #
 import logging
 
-import sentry_sdk
-from django.core.signals import request_finished
-from django.dispatch import receiver
-
-try:
-    from asgiref.local import Local
-except ImportError:
-    from threading import local as Local
-
 from django.conf import settings
 
 
 class AdminExistsFilter(logging.Filter):
     def filter(self, record):
         return not settings.DEBUG and len(settings.ADMINS) > 0
-
-
-local = Local()
-
-
-class RequestIdFilter(logging.Filter):
-    def filter(self, record):
-        record.request_id = getattr(local, 'request_id', None)
-        return True
-
-
-class RequestIdMiddleware:
-    def __init__(self, get_response):
-        self.get_response = get_response
-
-    def __call__(self, request):
-        if settings.REQUEST_ID_HEADER and settings.REQUEST_ID_HEADER in request.headers:
-            local.request_id = request.request_id = request.headers[settings.REQUEST_ID_HEADER]
-
-            if settings.SENTRY_ENABLED:
-                sentry_sdk.set_tag("request_id", request.request_id)
-        else:
-            local.request_id = request.request_id = None
-
-        return self.get_response(request)
-
-
-@receiver(request_finished)
-def on_request_finished(sender, **kwargs):
-    # not part of middleware, since things could be logged after the middleware stack is finished
-    local.request_id = None

src/pretix/helpers/migrations/0003_thumbnail_created.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.16 on 2022-11-21 17:22
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixhelpers', '0002_auto_20180320_1219'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='thumbnail',
-            name='created',
-            field=models.DateTimeField(auto_now_add=True, null=True),
-        ),
-    ]

src/pretix/helpers/models.py

@@ -29,7 +29,6 @@ class Thumbnail(models.Model):
     source = models.CharField(max_length=255)
     size = models.CharField(max_length=255)
     thumb = models.FileField(upload_to='pub/thumbs/', max_length=255)
-    created = models.DateTimeField(auto_now_add=True, null=True)
 
     class Meta:
         unique_together = (('source', 'size'),)

src/pretix/locale/ar/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-29 20:31+0000\n"
+"POT-Creation-Date: 2022-10-11 09:30+0000\n"
 "PO-Revision-Date: 2021-09-15 11:22+0000\n"
 "Last-Translator: Mohamed Tawfiq <mtawfiq@wafyapp.com>\n"
 "Language-Team: Arabic <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -132,18 +132,18 @@ msgstr ""
 msgid "Mercado Pago"
 msgstr ""
 
-#: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:163
+#: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:157
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:48
 msgid "Continue"
 msgstr "المتابعة"
 
-#: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:221
+#: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:215
 #: pretix/plugins/stripe/static/pretixplugins/stripe/pretix-stripe.js:152
 #: pretix/plugins/stripe/static/pretixplugins/stripe/pretix-stripe.js:183
 msgid "Confirming your payment …"
 msgstr "جاري تأكيد الدفع الخاص بك …"
 
-#: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:246
+#: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:240
 msgid "Payment method unavailable"
 msgstr ""
 
@@ -486,48 +486,48 @@ msgstr "الدقائق"
 msgid "Check-in QR"
 msgstr "QR الدخول"
 
-#: pretix/static/pretixcontrol/js/ui/editor.js:384
+#: pretix/static/pretixcontrol/js/ui/editor.js:378
 msgid "The PDF background file could not be loaded for the following reason:"
 msgstr "لا يمكن تحميل ملف PDF الخلفية للأسباب التالية:"
 
-#: pretix/static/pretixcontrol/js/ui/editor.js:653
+#: pretix/static/pretixcontrol/js/ui/editor.js:648
 msgid "Group of objects"
 msgstr "مجموعة من العناصر"
 
-#: pretix/static/pretixcontrol/js/ui/editor.js:659
+#: pretix/static/pretixcontrol/js/ui/editor.js:654
 msgid "Text object"
 msgstr "عنصر نص"
 
-#: pretix/static/pretixcontrol/js/ui/editor.js:661
+#: pretix/static/pretixcontrol/js/ui/editor.js:656
 msgid "Barcode area"
 msgstr "منطقة باركود"
 
-#: pretix/static/pretixcontrol/js/ui/editor.js:663
+#: pretix/static/pretixcontrol/js/ui/editor.js:658
 msgid "Image area"
 msgstr "منطقة صورة"
 
-#: pretix/static/pretixcontrol/js/ui/editor.js:665
+#: pretix/static/pretixcontrol/js/ui/editor.js:660
 msgid "Powered by pretix"
 msgstr "مدعوم من pretix"
 
-#: pretix/static/pretixcontrol/js/ui/editor.js:667
+#: pretix/static/pretixcontrol/js/ui/editor.js:662
 msgid "Object"
 msgstr "عنصر"
 
-#: pretix/static/pretixcontrol/js/ui/editor.js:671
+#: pretix/static/pretixcontrol/js/ui/editor.js:666
 msgid "Ticket design"
 msgstr "تصميم التذكرة"
 
-#: pretix/static/pretixcontrol/js/ui/editor.js:961
+#: pretix/static/pretixcontrol/js/ui/editor.js:956
 msgid "Saving failed."
 msgstr "فشلت عملية الحفظ."
 
-#: pretix/static/pretixcontrol/js/ui/editor.js:1011
-#: pretix/static/pretixcontrol/js/ui/editor.js:1050
+#: pretix/static/pretixcontrol/js/ui/editor.js:1006
+#: pretix/static/pretixcontrol/js/ui/editor.js:1045
 msgid "Error while uploading your PDF file, please try again."
 msgstr "حصل خطأ أثناء رفع ملف PDF الخاص بك، يرجى المحاولة مرة أخرى."
 
-#: pretix/static/pretixcontrol/js/ui/editor.js:1035
+#: pretix/static/pretixcontrol/js/ui/editor.js:1030
 msgid "Do you really want to leave the editor without saving your changes?"
 msgstr "هل تريد أن تغادر المحرر دون حفظ التعديلات؟"
 
@@ -643,32 +643,32 @@ msgstr[3] "سيتم حجز العناصر لك في سلة التسوق لعدة
 msgstr[4] "سيتم حجز العناصر لك في سلة التسوق لدقائق {num}."
 msgstr[5] "سيتم حجز العناصر لك في سلة التسوق لمدة {num}."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "يحصل المنظم على %(currency) %(amount)"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr "ستسترد %(currency)%(amount)"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr "الرجاء إدخال المبلغ الذي يمكن للمنظم الاحتفاظ به."
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "الرجاء إدخال عدد لأحد أنواع التذاكر."
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 msgid "required"
 msgstr "مطلوب"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr "المنطقة الزمنية:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr "التوقيت المحلي:"