Map PostgreSQL port

.github/workflows/build.yml

@@ -38,7 +38,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system dependencies
-        run: sudo apt update && sudo apt install -y gettext unzip
+        run: sudo apt update && sudo apt install gettext unzip
       - name: Install Python dependencies
         run: pip3 install -U setuptools build pip check-manifest
       - name: Run check-manifest

.github/workflows/docs.yml

@@ -37,7 +37,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system packages
-        run: sudo apt update && sudo apt install -y enchant-2 hunspell aspell-en
+        run: sudo apt update && sudo apt install enchant-2 hunspell aspell-en
       - name: Install Dependencies
         run: pip3 install -Ur requirements.txt
         working-directory: ./doc

.github/workflows/strings.yml

@@ -35,9 +35,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system packages
-        run: sudo apt update && sudo apt -y install gettext
+        run: sudo apt update && sudo apt install gettext
       - name: Install Dependencies
-        run: pip3 install uv && uv pip install --system -e ".[dev]"
+        run: pip3 install -e ".[dev]"
       - name: Compile messages
         run: python manage.py compilemessages
         working-directory: ./src
@@ -62,7 +62,7 @@ jobs:
       - name: Install system packages
         run: sudo apt update && sudo apt install enchant-2 hunspell hunspell-de-de aspell-en aspell-de
       - name: Install Dependencies
-        run: pip3 install uv && uv pip install --system -e ".[dev]"
+        run: pip3 install -e ".[dev]"
       - name: Spellcheck translations
         run: potypo
         working-directory: ./src

.github/workflows/style.yml

@@ -35,7 +35,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install Dependencies
-        run: pip3 install uv && uv pip install --system -e ".[dev]" psycopg2-binary
+        run: pip3 install -e ".[dev]" psycopg2-binary
       - name: Run isort
         run: isort -c .
         working-directory: ./src
@@ -55,7 +55,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install Dependencies
-        run: pip3 install uv && uv pip install --system -e ".[dev]" psycopg2-binary
+        run: pip3 install -e ".[dev]" psycopg2-binary
       - name: Run flake8
         run: flake8 .
         working-directory: ./src

.github/workflows/tests.yml

@@ -37,7 +37,7 @@ jobs:
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: pretix
         options: >-
-          --health-cmd "pg_isready -U postgres -d pretix"
+          --health-cmd pg_isready
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
@@ -56,9 +56,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system dependencies
-        run: sudo apt update && sudo apt install -y gettext
+        run: sudo apt update && sudo apt install gettext
       - name: Install Python dependencies
-        run: pip3 install uv && uv pip install --system -e ".[dev]" psycopg2-binary
+        run: pip3 install --ignore-requires-python -e ".[dev]" psycopg2-binary  # We ignore that flake8 needs newer python as we don't run flake8 during tests
       - name: Run checks
         run: python manage.py check
         working-directory: ./src
@@ -70,15 +70,15 @@ jobs:
         run: make all compress
       - name: Run tests
         working-directory: ./src
-        run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test -n 3 -p no:sugar --cov=./ --cov-report=xml tests --maxfail=100
+        run: PRETIX_CONFIG_FILE=tests/travis_${{ matrix.database }}.cfg py.test -n 3 -p no:sugar --cov=./ --cov-report=xml --reruns 3 tests --maxfail=100
       - name: Run concurrency tests
         working-directory: ./src
-        run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test tests/concurrency_tests/ --reuse-db
+        run: PRETIX_CONFIG_FILE=tests/travis_${{ matrix.database }}.cfg py.test tests/concurrency_tests/ --reruns 0 --reuse-db
         if: matrix.database == 'postgres'
       - name: Upload coverage
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v1
         with:
           file: src/coverage.xml
           token: ${{ secrets.CODECOV_TOKEN }}
-          fail_ci_if_error: false
+          fail_ci_if_error: true
         if: matrix.database == 'postgres' && matrix.python-version == '3.11'

.gitlab-ci.yml

@@ -10,7 +10,7 @@ tests:
         - cd src
         - python manage.py check
         - make all compress
-        - PRETIX_CONFIG_FILE=tests/ci_sqlite.cfg py.test -n 3 tests --maxfail=100
+        - PRETIX_CONFIG_FILE=tests/travis_sqlite.cfg py.test --reruns 3 -n 3 tests --maxfail=100
     except:
         - pypi
 pypi:

doc/admin/config.rst

@@ -288,7 +288,6 @@ Example::
     [django]
     secret=j1kjps5a5&4ilpn912s7a1!e2h!duz^i3&idu@_907s$wrz@x-
     debug=off
-    passwords_argon2=on
 
 ``secret``
     The secret to be used by Django for signing and verification purposes. If this
@@ -304,10 +303,6 @@ Example::
 
     .. WARNING:: Never set this to ``True`` in production!
 
-``passwords_argon``
-    Use the ``argon2`` algorithm for password hashing. Disable on systems with a small number of CPU cores (currently
-    less than 8).
-
 ``profile``
     Enable code profiling for a random subset of requests. Disabled by default, see
     :ref:`perf-monitoring` for details.

doc/admin/installation/docker_smallscale.rst

@@ -231,10 +231,11 @@ The following snippet is an example on how to configure a nginx proxy for pretix
         }
     }
     server {
-        listen 443 ssl default_server;
-        listen [::]:443 ipv6only=on ssl default_server;
+        listen 443 default_server;
+        listen [::]:443 ipv6only=on default_server;
         server_name pretix.mydomain.com;
 
+        ssl on;
         ssl_certificate /path/to/cert.chain.pem;
         ssl_certificate_key /path/to/key.pem;
 

doc/admin/installation/manual_smallscale.rst

@@ -216,10 +216,11 @@ The following snippet is an example on how to configure a nginx proxy for pretix
         }
     }
     server {
-        listen 443 ssl default_server;
-        listen [::]:443 ipv6only=on ssl default_server;
+        listen 443 default_server;
+        listen [::]:443 ipv6only=on default_server;
         server_name pretix.mydomain.com;
 
+        ssl on;
         ssl_certificate /path/to/cert.chain.pem;
         ssl_certificate_key /path/to/key.pem;
 

doc/api/resources/auto_checkin_rules.rst

@@ -71,7 +71,7 @@ Endpoints
             "mode": "placed",
             "all_sales_channels": false,
             "limit_sales_channels": ["web"],
-            "all_products": false,
+            "all_products": False,
             "limit_products": [2, 3],
             "limit_variations": [456],
             "all_payment_methods": true,
@@ -113,7 +113,7 @@ Endpoints
         "mode": "placed",
         "all_sales_channels": false,
         "limit_sales_channels": ["web"],
-        "all_products": false,
+        "all_products": False,
         "limit_products": [2, 3],
         "limit_variations": [456],
         "all_payment_methods": true,
@@ -146,7 +146,7 @@ Endpoints
         "mode": "placed",
         "all_sales_channels": false,
         "limit_sales_channels": ["web"],
-        "all_products": false,
+        "all_products": False,
         "limit_products": [2, 3],
         "limit_variations": [456],
         "all_payment_methods": true,
@@ -167,7 +167,7 @@ Endpoints
         "mode": "placed",
         "all_sales_channels": false,
         "limit_sales_channels": ["web"],
-        "all_products": false,
+        "all_products": False,
         "limit_products": [2, 3],
         "limit_variations": [456],
         "all_payment_methods": true,
@@ -216,7 +216,7 @@ Endpoints
         "mode": "placed",
         "all_sales_channels": false,
         "limit_sales_channels": ["web"],
-        "all_products": false,
+        "all_products": False,
         "limit_products": [2, 3],
         "limit_variations": [456],
         "all_payment_methods": true,

doc/api/resources/checkinlists.rst

@@ -31,6 +31,8 @@ subevent                              integer                    ID of the date
 position_count                        integer                    Number of tickets that match this list (read-only).
 checkin_count                         integer                    Number of check-ins performed on this list (read-only).
 include_pending                       boolean                    If ``true``, the check-in list also contains tickets from orders in pending state.
+auto_checkin_sales_channels           list of strings            All items on the check-in list will be automatically marked as checked-in when purchased through any of the listed sales channels.
+                                                                 **Deprecated, will be removed in pretix 2024.10.** Use :ref:`rest-autocheckinrules`: instead.
 allow_multiple_entries                boolean                    If ``true``, subsequent scans of a ticket on this list should not show a warning but instead be stored as an additional check-in.
 allow_entry_after_exit                boolean                    If ``true``, subsequent scans of a ticket on this list are valid if the last scan of the ticket was an exit scan.
 rules                                 object                     Custom check-in logic. The contents of this field are currently not considered a stable API and modifications through the API are highly discouraged.
@@ -89,7 +91,10 @@ Endpoints
             "allow_entry_after_exit": true,
             "exit_all_at": null,
             "rules": {},
-            "addon_match": false
+            "addon_match": false,
+            "auto_checkin_sales_channels": [
+              "pretixpos"
+            ]
           }
         ]
       }
@@ -141,7 +146,10 @@ Endpoints
         "allow_entry_after_exit": true,
         "exit_all_at": null,
         "rules": {},
-        "addon_match": false
+        "addon_match": false,
+        "auto_checkin_sales_channels": [
+          "pretixpos"
+        ]
       }
 
    :param organizer: The ``slug`` field of the organizer to fetch
@@ -238,7 +246,10 @@ Endpoints
         "subevent": null,
         "allow_multiple_entries": false,
         "allow_entry_after_exit": true,
-        "addon_match": false
+        "addon_match": false,
+        "auto_checkin_sales_channels": [
+          "pretixpos"
+        ]
       }
 
    **Example response**:
@@ -260,7 +271,10 @@ Endpoints
         "subevent": null,
         "allow_multiple_entries": false,
         "allow_entry_after_exit": true,
-        "addon_match": false
+        "addon_match": false,
+        "auto_checkin_sales_channels": [
+          "pretixpos"
+        ]
       }
 
    :param organizer: The ``slug`` field of the organizer of the event/item to create a list for
@@ -312,7 +326,10 @@ Endpoints
         "subevent": null,
         "allow_multiple_entries": false,
         "allow_entry_after_exit": true,
-        "addon_match": false
+        "addon_match": false,
+        "auto_checkin_sales_channels": [
+          "pretixpos"
+        ]
       }
 
    :param organizer: The ``slug`` field of the organizer to modify
@@ -325,7 +342,7 @@ Endpoints
 
 .. http:delete:: /api/v1/organizers/(organizer)/events/(event)/checkinlist/(id)/
 
-   Delete a check-in list. **Note that this also deletes the information on all check-ins performed via this list.**
+   Delete a check-in list. Note that this also deletes the information on all check-ins performed via this list.
 
    **Example request**:
 

doc/api/resources/invoices.rst

@@ -352,12 +352,12 @@ Fetching individual invoices
 
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
-   :param number: The ``number`` field of the invoice to fetch
+   :param invoice_no: The ``invoice_no`` field of the invoice to fetch
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
 
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/invoices/(number)/download/
+.. http:get:: /api/v1/organizers/(organizer)/events/(event)/invoices/(invoice_no)/download/
 
    Download an invoice in PDF format.
 
@@ -384,7 +384,7 @@ Fetching individual invoices
 
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
-   :param number: The ``number`` field of the invoice to fetch
+   :param invoice_no: The ``invoice_no`` field of the invoice to fetch
    :statuscode 200: no error
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
@@ -397,7 +397,7 @@ Modifying invoices
 
 Invoices cannot be edited directly, but the following actions can be triggered:
 
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/invoices/(number)/reissue/
+.. http:post:: /api/v1/organizers/(organizer)/events/(event)/invoices/(invoice_no)/reissue/
 
    Cancels the invoice and creates a new one.
 
@@ -419,13 +419,13 @@ Invoices cannot be edited directly, but the following actions can be triggered:
 
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
-   :param number: The ``number`` field of the invoice to reissue
+   :param invoice_no: The ``invoice_no`` field of the invoice to reissue
    :statuscode 200: no error
    :statuscode 400: The invoice has already been canceled
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to change this resource.
 
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/invoices/(number)/regenerate/
+.. http:post:: /api/v1/organizers/(organizer)/events/(event)/invoices/(invoice_no)/regenerate/
 
    Re-generates the invoice from order data.
 
@@ -447,7 +447,7 @@ Invoices cannot be edited directly, but the following actions can be triggered:
 
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
-   :param number: The ``number`` field of the invoice to regenerate
+   :param invoice_no: The ``invoice_no`` field of the invoice to regenerate
    :statuscode 200: no error
    :statuscode 400: The invoice has already been canceled
    :statuscode 401: Authentication failure

doc/api/resources/orders.rst

@@ -104,10 +104,6 @@ url                                   string                     The full URL to
 payments                              list of objects            List of payment processes (see below)
 refunds                               list of objects            List of refund processes (see below)
 last_modified                         datetime                   Last modification of this object
-cancellation_date                     datetime                   Time of order cancellation (or ``null``). **Note**:
-                                                                 Will not be set for partial cancellations and is not
-                                                                 reliable for orders that have been cancelled,
-                                                                 reactivated and cancelled again.
 ===================================== ========================== =======================================================
 
 
@@ -155,9 +151,6 @@ cancellation_date                     datetime                   Time of order c
 
    The ``expires`` attribute can now be passed during order creation.
 
-.. versionchanged:: 2024.11
-
-   The ``cancellation_date`` attribute has been added and can also be used as an ordering key.
 
 .. _order-position-resource:
 
@@ -213,17 +206,6 @@ checkins                              list of objects            List of **succe
 ├ device                              integer                    Internal ID of the device. Can be ``null``. **Deprecated**, since this ID is not otherwise used in the API and is therefore not very useful.
 ├ device_id                           integer                    Attribute ``device_id`` of the device. Can be ``null``.
 └ auto_checked_in                     boolean                    Indicates if this check-in been performed automatically by the system
-print_logs                            list of objects            List of print jobs recorded e.g. by the pretix apps
-├ id                                  integer                    Internal ID of the print job
-├ successful                          boolean                    Whether the print job successfully resulted in a print.
-                                                                 This is not expected to be 100 % reliable information (since
-                                                                 printer feedback is never perfect) and there is no guarantee
-                                                                 that unsuccessful jobs will be logged.
-├ device_id                           integer                    Attribute ``device_id`` of the device that recorded the print. Can be ``null``.
-├ datetime                            datetime                   Time of printing
-├ source                              string                     Source of print job, e.g. name of the app used.
-├ type                                string                     Type of print (currently ``badge``, ``ticket``, ``certificate``, or ``other``)
-└ info                                object                     Additional data with client-dependent structure.
 downloads                             list of objects            List of ticket download options
 ├ output                              string                     Ticket output provider (e.g. ``pdf``, ``passbook``)
 └ url                                 string                     Download URL
@@ -251,10 +233,6 @@ pdf_data                              object                     Data object req
 
    The attributes ``blocked``, ``valid_from`` and ``valid_until`` have been added.
 
-.. versionchanged:: 2024.9
-
-   The attribute ``print_logs`` has been added.
-
 .. _order-payment-resource:
 
 Order payment resource
@@ -421,21 +399,10 @@ List of all orders
                     "type": "entry",
                     "gate": null,
                     "device": 2,
-                    "device_id": 1,
                     "datetime": "2017-12-25T12:45:23Z",
                     "auto_checked_in": false
                   }
                 ],
-                "print_logs": [
-                  {
-                    "id": 1,
-                    "type": "badge",
-                    "datetime": "2017-12-25T12:45:23Z",
-                    "device_id": 1,
-                    "source": "pretixSCAN",
-                    "info": {}
-                  }
-                ],
                 "answers": [
                   {
                     "question": 12,
@@ -471,15 +438,14 @@ List of all orders
                 "provider": "banktransfer"
               }
             ],
-            "refunds": [],
-            "cancellation_date": null
+            "refunds": []
           }
         ]
       }
 
    :query integer page: The page number in case of a multi-page result set, default is 1
    :query string ordering: Manually set the ordering of results. Valid fields to be used are ``datetime``, ``code``,
-                           ``last_modified``, ``status`` and ``cancellation_date``. Default: ``datetime``
+                           ``last_modified``, and ``status``. Default: ``datetime``
    :query string code: Only return orders that match the given order code
    :query string status: Only return orders in the given order status (see above)
    :query string search: Only return orders matching a given search query (matching for names, email addresses, and company names)
@@ -660,22 +626,10 @@ Fetching individual orders
                 "type": "entry",
                 "gate": null,
                 "device": 2,
-                "device_id": 1,
                 "datetime": "2017-12-25T12:45:23Z",
                 "auto_checked_in": false
               }
             ],
-            "print_logs": [
-              {
-                "id": 1,
-                "type": "badge",
-                "successful": true,
-                "datetime": "2017-12-25T12:45:23Z",
-                "device_id": 1,
-                "source": "pretixSCAN",
-                "info": {}
-              }
-            ],
             "answers": [
               {
                 "question": 12,
@@ -711,8 +665,7 @@ Fetching individual orders
             "provider": "banktransfer"
           }
         ],
-        "refunds": [],
-        "cancellation_date": null
+        "refunds": []
       }
 
    :param organizer: The ``slug`` field of the organizer to fetch
@@ -1024,8 +977,8 @@ Creating orders
       * ``internal_reference``
       * ``vat_id``
       * ``vat_id_validated`` (optional) – If you need support for reverse charge (rarely the case), you need to check
-         yourself if the passed VAT ID is a valid EU VAT ID. In that case, set this to ``true``. Only valid VAT IDs will
-         trigger reverse charge taxation. Don't forget to set ``is_business`` as well!
+       yourself if the passed VAT ID is a valid EU VAT ID. In that case, set this to ``true``. Only valid VAT IDs will
+       trigger reverse charge taxation. Don't forget to set ``is_business`` as well!
 
    * ``positions``
 
@@ -1628,22 +1581,10 @@ List of all order positions
                 "type": "entry",
                 "gate": null,
                 "device": 2,
-                "device_id": 1,
                 "datetime": "2017-12-25T12:45:23Z",
                 "auto_checked_in": false
               }
             ],
-            "print_logs": [
-              {
-                "id": 1,
-                "type": "badge",
-                "successful": true,
-                "datetime": "2017-12-25T12:45:23Z",
-                "device_id": 1,
-                "source": "pretixSCAN",
-                "info": {}
-              }
-            ],
             "answers": [
               {
                 "question": 12,
@@ -1754,22 +1695,10 @@ Fetching individual positions
             "type": "entry",
             "gate": null,
             "device": 2,
-            "device_id": 1,
             "datetime": "2017-12-25T12:45:23Z",
             "auto_checked_in": false
           }
         ],
-        "print_logs": [
-          {
-            "id": 1,
-            "type": "badge",
-            "successful": true,
-            "datetime": "2017-12-25T12:45:23Z",
-            "device_id": 1,
-            "source": "pretixSCAN",
-            "info": {}
-          }
-        ],
         "answers": [
           {
             "question": 12,
@@ -1866,10 +1795,6 @@ Manipulating individual positions
 
    The endpoints to manage blocks have been added.
 
-.. versionchanged:: 2024.9
-
-   The API now supports logging ticket and badge prints.
-
 .. http:patch:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/(id)/
 
    Updates specific fields on an order position. Currently, only the following fields are supported:
@@ -2129,59 +2054,6 @@ Manipulating individual positions
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to update this order position.
 
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/orderpositions/(id)/printlog/
-
-   Creates a print log, stating that this ticket has been printed.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/orderpositions/23442/printlog/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-     {
-       "datetime": "2024-09-19T13:37:00+02:00",
-       "source": "pretixPOS",
-       "type": "badge",
-       "info": {
-         "cashier": 1234
-       }
-     }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/pdf
-
-     {
-       "id": 1234,
-       "device_id": null,
-       "datetime": "2024-09-19T13:37:00+02:00",
-       "source": "pretixPOS",
-       "type": "badge",
-       "info": {
-         "cashier": 1234
-       }
-     }
-
-   :param organizer: The ``slug`` field of the organizer to create a log for
-   :param event: The ``slug`` field of the event to create a log for
-   :param id: The ``id`` field of the order position to create a log for
-   :statuscode 201: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource
-                    **or** downloads are not available for this order position at this time. The response content will
-                    contain more details.
-   :statuscode 404: The requested order position or download provider does not exist.
-   :statuscode 409: The file is not yet ready and will now be prepared. Retry the request after waiting for a few
-                    seconds.
-
 Changing order contents
 -----------------------
 

doc/api/resources/scheduled_exports.rst

@@ -313,7 +313,7 @@ Endpoints for event exports
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.
 
 Endpoints for organizer exports
--------------------------------
+---------------------------
 
 .. http:get:: /api/v1/organizers/(organizer)/scheduled_exports/
 
@@ -553,4 +553,4 @@ Endpoints for organizer exports
    :statuscode 403: The requested organizer does not exist **or** you have no permission to delete this resource.
 
 
-.. _RFC 5545: https://datatracker.ietf.org/doc/html/rfc5545#section-3.8.5.3
+.. _RFC 5545: https://datatracker.ietf.org/doc/html/rfc5545#section-3.8.5.3

doc/api/resources/seats.rst

@@ -1,4 +1,4 @@
-.. _`rest-seats`:
+.. _`rest-reusablemedia`:
 
 Seats
 =====
@@ -249,7 +249,7 @@ Endpoints
             "orderposition": null,
             "cartposition": null,
             "voucher": null
-        }
+        },
 
    :param organizer: The ``slug`` field of the organizer to modify
    :param event: The ``slug`` field of the event to modify
@@ -260,114 +260,3 @@ Endpoints
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer or event does not exist **or** you have no permission to change this resource.
    :statuscode 404: Seat does not exist; or the endpoint without subevent id was used for event with subevents, or vice versa.
-
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/seats/bulk_block/
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/subevents/(id)/seats/bulk_block/
-
-   Set the ``blocked`` attribute to ``true`` for a large number of seats at once.
-   You can pass either a list of ``id`` values or a list of ``seat_guid`` values.
-   You can pass up to 10,000 seats in one request.
-
-   The endpoint will return an error if you pass a seat ID that does not exist.
-   However, it will not return an error if one of the passed seats is already blocked or sold.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-        PATCH /api/v1/organizers/bigevents/events/sampleconf/seats/bulk_block/ HTTP/1.1
-        Host: pretix.eu
-        Accept: application/json, text/javascript
-        Content-Type: application/json
-
-        {
-            "ids": [12, 45, 56]
-        }
-
-   or
-
-   .. sourcecode:: http
-
-        PATCH /api/v1/organizers/bigevents/events/sampleconf/seats/bulk_block/ HTTP/1.1
-        Host: pretix.eu
-        Accept: application/json, text/javascript
-        Content-Type: application/json
-
-        {
-            "seat_guids": ["6c0e29e5-05d6-421f-99f3-afd01478ecad", "c2899340-e2e7-4d05-8100-000a4b6d7cf4"]
-        }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-        HTTP/1.1 200 OK
-        Vary: Accept
-        Content-Type: application/json
-
-        {}
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param subevent_id: The ``id`` field of the subevent to modify
-   :statuscode 200: no error
-   :statuscode 400: The seat could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer or event does not exist **or** you have no permission to change this resource.
-   :statuscode 404: Seat does not exist; or the endpoint without subevent id was used for event with subevents, or vice versa.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/seats/bulk_unblock/
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/subevents/(id)/seats/bulk_unblock/
-
-   Set the ``blocked`` attribute to ``false`` for a large number of seats at once.
-   You can pass either a list of ``id`` values or a list of ``seat_guid`` values.
-   You can pass up to 10,000 seats in one request.
-
-   The endpoint will return an error if you pass a seat ID that does not exist.
-   However, it will not return an error if one of the passed seat is already unblocked or is sold.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-        PATCH /api/v1/organizers/bigevents/events/sampleconf/seats/bulk_unblock/ HTTP/1.1
-        Host: pretix.eu
-        Accept: application/json, text/javascript
-        Content-Type: application/json
-
-        {
-            "ids": [12, 45, 56]
-        }
-
-   or
-
-   .. sourcecode:: http
-
-        PATCH /api/v1/organizers/bigevents/events/sampleconf/seats/bulk_unblock/ HTTP/1.1
-        Host: pretix.eu
-        Accept: application/json, text/javascript
-        Content-Type: application/json
-
-        {
-            "seat_guids": ["6c0e29e5-05d6-421f-99f3-afd01478ecad", "c2899340-e2e7-4d05-8100-000a4b6d7cf4"]
-        }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-        HTTP/1.1 200 OK
-        Vary: Accept
-        Content-Type: application/json
-
-        {}
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param subevent_id: The ``id`` field of the subevent to modify
-   :statuscode 200: no error
-   :statuscode 400: The seat could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer or event does not exist **or** you have no permission to change this resource.
-   :statuscode 404: Seat does not exist; or the endpoint without subevent id was used for event with subevents, or vice versa.

doc/development/api/cookieconsent.rst

@@ -17,7 +17,6 @@ First, you need to declare that you are using non-essential cookies by respondin
 signal:
 
 .. automodule:: pretix.presale.signals
-   :no-index:
    :members: register_cookie_providers
 
 You are expected to return a list of ``CookieProvider`` objects instantiated from the following class:

doc/development/api/general.rst

@@ -22,14 +22,12 @@ Order events
 There are multiple signals that will be sent out in the ordering cycle:
 
 .. automodule:: pretix.base.signals
-   :no-index:
    :members: validate_cart, validate_cart_addons, validate_order, order_valid_if_pending, order_fee_calculation, order_paid, order_placed, order_canceled, order_reactivated, order_expired, order_modified, order_changed, order_approved, order_denied, order_fee_type_name, allow_ticket_download, order_split, order_gracefully_delete, invoice_line_text
 
 Check-ins
 """""""""
 
 .. automodule:: pretix.base.signals
-   :no-index:
    :members: checkin_created
 
 
@@ -41,21 +39,18 @@ Frontend
 
 
 .. automodule:: pretix.presale.signals
-   :no-index:
    :members: order_info, order_info_top, order_meta_from_request, order_api_meta_from_request
 
 Request flow
 """"""""""""
 
 .. automodule:: pretix.presale.signals
-   :no-index:
    :members: process_request, process_response
 
 Vouchers
 """"""""
 
 .. automodule:: pretix.presale.signals
-   :no-index:
    :members: voucher_redeem_info
 
 Backend
@@ -67,28 +62,24 @@ Backend
              item_formsets, order_search_filter_q, order_search_forms
 
 .. automodule:: pretix.base.signals
-   :no-index:
    :members: logentry_display, logentry_object_link, requiredaction_display, timeline_events, orderposition_blocked_display, customer_created, customer_signed_in
 
 Vouchers
 """"""""
 
 .. automodule:: pretix.control.signals
-   :no-index:
    :members: item_forms, voucher_form_class, voucher_form_html, voucher_form_validation
 
 Dashboards
 """"""""""
 
 .. automodule:: pretix.control.signals
-   :no-index:
    :members: event_dashboard_widgets, user_dashboard_widgets, event_dashboard_top
 
 Ticket designs
 """"""""""""""
 
 .. automodule:: pretix.base.signals
-   :no-index:
    :members: layout_text_variables, layout_image_variables
 
 .. automodule:: pretix.plugins.ticketoutputpdf.signals
@@ -98,9 +89,4 @@ API
 ---
 
 .. automodule:: pretix.base.signals
-   :no-index:
    :members: validate_event_settings, api_event_settings_fields
-
-.. automodule:: pretix.api.signals
-   :no-index:
-   :members: register_device_security_profile

doc/development/api/import.rst

@@ -60,7 +60,6 @@ that we'll provide in this plugin:
 Similar signals exist for other objects:
 
 .. automodule:: pretix.base.signals
-   :no-index:
    :members: voucher_import_columns
 
 

doc/development/api/invoice.rst

@@ -84,6 +84,8 @@ convenient to you:
 
    .. automethod:: _register_fonts
 
+   .. automethod:: _register_event_fonts
+
    .. automethod:: _on_first_page
 
    .. automethod:: _on_other_page

doc/development/api/placeholder.rst

@@ -86,10 +86,7 @@ Signals
 -------
 
 .. automodule:: pretix.base.signals
-   :no-index:
    :members: register_text_placeholders
-
 .. automodule:: pretix.base.signals
-   :no-index:
    :members: register_mail_placeholders
 

doc/plugins/kulturpass.rst

@@ -1,5 +1,5 @@
 KulturPass
-==========
+=========
 
 .. note::
 

doc/plugins/presale-saml.rst

@@ -158,7 +158,7 @@ expects and - more importantly - supports.
     for a sample configuration in an academic context.
 
     Note, that you can have multiple attributes with the same ``friendlyName``
-    but different ``name`` value. This is often used in systems, where the same
+    but different ``name``s. This is often used in systems, where the same
     information (for example a persons name) is saved in different fields -
     for example because one institution is returning SAML 1.0 and other
     institutions are returning SAML 2.0 style attributes. Typically, this only

pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
   "arabic-reshaper==3.0.0",  # Support for Arabic in reportlab
   "babel",
   "BeautifulSoup4==4.12.*",
-  "bleach==6.2.*",
+  "bleach==5.0.*",
   "celery==5.4.*",
   "chardet==5.2.*",
   "cryptography>=3.4.2",
@@ -43,8 +43,8 @@ dependencies = [
   "django-formset-js-improved==0.5.0.3",
   "django-formtools==2.5.1",
   "django-hierarkey==1.2.*",
-  "django-hijack==3.7.*",
-  "django-i18nfield==1.9.*,>=1.9.5",
+  "django-hijack==3.6.*",
+  "django-i18nfield==1.9.*,>=1.9.4",
   "django-libsass==0.9",
   "django-localflavor==4.0",
   "django-markup",
@@ -53,7 +53,7 @@ dependencies = [
   "django-phonenumber-field==7.3.*",
   "django-redis==5.4.*",
   "django-scopes==2.0.*",
-  "django-statici18n==2.6.*",
+  "django-statici18n==2.5.*",
   "djangorestframework==3.15.*",
   "dnspython==2.7.*",
   "drf_ujson2==1.7.*",
@@ -74,40 +74,41 @@ dependencies = [
   "paypal-checkout-serversdk==1.0.*",
   "PyJWT==2.9.*",
   "phonenumberslite==8.13.*",
-  "Pillow==11.0.*",
+  "Pillow==10.4.*",
   "pretix-plugin-build",
-  "protobuf==5.29.*",
+  "protobuf==5.28.*",
   "psycopg2-binary",
   "pycountry",
   "pycparser==2.22",
   "pycryptodome==3.21.*",
-  "pypdf==5.1.*",
+  "pypdf==5.0.*",
   "python-bidi==0.6.*",  # Support for Arabic in reportlab
   "python-dateutil==2.9.*",
   "pytz",
   "pytz-deprecation-shim==0.1.*",
   "pyuca",
   "qrcode==8.0",
-  "redis==5.2.*",
+  "redis==5.1.*",
   "reportlab==4.2.*",
   "requests==2.31.*",
-  "sentry-sdk==2.18.*",
+  "sentry-sdk==2.17.*",
   "sepaxml==2.6.*",
+  "slimit",
   "stripe==7.9.*",
   "text-unidecode==1.*",
   "tlds>=2020041600",
   "tqdm==4.*",
-  "ua-parser==1.0.*",
+  "ua-parser==0.18.*",
   "vat_moss_forked==2020.3.20.0.11.0",
   "vobject==0.9.*",
-  "webauthn==2.3.*",
-  "zeep==4.3.*"
+  "webauthn==2.2.*",
+  "zeep==4.2.*"
 ]
 
 [project.optional-dependencies]
 memcached = ["pylibmc"]
 dev = [
-  "aiohttp==3.11.*",
+  "aiohttp==3.10.*",
   "coverage",
   "coveralls",
   "fakeredis==2.26.*",
@@ -116,11 +117,12 @@ dev = [
   "isort==5.13.*",
   "pep8-naming==0.14.*",
   "potypo",
-  "pytest-asyncio>=0.24",
+  "pytest-asyncio",
   "pytest-cache",
   "pytest-cov",
   "pytest-django==4.*",
   "pytest-mock==3.14.*",
+  "pytest-rerunfailures==14.*",
   "pytest-sugar",
   "pytest-xdist==3.6.*",
   "pytest==8.3.*",

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__ = "2024.12.0.dev0"
+__version__ = "2024.10.0.dev0"

src/pretix/api/auth/device.py

@@ -27,7 +27,7 @@ from rest_framework import exceptions
 from rest_framework.authentication import TokenAuthentication
 
 from pretix.api.auth.devicesecurity import (
-    FullAccessSecurityProfile, get_all_security_profiles,
+    DEVICE_SECURITY_PROFILES, FullAccessSecurityProfile,
 )
 from pretix.base.models import Device
 
@@ -58,8 +58,7 @@ class DeviceTokenAuthentication(TokenAuthentication):
     def authenticate(self, request):
         r = super().authenticate(request)
         if r and isinstance(r[1], Device):
-            profiles = get_all_security_profiles()
-            profile = profiles.get(r[1].security_profile, FullAccessSecurityProfile())
+            profile = DEVICE_SECURITY_PROFILES.get(r[1].security_profile, FullAccessSecurityProfile)
             if not profile.is_allowed(request):
                 raise exceptions.PermissionDenied('Request denied by device security profile.')
         return r

src/pretix/api/auth/devicesecurity.py

@@ -20,40 +20,13 @@
 # <https://www.gnu.org/licenses/>.
 #
 import logging
-from collections import OrderedDict
 
-from django.dispatch import receiver
 from django.utils.translation import gettext_lazy as _
 
-from pretix.api.signals import register_device_security_profile
-
 logger = logging.getLogger(__name__)
-_ALL_PROFILES = None
 
 
-class BaseSecurityProfile:
-    @property
-    def identifier(self) -> str:
-        """
-        Unique identifier for this profile.
-        """
-        raise NotImplementedError()
-
-    @property
-    def verbose_name(self) -> str:
-        """
-        Human-readable name (can be a ``gettext_lazy`` object).
-        """
-        raise NotImplementedError()
-
-    def is_allowed(self, request) -> bool:
-        """
-        Return whether a given request should be allowed.
-        """
-        raise NotImplementedError()
-
-
-class FullAccessSecurityProfile(BaseSecurityProfile):
+class FullAccessSecurityProfile:
     identifier = 'full'
     verbose_name = _('Full device access (reading and changing orders and gift cards, reading of products and settings)')
 
@@ -61,7 +34,7 @@ class FullAccessSecurityProfile(BaseSecurityProfile):
         return True
 
 
-class AllowListSecurityProfile(BaseSecurityProfile):
+class AllowListSecurityProfile:
     allowlist = ()
 
     def is_allowed(self, request):
@@ -104,7 +77,6 @@ class PretixScanSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:blockedsecrets-list'),
         ('GET', 'api-v1:order-list'),
         ('GET', 'api-v1:orderposition-pdf_image'),
-        ('POST', 'api-v1:orderposition-printlog'),
         ('GET', 'api-v1:event.settings'),
         ('POST', 'api-v1:upload'),
         ('POST', 'api-v1:checkinrpc.redeem'),
@@ -140,7 +112,6 @@ class PretixScanNoSyncNoSearchSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:revokedsecrets-list'),
         ('GET', 'api-v1:blockedsecrets-list'),
         ('GET', 'api-v1:orderposition-pdf_image'),
-        ('POST', 'api-v1:orderposition-printlog'),
         ('GET', 'api-v1:event.settings'),
         ('POST', 'api-v1:upload'),
         ('POST', 'api-v1:checkinrpc.redeem'),
@@ -176,7 +147,6 @@ class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:revokedsecrets-list'),
         ('GET', 'api-v1:blockedsecrets-list'),
         ('GET', 'api-v1:orderposition-pdf_image'),
-        ('POST', 'api-v1:orderposition-printlog'),
         ('GET', 'api-v1:event.settings'),
         ('POST', 'api-v1:upload'),
         ('POST', 'api-v1:checkinrpc.redeem'),
@@ -184,28 +154,87 @@ class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
     )
 
 
-def get_all_security_profiles():
-    global _ALL_PROFILES
-
-    if _ALL_PROFILES:
-        return _ALL_PROFILES
-
-    types = OrderedDict()
-    for recv, ret in register_device_security_profile.send(None):
-        if isinstance(ret, (list, tuple)):
-            for r in ret:
-                types[r.identifier] = r
-        else:
-            types[ret.identifier] = ret
-    _ALL_PROFILES = types
-    return types
-
-
-@receiver(register_device_security_profile, dispatch_uid="base_register_default_security_profiles")
-def register_default_webhook_events(sender, **kwargs):
-    return (
-        FullAccessSecurityProfile(),
-        PretixScanSecurityProfile(),
-        PretixScanNoSyncSecurityProfile(),
-        PretixScanNoSyncNoSearchSecurityProfile(),
+class PretixPosSecurityProfile(AllowListSecurityProfile):
+    identifier = 'pretixpos'
+    verbose_name = _('pretixPOS')
+    allowlist = (
+        ('GET', 'api-v1:version'),
+        ('GET', 'api-v1:device.eventselection'),
+        ('GET', 'api-v1:idempotency.query'),
+        ('GET', 'api-v1:device.info'),
+        ('POST', 'api-v1:device.update'),
+        ('POST', 'api-v1:device.revoke'),
+        ('POST', 'api-v1:device.roll'),
+        ('GET', 'api-v1:event-list'),
+        ('GET', 'api-v1:event-detail'),
+        ('GET', 'api-v1:subevent-list'),
+        ('GET', 'api-v1:subevent-detail'),
+        ('GET', 'api-v1:itemcategory-list'),
+        ('GET', 'api-v1:item-list'),
+        ('GET', 'api-v1:question-list'),
+        ('GET', 'api-v1:quota-list'),
+        ('GET', 'api-v1:taxrule-list'),
+        ('GET', 'api-v1:ticketlayout-list'),
+        ('GET', 'api-v1:ticketlayoutitem-list'),
+        ('GET', 'api-v1:badgelayout-list'),
+        ('GET', 'api-v1:badgeitem-list'),
+        ('GET', 'api-v1:voucher-list'),
+        ('GET', 'api-v1:voucher-detail'),
+        ('GET', 'api-v1:order-list'),
+        ('POST', 'api-v1:order-list'),
+        ('GET', 'api-v1:order-detail'),
+        ('DELETE', 'api-v1:orderposition-detail'),
+        ('PATCH', 'api-v1:orderposition-detail'),
+        ('GET', 'api-v1:orderposition-list'),
+        ('GET', 'api-v1:orderposition-answer'),
+        ('GET', 'api-v1:orderposition-pdf_image'),
+        ('POST', 'api-v1:order-mark-canceled'),
+        ('POST', 'api-v1:orderpayment-list'),
+        ('POST', 'api-v1:orderrefund-list'),
+        ('POST', 'api-v1:orderrefund-done'),
+        ('POST', 'api-v1:cartposition-list'),
+        ('POST', 'api-v1:cartposition-bulk-create'),
+        ('GET', 'api-v1:checkinlist-list'),
+        ('POST', 'api-v1:checkinlistpos-redeem'),
+        ('POST', 'plugins:pretix_posbackend:order.posprintlog'),
+        ('POST', 'plugins:pretix_posbackend:order.poslock'),
+        ('DELETE', 'plugins:pretix_posbackend:order.poslock'),
+        ('DELETE', 'api-v1:cartposition-detail'),
+        ('GET', 'api-v1:giftcard-list'),
+        ('POST', 'api-v1:giftcard-transact'),
+        ('PATCH', 'api-v1:giftcard-detail'),
+        ('GET', 'plugins:pretix_posbackend:posclosing-list'),
+        ('POST', 'plugins:pretix_posbackend:posreceipt-list'),
+        ('POST', 'plugins:pretix_posbackend:posclosing-list'),
+        ('POST', 'plugins:pretix_posbackend:posdebugdump-list'),
+        ('POST', 'plugins:pretix_posbackend:posdebuglogentry-list'),
+        ('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:blockedsecrets-list'),
+        ('GET', 'api-v1:event.settings'),
+        ('GET', 'plugins:pretix_seating:event.event'),
+        ('GET', 'plugins:pretix_seating:event.event.subevent'),
+        ('GET', 'plugins:pretix_seating:event.plan'),
+        ('GET', 'plugins:pretix_seating:selection.simple'),
+        ('POST', 'api-v1:upload'),
+        ('POST', 'api-v1:checkinrpc.redeem'),
+        ('GET', 'api-v1:checkinrpc.search'),
+        ('POST', 'api-v1:reusablemedium-lookup'),
+        ('GET', 'api-v1:reusablemedium-list'),
+        ('POST', 'api-v1:reusablemedium-list'),
     )
+
+
+DEVICE_SECURITY_PROFILES = {
+    k.identifier: k() for k in (
+        FullAccessSecurityProfile,
+        PretixScanSecurityProfile,
+        PretixScanNoSyncSecurityProfile,
+        PretixScanNoSyncNoSearchSecurityProfile,
+        PretixPosSecurityProfile,
+    )
+}

src/pretix/api/serializers/cart.py

@@ -235,7 +235,7 @@ class CartPositionCreateSerializer(BaseCartPositionCreateSerializer):
         return cid
 
     def create(self, validated_data):
-        validated_data.pop('sales_channel', None)
+        validated_data.pop('sales_channel')
         addons_data = validated_data.pop('addons', None)
         bundled_data = validated_data.pop('bundled', None)
 

src/pretix/api/serializers/checkin.py

@@ -26,22 +26,31 @@ from rest_framework.exceptions import ValidationError
 from pretix.api.serializers.event import SubEventSerializer
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.base.media import MEDIA_TYPES
-from pretix.base.models import Checkin, CheckinList
+from pretix.base.models import Checkin, CheckinList, SalesChannel
 
 
 class CheckinListSerializer(I18nAwareModelSerializer):
     checkin_count = serializers.IntegerField(read_only=True)
     position_count = serializers.IntegerField(read_only=True)
+    auto_checkin_sales_channels = serializers.SlugRelatedField(
+        slug_field="identifier",
+        queryset=SalesChannel.objects.none(),
+        required=False,
+        allow_empty=True,
+        many=True,
+    )
 
     class Meta:
         model = CheckinList
         fields = ('id', 'name', 'all_products', 'limit_products', 'subevent', 'checkin_count', 'position_count',
-                  'include_pending', 'allow_multiple_entries', 'allow_entry_after_exit',
+                  'include_pending', 'auto_checkin_sales_channels', 'allow_multiple_entries', 'allow_entry_after_exit',
                   'rules', 'exit_all_at', 'addon_match', 'ignore_in_statistics', 'consider_tickets_used')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
+        self.fields['auto_checkin_sales_channels'].child_relation.queryset = self.context['event'].organizer.sales_channels.all()
+
         if 'subevent' in self.context['request'].query_params.getlist('expand'):
             self.fields['subevent'] = SubEventSerializer(read_only=True)
 

src/pretix/api/serializers/event.py

@@ -989,40 +989,6 @@ def prefetch_by_id(items, qs, id_attr, target_attr):
             setattr(item, target_attr, result.get(getattr(item, id_attr)))
 
 
-class SeatBulkBlockInputSerializer(serializers.Serializer):
-    ids = serializers.ListField(child=serializers.IntegerField(), required=False, allow_empty=True)
-    seat_guids = serializers.ListField(child=serializers.CharField(), required=False, allow_empty=True)
-
-    def to_internal_value(self, data):
-        data = super().to_internal_value(data)
-
-        if data.get("seat_guids") and data.get("ids"):
-            raise ValidationError("Please pass either seat_guids or ids.")
-
-        if data.get("seat_guids"):
-            seat_ids = data["seat_guids"]
-            if len(seat_ids) > 10000:
-                raise ValidationError({"seat_guids": ["Please do not pass over 10000 seats."]})
-
-            seats = {s.seat_guid: s for s in self.context["queryset"].filter(seat_guid__in=seat_ids)}
-            for s in seat_ids:
-                if s not in seats:
-                    raise ValidationError({"seat_guids": [f"The seat '{s}' does not exist."]})
-        elif data.get("ids"):
-            seat_ids = data["ids"]
-            if len(seat_ids) > 10000:
-                raise ValidationError({"ids": ["Please do not pass over 10000 seats."]})
-
-            seats = self.context["queryset"].in_bulk(seat_ids)
-            for s in seat_ids:
-                if s not in seats:
-                    raise ValidationError({"ids": [f"The seat '{s}' does not exist."]})
-        else:
-            raise ValidationError("Please pass either seat_guids or ids.")
-
-        return {"seats": seats.values()}
-
-
 class SeatSerializer(I18nAwareModelSerializer):
     orderposition = serializers.IntegerField(source='orderposition_id')
     cartposition = serializers.IntegerField(source='cartposition_id')

src/pretix/api/serializers/i18n.py

@@ -19,8 +19,57 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
+from django.conf import settings
 from django.core.validators import URLValidator
-from i18nfield.rest_framework import I18nAwareModelSerializer, I18nField
+from i18nfield.fields import I18nCharField, I18nTextField
+from i18nfield.strings import LazyI18nString
+from rest_framework.exceptions import ValidationError
+from rest_framework.fields import Field
+from rest_framework.serializers import ModelSerializer
+
+
+class I18nField(Field):
+    def __init__(self, **kwargs):
+        self.allow_blank = kwargs.pop('allow_blank', False)
+        self.trim_whitespace = kwargs.pop('trim_whitespace', True)
+        self.max_length = kwargs.pop('max_length', None)
+        self.min_length = kwargs.pop('min_length', None)
+        super().__init__(**kwargs)
+
+    def to_representation(self, value):
+        if hasattr(value, 'data'):
+            if isinstance(value.data, dict):
+                return value.data
+            elif value.data is None:
+                return None
+            else:
+                return {
+                    settings.LANGUAGE_CODE: str(value.data)
+                }
+        elif value is None:
+            return None
+        else:
+            return {
+                settings.LANGUAGE_CODE: str(value)
+            }
+
+    def to_internal_value(self, data):
+        if isinstance(data, str):
+            return LazyI18nString(data)
+        elif isinstance(data, dict):
+            if any([k not in dict(settings.LANGUAGES) for k in data.keys()]):
+                raise ValidationError('Invalid languages included.')
+            return LazyI18nString(data)
+        else:
+            raise ValidationError('Invalid data type.')
+
+
+class I18nAwareModelSerializer(ModelSerializer):
+    pass
+
+
+I18nAwareModelSerializer.serializer_field_mapping[I18nCharField] = I18nField
+I18nAwareModelSerializer.serializer_field_mapping[I18nTextField] = I18nField
 
 
 class I18nURLField(I18nField):
@@ -35,10 +84,3 @@ class I18nURLField(I18nField):
         else:
             URLValidator()(value.data)
         return value
-
-
-__all__ = [
-    "I18nAwareModelSerializer",  # for backwards compatibility
-    "I18nField",  # for backwards compatibility
-    "I18nURLField",
-]

src/pretix/api/serializers/order.py

@@ -55,7 +55,7 @@ from pretix.base.models import (
 )
 from pretix.base.models.orders import (
     BlockedTicketSecret, CartPosition, OrderFee, OrderPayment, OrderRefund,
-    PrintLog, RevokedTicketSecret,
+    RevokedTicketSecret,
 )
 from pretix.base.pdf import get_images, get_variables
 from pretix.base.services.cart import error_messages
@@ -284,26 +284,6 @@ class CheckinSerializer(I18nAwareModelSerializer):
         fields = ('id', 'datetime', 'list', 'auto_checked_in', 'gate', 'device', 'device_id', 'type')
 
 
-class PrintLogSerializer(serializers.ModelSerializer):
-    device_id = serializers.SlugRelatedField(
-        source='device',
-        slug_field='device_id',
-        read_only=True,
-    )
-
-    class Meta:
-        model = PrintLog
-        fields = (
-            "id",
-            "successful",
-            "datetime",
-            "source",
-            "type",
-            "device_id",
-            "info",
-        )
-
-
 class FailedCheckinSerializer(I18nAwareModelSerializer):
     error_reason = serializers.ChoiceField(choices=Checkin.REASONS, required=True, allow_null=False)
     raw_barcode = serializers.CharField(required=True, allow_null=False)
@@ -496,7 +476,6 @@ class OrderPositionListSerializer(serializers.ListSerializer):
 
 class OrderPositionSerializer(I18nAwareModelSerializer):
     checkins = CheckinSerializer(many=True, read_only=True)
-    print_logs = PrintLogSerializer(many=True, read_only=True)
     answers = AnswerSerializer(many=True)
     downloads = PositionDownloadsField(source='*', read_only=True)
     order = serializers.SlugRelatedField(slug_field='code', read_only=True)
@@ -511,7 +490,7 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
         fields = ('id', 'order', 'positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
                   'company', 'street', 'zipcode', 'city', 'country', 'state', 'discount',
                   'attendee_email', 'voucher', 'tax_rate', 'tax_value', 'secret', 'addon_to', 'subevent', 'checkins',
-                  'print_logs', 'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat', 'canceled',
+                  'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat', 'canceled',
                   'valid_from', 'valid_until', 'blocked', 'voucher_budget_use')
         read_only_fields = (
             'id', 'order', 'positionid', 'item', 'variation', 'price', 'voucher', 'tax_rate', 'tax_value', 'secret',
@@ -598,9 +577,9 @@ class CheckinListOrderPositionSerializer(OrderPositionSerializer):
         fields = ('id', 'order', 'positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
                   'company', 'street', 'zipcode', 'city', 'country', 'state',
                   'attendee_email', 'voucher', 'tax_rate', 'tax_value', 'secret', 'addon_to', 'subevent', 'checkins',
-                  'print_logs', 'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat',
-                  'require_attention', 'order__status', 'order__valid_if_pending', 'order__require_approval',
-                  'valid_from', 'valid_until', 'blocked')
+                  'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat', 'require_attention',
+                  'order__status', 'order__valid_if_pending', 'order__require_approval', 'valid_from', 'valid_until',
+                  'blocked')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -753,12 +732,12 @@ class OrderSerializer(I18nAwareModelSerializer):
             'code', 'event', 'status', 'testmode', 'secret', 'email', 'phone', 'locale', 'datetime', 'expires', 'payment_date',
             'payment_provider', 'fees', 'total', 'comment', 'custom_followup_at', 'invoice_address', 'positions', 'downloads',
             'checkin_attention', 'checkin_text', 'last_modified', 'payments', 'refunds', 'require_approval', 'sales_channel',
-            'url', 'customer', 'valid_if_pending', 'api_meta', 'cancellation_date'
+            'url', 'customer', 'valid_if_pending', 'api_meta'
         )
         read_only_fields = (
             'code', 'status', 'testmode', 'secret', 'datetime', 'expires', 'payment_date',
             'payment_provider', 'fees', 'total', 'positions', 'downloads', 'customer',
-            'last_modified', 'payments', 'refunds', 'require_approval', 'sales_channel', 'cancellation_date'
+            'last_modified', 'payments', 'refunds', 'require_approval', 'sales_channel'
         )
 
     def __init__(self, *args, **kwargs):
@@ -1515,7 +1494,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                 pos.answers = answers
                 pos.pseudonymization_id = "PREVIEW"
                 pos.checkins = []
-                pos.print_logs = []
                 pos_map[pos.positionid] = pos
             else:
                 if pos.voucher:

src/pretix/api/serializers/organizer.py

@@ -29,7 +29,6 @@ from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
-from pretix.api.auth.devicesecurity import get_all_security_profiles
 from pretix.api.serializers import AsymmetricField
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.api.serializers.order import CompatibleJSONField
@@ -298,7 +297,6 @@ class DeviceSerializer(serializers.ModelSerializer):
     revoked = serializers.BooleanField(read_only=True)
     initialized = serializers.DateTimeField(read_only=True)
     initialization_token = serializers.DateTimeField(read_only=True)
-    security_profile = serializers.ChoiceField(choices=[], required=False, default="full")
 
     class Meta:
         model = Device
@@ -308,10 +306,6 @@ class DeviceSerializer(serializers.ModelSerializer):
             'os_name', 'os_version', 'software_brand', 'software_version', 'security_profile'
         )
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['security_profile'].choices = [(k, v.verbose_name) for k, v in get_all_security_profiles().items()]
-
 
 class TeamInviteSerializer(serializers.ModelSerializer):
     class Meta:

src/pretix/api/signals.py

@@ -32,17 +32,10 @@ from pretix.helpers.periodic import minimum_interval
 register_webhook_events = Signal()
 """
 This signal is sent out to get all known webhook events. Receivers should return an
-instance of a subclass of ``pretix.api.webhooks.WebhookEvent`` or a list of such
+instance of a subclass of pretix.api.webhooks.WebhookEvent or a list of such
 instances.
 """
 
-register_device_security_profile = Signal()
-"""
-This signal is sent out to get all known device security_profiles. Receivers should
-return an instance of a subclass of ``pretix.api.auth.devicesecurity.BaseSecurityProfile``
-or a list of such instances.
-"""
-
 
 @receiver(periodic_task)
 @scopes_disabled()

src/pretix/api/views/checkin.py

@@ -62,7 +62,6 @@ from pretix.base.models import (
     CachedFile, Checkin, CheckinList, Device, Event, Order, OrderPosition,
     Question, ReusableMedium, RevokedTicketSecret, TeamAPIToken,
 )
-from pretix.base.models.orders import PrintLog
 from pretix.base.services.checkin import (
     CheckInError, RequiredQuestionsError, SQLLogic, perform_checkin,
 )
@@ -116,7 +115,7 @@ class CheckinListViewSet(viewsets.ModelViewSet):
         if 'subevent' in self.request.query_params.getlist('expand'):
             qs = qs.prefetch_related(
                 'subevent', 'subevent__event', 'subevent__subeventitem_set', 'subevent__subeventitemvariation_set',
-                'subevent__seat_category_mappings', 'subevent__meta_values',
+                'subevent__seat_category_mappings', 'subevent__meta_values', 'auto_checkin_sales_channels'
             )
         return qs
 
@@ -143,9 +142,7 @@ class CheckinListViewSet(viewsets.ModelViewSet):
             data=self.request.data
         )
 
-    @transaction.atomic
     def perform_destroy(self, instance):
-        instance.checkins.all().delete()
         instance.log_action(
             'pretix.event.checkinlist.deleted',
             user=self.request.user,
@@ -368,9 +365,8 @@ def _checkin_list_position_queryset(checkinlists, ignore_status=False, ignore_pr
         qs = qs.prefetch_related(
             Prefetch(
                 lookup='checkins',
-                queryset=Checkin.objects.filter(list_id__in=[cl.pk for cl in checkinlists]).select_related('device')
+                queryset=Checkin.objects.filter(list_id__in=[cl.pk for cl in checkinlists])
             ),
-            Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
             'answers', 'answers__options', 'answers__question',
             Prefetch('addons', OrderPosition.objects.select_related('item', 'variation')),
             Prefetch('order', Order.objects.select_related('invoice_address').prefetch_related(
@@ -382,7 +378,6 @@ def _checkin_list_position_queryset(checkinlists, ignore_status=False, ignore_pr
                     'positions',
                     OrderPosition.objects.prefetch_related(
                         Prefetch('checkins', queryset=Checkin.objects.select_related('device')),
-                        Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
                         'item', 'variation', 'answers', 'answers__options', 'answers__question',
                     )
                 )
@@ -394,9 +389,8 @@ def _checkin_list_position_queryset(checkinlists, ignore_status=False, ignore_pr
         qs = qs.prefetch_related(
             Prefetch(
                 lookup='checkins',
-                queryset=Checkin.objects.filter(list_id__in=[cl.pk for cl in checkinlists]).select_related('device')
+                queryset=Checkin.objects.filter(list_id__in=[cl.pk for cl in checkinlists])
             ),
-            Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
             'answers', 'answers__options', 'answers__question',
             Prefetch('addons', OrderPosition.objects.select_related('item', 'variation'))
         ).select_related('item', 'variation', 'order', 'addon_to', 'order__invoice_address', 'order', 'seat')

src/pretix/api/views/device.py

@@ -20,7 +20,6 @@
 # <https://www.gnu.org/licenses/>.
 #
 import base64
-import copy
 import logging
 
 from cryptography.hazmat.backends.openssl.backend import Backend
@@ -147,8 +146,6 @@ class InitializeView(APIView):
     permission_classes = ()
 
     def post(self, request, format=None):
-        from pretix.base.signals import device_info_updated
-
         serializer = InitializationRequestSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
 
@@ -163,8 +160,6 @@ class InitializeView(APIView):
         if device.revoked:
             raise ValidationError({'token': ['This initialization token has been revoked.']})
 
-        old_instance = copy.copy(device)
-
         device.initialized = now()
         device.hardware_brand = serializer.validated_data.get('hardware_brand')
         device.hardware_model = serializer.validated_data.get('hardware_model')
@@ -179,10 +174,6 @@ class InitializeView(APIView):
 
         device.log_action('pretix.device.initialized', data=serializer.validated_data, auth=device)
 
-        device_info_updated.send(
-            sender=Device, old_device=old_instance, new_device=device
-        )
-
         serializer = DeviceSerializer(device)
         return Response(serializer.data)
 
@@ -191,12 +182,9 @@ class UpdateView(APIView):
     authentication_classes = (DeviceTokenAuthentication,)
 
     def post(self, request, format=None):
-        from pretix.base.signals import device_info_updated
-
         serializer = UpdateRequestSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         device = request.auth
-        old_instance = copy.copy(device)
         device.hardware_brand = serializer.validated_data.get('hardware_brand')
         device.hardware_model = serializer.validated_data.get('hardware_model')
         device.os_name = serializer.validated_data.get('os_name')
@@ -212,8 +200,9 @@ class UpdateView(APIView):
         device.save()
         device.log_action('pretix.device.updated', data=serializer.validated_data, auth=device)
 
+        from ...base.signals import device_info_updated
         device_info_updated.send(
-            sender=Device, old_device=old_instance, new_device=device
+            sender=Device, old_device=request.auth, new_device=device
         )
 
         serializer = DeviceSerializer(device)

src/pretix/api/views/event.py

@@ -40,7 +40,6 @@ from django.utils.timezone import now
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
 from django_scopes import scopes_disabled
 from rest_framework import serializers, views, viewsets
-from rest_framework.decorators import action
 from rest_framework.exceptions import (
     NotFound, PermissionDenied, ValidationError,
 )
@@ -51,9 +50,8 @@ from pretix.api.auth.permission import EventCRUDPermission
 from pretix.api.pagination import TotalOrderingFilter
 from pretix.api.serializers.event import (
     CloneEventSerializer, DeviceEventSettingsSerializer, EventSerializer,
-    EventSettingsSerializer, ItemMetaPropertiesSerializer,
-    SeatBulkBlockInputSerializer, SeatSerializer, SubEventSerializer,
-    TaxRuleSerializer,
+    EventSettingsSerializer, ItemMetaPropertiesSerializer, SeatSerializer,
+    SubEventSerializer, TaxRuleSerializer,
 )
 from pretix.api.views import ConditionalListView
 from pretix.base.models import (
@@ -239,9 +237,9 @@ class EventViewSet(viewsets.ModelViewSet):
             disabled = {m: 'disabled' for m in current_plugins_value if m not in updated_plugins_value}
             changed = merge_dicts(enabled, disabled)
 
-            for module, operation in changed.items():
+            for module, action in changed.items():
                 serializer.instance.log_action(
-                    'pretix.event.plugins.' + operation,
+                    'pretix.event.plugins.' + action,
                     user=self.request.user,
                     auth=self.request.auth,
                     data={'plugin': module}
@@ -746,24 +744,3 @@ class SeatViewSet(ConditionalListView, viewsets.ModelViewSet):
             auth=self.request.auth,
             data={"seats": [serializer.instance.pk]},
         )
-
-    def bulk_change_blocked(self, blocked):
-        s = SeatBulkBlockInputSerializer(
-            data=self.request.data,
-            context={"event": self.request.event, "queryset": self.get_queryset()},
-        )
-        s.is_valid(raise_exception=True)
-
-        seats = s.validated_data["seats"]
-        for seat in seats:
-            seat.blocked = blocked
-        Seat.objects.bulk_update(seats, ["blocked"], batch_size=1000)
-        return Response({})
-
-    @action(methods=["POST"], detail=False)
-    def bulk_block(self, request, *args, **kwargs):
-        return self.bulk_change_blocked(True)
-
-    @action(methods=["POST"], detail=False)
-    def bulk_unblock(self, request, *args, **kwargs):
-        return self.bulk_change_blocked(False)

src/pretix/api/views/media.py

@@ -42,7 +42,6 @@ from pretix.base.models import (
     Checkin, GiftCard, GiftCardAcceptance, GiftCardTransaction, OrderPosition,
     ReusableMedium,
 )
-from pretix.base.models.orders import PrintLog
 from pretix.helpers import OF_SELF
 from pretix.helpers.dicts import merge_dicts
 
@@ -80,7 +79,6 @@ class ReusableMediaViewSet(viewsets.ModelViewSet):
                     'order', 'order__event', 'order__event__organizer', 'seat',
                 ).prefetch_related(
                     Prefetch('checkins', queryset=Checkin.objects.select_related('device')),
-                    Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
                     'answers', 'answers__options', 'answers__question',
                 )
             ),

src/pretix/api/views/order.py

@@ -57,8 +57,7 @@ from pretix.api.serializers.order import (
     OrderPaymentCreateSerializer, OrderPaymentSerializer,
     OrderPositionSerializer, OrderRefundCreateSerializer,
     OrderRefundSerializer, OrderSerializer, PriceCalcSerializer,
-    PrintLogSerializer, RevokedTicketSecretSerializer,
-    SimulatedOrderSerializer,
+    RevokedTicketSecretSerializer, SimulatedOrderSerializer,
 )
 from pretix.api.serializers.orderchange import (
     BlockNameSerializer, OrderChangeOperationSerializer,
@@ -76,7 +75,7 @@ from pretix.base.models import (
     TeamAPIToken, generate_secret,
 )
 from pretix.base.models.orders import (
-    BlockedTicketSecret, PrintLog, QuestionAnswer, RevokedTicketSecret,
+    BlockedTicketSecret, QuestionAnswer, RevokedTicketSecret,
 )
 from pretix.base.payment import PaymentException
 from pretix.base.pdf import get_images
@@ -215,7 +214,7 @@ class OrderViewSetMixin:
     queryset = Order.objects.none()
     filter_backends = (DjangoFilterBackend, TotalOrderingFilter)
     ordering = ('datetime',)
-    ordering_fields = ('datetime', 'code', 'status', 'last_modified', 'cancellation_date')
+    ordering_fields = ('datetime', 'code', 'status', 'last_modified')
     filterset_class = OrderFilter
     lookup_field = 'code'
 
@@ -260,7 +259,6 @@ class OrderViewSetMixin:
                 'positions',
                 opq.all().prefetch_related(
                     Prefetch('checkins', queryset=Checkin.objects.select_related('device')),
-                    Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
                     Prefetch('item', queryset=self.request.event.items.prefetch_related(
                         Prefetch('meta_values', ItemMetaValue.objects.select_related('property'), to_attr='meta_values_cached')
                     )),
@@ -282,7 +280,6 @@ class OrderViewSetMixin:
                 'positions',
                 opq.all().prefetch_related(
                     Prefetch('checkins', queryset=Checkin.objects.select_related('device')),
-                    Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
                     'item', 'variation',
                     Prefetch('answers', queryset=QuestionAnswer.objects.prefetch_related('options', 'question').order_by('question__position')),
                     'seat',
@@ -1096,7 +1093,6 @@ class OrderPositionViewSet(viewsets.ModelViewSet):
             )
             qs = qs.prefetch_related(
                 Prefetch('checkins', queryset=Checkin.objects.select_related("device")),
-                Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
                 Prefetch('item', queryset=self.request.event.items.prefetch_related(
                     Prefetch('meta_values', ItemMetaValue.objects.select_related('property'),
                              to_attr='meta_values_cached')
@@ -1140,7 +1136,6 @@ class OrderPositionViewSet(viewsets.ModelViewSet):
         else:
             qs = qs.prefetch_related(
                 Prefetch('checkins', queryset=Checkin.objects.select_related("device")),
-                Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
                 'answers', 'answers__options', 'answers__question',
             ).select_related(
                 'item', 'order', 'order__event', 'order__event__organizer', 'seat'
@@ -1259,34 +1254,6 @@ class OrderPositionViewSet(viewsets.ModelViewSet):
         )
         return resp
 
-    @action(detail=True, url_name="printlog", url_path="printlog", methods=["POST"])
-    def printlog(self, request, **kwargs):
-        pos = self.get_object()
-        serializer = PrintLogSerializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-
-        with transaction.atomic():
-            serializer.save(
-                position=pos,
-                device=request.auth if isinstance(request.auth, Device) else None,
-                user=request.user if request.user.is_authenticated else None,
-                api_token=request.auth if isinstance(request.auth, TeamAPIToken) else None,
-                oauth_application=request.auth.application if isinstance(request.auth, OAuthAccessToken) else None,
-            )
-
-            pos.order.log_action(
-                "pretix.event.order.print",
-                data={
-                    "position": pos.pk,
-                    "positionid": pos.positionid,
-                    **serializer.validated_data,
-                },
-                auth=request.auth,
-                user=request.user,
-            )
-
-        return Response(serializer.data, status=status.HTTP_201_CREATED)
-
     @action(detail=True, url_name='pdf_image', url_path=r'pdf_image/(?P<key>[^/]+)')
     def pdf_image(self, request, key, **kwargs):
         pos = self.get_object()

src/pretix/base/auth.py

@@ -152,7 +152,7 @@ class NativeAuthBackend(BaseAuthBackend):
         to log in.
         """
         d = OrderedDict([
-            ('email', forms.EmailField(label=_("Email"), max_length=254,
+            ('email', forms.EmailField(label=_("E-mail"), max_length=254,
                                        widget=forms.EmailInput(attrs={'autofocus': 'autofocus'}))),
             ('password', forms.CharField(label=_("Password"), widget=forms.PasswordInput,
                                          max_length=4096)),

src/pretix/base/email.py

@@ -35,7 +35,6 @@ from django.utils.translation import get_language, gettext_lazy as _
 from pretix.base.models import Event
 from pretix.base.signals import register_html_mail_renderers
 from pretix.base.templatetags.rich_text import markdown_compile_email
-from pretix.helpers.format import SafeFormatter, format_map
 
 from pretix.base.services.placeholders import (  # noqa
     get_available_placeholders, PlaceholderContext
@@ -69,7 +68,7 @@ def test_custom_smtp_backend(backend: T, from_addr: str) -> None:
 
 class BaseHTMLMailRenderer:
     """
-    This is the base class for all HTML email renderers.
+    This is the base class for all HTML e-mail renderers.
     """
 
     def __init__(self, event: Event, organizer=None):
@@ -80,7 +79,7 @@ class BaseHTMLMailRenderer:
         return self.identifier
 
     def render(self, plain_body: str, plain_signature: str, subject: str, order=None,
-               position=None, context=None) -> str:
+               position=None) -> str:
         """
         This method should generate the HTML part of the email.
 
@@ -89,7 +88,6 @@ class BaseHTMLMailRenderer:
         :param subject: The email subject.
         :param order: The order if this email is connected to one, otherwise ``None``.
         :param position: The order position if this email is connected to one, otherwise ``None``.
-        :param context: Context to use to render placeholders in the plain body
         :return: An HTML string
         """
         raise NotImplementedError()
@@ -136,10 +134,8 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
     def compile_markdown(self, plaintext):
         return markdown_compile_email(plaintext)
 
-    def render(self, plain_body: str, plain_signature: str, subject: str, order, position, context) -> str:
+    def render(self, plain_body: str, plain_signature: str, subject: str, order, position) -> str:
         body_md = self.compile_markdown(plain_body)
-        if context:
-            body_md = format_map(body_md, context=context, mode=SafeFormatter.MODE_RICH_TO_HTML)
         htmlctx = {
             'site': settings.PRETIX_INSTANCE_NAME,
             'site_url': settings.SITE_URL,

src/pretix/base/exporters/customers.py

@@ -64,7 +64,7 @@ class CustomerListExporter(OrganizerLevelExportMixin, ListExporter):
             _('Customer ID'),
             _('SSO provider'),
             _('External identifier'),
-            _('Email'),
+            _('E-mail'),
             _('Phone number'),
             _('Full name'),
         ]

src/pretix/base/exporters/invoices.py

@@ -199,7 +199,7 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
                 _('Invoice number'),
                 _('Date'),
                 _('Order code'),
-                _('Email address'),
+                _('E-mail address'),
                 _('Invoice type'),
                 _('Cancellation of'),
                 _('Language'),
@@ -326,7 +326,7 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
                 _('Event start date'),
                 _('Date'),
                 _('Order code'),
-                _('Email address'),
+                _('E-mail address'),
                 _('Invoice type'),
                 _('Cancellation of'),
                 _('Invoice sender:') + ' ' + _('Name'),

src/pretix/base/exporters/orderlist.py

@@ -284,7 +284,7 @@ class OrderListExporter(MultiSheetListExporter):
         headers.append(_('Comment'))
         headers.append(_('Follow-up date'))
         headers.append(_('Positions'))
-        headers.append(_('Email address verified'))
+        headers.append(_('E-mail address verified'))
         headers.append(_('External customer ID'))
         headers.append(_('Payment providers'))
         if form_data.get('include_payment_amounts'):
@@ -655,7 +655,7 @@ class OrderListExporter(MultiSheetListExporter):
         headers += [
             _('Sales channel'),
             _('Order locale'),
-            _('Email address verified'),
+            _('E-mail address verified'),
             _('External customer ID'),
             _('Check-in lists'),
             _('Payment providers'),

src/pretix/base/forms/auth.py

@@ -254,7 +254,7 @@ class PasswordRecoverForm(forms.Form):
 
 class PasswordForgotForm(forms.Form):
     email = forms.EmailField(
-        label=_('Email'),
+        label=_('E-mail'),
     )
 
     def __init__(self, *args, **kwargs):

src/pretix/base/forms/questions.py

@@ -54,7 +54,6 @@ from django.core.validators import (
 from django.db.models import QuerySet
 from django.forms import Select, widgets
 from django.forms.widgets import FILE_INPUT_CONTRADICTION
-from django.urls import reverse
 from django.utils.formats import date_format
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
@@ -78,7 +77,7 @@ from pretix.base.i18n import (
     get_babel_locale, get_language_without_region, language,
 )
 from pretix.base.models import InvoiceAddress, Item, Question, QuestionOption
-from pretix.base.models.tax import ask_for_vat_id
+from pretix.base.models.tax import VAT_ID_COUNTRIES, ask_for_vat_id
 from pretix.base.services.tax import (
     VATIDFinalError, VATIDTemporaryError, validate_vat_id,
 )
@@ -603,7 +602,6 @@ class BaseQuestionsForm(forms.Form):
         questions = pos.item.questions_to_ask
         event = kwargs.pop('event')
         self.all_optional = kwargs.pop('all_optional', False)
-        self.attendee_addresses_required = event.settings.attendee_addresses_required and not self.all_optional
 
         super().__init__(*args, **kwargs)
 
@@ -678,7 +676,7 @@ class BaseQuestionsForm(forms.Form):
 
         if item.ask_attendee_data and event.settings.attendee_addresses_asked:
             add_fields['street'] = forms.CharField(
-                required=self.attendee_addresses_required,
+                required=event.settings.attendee_addresses_required and not self.all_optional,
                 label=_('Address'),
                 widget=forms.Textarea(attrs={
                     'rows': 2,
@@ -688,7 +686,7 @@ class BaseQuestionsForm(forms.Form):
                 initial=(cartpos.street if cartpos else orderpos.street),
             )
             add_fields['zipcode'] = forms.CharField(
-                required=False,
+                required=event.settings.attendee_addresses_required and not self.all_optional,
                 max_length=30,
                 label=_('ZIP code'),
                 initial=(cartpos.zipcode if cartpos else orderpos.zipcode),
@@ -697,7 +695,7 @@ class BaseQuestionsForm(forms.Form):
                 }),
             )
             add_fields['city'] = forms.CharField(
-                required=False,
+                required=event.settings.attendee_addresses_required and not self.all_optional,
                 label=_('City'),
                 max_length=255,
                 initial=(cartpos.city if cartpos else orderpos.city),
@@ -709,12 +707,11 @@ class BaseQuestionsForm(forms.Form):
             add_fields['country'] = CountryField(
                 countries=CachedCountries
             ).formfield(
-                required=self.attendee_addresses_required,
+                required=event.settings.attendee_addresses_required and not self.all_optional,
                 label=_('Country'),
                 initial=country,
                 widget=forms.Select(attrs={
                     'autocomplete': 'country',
-                    'data-country-information-url': reverse('js_helpers.states'),
                 }),
             )
             c = [('', pgettext_lazy('address', 'Select state'))]
@@ -949,9 +946,9 @@ class BaseQuestionsForm(forms.Form):
         d = super().clean()
 
         if self.address_validation:
-            self.cleaned_data = d = validate_address(d, all_optional=not self.attendee_addresses_required)
+            self.cleaned_data = d = validate_address(d, True)
 
-        if d.get('street') and d.get('country') and str(d['country']) in COUNTRIES_WITH_STATE_IN_ADDRESS:
+        if d.get('city') and d.get('country') and str(d['country']) in COUNTRIES_WITH_STATE_IN_ADDRESS:
             if not d.get('state'):
                 self.add_error('state', _('This field is required.'))
 
@@ -1008,7 +1005,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
             'street': forms.Textarea(attrs={
                 'rows': 2,
                 'placeholder': _('Street and Number'),
-                'autocomplete': 'street-address',
+                'autocomplete': 'street-address'
             }),
             'beneficiary': forms.Textarea(attrs={'rows': 3}),
             'country': forms.Select(attrs={
@@ -1024,7 +1021,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
                 'data-display-dependency': '#id_is_business_1',
                 'autocomplete': 'organization',
             }),
-            'vat_id': forms.TextInput(attrs={'data-display-dependency': '#id_is_business_1'}),
+            'vat_id': forms.TextInput(attrs={'data-display-dependency': '#id_is_business_1', 'data-countries-with-vat-id': ','.join(VAT_ID_COUNTRIES)}),
             'internal_reference': forms.TextInput,
         }
         labels = {
@@ -1058,7 +1055,6 @@ class BaseInvoiceAddressForm(forms.ModelForm):
             ])
 
         self.fields['country'].choices = CachedCountries()
-        self.fields['country'].widget.attrs['data-country-information-url'] = reverse('js_helpers.states')
 
         c = [('', pgettext_lazy('address', 'Select state'))]
         fprefix = self.prefix + '-' if self.prefix else ''
@@ -1087,10 +1083,6 @@ class BaseInvoiceAddressForm(forms.ModelForm):
         )
         self.fields['state'].widget.is_required = True
 
-        self.fields['street'].required = False
-        self.fields['zipcode'].required = False
-        self.fields['city'].required = False
-
         # Without JavaScript the VAT ID field is not hidden, so we empty the field if a country outside the EU is selected.
         if cc and not ask_for_vat_id(cc) and fprefix + 'vat_id' in self.data:
             self.data = self.data.copy()
@@ -1143,7 +1135,6 @@ class BaseInvoiceAddressForm(forms.ModelForm):
             validate_address  # local import to prevent impact on startup time
 
         data = self.cleaned_data
-
         if not data.get('is_business'):
             data['company'] = ''
             data['vat_id'] = ''
@@ -1151,11 +1142,9 @@ class BaseInvoiceAddressForm(forms.ModelForm):
             data['vat_id'] = ''
         if self.event.settings.invoice_address_required:
             if data.get('is_business') and not data.get('company'):
-                raise ValidationError({"company": _('You need to provide a company name.')})
+                raise ValidationError(_('You need to provide a company name.'))
             if not data.get('is_business') and not data.get('name_parts'):
                 raise ValidationError(_('You need to provide your name.'))
-            if not self.all_optional and 'street' in self.fields and not data.get('street') and not data.get('zipcode') and not data.get('city'):
-                raise ValidationError({"street": _('This field is required.')})
 
         if 'vat_id' in self.changed_data or not data.get('vat_id'):
             self.instance.vat_id_validated = False

src/pretix/base/forms/user.py

@@ -48,10 +48,10 @@ from pretix.control.forms import SingleLanguageWidget
 
 class UserSettingsForm(forms.ModelForm):
     error_messages = {
-        'duplicate_identifier': _("There already is an account associated with this email address. "
+        'duplicate_identifier': _("There already is an account associated with this e-mail address. "
                                   "Please choose a different one."),
-        'pw_current': _("Please enter your current password if you want to change your email address "
-                        "or password."),
+        'pw_current': _("Please enter your current password if you want to change your e-mail "
+                        "address or password."),
         'pw_current_wrong': _("The current password you entered was not correct."),
         'pw_mismatch': _("Please enter the same password twice"),
         'rate_limit': _("For security reasons, please wait 5 minutes before you try again."),

src/pretix/base/invoice.py

@@ -289,7 +289,7 @@ class BaseReportlabInvoiceRenderer(BaseInvoiceRenderer):
     def _clean_text(self, text, tags=None):
         return self._normalize(bleach.clean(
             text,
-            tags=set(tags) if tags else set()
+            tags=tags or []
         ).strip().replace('<br>', '<br />').replace('\n', '<br />\n'))
 
 
@@ -461,7 +461,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
     def _draw_event(self, canvas):
         def shorten(txt):
             txt = str(txt)
-            txt = bleach.clean(txt, tags=set()).strip()
+            txt = bleach.clean(txt, tags=[]).strip()
             p = Paragraph(self._normalize(txt.strip().replace('\n', '<br />\n')), style=self.stylesheet['Normal'])
             p_size = p.wrap(self.event_width, self.event_height)
 

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

@@ -81,7 +81,7 @@ class Command(BaseCommand):
             try:
                 r = receiver(signal=periodic_task, sender=self)
             except Exception as err:
-                if isinstance(err, KeyboardInterrupt):
+                if isinstance(Exception, KeyboardInterrupt):
                     raise err
                 if settings.SENTRY_ENABLED:
                     from sentry_sdk import capture_exception

src/pretix/base/media.py

@@ -37,16 +37,6 @@ class BaseMediaType:
     def verbose_name(self):
         raise NotImplementedError()
 
-    @property
-    def icon(self):
-        """
-        This can be:
-
-        - The name of a Font Awesome icon to represent this channel type.
-        - The name of a SVG icon file that is resolvable through the static file system. We recommend to design for a size of 18x14 pixels.
-        """
-        return "circle"
-
     def generate_identifier(self, organizer):
         if self.medium_created_by_server:
             raise NotImplementedError()
@@ -69,7 +59,6 @@ class BaseMediaType:
 class BarcodePlainMediaType(BaseMediaType):
     identifier = 'barcode'
     verbose_name = _('Barcode / QR-Code')
-    icon = 'qrcode'
     medium_created_by_server = True
     supports_giftcard = False
     supports_orderposition = True
@@ -86,7 +75,6 @@ class BarcodePlainMediaType(BaseMediaType):
 class NfcUidMediaType(BaseMediaType):
     identifier = 'nfc_uid'
     verbose_name = _('NFC UID-based')
-    icon = 'pretixbase/img/media/nfc_uid.svg'
     medium_created_by_server = False
     supports_giftcard = True
     supports_orderposition = False
@@ -126,7 +114,6 @@ class NfcUidMediaType(BaseMediaType):
 class NfcMf0aesMediaType(BaseMediaType):
     identifier = 'nfc_mf0aes'
     verbose_name = 'NFC Mifare Ultralight AES'
-    icon = 'pretixbase/img/media/nfc_secure.svg'
     medium_created_by_server = False
     supports_giftcard = True
     supports_orderposition = False

src/pretix/base/migrations/0001_initial.py

@@ -29,7 +29,7 @@ class Migration(migrations.Migration):
                 ('password', models.CharField(verbose_name='password', max_length=128)),
                 ('last_login', models.DateTimeField(verbose_name='last login', blank=True, null=True)),
                 ('is_superuser', models.BooleanField(verbose_name='superuser status', default=False, help_text='Designates that this user has all permissions without explicitly assigning them.')),
-                ('email', models.EmailField(max_length=191, blank=True, unique=True, verbose_name='Email', null=True,
+                ('email', models.EmailField(max_length=191, blank=True, unique=True, verbose_name='E-mail', null=True,
                                             db_index=True)),
                 ('givenname', models.CharField(verbose_name='Given name', max_length=255, blank=True, null=True)),
                 ('familyname', models.CharField(verbose_name='Family name', max_length=255, blank=True, null=True)),

src/pretix/base/migrations/0001_squashed_0028_auto_20160816_1242.py

@@ -9,7 +9,6 @@ from decimal import Decimal
 import django.core.validators
 import django.db.models.deletion
 import i18nfield.fields
-from argon2.exceptions import HashingError
 from django.conf import settings
 from django.contrib.auth.hashers import make_password
 from django.db import migrations, models
@@ -26,14 +25,7 @@ def initial_user(apps, schema_editor):
     user = User(email='admin@localhost')
     user.is_staff = True
     user.is_superuser = True
-    try:
-        user.password = make_password('admin')
-    except HashingError:
-        raise Exception(
-            "Could not hash password of initial user with argon2id. If this is a system with less than 8 CPU cores, "
-            "you might need to disable argon2id by setting `passwords_argon2=off` in the `[django]` section of the "
-            "pretix.cfg configuration file."
-        )
+    user.password = make_password('admin')
     user.save()
 
 
@@ -56,7 +48,7 @@ class Migration(migrations.Migration):
                 ('password', models.CharField(max_length=128, verbose_name='password')),
                 ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
                 ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
-                ('email', models.EmailField(blank=True, db_index=True, max_length=254, null=True, unique=True, verbose_name='Email')),
+                ('email', models.EmailField(blank=True, db_index=True, max_length=254, null=True, unique=True, verbose_name='E-mail')),
                 ('givenname', models.CharField(blank=True, max_length=255, null=True, verbose_name='Given name')),
                 ('familyname', models.CharField(blank=True, max_length=255, null=True, verbose_name='Family name')),
                 ('is_active', models.BooleanField(default=True, verbose_name='Is active')),
@@ -240,7 +232,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('code', models.CharField(max_length=16, verbose_name='Order code')),
                 ('status', models.CharField(choices=[('n', 'pending'), ('p', 'paid'), ('e', 'expired'), ('c', 'cancelled'), ('r', 'refunded')], max_length=3, verbose_name='Status')),
-                ('email', models.EmailField(blank=True, max_length=254, null=True, verbose_name='Email')),
+                ('email', models.EmailField(blank=True, max_length=254, null=True, verbose_name='E-mail')),
                 ('locale', models.CharField(blank=True, max_length=32, null=True, verbose_name='Locale')),
                 ('secret', models.CharField(default=pretix.base.models.orders.generate_secret, max_length=32)),
                 ('datetime', models.DateTimeField(verbose_name='Date')),

src/pretix/base/migrations/0002_auto_20160209_0940.py

@@ -187,7 +187,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('code', models.CharField(max_length=16, verbose_name='Order code')),
                 ('status', models.CharField(choices=[('n', 'pending'), ('p', 'paid'), ('e', 'expired'), ('c', 'cancelled'), ('r', 'refunded')], max_length=3, verbose_name='Status')),
-                ('email', models.EmailField(blank=True, max_length=254, null=True, verbose_name='Email')),
+                ('email', models.EmailField(blank=True, max_length=254, null=True, verbose_name='E-mail')),
                 ('locale', models.CharField(blank=True, max_length=32, null=True, verbose_name='Locale')),
                 ('secret', models.CharField(default=pretix.base.models.orders.generate_secret, max_length=32)),
                 ('datetime', models.DateTimeField(verbose_name='Date')),

src/pretix/base/migrations/0051_auto_20170206_2027.py

@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('created', models.DateTimeField(auto_now_add=True, verbose_name='On waiting list since')),
-                ('email', models.EmailField(max_length=254, verbose_name='Email address')),
+                ('email', models.EmailField(max_length=254, verbose_name='E-mail address')),
                 ('locale', models.CharField(default='en', max_length=190)),
                 ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='waitinglistentries', to='pretixbase.Event', verbose_name='Event')),
                 ('item', models.ForeignKey(help_text='The product the user waits for.', on_delete=django.db.models.deletion.CASCADE, related_name='waitinglistentries', to='pretixbase.Item', verbose_name='Product')),

src/pretix/base/migrations/0051_auto_20170206_2027_squashed_0057_auto_20170501_2116.py

@@ -35,7 +35,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('created', models.DateTimeField(auto_now_add=True, verbose_name='On waiting list since')),
-                ('email', models.EmailField(max_length=254, verbose_name='Email address')),
+                ('email', models.EmailField(max_length=254, verbose_name='E-mail address')),
                 ('locale', models.CharField(default='en', max_length=190)),
                 ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='waitinglistentries', to='pretixbase.Event', verbose_name='Event')),
                 ('item', models.ForeignKey(help_text='The product the user waits for.', on_delete=django.db.models.deletion.CASCADE, related_name='waitinglistentries', to='pretixbase.Item', verbose_name='Product')),

src/pretix/base/migrations/0077_auto_20171124_1629_squashed_0088_auto_20180328_1217.py

@@ -163,7 +163,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('action_type', models.CharField(max_length=255)),
-                ('method', models.CharField(choices=[('mail', 'Email')], max_length=255)),
+                ('method', models.CharField(choices=[('mail', 'E-mail')], max_length=255)),
                 ('event', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
                                             to='pretixbase.Event')),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),

src/pretix/base/migrations/0078_auto_20171206_1603.py

@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('action_type', models.CharField(max_length=255)),
-                ('method', models.CharField(choices=[('mail', 'Email')], max_length=255)),
+                ('method', models.CharField(choices=[('mail', 'E-mail')], max_length=255)),
                 ('event', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='pretixbase.Event')),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
                 ('enabled', models.BooleanField(default=True)),

src/pretix/base/migrations/0272_printlog.py

@@ -1,79 +0,0 @@
-# Generated by Django 4.2.16 on 2024-09-19 10:41
-
-import django.db.models.deletion
-import django.utils.timezone
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.OAUTH2_PROVIDER_APPLICATION_MODEL),
-        ("pretixbase", "0271_itemcategory_cross_selling"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="PrintLog",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True, primary_key=True, serialize=False
-                    ),
-                ),
-                ("datetime", models.DateTimeField(default=django.utils.timezone.now)),
-                ("created", models.DateTimeField(auto_now_add=True, null=True)),
-                ("successful", models.BooleanField(default=True)),
-                ("source", models.CharField(max_length=255)),
-                ("type", models.CharField(max_length=255)),
-                ("info", models.JSONField(default=dict)),
-                (
-                    "api_token",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.PROTECT,
-                        to="pretixbase.teamapitoken",
-                    ),
-                ),
-                (
-                    "device",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.PROTECT,
-                        related_name="print_logs",
-                        to="pretixbase.device",
-                    ),
-                ),
-                (
-                    "oauth_application",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.PROTECT,
-                        to=settings.OAUTH2_PROVIDER_APPLICATION_MODEL,
-                    ),
-                ),
-                (
-                    "position",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="print_logs",
-                        to="pretixbase.orderposition",
-                    ),
-                ),
-                (
-                    "user",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.PROTECT,
-                        related_name="print_logs",
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-            ],
-            options={
-                "ordering": ("-datetime",),
-            },
-        ),
-    ]

src/pretix/base/migrations/0273_remove_checkinlist_auto_checkin_sales_channels.py

@@ -1,48 +0,0 @@
-# Generated by Django 4.2.16 on 2024-10-29 15:03
-
-from django.db import migrations
-
-
-def migrate_autocheckin(apps, schema_editor):
-    CheckinList = apps.get_model("pretixbase", "CheckinList")
-    AutoCheckinRule = apps.get_model("autocheckin", "AutoCheckinRule")
-
-    for cl in CheckinList.objects.filter(auto_checkin_sales_channels__isnull=False).select_related("event", "event__organizer"):
-        sales_channels = cl.auto_checkin_sales_channels.all()
-        all_sales_channels = cl.event.organizer.sales_channels.all()
-
-        if "pretix.plugins.autocheckin" not in cl.event.plugins:
-            cl.event.plugins = cl.event.plugins + ",pretix.plugins.autocheckin"
-            cl.event.save()
-
-        r = AutoCheckinRule.objects.get_or_create(
-            list=cl,
-            event=cl.event,
-            all_products=True,
-            all_payment_methods=True,
-            defaults=dict(
-                mode="placed",
-                all_sales_channels=len(sales_channels) == len(all_sales_channels),
-            )
-        )[0]
-        if len(sales_channels) != len(all_sales_channels):
-            r.limit_sales_channels.set(sales_channels)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("pretixbase", "0272_printlog"),
-        ("autocheckin", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.RunPython(
-            migrate_autocheckin,
-            migrations.RunPython.noop,
-        ),
-        migrations.RemoveField(
-            model_name="checkinlist",
-            name="auto_checkin_sales_channels",
-        ),
-    ]

src/pretix/base/modelimport.py

@@ -256,9 +256,6 @@ class SubeventColumnMixin:
         ]
 
     def clean(self, value, previous_values):
-        if not value:
-            return None
-
         if value in self._subevent_cache:
             return self._subevent_cache[value]
 

src/pretix/base/modelimport_orders.py

@@ -56,7 +56,7 @@ from pretix.base.signals import order_import_columns
 
 class EmailColumn(ImportColumn):
     identifier = 'email'
-    verbose_name = gettext_lazy('Email address')
+    verbose_name = gettext_lazy('E-mail address')
 
     def clean(self, value, previous_values):
         if value:
@@ -322,7 +322,7 @@ class AttendeeNamePart(ImportColumn):
 
 class AttendeeEmail(ImportColumn):
     identifier = 'attendee_email'
-    verbose_name = gettext_lazy('Attendee email address')
+    verbose_name = gettext_lazy('Attendee e-mail address')
 
     def clean(self, value, previous_values):
         if value:

src/pretix/base/models/auth.py

@@ -241,7 +241,7 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
     REQUIRED_FIELDS = []
 
     email = models.EmailField(unique=True, db_index=True, null=True, blank=True,
-                              verbose_name=_('Email'), max_length=190)
+                              verbose_name=_('E-mail'), max_length=190)
     fullname = models.CharField(max_length=255, blank=True, null=True,
                                 verbose_name=_('Full name'))
     is_active = models.BooleanField(default=True,

src/pretix/base/models/checkin.py

@@ -99,6 +99,14 @@ class CheckinList(LoggedModel):
         verbose_name=_('Automatically check out everyone at'),
         null=True, blank=True
     )
+    auto_checkin_sales_channels = models.ManyToManyField(
+        "SalesChannel",
+        verbose_name=_('Sales channels to automatically check in'),
+        help_text=_('This option is deprecated and will be removed in the next months. As a replacement, our new plugin '
+                    '"Auto check-in" can be used. When we remove this option, we will automatically migrate your event '
+                    'to use the new plugin.'),
+        blank=True,
+    )
     rules = models.JSONField(default=dict, blank=True)
 
     objects = ScopedManager(organizer='event__organizer')
@@ -133,7 +141,7 @@ class CheckinList(LoggedModel):
         return self.positions_query(ignore_status=False)
 
     @scopes_disabled()
-    def _filter_positions_inside(self, qs, at_time=None):
+    def positions_inside_query(self, ignore_status=False, at_time=None):
         if at_time is None:
             c_q = []
         else:
@@ -141,7 +149,7 @@ class CheckinList(LoggedModel):
 
         if "postgresql" not in settings.DATABASES["default"]["ENGINE"]:
             # Use a simple approach that works on all databases
-            qs = qs.annotate(
+            qs = self.positions_query(ignore_status=ignore_status).annotate(
                 last_entry=Subquery(
                     Checkin.objects.filter(
                         *c_q,
@@ -194,7 +202,7 @@ class CheckinList(LoggedModel):
             .values("position_id", "type", "datetime", "cnt_exists_after")
             .query.sql_with_params()
         )
-        return qs.filter(
+        return self.positions_query(ignore_status=ignore_status).filter(
             pk__in=RawSQL(
                 f"""
                 SELECT "position_id"
@@ -206,10 +214,6 @@ class CheckinList(LoggedModel):
             )
         )
 
-    @scopes_disabled()
-    def positions_inside_query(self, ignore_status=False, at_time=None):
-        return self._filter_positions_inside(self.positions_query(ignore_status=ignore_status), at_time=at_time)
-
     @property
     def positions_inside(self):
         return self.positions_inside_query(None)

src/pretix/base/models/customers.py

@@ -91,7 +91,7 @@ class Customer(LoggedModel):
             ),
         ],
     )
-    email = models.EmailField(db_index=True, null=True, blank=False, verbose_name=_('Email'), max_length=190)
+    email = models.EmailField(db_index=True, null=True, blank=False, verbose_name=_('E-mail'), max_length=190)
     phone = PhoneNumberField(null=True, blank=True, verbose_name=_('Phone number'))
     password = models.CharField(verbose_name=_('Password'), max_length=128)
     name_cached = models.CharField(max_length=255, verbose_name=_('Full name'), blank=True)
@@ -392,7 +392,7 @@ class CustomerSSOClient(LoggedModel):
     SCOPE_CHOICES = (
         ('openid', _('OpenID Connect access (required)')),
         ('profile', _('Profile data (name, addresses)')),
-        ('email', _('Email address')),
+        ('email', _('E-mail address')),
         ('phone', _('Phone number')),
     )
 

src/pretix/base/models/devices.py

@@ -28,6 +28,7 @@ from django.utils.crypto import get_random_string
 from django.utils.translation import gettext_lazy as _
 from django_scopes import ScopedManager, scopes_disabled
 
+from pretix.api.auth.devicesecurity import DEVICE_SECURITY_PROFILES
 from pretix.base.models import LoggedModel
 
 
@@ -160,6 +161,7 @@ class Device(LoggedModel):
     )
     security_profile = models.CharField(
         max_length=190,
+        choices=[(k, v.verbose_name) for k, v in DEVICE_SECURITY_PROFILES.items()],
         default='full',
         null=True,
         blank=False

src/pretix/base/models/event.py

@@ -823,9 +823,6 @@ class Event(EventMixin, LoggedModel):
         self.save()
         self.log_action('pretix.object.cloned', data={'source': other.slug, 'source_id': other.pk})
 
-        if hasattr(other, 'alternative_domain_assignment'):
-            other.alternative_domain_assignment.domain.event_assignments.create(event=self)
-
         if not self.all_sales_channels:
             self.limit_sales_channels.set(
                 self.organizer.sales_channels.filter(
@@ -1027,9 +1024,10 @@ class Event(EventMixin, LoggedModel):
 
         checkin_list_map = {}
         for cl in other.checkin_lists.filter(subevent__isnull=True).prefetch_related(
-            'limit_products'
+            'limit_products', 'auto_checkin_sales_channels'
         ):
             items = list(cl.limit_products.all())
+            auto_checkin_sales_channels = list(cl.auto_checkin_sales_channels.all())
             checkin_list_map[cl.pk] = cl
             cl.pk = None
             cl._prefetched_objects_cache = {}
@@ -1041,6 +1039,8 @@ class Event(EventMixin, LoggedModel):
             cl.log_action('pretix.object.cloned')
             for i in items:
                 cl.limit_products.add(item_map[i.pk])
+            if auto_checkin_sales_channels:
+                cl.auto_checkin_sales_channels.set(self.organizer.sales_channels.filter(identifier__in=[s.identifier for s in auto_checkin_sales_channels]))
 
         if other.seating_plan:
             if other.seating_plan.organizer_id == self.organizer_id:

src/pretix/base/models/items.py

@@ -1118,12 +1118,13 @@ class ItemVariation(models.Model):
     :param original_price: The item's "original" price. Will not be used for any calculations, will just be shown.
     :type original_price: decimal.Decimal
     :param require_approval: If set to ``True``, orders containing this variation can only be processed and paid after
-                             approval by an administrator
+    approval by an administrator
     :type require_approval: bool
     :param all_sales_channels: A flag indicating that this variation is available on all channels and limit_sales_channels will be ignored.
     :type all_sales_channels: bool
     :param limit_sales_channels: A list of sales channel identifiers, that this variation is available for sale on.
     :type limit_sales_channels: list
+
     """
     item = models.ForeignKey(
         Item,

src/pretix/base/models/memberships.py

@@ -159,24 +159,10 @@ class Membership(models.Model):
         de = date_format(self.date_end, 'SHORT_DATE_FORMAT')
         return f'{self.membership_type.name}: {self.attendee_name} ({ds} – {de})'
 
-    @property
-    def percentage_used(self):
-        if self.membership_type.max_usages and self.usages:
-            return int(self.usages / self.membership_type.max_usages * 100)
-        return 0
-
     @property
     def attendee_name(self):
         return build_name(self.attendee_name_parts, fallback_scheme=lambda: self.customer.organizer.settings.name_scheme)
 
-    @property
-    def expired(self):
-        return time_machine_now() > self.date_end
-
-    @property
-    def not_yet_valid(self):
-        return time_machine_now() < self.date_start
-
     def is_valid(self, ev=None, ticket_valid_from=None, valid_from_not_chosen=False):
         if valid_from_not_chosen:
             return not self.canceled and self.date_end >= time_machine_now()

src/pretix/base/models/notifications.py

@@ -43,7 +43,7 @@ class NotificationSetting(models.Model):
     :type enabled: bool
     """
     CHANNELS = (
-        ('mail', _('Email')),
+        ('mail', _('E-mail')),
     )
     user = models.ForeignKey('User', on_delete=models.CASCADE,
                              related_name='notification_settings')

src/pretix/base/models/orders.py

@@ -242,7 +242,7 @@ class Order(LockModel, LoggedModel):
     )
     email = models.EmailField(
         null=True, blank=True,
-        verbose_name=_('Email')
+        verbose_name=_('E-mail')
     )
     phone = PhoneNumberField(
         null=True, blank=True,
@@ -317,7 +317,7 @@ class Order(LockModel, LoggedModel):
     )
     email_known_to_work = models.BooleanField(
         default=False,
-        verbose_name=_('Email address verified')
+        verbose_name=_('E-mail address verified')
     )
     invoice_dirty = models.BooleanField(
         # Invoice needs to be re-issued when the order is paid again
@@ -2275,7 +2275,6 @@ class OrderFee(models.Model):
     FEE_TYPE_SERVICE = "service"
     FEE_TYPE_CANCELLATION = "cancellation"
     FEE_TYPE_INSURANCE = "insurance"
-    FEE_TYPE_LATE = "late"
     FEE_TYPE_OTHER = "other"
     FEE_TYPE_GIFTCARD = "giftcard"
     FEE_TYPES = (
@@ -2284,7 +2283,6 @@ class OrderFee(models.Model):
         (FEE_TYPE_SERVICE, _("Service fee")),
         (FEE_TYPE_CANCELLATION, _("Cancellation fee")),
         (FEE_TYPE_INSURANCE, _("Insurance fee")),
-        (FEE_TYPE_LATE, _("Late fee")),
         (FEE_TYPE_OTHER, _("Other fees")),
         (FEE_TYPE_GIFTCARD, _("Gift card")),
     )
@@ -3206,9 +3204,9 @@ class InvoiceAddress(models.Model):
     company = models.CharField(max_length=255, blank=True, verbose_name=_('Company name'))
     name_cached = models.CharField(max_length=255, verbose_name=_('Full name'), blank=True)
     name_parts = models.JSONField(default=dict)
-    street = models.TextField(verbose_name=_('Address'), blank=True)
-    zipcode = models.CharField(max_length=30, verbose_name=_('ZIP code'), blank=True)
-    city = models.CharField(max_length=255, verbose_name=_('City'), blank=True)
+    street = models.TextField(verbose_name=_('Address'), blank=False)
+    zipcode = models.CharField(max_length=30, verbose_name=_('ZIP code'), blank=False)
+    city = models.CharField(max_length=255, verbose_name=_('City'), blank=False)
     country_old = models.CharField(max_length=255, verbose_name=_('Country'), blank=False)
     country = FastCountryField(verbose_name=_('Country'), blank=False, blank_label=_('Select country'),
                                countries=CachedCountries)
@@ -3393,74 +3391,6 @@ class BlockedTicketSecret(models.Model):
         unique_together = (('event', 'secret'),)
 
 
-class PrintLog(models.Model):
-    """
-    A print log object is created when a ticket or badge is printed with our apps.
-    """
-    TYPE_BADGE = 'badge'
-    TYPE_TICKET = 'ticket'
-    TYPE_CERTIFICATE = 'certificate'
-    TYPE_OTHER = 'other'
-    PRINT_TYPES = (
-        (TYPE_BADGE, _('Badge')),
-        (TYPE_TICKET, _('Ticket')),
-        (TYPE_CERTIFICATE, _('Certificate')),
-        (TYPE_OTHER, _('Other')),
-    )
-
-    position = models.ForeignKey(
-        'pretixbase.OrderPosition',
-        related_name='print_logs',
-        on_delete=models.CASCADE,
-    )
-    successful = models.BooleanField(
-        default=True,
-    )
-
-    # Datetime of checkin, might be different from created if past scans are uploaded
-    datetime = models.DateTimeField(default=now)
-
-    # Datetime of creation on server
-    created = models.DateTimeField(auto_now_add=True, null=True, blank=True)
-
-    # Who printed?
-    device = models.ForeignKey('Device', related_name='print_logs', null=True, blank=True, on_delete=models.PROTECT)
-    user = models.ForeignKey('User', related_name='print_logs', null=True, blank=True, on_delete=models.PROTECT)
-    api_token = models.ForeignKey('TeamAPIToken', null=True, blank=True, on_delete=models.PROTECT)
-    oauth_application = models.ForeignKey('pretixapi.OAuthApplication', null=True, blank=True, on_delete=models.PROTECT)
-
-    # Source = Tag field with undefined values, e.g. name of app ("pretixscan")
-    source = models.CharField(max_length=255)
-
-    # Type = Type of object printed ("badge", "ticket")
-    type = models.CharField(max_length=255, choices=PRINT_TYPES)
-
-    info = models.JSONField(default=dict)
-
-    objects = ScopedManager(organizer='position__order__event__organizer')
-
-    class Meta:
-        ordering = (('-datetime'),)
-
-    def __repr__(self):
-        return "<PrintLog: pos {} at {} from {}>".format(
-            self.position, self.datetime, self.source
-        )
-
-    def save(self, **kwargs):
-        super().save(**kwargs)
-        if self.position:
-            self.position.order.touch()
-
-    def delete(self, **kwargs):
-        super().delete(**kwargs)
-        self.position.order.touch()
-
-    @property
-    def is_late_upload(self):
-        return self.created and abs(self.created - self.datetime) > timedelta(minutes=2)
-
-
 @receiver(post_delete, sender=CachedTicket)
 def cachedticket_delete(sender, instance, **kwargs):
     if instance.file:

src/pretix/base/models/seating.py

@@ -53,30 +53,6 @@ class SeatingPlanLayoutValidator:
             e = str(e).replace('%', '%%')
             raise ValidationError(_('Your layout file is not a valid seating plan. Error message: {}').format(e))
 
-        try:
-            seat_guids = set()
-            for z in val["zones"]:
-                for r in z["rows"]:
-                    for s in r["seats"]:
-                        if not s.get("seat_guid"):
-                            raise ValidationError(
-                                _("Seat with zone {zone}, row {row}, and number {number} has no seat ID.").format(
-                                    zone=z["name"],
-                                    row=r["row_number"],
-                                    number=s["seat_number"],
-                                )
-                            )
-                        elif s["seat_guid"] in seat_guids:
-                            raise ValidationError(
-                                _("Multiple seats have the same ID: {id}").format(
-                                    id=s["seat_guid"],
-                                )
-                            )
-
-                        seat_guids.add(s["seat_guid"])
-        except ValidationError as e:
-            raise ValidationError(_('Your layout file is not a valid seating plan. Error message: {}').format(", ".join(e.message for e in e.error_list)))
-
 
 class SeatingPlan(LoggedModel):
     """

src/pretix/base/models/waitinglist.py

@@ -73,7 +73,7 @@ class WaitingListEntry(LoggedModel):
         blank=True, default=dict
     )
     email = models.EmailField(
-        verbose_name=_("Email address")
+        verbose_name=_("E-mail address")
     )
     phone = PhoneNumberField(
         null=True, blank=True,

src/pretix/base/payment.py

@@ -1419,51 +1419,50 @@ class GiftCardPayment(BasePaymentProvider):
     def payment_refund_supported(self, payment: OrderPayment) -> bool:
         return True
 
-    def _add_giftcard_to_cart(self, cs, gc):
-        from pretix.base.services.cart import add_payment_to_cart_session
-
-        if gc.currency != self.event.currency:
-            raise ValidationError(_("This gift card does not support this currency."))
-        if gc.testmode and not self.event.testmode:
-            raise ValidationError(_("This gift card can only be used in test mode."))
-        if not gc.testmode and self.event.testmode:
-            raise ValidationError(_("Only test gift cards can be used in test mode."))
-        if gc.expires and gc.expires < time_machine_now():
-            raise ValidationError(_("This gift card is no longer valid."))
-        if gc.value <= Decimal("0.00"):
-            raise ValidationError(_("All credit on this gift card has been used."))
-
-        for p in cs.get('payments', []):
-            if p['provider'] == self.identifier and p['info_data']['gift_card'] == gc.pk:
-                raise ValidationError(_("This gift card is already used for your payment."))
-
-        add_payment_to_cart_session(
-            cs,
-            self,
-            max_value=gc.value,
-            info_data={
-                'gift_card': gc.pk,
-                'gift_card_secret': gc.secret,
-            }
-        )
-
     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."))
                 return
 
+        cs = cart_session(request)
         try:
             gc = self.event.organizer.accepted_gift_cards.get(
                 secret=request.POST.get("giftcard").strip()
             )
-            cs = cart_session(request)
-            try:
-                self._add_giftcard_to_cart(cs, gc)
-                return True
-            except ValidationError as e:
-                messages.error(request, str(e.message))
+            if gc.currency != self.event.currency:
+                messages.error(request, _("This gift card does not support this currency."))
                 return
+            if gc.testmode and not self.event.testmode:
+                messages.error(request, _("This gift card can only be used in test mode."))
+                return
+            if not gc.testmode and self.event.testmode:
+                messages.error(request, _("Only test gift cards can be used in test mode."))
+                return
+            if gc.expires and gc.expires < time_machine_now():
+                messages.error(request, _("This gift card is no longer valid."))
+                return
+            if gc.value <= Decimal("0.00"):
+                messages.error(request, _("All credit on this gift card has been used."))
+                return
+
+            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,
+                }
+            )
+            return True
         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 "

src/pretix/base/services/cart.py

@@ -343,13 +343,11 @@ class CartManager:
                 err = error_messages['some_subevent_not_started']
                 cp.addons.all().delete()
                 cp.delete()
-                continue
 
             if cp.subevent and cp.subevent.presale_end and time_machine_now(self.real_now_dt) > cp.subevent.presale_end:
                 err = error_messages['some_subevent_ended']
                 cp.addons.all().delete()
                 cp.delete()
-                continue
 
             if cp.subevent:
                 tlv = self.event.settings.get('payment_term_last', as_type=RelativeDateWrapper)
@@ -362,7 +360,6 @@ class CartManager:
                         err = error_messages['some_subevent_ended']
                         cp.addons.all().delete()
                         cp.delete()
-                        continue
         return err
 
     def _update_subevents_cache(self, se_ids: List[int]):
@@ -1426,28 +1423,6 @@ class CartManager:
             raise CartError(err)
 
 
-def add_payment_to_cart_session(cart_session, provider, min_value: Decimal=None, max_value: Decimal=None, info_data: dict=None):
-    """
-    :param cart_session: The current cart session.
-    :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:
-    """
-    cart_session.setdefault('payments', [])
-    cart_session['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 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.
@@ -1462,7 +1437,16 @@ def add_payment_to_cart(request, provider, min_value: Decimal=None, max_value: D
     from pretix.presale.views.cart import cart_session
 
     cs = cart_session(request)
-    add_payment_to_cart_session(cs, provider, min_value, max_value, info_data)
+    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):

src/pretix/base/services/checkin.py

@@ -57,7 +57,7 @@ from pretix.base.models import (
     Checkin, CheckinList, Device, Event, Gate, Item, ItemVariation, Order,
     OrderPosition, QuestionOption,
 )
-from pretix.base.signals import checkin_created, periodic_task
+from pretix.base.signals import checkin_created, order_placed, periodic_task
 from pretix.helpers import OF_SELF
 from pretix.helpers.jsonlogic import Logic
 from pretix.helpers.jsonlogic_boolalg import convert_to_dnf
@@ -1154,6 +1154,23 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
             )
 
 
+@receiver(order_placed, dispatch_uid="legacy_autocheckin_order_placed")
+def order_placed(sender, **kwargs):
+    order = kwargs['order']
+    event = sender
+
+    cls = list(event.checkin_lists.filter(auto_checkin_sales_channels=order.sales_channel).prefetch_related(
+        'limit_products'))
+    if not cls:
+        return
+    for op in order.positions.all():
+        for cl in cls:
+            if cl.all_products or op.item_id in {i.pk for i in cl.limit_products.all()}:
+                if not cl.subevent_id or cl.subevent_id == op.subevent_id:
+                    ci = Checkin.objects.create(position=op, list=cl, auto_checked_in=True, type=Checkin.TYPE_ENTRY)
+                    checkin_created.send(event, checkin=ci)
+
+
 @receiver(periodic_task, dispatch_uid="autocheckout_exit_all")
 @scopes_disabled()
 def process_exit_all(sender, **kwargs):

src/pretix/base/services/mail.py

@@ -76,7 +76,7 @@ from pretix.base.services.tasks import TransactionAwareTask
 from pretix.base.services.tickets import get_tickets_for_order
 from pretix.base.signals import email_filter, global_email_filter
 from pretix.celery_app import app
-from pretix.helpers.format import SafeFormatter, format_map
+from pretix.helpers.format import format_map
 from pretix.helpers.hierarkey import clean_filename
 from pretix.multidomain.urlreverse import build_absolute_uri
 from pretix.presale.ical import get_private_icals
@@ -311,17 +311,11 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
             try:
                 if plain_text_only:
                     body_html = None
-                elif 'context' in inspect.signature(renderer.render).parameters:
-                    body_html = renderer.render(content_plain, signature, raw_subject, order, position, context)
                 elif 'position' in inspect.signature(renderer.render).parameters:
-                    # Backwards compatibility
-                    warnings.warn('Email renderer called without context argument because context argument is not '
-                                  'supported.',
-                                  DeprecationWarning)
                     body_html = renderer.render(content_plain, signature, raw_subject, order, position)
                 else:
                     # Backwards compatibility
-                    warnings.warn('Email renderer called without position argument because position argument is not '
+                    warnings.warn('E-mail renderer called without position argument because position argument is not '
                                   'supported.',
                                   DeprecationWarning)
                     body_html = renderer.render(content_plain, signature, raw_subject, order)
@@ -329,8 +323,6 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
                 logger.exception('Could not render HTML body')
                 body_html = None
 
-        body_plain = format_map(body_plain, context, mode=SafeFormatter.MODE_RICH_TO_PLAIN)
-
         send_task = mail_send_task.si(
             to=[email] if isinstance(email, str) else list(email),
             cc=cc,
@@ -663,7 +655,7 @@ def render_mail(template, context):
     if isinstance(template, LazyI18nString):
         body = str(template)
         if context:
-            body = format_map(body, context, mode=SafeFormatter.MODE_IGNORE_RICH)
+            body = format_map(body, context)
     else:
         tpl = get_template(template)
         body = tpl.render(context)

src/pretix/base/services/placeholders.py

@@ -26,7 +26,6 @@ from decimal import Decimal
 
 from django.dispatch import receiver
 from django.utils.formats import date_format
-from django.utils.html import escape
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 
@@ -40,8 +39,7 @@ from pretix.base.settings import PERSON_NAME_SCHEMES, get_name_parts_localized
 from pretix.base.signals import (
     register_mail_placeholders, register_text_placeholders,
 )
-from pretix.base.templatetags.rich_text import markdown_compile_email
-from pretix.helpers.format import PlainHtmlAlternativeString, SafeFormatter
+from pretix.helpers.format import SafeFormatter
 
 logger = logging.getLogger('pretix.base.services.placeholders')
 
@@ -109,91 +107,6 @@ class SimpleFunctionalTextPlaceholder(BaseTextPlaceholder):
             return self._sample
 
 
-class BaseRichTextPlaceholder(BaseTextPlaceholder):
-    """
-    This is the base class for all placeholders which can render either to plain text
-    or to a rich HTML element.
-    """
-
-    def __init__(self, identifier, args):
-        self._identifier = identifier
-        self._args = args
-
-    @property
-    def identifier(self):
-        return self._identifier
-
-    @property
-    def required_context(self):
-        return self._args
-
-    @property
-    def is_block(self):
-        return False
-
-    def render(self, context):
-        return PlainHtmlAlternativeString(
-            self.render_plain(**{k: context[k] for k in self._args}),
-            self.render_html(**{k: context[k] for k in self._args}),
-            self.is_block,
-        )
-
-    def render_html(self, **kwargs):
-        """
-        HTML rendering of the placeholder. Should return "safe" HTML, i.e. everything needs to be
-        escaped.
-        """
-        raise NotImplementedError
-
-    def render_plain(self, **kwargs):
-        """
-        Plain text rendering of the placeholder.
-        """
-        raise NotImplementedError
-
-    def render_sample(self, event):
-        return PlainHtmlAlternativeString(
-            self.render_sample_plain(event=event),
-            self.render_sample_html(event=event),
-            self.is_block,
-        )
-
-    def render_sample_html(self, event):
-        raise NotImplementedError
-
-    def render_sample_plain(self, event):
-        raise NotImplementedError
-
-
-class SimpleButtonPlaceholder(BaseRichTextPlaceholder):
-    def __init__(self, identifier, args, url_func, text_func, sample_url_func, sample_text_func):
-        super().__init__(identifier, args)
-        self._url_func = url_func
-        self._text_func = text_func
-        self._sample_url_func = sample_url_func
-        self._sample_text_func = sample_text_func
-
-    def render_html(self, **context):
-        text = self._text_func(**{k: context[k] for k in self._args})
-        url = self._url_func(**{k: context[k] for k in self._args})
-        return f'<a href="{url}" class="button">{escape(text)}</a>'
-
-    def render_plain(self, **context):
-        text = self._text_func(**{k: context[k] for k in self._args})
-        url = self._url_func(**{k: context[k] for k in self._args})
-        return f'{text}: {url}'
-
-    def render_sample_html(self, event):
-        text = self._sample_text_func(event)
-        url = self._sample_url_func(event)
-        return f'<a href="{url}" class="button">{escape(text)}</a>'
-
-    def render_sample_plain(self, event):
-        text = self._sample_text_func(event)
-        url = self._sample_url_func(event)
-        return f'{text}: {url}'
-
-
 class PlaceholderContext(SafeFormatter):
     """
     Holds the contextual arguments and corresponding list of available placeholders for formatting
@@ -296,24 +209,13 @@ def get_best_name(position_or_address, parts=False):
 def base_placeholders(sender, **kwargs):
     from pretix.multidomain.urlreverse import build_absolute_uri
 
-    def _event_sample(event):
-        if event.has_subevents:
-            se = event.subevents.first()
-            if se:
-                return se.name
-        return event.name
-
     ph = [
         SimpleFunctionalTextPlaceholder(
             'event', ['event'], lambda event: event.name, lambda event: event.name
         ),
         SimpleFunctionalTextPlaceholder(
             'event', ['event_or_subevent'], lambda event_or_subevent: event_or_subevent.name,
-            _event_sample,
-        ),
-        SimpleFunctionalTextPlaceholder(
-            'event_series_name', ['event', 'event_or_subevent'], lambda event, event_or_subevent: event.name,
-            lambda event: event.name
+            lambda event_or_subevent: event_or_subevent.name
         ),
         SimpleFunctionalTextPlaceholder(
             'event_slug', ['event'], lambda event: event.slug, lambda event: event.slug
@@ -371,27 +273,6 @@ def base_placeholders(sender, **kwargs):
                 }
             ),
         ),
-        SimpleButtonPlaceholder(
-            'url_button', ['order', 'event'],
-            url_func=lambda order, event: build_absolute_uri(
-                event,
-                'presale:event.order.open', kwargs={
-                    'order': order.code,
-                    'secret': order.secret,
-                    'hash': order.email_confirm_secret()
-                }
-            ),
-            text_func=lambda order, event: _("View order details"),
-            sample_url_func=lambda event: build_absolute_uri(
-                event,
-                'presale:event.order.open', kwargs={
-                    'order': 'F8VVL',
-                    'secret': '6zzjnumtsx136ddy',
-                    'hash': '98kusd8ofsj8dnkd'
-                }
-            ),
-            sample_text_func=lambda event: _("View order details"),
-        ),
         SimpleFunctionalTextPlaceholder(
             'url_info_change', ['order', 'event'], lambda order, event: build_absolute_uri(
                 event,
@@ -456,27 +337,6 @@ def base_placeholders(sender, **kwargs):
                 }
             ),
         ),
-        SimpleButtonPlaceholder(
-            'url_button', ['event', 'position'],
-            url_func=lambda event, position: build_absolute_uri(
-                event,
-                'presale:event.order.position', kwargs={
-                    'order': position.order.code,
-                    'secret': position.web_secret,
-                    'position': position.positionid
-                }
-            ),
-            text_func=lambda event, position: _("View registration details"),
-            sample_url_func=lambda event: build_absolute_uri(
-                event,
-                'presale:event.order.position', kwargs={
-                    'order': 'F8VVL',
-                    'secret': '6zzjnumtsx136ddy',
-                    'position': '123'
-                }
-            ),
-            sample_text_func=lambda event: _("View registration details"),
-        ),
         SimpleFunctionalTextPlaceholder(
             'url_info_change', ['position', 'event'], lambda position, event: build_absolute_uri(
                 event,
@@ -732,8 +592,8 @@ def base_placeholders(sender, **kwargs):
 
 
 class FormPlaceholderMixin:
-    def _set_field_placeholders(self, fn, base_parameters, rich=False):
-        placeholders = get_available_placeholders(self.event, base_parameters, rich=rich)
+    def _set_field_placeholders(self, fn, base_parameters):
+        placeholders = get_available_placeholders(self.event, base_parameters)
         ht = format_placeholders_help_text(placeholders, self.event)
         if self.fields[fn].help_text:
             self.fields[fn].help_text += ' ' + str(ht)
@@ -744,7 +604,7 @@ class FormPlaceholderMixin:
         )
 
 
-def get_available_placeholders(event, base_parameters, rich=False):
+def get_available_placeholders(event, base_parameters):
     if 'order' in base_parameters:
         base_parameters.append('invoice_address')
         base_parameters.append('position_or_address')
@@ -753,35 +613,6 @@ def get_available_placeholders(event, base_parameters, rich=False):
         if not isinstance(val, (list, tuple)):
             val = [val]
         for v in val:
-            if isinstance(v, BaseRichTextPlaceholder) and not rich:
-                continue
             if all(rp in base_parameters for rp in v.required_context):
                 params[v.identifier] = v
     return params
-
-
-def get_sample_context(event, context_parameters, rich=True):
-    context_dict = {}
-    lbl = _('This value will be replaced based on dynamic parameters.')
-    for k, v in get_available_placeholders(event, context_parameters, rich=rich).items():
-        sample = v.render_sample(event)
-        if isinstance(sample, PlainHtmlAlternativeString):
-            context_dict[k] = PlainHtmlAlternativeString(
-                sample.plain,
-                '<{el} class="placeholder placeholder-html" title="{title}">{html}</{el}>'.format(
-                    el='div' if sample.is_block else 'span',
-                    title=lbl,
-                    html=sample.html,
-                )
-            )
-        elif str(sample).strip().startswith('* ') or str(sample).startswith('  '):
-            context_dict[k] = '<div class="placeholder" title="{}">{}</div>'.format(
-                lbl,
-                markdown_compile_email(str(sample))
-            )
-        else:
-            context_dict[k] = '<span class="placeholder" title="{}">{}</span>'.format(
-                lbl,
-                escape(sample)
-            )
-    return context_dict

src/pretix/base/settings.py

@@ -56,7 +56,6 @@ from django.utils.translation import (
 from django_countries.fields import Country
 from hierarkey.models import GlobalSettingsBase, Hierarkey
 from i18nfield.forms import I18nFormField, I18nTextarea, I18nTextInput
-from i18nfield.rest_framework import I18nField
 from i18nfield.strings import LazyI18nString
 from phonenumbers import PhoneNumber, parse
 from rest_framework import serializers
@@ -64,7 +63,7 @@ from rest_framework import serializers
 from pretix.api.serializers.fields import (
     ListMultipleChoiceField, UploadedFileField,
 )
-from pretix.api.serializers.i18n import I18nURLField
+from pretix.api.serializers.i18n import I18nField, I18nURLField
 from pretix.base.forms import I18nMarkdownTextarea, I18nURLFormField
 from pretix.base.models.tax import VAT_ID_COUNTRIES, TaxRule
 from pretix.base.reldate import (
@@ -551,7 +550,7 @@ DEFAULTS = {
         'serializer_class': serializers.BooleanField,
         'type': bool,
         'form_kwargs': dict(
-            label=_("Require a business address"),
+            label=_("Require a business addresses"),
             help_text=_('This will require users to enter a company name.'),
             widget=forms.CheckboxInput(attrs={'data-checkbox-dependency': '#id_invoice_address_required'}),
         )

src/pretix/base/shredder.py

@@ -287,9 +287,9 @@ class PhoneNumberShredder(BaseDataShredder):
 
 
 class EmailAddressShredder(BaseDataShredder):
-    verbose_name = _('Emails')
+    verbose_name = _('E-mails')
     identifier = 'order_emails'
-    description = _('This will remove all email addresses from orders and attendees, as well as logged email '
+    description = _('This will remove all e-mail addresses from orders and attendees, as well as logged email '
                     'contents. This will also remove the association to customer accounts.')
 
     def generate_files(self) -> List[Tuple[str, str, str]]:

src/pretix/base/signals.py

@@ -367,7 +367,7 @@ validate_cart_addons = EventPluginSignal()
 Arguments: ``addons``, ``base_position``, ``iao``
 
 This signal is sent when a user tries to select a combination of addons. In contrast to
-``validate_cart``, this is executed before the cart is actually modified. You are passed
+ ``validate_cart``, this is executed before the cart is actually modified. You are passed
 an argument ``addons`` containing a dict of ``(item, variation or None) → count`` tuples as well
 as the ``ItemAddOn`` object as the argument ``iao`` and the base cart position as
 ``base_position``.

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

@@ -131,9 +131,6 @@
             text-align: left;
             padding: 0;
         }
-        .content table td.align-right {
-            text-align: right;
-        }
 
         a.button {
             display: inline-block;
@@ -181,9 +178,6 @@
         pre, pre code {
             white-space: pre-line;
         }
-        .text-right, .content table td.text-right {
-            text-align: right;
-        }
 
         {% if rtl %}
             body {
@@ -192,9 +186,6 @@
             .content {
                 text-align: right;
             }
-            .text-right, .content table td.text-right {
-                text-align: left;
-            }
         {% endif %}
 
         {% block addcss %}{% endblock %}

src/pretix/base/templatetags/icon.py

@@ -1,34 +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 import template
-from django.utils.html import format_html
-
-register = template.Library()
-
-
-@register.simple_tag
-def icon(key, *args, **kwargs):
-    return format_html(
-        '<span class="fa fa-{} {}" aria-hidden="true"></span>',
-        key,
-        kwargs["class"] if "class" in kwargs else "",
-    )

src/pretix/base/templatetags/money.py

@@ -52,12 +52,12 @@ def money_filter(value: Decimal, arg='', hide_currency=False):
         # would make the numbers incorrect. If this branch executes, it's likely a bug in
         # pretix, but we won't show wrong numbers!
         if hide_currency:
-            return floatformat(value, "2g")
+            return floatformat(value, 2)
         else:
-            return '{} {}'.format(arg, floatformat(value, "2g"))
+            return '{} {}'.format(arg, floatformat(value, 2))
 
     if hide_currency:
-        return floatformat(value, f"{places}g")
+        return floatformat(value, places)
 
     locale_parts = translation.get_language().split("-", 1)
     locale = locale_parts[0]
@@ -70,7 +70,7 @@ def money_filter(value: Decimal, arg='', hide_currency=False):
     try:
         return format_currency(value, arg, locale=locale)
     except:
-        return '{} {}'.format(arg, floatformat(value, f"{places}g"))
+        return '{} {}'.format(arg, floatformat(value, places))
 
 
 @register.filter("money_numberfield")

src/pretix/base/templatetags/rich_text.py

@@ -54,7 +54,7 @@ from tlds import tld_set
 
 register = template.Library()
 
-ALLOWED_TAGS_SNIPPET = {
+ALLOWED_TAGS_SNIPPET = [
     'a',
     'abbr',
     'acronym',
@@ -68,8 +68,8 @@ ALLOWED_TAGS_SNIPPET = {
     'strike',
     's',
     # Update doc/user/markdown.rst if you change this!
-}
-ALLOWED_TAGS = ALLOWED_TAGS_SNIPPET | {
+]
+ALLOWED_TAGS = ALLOWED_TAGS_SNIPPET + [
     'blockquote',
     'li',
     'ol',
@@ -91,7 +91,7 @@ ALLOWED_TAGS = ALLOWED_TAGS_SNIPPET | {
     'h6',
     'pre',
     # Update doc/user/markdown.rst if you change this!
-}
+]
 
 ALLOWED_ATTRIBUTES = {
     'a': ['href', 'title', 'class'],
@@ -106,7 +106,7 @@ ALLOWED_ATTRIBUTES = {
     # Update doc/user/markdown.rst if you change this!
 }
 
-ALLOWED_PROTOCOLS = {'http', 'https', 'mailto', 'tel'}
+ALLOWED_PROTOCOLS = ['http', 'https', 'mailto', 'tel']
 
 URL_RE = SimpleLazyObject(lambda: build_url_re(tlds=sorted(tld_set, key=len, reverse=True)))
 
@@ -211,9 +211,9 @@ class CleanPostprocessor(Postprocessor):
     def run(self, text):
         return bleach.clean(
             text,
-            tags=set(self.tags),
+            tags=self.tags,
             attributes=self.attributes,
-            protocols=set(self.protocols),
+            protocols=self.protocols,
             strip=self.strip
         )
 
@@ -305,11 +305,10 @@ def markdown_compile_email(source, allowed_tags=ALLOWED_TAGS, allowed_attributes
         source,
         extensions=[
             'markdown.extensions.sane_lists',
-            'markdown.extensions.tables',
             EmailNl2BrExtension(),
             LinkifyAndCleanExtension(
                 linker,
-                tags=set(allowed_tags),
+                tags=allowed_tags,
                 attributes=allowed_attributes,
                 protocols=ALLOWED_PROTOCOLS,
                 strip=False,

src/pretix/base/templatetags/textbubble.py

@@ -1,42 +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 import template
-from django.utils.html import format_html, mark_safe
-
-register = template.Library()
-
-
-@register.simple_tag
-def textbubble(type, *args, **kwargs):
-    return format_html(
-        '<span class="textbubble-{}">{}',
-        type or "info",
-        "" if "icon" not in kwargs else format_html(
-            '<i class="fa fa-{}" aria-hidden="true"></i> ',
-            kwargs["icon"]
-        )
-    )
-
-
-@register.simple_tag
-def endtextbubble():
-    return mark_safe('</span>')

src/pretix/base/views/js_helpers.py

@@ -22,30 +22,16 @@
 import pycountry
 from django.http import JsonResponse
 
-from pretix.base.addressvalidation import (
-    COUNTRIES_WITH_STREET_ZIPCODE_AND_CITY_REQUIRED,
-)
-from pretix.base.models.tax import VAT_ID_COUNTRIES
 from pretix.base.settings import COUNTRIES_WITH_STATE_IN_ADDRESS
 
 
 def states(request):
     cc = request.GET.get("country", "DE")
-    info = {
-        'street': {'required': True},
-        'zipcode': {'required': cc in COUNTRIES_WITH_STREET_ZIPCODE_AND_CITY_REQUIRED},
-        'city': {'required': cc in COUNTRIES_WITH_STREET_ZIPCODE_AND_CITY_REQUIRED},
-        'state': {'visible': cc in COUNTRIES_WITH_STATE_IN_ADDRESS, 'required': cc in COUNTRIES_WITH_STATE_IN_ADDRESS},
-        'vat_id': {'visible': cc in VAT_ID_COUNTRIES, 'required': False},
-    }
     if cc not in COUNTRIES_WITH_STATE_IN_ADDRESS:
-        return JsonResponse({'data': [], **info, })
+        return JsonResponse({'data': []})
     types, form = COUNTRIES_WITH_STATE_IN_ADDRESS[cc]
     statelist = [s for s in pycountry.subdivisions.get(country_code=cc) if s.type in types]
-    return JsonResponse({
-        'data': [
-            {'name': s.name, 'code': s.code[3:]}
-            for s in sorted(statelist, key=lambda s: s.name)
-        ],
-        **info,
-    })
+    return JsonResponse({'data': [
+        {'name': s.name, 'code': s.code[3:]}
+        for s in sorted(statelist, key=lambda s: s.name)
+    ]})

src/pretix/control/forms/checkin.py

@@ -33,7 +33,9 @@ from django_scopes.forms import (
 from pretix.base.forms.widgets import SplitDateTimePickerWidget
 from pretix.base.models import Gate
 from pretix.base.models.checkin import Checkin, CheckinList
-from pretix.control.forms import ItemMultipleChoiceField
+from pretix.control.forms import (
+    ItemMultipleChoiceField, SalesChannelCheckboxSelectMultiple,
+)
 from pretix.control.forms.widgets import Select2
 
 
@@ -65,6 +67,10 @@ class CheckinListForm(forms.ModelForm):
         kwargs.pop('locales', None)
         super().__init__(**kwargs)
         self.fields['limit_products'].queryset = self.event.items.all()
+        self.fields['auto_checkin_sales_channels'].queryset = self.event.organizer.sales_channels.all()
+        self.fields['auto_checkin_sales_channels'].widget = SalesChannelCheckboxSelectMultiple(
+            self.event, choices=self.fields['auto_checkin_sales_channels'].widget.choices
+        )
 
         if not self.event.organizer.gates.exists():
             del self.fields['gates']
@@ -96,6 +102,7 @@ class CheckinListForm(forms.ModelForm):
             'limit_products',
             'subevent',
             'include_pending',
+            'auto_checkin_sales_channels',
             'allow_multiple_entries',
             'allow_entry_after_exit',
             'rules',
@@ -118,6 +125,7 @@ class CheckinListForm(forms.ModelForm):
             'limit_products': ItemMultipleChoiceField,
             'gates': SafeModelMultipleChoiceField,
             'subevent': SafeModelChoiceField,
+            'auto_checkin_sales_channels': SafeModelMultipleChoiceField,
             'exit_all_at': NextTimeField,
         }
 

src/pretix/control/forms/event.py

@@ -35,7 +35,7 @@
 # License for the specific language governing permissions and limitations under the License.
 
 from decimal import Decimal
-from urllib.parse import urlencode
+from urllib.parse import urlencode, urlparse
 from zoneinfo import ZoneInfo
 
 import pycountry
@@ -76,10 +76,8 @@ from pretix.control.forms import (
 )
 from pretix.control.forms.widgets import Select2
 from pretix.helpers.countries import CachedCountries
-from pretix.multidomain.models import AlternativeDomainAssignment, KnownDomain
-from pretix.multidomain.urlreverse import (
-    build_absolute_uri, get_organizer_domain,
-)
+from pretix.multidomain.models import KnownDomain
+from pretix.multidomain.urlreverse import build_absolute_uri
 from pretix.plugins.banktransfer.payment import BankTransfer
 from pretix.presale.style import get_fonts
 
@@ -138,11 +136,6 @@ class EventWizardBasicsForm(I18nModelForm):
         choices=settings.LANGUAGES,
         label=_("Default language"),
     )
-    no_taxes = forms.BooleanField(
-        label=_("I don't want to specify taxes now"),
-        help_text=_("You can always configure tax rates later."),
-        required=False,
-    )
     tax_rate = forms.DecimalField(
         label=_("Sales tax rate"),
         help_text=_("Do you need to pay sales tax on your tickets? In this case, please enter the applicable tax rate "
@@ -230,11 +223,6 @@ class EventWizardBasicsForm(I18nModelForm):
             raise ValidationError({
                 'timezone': _('Your default locale must be specified.')
             })
-        if not data.get("no_taxes") and not data.get("tax_rate"):
-            raise ValidationError({
-                'tax_rate': _('You have not specified a tax rate. If you do not want us to compute sales taxes, please '
-                              'check "{field}" above.').format(field=self.fields["no_taxes"].label)
-            })
 
         # change timezone
         zone = ZoneInfo(data.get('timezone'))
@@ -365,9 +353,14 @@ class EventUpdateForm(I18nModelForm):
 
     def __init__(self, *args, **kwargs):
         self.change_slug = kwargs.pop('change_slug', False)
+        self.domain = kwargs.pop('domain', False)
 
         kwargs.setdefault('initial', {})
         self.instance = kwargs['instance']
+        if self.domain and self.instance:
+            initial_domain = self.instance.domains.first()
+            if initial_domain:
+                kwargs['initial'].setdefault('domain', initial_domain.domainname)
 
         super().__init__(*args, **kwargs)
         if not self.change_slug:
@@ -376,54 +369,48 @@ class EventUpdateForm(I18nModelForm):
         self.fields['location'].widget.attrs['placeholder'] = _(
             'Sample Conference Center\nHeidelberg, Germany'
         )
-
-        try:
+        if self.domain:
             self.fields['domain'] = forms.CharField(
                 max_length=255,
-                label=_('Domain'),
-                initial=self.instance.domain.domainname,
-                required=False,
-                disabled=True,
-                help_text=_('You can configure this in your organizer settings.')
-            )
-        except KnownDomain.DoesNotExist:
-            domain = get_organizer_domain(self.instance.organizer)
-            try:
-                current_domain_assignment = self.instance.alternative_domain_assignment
-            except AlternativeDomainAssignment.DoesNotExist:
-                current_domain_assignment = None
-            self.fields['domain'] = forms.ChoiceField(
-                label=_('Domain'),
-                help_text=_('You can add more domains in your organizer account.'),
-                choices=[('', _('Same as organizer account') + (f" ({domain})" if domain else ""))] + [
-                    (d.domainname, d.domainname) for d in self.instance.organizer.domains.filter(mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
-                ],
-                initial=current_domain_assignment.domain_id if current_domain_assignment else "",
+                label=_('Custom domain'),
                 required=False,
+                help_text=_('You need to configure the custom domain in the webserver beforehand.')
             )
         self.fields['limit_sales_channels'].queryset = self.event.organizer.sales_channels.all()
         self.fields['limit_sales_channels'].widget = SalesChannelCheckboxSelectMultiple(self.event, attrs={
             'data-inverse-dependency': '<[name$=all_sales_channels]',
         }, choices=self.fields['limit_sales_channels'].widget.choices)
 
+    def clean_domain(self):
+        d = self.cleaned_data['domain']
+        if d:
+            if d == urlparse(settings.SITE_URL).hostname:
+                raise ValidationError(
+                    _('You cannot choose the base domain of this installation.')
+                )
+            if KnownDomain.objects.filter(domainname=d).exclude(event=self.instance.pk).exists():
+                raise ValidationError(
+                    _('This domain is already in use for a different event or organizer.')
+                )
+        return d
+
     def save(self, commit=True):
         instance = super().save(commit)
 
-        try:
-            current_domain_assignment = instance.alternative_domain_assignment
-        except AlternativeDomainAssignment.DoesNotExist:
-            current_domain_assignment = None
-        if self.cleaned_data['domain'] and not hasattr(instance, 'domain'):
-            domain = self.instance.organizer.domains.get(mode=KnownDomain.MODE_ORG_ALT_DOMAIN, domainname=self.cleaned_data["domain"])
-            AlternativeDomainAssignment.objects.update_or_create(
-                event=instance,
-                defaults={
-                    "domain": domain,
-                }
-            )
-            instance.cache.clear()
-        elif current_domain_assignment:
-            current_domain_assignment.delete()
+        if self.domain:
+            current_domain = instance.domains.first()
+            if self.cleaned_data['domain']:
+                if current_domain and current_domain.domainname != self.cleaned_data['domain']:
+                    current_domain.delete()
+                    KnownDomain.objects.create(
+                        organizer=instance.organizer, event=instance, domainname=self.cleaned_data['domain']
+                    )
+                elif not current_domain:
+                    KnownDomain.objects.create(
+                        organizer=instance.organizer, event=instance, domainname=self.cleaned_data['domain']
+                    )
+            elif current_domain:
+                current_domain.delete()
             instance.cache.clear()
 
         return instance
@@ -1385,7 +1372,7 @@ class MailSettingsForm(FormPlaceholderMixin, SettingsForm):
         self.event.meta_values_cached = self.event.meta_values.select_related('property').all()
 
         for k, v in self.base_context.items():
-            self._set_field_placeholders(k, v, rich=k.startswith('mail_text_'))
+            self._set_field_placeholders(k, v)
 
         for k, v in list(self.fields.items()):
             if k.endswith('_attendee') and not event.settings.attendee_emails_asked:

src/pretix/control/forms/filter.py

@@ -549,7 +549,7 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
     )
     email = forms.CharField(
         required=False,
-        label=_('Email address')
+        label=_('E-mail address')
     )
     comment = forms.CharField(
         required=False,
@@ -563,7 +563,7 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
     email_known_to_work = forms.NullBooleanField(
         required=False,
         widget=FilterNullBooleanSelect,
-        label=_('Email address verified'),
+        label=_('E-mail address verified'),
     )
     total = forms.DecimalField(
         localize=True,
@@ -648,7 +648,7 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
         )
         self.fields['attendee_email'] = forms.CharField(
             required=False,
-            label=_('Attendee email address')
+            label=_('Attendee e-mail address')
         )
         self.fields['attendee_address_company'] = forms.CharField(
             required=False,
@@ -1967,7 +1967,7 @@ class CheckinListAttendeeFilterForm(FilterForm):
             if s == '1':
                 qs = qs.filter(last_entry__isnull=False)
             elif s == '2':
-                qs = self.list._filter_positions_inside(qs)
+                qs = qs.filter(pk__in=self.list.positions_inside.values_list('pk'))
             elif s == '3':
                 qs = qs.filter(last_entry__isnull=False).filter(
                     Q(last_exit__isnull=False) & Q(last_exit__gte=F('last_entry'))

src/pretix/control/forms/global_settings.py

@@ -128,7 +128,7 @@ class UpdateSettingsForm(SettingsForm):
     )
     update_check_email = forms.EmailField(
         required=False,
-        label=_("Email notifications"),
+        label=_("E-mail notifications"),
         help_text=_("We will notify you at this address if we detect that a new update is available. This "
                     "address will not be transmitted to pretix.eu, the emails will be sent by this server "
                     "locally.")

src/pretix/control/forms/orders.py

@@ -609,49 +609,6 @@ class OrderFeeChangeForm(forms.Form):
         change_decimal_field(self.fields['value'], instance.order.event.currency)
 
 
-class OrderFeeAddForm(forms.Form):
-    fee_type = forms.ChoiceField(choices=OrderFee.FEE_TYPES)
-    value = forms.DecimalField(
-        max_digits=13, decimal_places=2,
-        localize=True,
-        label=_('Price'),
-        help_text=_("including all taxes"),
-    )
-    tax_rule = forms.ModelChoiceField(
-        TaxRule.objects.none(),
-        required=False,
-    )
-    description = forms.CharField(required=False)
-
-    def __init__(self, *args, **kwargs):
-        order = kwargs.pop('order')
-        super().__init__(*args, **kwargs)
-        self.fields['tax_rule'].queryset = order.event.tax_rules.all()
-        change_decimal_field(self.fields['value'], order.event.currency)
-
-
-class OrderFeeAddFormset(forms.BaseFormSet):
-    def __init__(self, *args, **kwargs):
-        self.order = kwargs.pop('order', None)
-        super().__init__(*args, **kwargs)
-
-    def _construct_form(self, i, **kwargs):
-        kwargs['order'] = self.order
-        return super()._construct_form(i, **kwargs)
-
-    @property
-    def empty_form(self):
-        form = self.form(
-            auto_id=self.auto_id,
-            prefix=self.add_prefix('__prefix__'),
-            empty_permitted=True,
-            use_required_attribute=False,
-            order=self.order,
-        )
-        self.add_fields(form, None)
-        return form
-
-
 class OrderContactForm(forms.ModelForm):
     regenerate_secrets = forms.BooleanField(required=False, label=_('Invalidate secrets'),
                                             help_text=_('Regenerates the order and ticket secrets. You will '

src/pretix/control/forms/organizer.py

@@ -54,7 +54,6 @@ from i18nfield.strings import LazyI18nString
 from phonenumber_field.formfields import PhoneNumberField
 from pytz import common_timezones
 
-from pretix.api.auth.devicesecurity import get_all_security_profiles
 from pretix.api.models import WebHook
 from pretix.api.webhooks import get_all_webhook_events
 from pretix.base.customersso.oidc import oidc_validate_and_complete_config
@@ -133,108 +132,63 @@ class OrganizerDeleteForm(forms.Form):
 class OrganizerUpdateForm(OrganizerForm):
 
     def __init__(self, *args, **kwargs):
+        self.domain = kwargs.pop('domain', False)
         self.change_slug = kwargs.pop('change_slug', False)
         kwargs.setdefault('initial', {})
         self.instance = kwargs['instance']
+        if self.domain and self.instance:
+            initial_domain = self.instance.domains.filter(event__isnull=True).first()
+            if initial_domain:
+                kwargs['initial'].setdefault('domain', initial_domain.domainname)
 
         super().__init__(*args, **kwargs)
         if not self.change_slug:
             self.fields['slug'].widget.attrs['readonly'] = 'readonly'
+        if self.domain:
+            self.fields['domain'] = forms.CharField(
+                max_length=255,
+                label=_('Custom domain'),
+                required=False,
+                help_text=_('You need to configure the custom domain in the webserver beforehand.')
+            )
+
+    def clean_domain(self):
+        d = self.cleaned_data['domain']
+        if d:
+            if d == urlparse(settings.SITE_URL).hostname:
+                raise ValidationError(
+                    _('You cannot choose the base domain of this installation.')
+                )
+            if KnownDomain.objects.filter(domainname=d).exclude(organizer=self.instance.pk,
+                                                                event__isnull=True).exists():
+                raise ValidationError(
+                    _('This domain is already in use for a different event or organizer.')
+                )
+        return d
 
     def clean_slug(self):
         if self.change_slug:
             return self.cleaned_data['slug']
         return self.instance.slug
 
+    def save(self, commit=True):
+        instance = super().save(commit)
 
-class KnownDomainForm(forms.ModelForm):
-    class Meta:
-        model = KnownDomain
-        fields = ["domainname", "mode", "event"]
-        field_classes = {
-            "event": SafeModelChoiceField,
-        }
+        if self.domain:
+            current_domain = instance.domains.filter(event__isnull=True).first()
+            if self.cleaned_data['domain']:
+                if current_domain and current_domain.domainname != self.cleaned_data['domain']:
+                    current_domain.delete()
+                    KnownDomain.objects.create(organizer=instance, domainname=self.cleaned_data['domain'])
+                elif not current_domain:
+                    KnownDomain.objects.create(organizer=instance, domainname=self.cleaned_data['domain'])
+            elif current_domain:
+                current_domain.delete()
+            instance.cache.clear()
+            for ev in instance.events.all():
+                ev.cache.clear()
 
-    def __init__(self, *args, **kwargs):
-        self.organizer = kwargs.pop('organizer')
-        super().__init__(*args, **kwargs)
-        self.fields["event"].queryset = self.organizer.events.all()
-        if self.instance and self.instance.pk:
-            self.fields["domainname"].widget.attrs['readonly'] = 'readonly'
-
-    def clean_domainname(self):
-        if self.instance and self.instance.pk:
-            return self.instance.domainname
-        d = self.cleaned_data['domainname']
-        if d:
-            if d == urlparse(settings.SITE_URL).hostname:
-                raise ValidationError(
-                    _('You cannot choose the base domain of this installation.')
-                )
-            if KnownDomain.objects.filter(domainname=d).exclude(organizer=self.instance.organizer).exists():
-                raise ValidationError(
-                    _('This domain is already in use for a different event or organizer.')
-                )
-        return d
-
-    def clean(self):
-        d = super().clean()
-
-        if d["mode"] == KnownDomain.MODE_ORG_DOMAIN and d["event"]:
-            raise ValidationError(
-                _("Do not choose an event for this mode.")
-            )
-
-        if d["mode"] == KnownDomain.MODE_ORG_ALT_DOMAIN and d["event"]:
-            raise ValidationError(
-                _("Do not choose an event for this mode. You can assign events to this domain in event settings.")
-            )
-
-        if d["mode"] == KnownDomain.MODE_EVENT_DOMAIN and not d["event"]:
-            raise ValidationError(
-                _("You need to choose an event.")
-            )
-
-        return d
-
-
-class BaseKnownDomainFormSet(forms.BaseInlineFormSet):
-    def __init__(self, *args, **kwargs):
-        self.organizer = kwargs.pop('organizer')
-        super().__init__(*args, **kwargs)
-
-    def _construct_form(self, i, **kwargs):
-        kwargs['organizer'] = self.organizer
-        return super()._construct_form(i, **kwargs)
-
-    @property
-    def empty_form(self):
-        form = self.form(
-            auto_id=self.auto_id,
-            prefix=self.add_prefix('__prefix__'),
-            empty_permitted=True,
-            use_required_attribute=False,
-            organizer=self.organizer,
-        )
-        self.add_fields(form, None)
-        return form
-
-    def clean(self):
-        super().clean()
-        data = [f.cleaned_data for f in self.forms]
-
-        if len([d for d in data if d.get("mode") == KnownDomain.MODE_ORG_DOMAIN and not d.get("DELETE")]) > 1:
-            raise ValidationError(_("You may set only one organizer domain."))
-
-        return data
-
-
-KnownDomainFormset = inlineformset_factory(
-    Organizer, KnownDomain,
-    KnownDomainForm,
-    formset=BaseKnownDomainFormSet,
-    can_order=False, can_delete=True, extra=0
-)
+        return instance
 
 
 class SafeOrderPositionChoiceField(forms.ModelChoiceField):
@@ -357,11 +311,6 @@ class DeviceForm(forms.ModelForm):
             '-has_subevents', '-date_from'
         )
         self.fields['gate'].queryset = organizer.gates.all()
-        self.fields['security_profile'] = forms.ChoiceField(
-            label=self.fields['security_profile'].label,
-            help_text=self.fields['security_profile'].help_text,
-            choices=[(k, v.verbose_name) for k, v in get_all_security_profiles().items()],
-        )
 
     def clean(self):
         d = super().clean()
@@ -395,11 +344,6 @@ class DeviceBulkEditForm(forms.ModelForm):
             '-has_subevents', '-date_from'
         )
         self.fields['gate'].queryset = organizer.gates.all()
-        self.fields['security_profile'] = forms.ChoiceField(
-            label=self.fields['security_profile'].label,
-            help_text=self.fields['security_profile'].help_text,
-            choices=[(k, v.verbose_name) for k, v in get_all_security_profiles().items()],
-        )
 
     def clean(self):
         d = super().clean()

src/pretix/control/forms/users.py

@@ -40,7 +40,7 @@ class StaffSessionForm(forms.ModelForm):
 
 class UserEditForm(forms.ModelForm):
     error_messages = {
-        'duplicate_identifier': _("There already is an account associated with this email address. "
+        'duplicate_identifier': _("There already is an account associated with this e-mail address. "
                                   "Please choose a different one."),
         'pw_mismatch': _("Please enter the same password twice"),
     }

src/pretix/control/logdisplay.py

@@ -51,7 +51,6 @@ from pretix.base.models import (
     Checkin, CheckinList, Event, ItemVariation, LogEntry, OrderPosition,
     TaxRule,
 )
-from pretix.base.models.orders import PrintLog
 from pretix.base.signals import logentry_display, orderposition_blocked_display
 from pretix.base.templatetags.money import money_filter
 
@@ -613,7 +612,7 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
 
     if logentry.action_type == 'pretix.event.order.consent':
         return _('The user confirmed the following message: "{}"').format(
-            bleach.clean(logentry.parsed_data.get('msg'), tags=set(), strip=True)
+            bleach.clean(logentry.parsed_data.get('msg'), tags=[], strip=True)
         )
 
     if logentry.action_type == 'pretix.event.order.canceled':
@@ -640,16 +639,6 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
     if sender and logentry.action_type.startswith('pretix.event.checkin'):
         return _display_checkin(sender, logentry)
 
-    if logentry.action_type == 'pretix.event.order.print':
-        return _('Position #{posid} has been printed at {datetime} with type "{type}".').format(
-            posid=data.get('positionid'),
-            datetime=date_format(
-                dateutil.parser.parse(data["datetime"]).astimezone(sender.timezone),
-                "SHORT_DATETIME_FORMAT"
-            ),
-            type=dict(PrintLog.PRINT_TYPES)[data["type"]],
-        )
-
     if logentry.action_type == 'pretix.control.views.checkin':
         # deprecated
         dt = dateutil.parser.parse(data.get('datetime'))

src/pretix/control/navigation.py

@@ -78,7 +78,7 @@ def get_event_navigation(request: HttpRequest):
                 'active': url.url_name == 'event.settings.tickets',
             },
             {
-                'label': _('Email'),
+                'label': _('E-mail'),
                 'url': reverse('control:event.settings.mail', kwargs={
                     'event': request.event.slug,
                     'organizer': request.event.organizer.slug,
@@ -132,6 +132,16 @@ def get_event_navigation(request: HttpRequest):
             'icon': 'wrench',
             'children': event_settings
         })
+        if request.event.has_subevents:
+            nav.append({
+                'label': pgettext_lazy('subevent', 'Dates'),
+                'url': reverse('control:event.subevents', kwargs={
+                    'event': request.event.slug,
+                    'organizer': request.event.organizer.slug,
+                }),
+                'active': ('event.subevent' in url.url_name),
+                'icon': 'calendar',
+            })
 
     if 'can_change_items' in request.eventpermset:
         nav.append({
@@ -187,18 +197,6 @@ def get_event_navigation(request: HttpRequest):
             ]
         })
 
-    if 'can_change_event_settings' in request.eventpermset:
-        if request.event.has_subevents:
-            nav.append({
-                'label': pgettext_lazy('subevent', 'Dates'),
-                'url': reverse('control:event.subevents', kwargs={
-                    'event': request.event.slug,
-                    'organizer': request.event.organizer.slug,
-                }),
-                'active': ('event.subevent' in url.url_name),
-                'icon': 'calendar',
-            })
-
     if 'can_view_orders' in request.eventpermset:
         children = [
             {
@@ -498,7 +496,7 @@ def get_organizer_navigation(request):
                     'active': url.url_name.startswith('organizer.propert'),
                 },
                 {
-                    'label': _('Email'),
+                    'label': _('E-mail'),
                     'url': reverse('control:organizer.settings.mail', kwargs={
                         'organizer': request.organizer.slug,
                     }),

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

@@ -61,7 +61,6 @@
             <script type="text/javascript" src="{% static "fileupload/jquery.fileupload.js" %}"></script>
             <script type="text/javascript" src="{% static "lightbox/js/lightbox.js" %}"></script>
             <script type="text/javascript" src="{% static "are-you-sure/jquery.are-you-sure.js" %}"></script>
-            <script type="text/javascript" src="{% static "pretixbase/js/addressform.js" %}"></script>
 		{% endcompress %}
         {{ html_head|safe }}
 

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

@@ -127,7 +127,6 @@
                                 <strong>
                                     <a href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=c.position.order.code %}">{{ c.position.order.code }}</a>-{{ c.position.positionid }}
                                 </strong>
-                                {% include "pretixcontrol/checkin/fragment_checkin_source_type.html" with source_type=c.raw_source_type %}
                                 {% if c.position.attendee_name %}
                                     <br>
                                     <small>
@@ -144,7 +143,7 @@
                                     </small>
                                 {% endif %}
                             {% else %}
-                                {% include "pretixcontrol/checkin/fragment_checkin_source_type.html" with source_type=c.raw_source_type %}
+                                <span class="fa fa-qrcode fa-fw"></span>
                                 <span title="{{ c.raw_barcode }}">
                                     {{ c.raw_barcode|slice:":16" }}{% if c.raw_barcode|length > 16 %}…{% endif %}
                                     <button type="button" class="btn btn-xs btn-link btn-clipboard" data-clipboard-text="{{ c.raw_barcode }}">

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

@@ -1,15 +0,0 @@
-{% load i18n %}
-{% load static %}
-{% load getitem %}
-
-{% if source_type %}
-    {% with media_types|getitem:source_type as media_type %}
-        {% if "." in media_type.icon %}
-            <img src="{% static media_type.icon %}" class="fa-like-image"
-                 data-toggle="tooltip" title="{{ media_type.verbose_name }}">
-        {% else %}
-            <span class="fa fa-fw fa-{{ media_type.icon }} text-muted"
-                  data-toggle="tooltip" title="{{ media_type.verbose_name }}"></span>
-        {% endif %}
-    {% endwith %}
-{% endif %}

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

@@ -185,7 +185,6 @@
                                             <span class="fa fa-magic text-muted"
                                                   data-toggle="tooltip" title="{% trans "Checked in automatically" %}"></span>
                                         {% endif %}
-                                        {% include "pretixcontrol/checkin/fragment_checkin_source_type.html" with source_type=e.last_entry_source_type %}
                                     {% endif %}
                                 {% endif %}
                             </td>

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

@@ -67,6 +67,7 @@
                 {% bootstrap_field form.allow_entry_after_exit layout="control" %}
                 {% bootstrap_field form.addon_match layout="control" %}
                 {% bootstrap_field form.exit_all_at layout="control" %}
+                {% bootstrap_field form.auto_checkin_sales_channels layout="control" %}
                 {% if form.gates %}
                     {% bootstrap_field form.gates layout="control" %}
                 {% endif %}

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

@@ -101,6 +101,7 @@
                             <a href="?{% url_replace request 'ordering' 'subevent' %}"><i class="fa fa-caret-up"></i></a>
                         </th>
                     {% endif %}
+                    <th class="iconcol">{% trans "Automated check-in" %}</th>
                     <th>{% trans "Products" %}</th>
                     <th class="action-col-2"></th>
                 </tr>
@@ -136,6 +137,17 @@
                                 </td>
                             {% endif %}
                         {% endif %}
+                        <td>
+                            {% for channel in cl.auto_checkin_sales_channels.all %}
+                                {% if "." in channel.icon %}
+                                    <img src="{% static channel.icon %}" class="fa-like-image"
+                                         data-toggle="tooltip" title="{{ channel.label }}">
+                                {% else %}
+                                    <span class="fa fa-{{ channel.icon }} text-muted"
+                                          data-toggle="tooltip" title="{{ channel.label }}"></span>
+                                {% endif %}
+                            {% endfor %}
+                        </td>
                         <td>
                             {% if cl.all_products %}
                                 <em>{% trans "All" %}</em>