Avoid showing empty add-on step (Z#23167007)

Do not show add-on step if none of the add-on items is available. This
is not a perfect solution, there are still cases where an empty add-on
step will show up, e.g.:

- Products disabled only for a specific subevent
- Sold-out add-ons combined with the "hide sold-out products" flag

.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

@@ -30,21 +30,15 @@ jobs:
             python-version: "3.9"
           - database: sqlite
             python-version: "3.10"
-    services:
-      postgres:
-        image: postgres:15
-        env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: pretix
-        options: >-
-          --health-cmd "pg_isready -U postgres -d pretix"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
     steps:
       - uses: actions/checkout@v4
+      - uses: harmon758/postgresql-action@v1
+        with:
+          postgresql version: '15'
+          postgresql db: 'pretix'
+          postgresql user: 'postgres'
+          postgresql password: 'postgres'
+        if: matrix.database == 'postgres'
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
@@ -56,9 +50,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 +64,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,26 +288,17 @@ 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
     setting is not provided, pretix will generate a random secret on the first start
     and will store it in the filesystem for later usage.
 
-``secret_fallback0`` ... ``secret_fallback9``
-    Prior versions of the secret to be used by Django for signing and verification purposes that will still
-    be accepted but no longer be used for new signing.
-
 ``debug``
     Whether or not to run in debug mode. Default is ``False``.
 
     .. 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/categories.rst

@@ -23,22 +23,6 @@ position                              integer                    An integer, use
 is_addon                              boolean                    If ``true``, items within this category are not on sale
                                                                  on their own but the category provides a source for
                                                                  defining add-ons for other products.
-cross_selling_mode                    string                     If ``null``, cross-selling is disabled for this category.
-                                                                 If ``"only"``, it is only visible in the cross-selling
-                                                                 step.
-                                                                 If ``"both"``, it is visible on the normal index page
-                                                                 as well.
-                                                                 Only available if ``is_addon`` is ``false``.
-cross_selling_condition               string                     Only relevant if ``cross_selling_mode`` is not ``null``.
-                                                                 If ``"always"``, always show in cross-selling step.
-                                                                 If ``"products"``, only show if the cart contains one of
-                                                                 the products listed in ``cross_selling_match_products``.
-                                                                 If ``"discounts"``, only show products that qualify for
-                                                                 a discount according to discount rules.
-cross_selling_match_products          list of integer            Only relevant if ``cross_selling_condition`` is
-                                                                 ``"products"``. Internal ID of the items of which at
-                                                                 least one needs to be in the cart for this category to
-                                                                 be shown.
 ===================================== ========================== =======================================================
 
 
@@ -76,10 +60,7 @@ Endpoints
             "internal_name": "",
             "description": {"en": "Tickets are what you need to get in."},
             "position": 1,
-            "is_addon": false,
-            "cross_selling_mode": null,
-            "cross_selling_condition": null,
-            "cross_selling_match_products": []
+            "is_addon": false
           }
         ]
       }
@@ -121,10 +102,7 @@ Endpoints
         "internal_name": "",
         "description": {"en": "Tickets are what you need to get in."},
         "position": 1,
-        "is_addon": false,
-        "cross_selling_mode": null,
-        "cross_selling_condition": null,
-        "cross_selling_match_products": []
+        "is_addon": false
       }
 
    :param organizer: The ``slug`` field of the organizer to fetch
@@ -152,10 +130,7 @@ Endpoints
         "internal_name": "",
         "description": {"en": "Tickets are what you need to get in."},
         "position": 1,
-        "is_addon": false,
-        "cross_selling_mode": null,
-        "cross_selling_condition": null,
-        "cross_selling_match_products": []
+        "is_addon": false
       }
 
    **Example response**:
@@ -172,10 +147,7 @@ Endpoints
         "internal_name": "",
         "description": {"en": "Tickets are what you need to get in."},
         "position": 1,
-        "is_addon": false,
-        "cross_selling_mode": null,
-        "cross_selling_condition": null,
-        "cross_selling_match_products": []
+        "is_addon": false
       }
 
    :param organizer: The ``slug`` field of the organizer of the event to create a category for
@@ -221,10 +193,7 @@ Endpoints
         "internal_name": "",
         "description": {"en": "Tickets are what you need to get in."},
         "position": 1,
-        "is_addon": true,
-        "cross_selling_mode": null,
-        "cross_selling_condition": null,
-        "cross_selling_match_products": []
+        "is_addon": true
       }
 
    :param organizer: The ``slug`` field of the organizer to modify

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/saleschannels.rst

@@ -51,7 +51,7 @@ Endpoints
         "results": [
           {
             "identifier": "web",
-            "label": {
+            "name": {
               "en": "Online shop"
             },
             "type": "web",
@@ -88,7 +88,7 @@ Endpoints
 
       {
         "identifier": "web",
-        "label": {
+        "name": {
           "en": "Online shop"
         },
         "type": "web",
@@ -116,7 +116,7 @@ Endpoints
 
       {
         "identifier": "api.custom",
-        "label": {
+        "name": {
           "en": "Custom integration"
         },
         "type": "api",
@@ -133,7 +133,7 @@ Endpoints
 
       {
         "identifier": "api.custom",
-        "label": {
+        "name": {
           "en": "Custom integration"
         },
         "type": "api",
@@ -178,7 +178,7 @@ Endpoints
 
       {
         "identifier": "web",
-        "label": {
+        "name": {
           "en": "Online shop"
         },
         "type": "web",

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
 =====

doc/api/resources/subevents.rst

@@ -136,7 +136,6 @@ Endpoints
       }
 
    :query page: The page number in case of a multi-page result set, default is 1
-   :query is_public: If set to ``true``/``false``, only subevents with a matching value of ``is_public`` are returned.
    :query active: If set to ``true``/``false``, only events with a matching value of ``active`` are returned.
    :query is_future: If set to ``true`` (``false``), only events that happen currently or in the future are (not) returned.
    :query is_past: If set to ``true`` (``false``), only events that are over are (not) returned.
@@ -468,7 +467,6 @@ Endpoints
       }
 
    :query page: The page number in case of a multi-page result set, default is 1
-   :query is_public: If set to ``true``/``false``, only subevents with a matching value of ``is_public`` are returned.
    :query active: If set to ``true``/``false``, only events with a matching value of ``active`` are returned.
    :query event__live: If set to ``true``/``false``, only events with a matching value of ``live`` on the parent event are returned.
    :query is_future: If set to ``true`` (``false``), only events that happen currently or in the future are (not) returned.

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

@@ -14,7 +14,7 @@ Core
    :members: periodic_task, event_live_issues, event_copy_data, email_filter, register_notification_types, notification,
       item_copy_data, register_sales_channel_types, register_global_settings, quota_availability, global_email_filter,
       register_ticket_secret_generators, gift_card_transaction_display,
-      register_text_placeholders, register_mail_placeholders, device_info_updated
+      register_text_placeholders, register_mail_placeholders
 
 Order events
 """"""""""""
@@ -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

doc/plugins/ticketoutputpdf.rst

@@ -29,8 +29,8 @@ item_assignments                      list of objects            Products this l
 ===================================== ========================== =======================================================
 
 
-Layout endpoints
-----------------
+Endpoints
+---------
 
 .. http:get:: /api/v1/organizers/(organizer)/events/(event)/ticketlayouts/
 
@@ -268,75 +268,5 @@ Layout endpoints
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer/event does not exist **or** you have no permission to delete this resource.
 
-Ticket rendering endpoint
------------------------------
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/ticketpdfrenderer/render_batch/
-
-   With this API call, you can instruct the system to render a set of tickets into one combined PDF file. To specify
-   which tickets to render, you need to submit a list of "parts". For every part, the following fields are supported:
-
-   * ``orderposition`` (``integer``, required): The ID of the order position to render.
-   * ``override_channel`` (``string``, optional): The sales channel ID to be used for layout selection instead of the
-     original channel of the order.
-   * ``override_layout`` (``integer``, optional): The ticket layout ID to be used instead of the auto-selected one.
-
-   If your input parameters validate correctly, a ``202 Accepted`` status code is returned.
-   The body points you to the download URL of the result. Running a ``GET`` request on that result URL will
-   yield one of the following status codes:
-
-    * ``200 OK`` – The export succeeded. The body will be your resulting file. Might be large!
-    * ``409 Conflict`` – Your export is still running. The body will be JSON with the structure ``{"status": "running"}``. ``status`` can be ``waiting`` before the task is actually being processed. Please retry, but wait at least one second before you do.
-    * ``410 Gone`` – Running the export has failed permanently. The body will be JSON with the structure ``{"status": "failed", "message": "Error message"}``
-    * ``404 Not Found`` – The export does not exist / is expired.
-
-   .. warning:: This endpoint is considered **experimental**. It might change at any time without prior notice.
-
-   .. note:: To avoid performance issues, a maximum number of 1000 parts is currently allowed.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/ticketpdfrenderer/render_batch/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-
-      {
-        "parts": [
-          {
-            "orderposition": 55412
-          },
-          {
-            "orderposition": 55412,
-            "override_channel": "web"
-          },
-          {
-            "orderposition": 55412,
-            "override_layout": 56
-          }
-        ]
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "download": "https://pretix.eu/api/v1/organizers/bigevents/events/sampleconf/ticketpdfrenderer/download/29891ede-196f-4942-9e26-d055a36e98b8/3f279f13-c198-4137-b49b-9b360ce9fcce/"
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :statuscode 202: no error
-   :statuscode 400: Invalid input options
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to view this resource.
-
 
 .. _here: https://github.com/pretix/pretix/blob/master/src/pretix/static/schema/pdf-layout.schema.json

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,7 +43,7 @@ dependencies = [
   "django-formset-js-improved==0.5.0.3",
   "django-formtools==2.5.1",
   "django-hierarkey==1.2.*",
-  "django-hijack==3.7.*",
+  "django-hijack==3.6.*",
   "django-i18nfield==1.9.*,>=1.9.4",
   "django-libsass==0.9",
   "django-localflavor==4.0",
@@ -53,9 +53,9 @@ 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.*",
+  "dnspython==2.6.*",
   "drf_ujson2==1.7.*",
   "geoip2==4.*",
   "importlib_metadata==8.*",  # Polyfill, we can probably drop this once we require Python 3.10+
@@ -74,25 +74,26 @@ 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.*",
+  "pycryptodome==3.20.*",
+  "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.*",
+  "qrcode==7.4.*",
+  "redis==5.0.*",
   "reportlab==4.2.*",
   "requests==2.31.*",
-  "sentry-sdk==2.18.*",
+  "sentry-sdk==2.14.*",
   "sepaxml==2.6.*",
+  "slimit",
   "stripe==7.9.*",
   "text-unidecode==1.*",
   "tlds>=2020041600",
@@ -101,26 +102,27 @@ dependencies = [
   "vat_moss_forked==2020.3.20.0.11.0",
   "vobject==0.9.*",
   "webauthn==2.2.*",
-  "zeep==4.3.*"
+  "zeep==4.2.*"
 ]
 
 [project.optional-dependencies]
 memcached = ["pylibmc"]
 dev = [
-  "aiohttp==3.11.*",
+  "aiohttp==3.10.*",
   "coverage",
   "coveralls",
-  "fakeredis==2.26.*",
+  "fakeredis==2.24.*",
   "flake8==7.1.*",
   "freezegun",
   "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/__init__.py

@@ -88,20 +88,16 @@ class SalesChannelMigrationMixin:
             }
 
             if data.get("all_sales_channels") and set(data["sales_channels"]) != all_channels:
-                raise ValidationError({
-                    "limit_sales_channels": [
-                        "If 'all_sales_channels' is set, the legacy attribute 'sales_channels' must not be set or set to "
-                        "the list of all sales channels."
-                    ]
-                })
+                raise ValidationError(
+                    "If 'all_sales_channels' is set, the legacy attribute 'sales_channels' must not be set or set to "
+                    "the list of all sales channels."
+                )
 
             if data.get("limit_sales_channels") and set(data["sales_channels"]) != set(data["limit_sales_channels"]):
-                raise ValidationError({
-                    "limit_sales_channels": [
-                        "If 'limit_sales_channels' is set, the legacy attribute 'sales_channels' must not be set or set to "
-                        "the same list."
-                    ]
-                })
+                raise ValidationError(
+                    "If 'limit_sales_channels' is set, the legacy attribute 'sales_channels' must not be set or set to "
+                    "the same list."
+                )
 
             if data["sales_channels"] == all_channels:
                 data["all_sales_channels"] = True
@@ -110,10 +106,6 @@ class SalesChannelMigrationMixin:
                 data["all_sales_channels"] = False
                 data["limit_sales_channels"] = data["sales_channels"]
             del data["sales_channels"]
-
-        if data.get("all_sales_channels"):
-            data["limit_sales_channels"] = []
-
         return super().to_internal_value(data)
 
     def to_representation(self, value):

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

@@ -772,7 +772,6 @@ class EventSettingsSerializer(SettingsSerializer):
         'invoice_address_company_required',
         'invoice_address_beneficiary',
         'invoice_address_custom_field',
-        'invoice_address_custom_field_helptext',
         'invoice_name_required',
         'invoice_address_not_asked_free',
         'invoice_show_payments',
@@ -917,7 +916,6 @@ class DeviceEventSettingsSerializer(EventSettingsSerializer):
         'invoice_address_company_required',
         'invoice_address_beneficiary',
         'invoice_address_custom_field',
-        'invoice_address_custom_field_helptext',
         'invoice_name_required',
         'invoice_address_not_asked_free',
         'invoice_address_from_name',

src/pretix/api/serializers/item.py

@@ -369,7 +369,7 @@ class ItemSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
         require_membership_types = validated_data.pop('require_membership_types', [])
         limit_sales_channels = validated_data.pop('limit_sales_channels', [])
         item = Item.objects.create(**validated_data)
-        if limit_sales_channels and not validated_data.get('all_sales_channels'):
+        if limit_sales_channels:
             item.limit_sales_channels.add(*limit_sales_channels)
         if picture:
             item.picture.save(os.path.basename(picture.name), picture)
@@ -441,22 +441,7 @@ class ItemCategorySerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = ItemCategory
-        fields = (
-            'id', 'name', 'internal_name', 'description', 'position',
-            'is_addon', 'cross_selling_mode',
-            'cross_selling_condition', 'cross_selling_match_products'
-        )
-
-    def validate(self, data):
-        data = super().validate(data)
-
-        full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
-        full_data.update(data)
-
-        if full_data.get('is_addon') and full_data.get('cross_selling_mode'):
-            raise ValidationError('is_addon and cross_selling_mode are mutually exclusive')
-
-        return data
+        fields = ('id', 'name', 'internal_name', 'description', 'position', 'is_addon')
 
 
 class QuestionOptionSerializer(I18nAwareModelSerializer):

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,10 +200,6 @@ class UpdateView(APIView):
         device.save()
         device.log_action('pretix.device.updated', 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)
 

src/pretix/api/views/event.py

@@ -297,8 +297,7 @@ class EventViewSet(viewsets.ModelViewSet):
 
             if 'all_sales_channels' in serializer.validated_data and 'sales_channels' in serializer.validated_data:
                 new_event.all_sales_channels = serializer.validated_data['all_sales_channels']
-                if not new_event.all_sales_channels:
-                    new_event.limit_sales_channels.set(serializer.validated_data['limit_sales_channels'])
+                new_event.limit_sales_channels.set(serializer.validated_data['limit_sales_channels'])
         else:
             serializer.instance.set_defaults()
 
@@ -371,7 +370,7 @@ with scopes_disabled():
 
         class Meta:
             model = SubEvent
-            fields = ['is_public', 'active', 'event__live']
+            fields = ['active', 'event__live']
 
         def ends_after_qs(self, queryset, name, value):
             expr = Q(

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

@@ -68,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):

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,
 )
@@ -277,10 +276,6 @@ class NamePartsFormField(forms.MultiValueField):
         return value
 
 
-def name_parts_is_empty(name_parts_dict):
-    return not any(k != "_scheme" and v for k, v in name_parts_dict.items())
-
-
 class WrappedPhonePrefixSelect(Select):
     initial = None
 
@@ -607,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)
 
@@ -682,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,
@@ -692,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),
@@ -701,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),
@@ -713,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'))]
@@ -953,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.'))
 
@@ -1012,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={
@@ -1028,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 = {
@@ -1062,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 ''
@@ -1091,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()
@@ -1134,7 +1122,6 @@ class BaseInvoiceAddressForm(forms.ModelForm):
 
         if event.settings.invoice_address_custom_field:
             self.fields['custom_field'].label = event.settings.invoice_address_custom_field
-            self.fields['custom_field'].help_text = event.settings.invoice_address_custom_field_helptext
         else:
             del self.fields['custom_field']
 
@@ -1147,19 +1134,16 @@ 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'] = ''
         if data.get('is_business') and not ask_for_vat_id(data.get('country')):
             data['vat_id'] = ''
-        if self.address_validation and self.event.settings.invoice_address_required and not self.all_optional:
+        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.')})
-            if not data.get('is_business') and name_parts_is_empty(data.get('name_parts', {})):
+                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 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
@@ -1171,7 +1155,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
 
         if all(
                 not v for k, v in data.items() if k not in ('is_business', 'country', 'name_parts')
-        ) and name_parts_is_empty(data.get('name_parts', {})):
+        ) and len(data.get('name_parts', {})) == 1:
             # Do not save the country if it is the only field set -- we don't know the user even checked it!
             self.cleaned_data['country'] = ''
 

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

@@ -36,7 +36,6 @@ import time
 import traceback
 
 from django.conf import settings
-from django.core.cache import cache
 from django.core.management.base import BaseCommand
 from django.dispatch.dispatcher import NO_RECEIVERS
 
@@ -58,8 +57,6 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         verbosity = int(options['verbosity'])
 
-        cache.set("pretix_runperiodic_executed", True, 3600 * 12)
-
         if not periodic_task.receivers or periodic_task.sender_receivers_cache.get(self) is NO_RECEIVERS:
             return
 

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/0271_itemcategory_cross_selling.py

@@ -1,32 +0,0 @@
-# Generated by Django 4.2.11 on 2024-05-27 13:19
-
-from django.db import migrations, models
-
-import pretix.base.models.orders
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("pretixbase", "0270_historicpassword"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="itemcategory",
-            name="cross_selling_condition",
-            field=models.CharField(null=True, max_length=10),
-        ),
-        migrations.AddField(
-            model_name="itemcategory",
-            name="cross_selling_mode",
-            field=models.CharField(null=True, max_length=5),
-        ),
-        migrations.AddField(
-            model_name="itemcategory",
-            name="cross_selling_match_products",
-            field=models.ManyToManyField(
-                related_name="matched_by_cross_selling_categories", to="pretixbase.item"
-            ),
-        ),
-    ]

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,
@@ -571,23 +571,13 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
 
     def get_session_auth_hash(self):
         """
-        Return an HMAC that needs to be the same throughout the session, used e.g. for forced
-        logout after every password change.
-        """
-        return self._get_session_auth_hash(secret=settings.SECRET_KEY)
-
-    def get_session_auth_fallback_hash(self):
-        for fallback_secret in settings.SECRET_KEY_FALLBACKS:
-            yield self._get_session_auth_hash(secret=fallback_secret)
-
-    def _get_session_auth_hash(self, secret):
-        """
+        Return an HMAC that needs to
         """
         key_salt = "pretix.base.models.User.get_session_auth_hash"
         payload = self.password
         payload += self.email
         payload += self.session_token
-        return salted_hmac(key_salt, payload, secret=secret).hexdigest()
+        return salted_hmac(key_salt, payload).hexdigest()
 
     def update_session_token(self):
         self.session_token = generate_session_token()

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)
@@ -219,24 +219,13 @@ class Customer(LoggedModel):
         return is_password_usable(self.password)
 
     def get_session_auth_hash(self):
-        """
-        Return an HMAC that needs to be the same throughout the session, used e.g. for forced
-        logout after every password change.
-        """
-        return self._get_session_auth_hash(secret=settings.SECRET_KEY)
-
-    def get_session_auth_fallback_hash(self):
-        for fallback_secret in settings.SECRET_KEY_FALLBACKS:
-            yield self._get_session_auth_hash(secret=fallback_secret)
-
-    def _get_session_auth_hash(self, secret):
         """
         Return an HMAC of the password field.
         """
         key_salt = "pretix.base.models.customers.Customer.get_session_auth_hash"
         payload = self.password
         payload += self.email
-        return salted_hmac(key_salt, payload, secret=secret).hexdigest()
+        return salted_hmac(key_salt, payload).hexdigest()
 
     def get_email_context(self):
         from pretix.base.settings import get_name_parts_localized
@@ -392,7 +381,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/discount.py

@@ -20,11 +20,11 @@
 # <https://www.gnu.org/licenses/>.
 #
 
-from collections import defaultdict, namedtuple
+from collections import defaultdict
 from decimal import Decimal
 from itertools import groupby
-from math import ceil, inf
-from typing import Dict
+from math import ceil
+from typing import Dict, Optional, Tuple
 
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
@@ -36,8 +36,6 @@ from django_scopes import ScopedManager
 from pretix.base.decimal import round_decimal
 from pretix.base.models.base import LoggedModel
 
-PositionInfo = namedtuple('PositionInfo', ['item_id', 'subevent_id', 'line_price_gross', 'is_addon_to', 'voucher_discount'])
-
 
 class Discount(LoggedModel):
     SUBEVENT_MODE_MIXED = 'mixed'
@@ -247,26 +245,22 @@ class Discount(LoggedModel):
             return False
         return True
 
-    def _apply_min_value(self, positions, condition_idx_group, benefit_idx_group, result, collect_potential_discounts, subevent_id):
-        if self.condition_min_value and sum(positions[idx].line_price_gross for idx in condition_idx_group) < self.condition_min_value:
+    def _apply_min_value(self, positions, condition_idx_group, benefit_idx_group, result):
+        if self.condition_min_value and sum(positions[idx][2] for idx in condition_idx_group) < self.condition_min_value:
             return
 
         if self.condition_min_count or self.benefit_only_apply_to_cheapest_n_matches:
             raise ValueError('Validation invariant violated.')
 
         for idx in benefit_idx_group:
-            previous_price = positions[idx].line_price_gross
+            previous_price = positions[idx][2]
             new_price = round_decimal(
                 previous_price * (Decimal('100.00') - self.benefit_discount_matching_percent) / Decimal('100.00'),
                 self.event.currency,
             )
             result[idx] = new_price
 
-        if collect_potential_discounts is not None:
-            for idx in condition_idx_group:
-                collect_potential_discounts[idx] = [(self, inf, -1, subevent_id)]
-
-    def _apply_min_count(self, positions, condition_idx_group, benefit_idx_group, result, collect_potential_discounts, subevent_id):
+    def _apply_min_count(self, positions, condition_idx_group, benefit_idx_group, result):
         if len(condition_idx_group) < self.condition_min_count:
             return
 
@@ -274,53 +268,23 @@ class Discount(LoggedModel):
             raise ValueError('Validation invariant violated.')
 
         if self.benefit_only_apply_to_cheapest_n_matches:
-            # sort by line_price
-            condition_idx_group = sorted(condition_idx_group, key=lambda idx: (positions[idx].line_price_gross, -idx))
-            benefit_idx_group = sorted(benefit_idx_group, key=lambda idx: (positions[idx].line_price_gross, -idx))
+            if not self.condition_min_count:
+                raise ValueError('Validation invariant violated.')
+
+            condition_idx_group = sorted(condition_idx_group, key=lambda idx: (positions[idx][2], -idx))  # sort by line_price
+            benefit_idx_group = sorted(benefit_idx_group, key=lambda idx: (positions[idx][2], -idx))  # sort by line_price
 
             # Prevent over-consuming of items, i.e. if our discount is "buy 2, get 1 free", we only
             # want to match multiples of 3
-
-            # how many discount applications are allowed according to condition products in cart
-            possible_applications_cond = len(condition_idx_group) // self.condition_min_count
-
-            # how many discount applications are possible according to benefitting products in cart
-            possible_applications_benefit = ceil(len(benefit_idx_group) / self.benefit_only_apply_to_cheapest_n_matches)
-
-            n_groups = min(possible_applications_cond, possible_applications_benefit)
+            n_groups = min(len(condition_idx_group) // self.condition_min_count, ceil(len(benefit_idx_group) / self.benefit_only_apply_to_cheapest_n_matches))
             consume_idx = condition_idx_group[:n_groups * self.condition_min_count]
             benefit_idx = benefit_idx_group[:n_groups * self.benefit_only_apply_to_cheapest_n_matches]
-
-            if collect_potential_discounts is not None:
-                if n_groups * self.benefit_only_apply_to_cheapest_n_matches > len(benefit_idx_group):
-                    # partially used discount ("for each 1 ticket you buy, get 50% on 2 t-shirts", cart content: 1 ticket
-                    # but only 1 t-shirt) -> 1 shirt definitiv potential discount
-                    for idx in consume_idx:
-                        collect_potential_discounts[idx] = [
-                            (self, n_groups * self.benefit_only_apply_to_cheapest_n_matches - len(benefit_idx_group), -1, subevent_id)
-                        ]
-
-                if possible_applications_cond * self.benefit_only_apply_to_cheapest_n_matches > len(benefit_idx_group):
-                    # unused discount ("for each 1 ticket you buy, get 50% on 2 t-shirts", cart content: 1 ticket
-                    # but 0 t-shirts) -> 2 shirt maybe potential discount (if the 1 ticket is not consumed by a later discount)
-                    for i, idx in enumerate(condition_idx_group[
-                                            n_groups * self.condition_min_count:
-                                            possible_applications_cond * self.condition_min_count
-                                            ]):
-                        collect_potential_discounts[idx] += [
-                            (self, self.benefit_only_apply_to_cheapest_n_matches, i // self.condition_min_count, subevent_id)
-                        ]
-
         else:
             consume_idx = condition_idx_group
             benefit_idx = benefit_idx_group
 
-            if collect_potential_discounts is not None:
-                for idx in consume_idx:
-                    collect_potential_discounts[idx] = [(self, inf, -1, subevent_id)]
-
         for idx in benefit_idx:
-            previous_price = positions[idx].line_price_gross
+            previous_price = positions[idx][2]
             new_price = round_decimal(
                 previous_price * (Decimal('100.00') - self.benefit_discount_matching_percent) / Decimal('100.00'),
                 self.event.currency,
@@ -328,16 +292,15 @@ class Discount(LoggedModel):
             result[idx] = new_price
 
         for idx in consume_idx:
-            result.setdefault(idx, positions[idx].line_price_gross)
+            result.setdefault(idx, positions[idx][2])
 
-    def apply(self, positions: Dict[int, PositionInfo],
-              collect_potential_discounts=None) -> Dict[int, Decimal]:
+    def apply(self, positions: Dict[int, Tuple[int, Optional[int], Decimal, bool, Decimal]]) -> Dict[int, Decimal]:
         """
         Tries to apply this discount to a cart
 
-        :param positions: Dictionary mapping IDs to PositionInfo tuples.
+        :param positions: Dictionary mapping IDs to tuples of the form
+                          ``(item_id, subevent_id, line_price_gross, is_addon_to, voucher_discount)``.
                           Bundled positions may not be included.
-        :param collect_potential_discounts: For detailed description, see pretix.base.services.pricing.apply_discounts
 
         :return: A dictionary mapping keys from the input dictionary to new prices. All positions
                  contained in this dictionary are considered "consumed" and should not be considered
@@ -379,13 +342,13 @@ class Discount(LoggedModel):
 
         if self.subevent_mode == self.SUBEVENT_MODE_MIXED:  # also applies to non-series events
             if self.condition_min_count:
-                self._apply_min_count(positions, condition_candidates, benefit_candidates, result, collect_potential_discounts, None)
+                self._apply_min_count(positions, condition_candidates, benefit_candidates, result)
             else:
-                self._apply_min_value(positions, condition_candidates, benefit_candidates, result, collect_potential_discounts, None)
+                self._apply_min_value(positions, condition_candidates, benefit_candidates, result)
 
         elif self.subevent_mode == self.SUBEVENT_MODE_SAME:
             def key(idx):
-                return positions[idx].subevent_id or 0
+                return positions[idx][1] or 0  # subevent_id
 
             # Build groups of candidates with the same subevent, then apply our regular algorithm
             # to each group
@@ -394,11 +357,11 @@ class Discount(LoggedModel):
             candidate_groups = [(k, list(g)) for k, g in _groups]
 
             for subevent_id, g in candidate_groups:
-                benefit_g = [idx for idx in benefit_candidates if positions[idx].subevent_id == subevent_id]
+                benefit_g = [idx for idx in benefit_candidates if positions[idx][1] == subevent_id]
                 if self.condition_min_count:
-                    self._apply_min_count(positions, g, benefit_g, result, collect_potential_discounts, subevent_id)
+                    self._apply_min_count(positions, g, benefit_g, result)
                 else:
-                    self._apply_min_value(positions, g, benefit_g, result, collect_potential_discounts, subevent_id)
+                    self._apply_min_value(positions, g, benefit_g, result)
 
         elif self.subevent_mode == self.SUBEVENT_MODE_DISTINCT:
             if self.condition_min_value or not self.benefit_same_products:
@@ -414,9 +377,9 @@ class Discount(LoggedModel):
             # Build a list of subevent IDs in descending order of frequency
             subevent_to_idx = defaultdict(list)
             for idx, p in positions.items():
-                subevent_to_idx[p.subevent_id].append(idx)
+                subevent_to_idx[p[1]].append(idx)
             for v in subevent_to_idx.values():
-                v.sort(key=lambda idx: positions[idx].line_price_gross)
+                v.sort(key=lambda idx: positions[idx][2])
             subevent_order = sorted(list(subevent_to_idx.keys()), key=lambda s: len(subevent_to_idx[s]), reverse=True)
 
             # Build groups of exactly condition_min_count distinct subevents
@@ -431,7 +394,7 @@ class Discount(LoggedModel):
                     l = [ll for ll in l if ll in condition_candidates and ll not in current_group]
                     if cardinality and len(l) != cardinality:
                         continue
-                    if se not in {positions[idx].subevent_id for idx in current_group}:
+                    if se not in {positions[idx][1] for idx in current_group}:
                         candidates += l
                         cardinality = len(l)
 
@@ -440,7 +403,7 @@ class Discount(LoggedModel):
 
                 # Sort the list by prices, then pick one. For "buy 2 get 1 free" we apply a "pick 1 from the start
                 # and 2 from the end" scheme to optimize price distribution among groups
-                candidates = sorted(candidates, key=lambda idx: positions[idx].line_price_gross)
+                candidates = sorted(candidates, key=lambda idx: positions[idx][2])
                 if len(current_group) < (self.benefit_only_apply_to_cheapest_n_matches or 0):
                     candidate = candidates[0]
                 else:
@@ -452,14 +415,14 @@ class Discount(LoggedModel):
                 if len(current_group) >= max(self.condition_min_count, 1):
                     candidate_groups.append(current_group)
                     for c in current_group:
-                        subevent_to_idx[positions[c].subevent_id].remove(c)
+                        subevent_to_idx[positions[c][1]].remove(c)
                     current_group = []
 
             # Distribute "leftovers"
             for se in subevent_order:
                 if subevent_to_idx[se]:
                     for group in candidate_groups:
-                        if se not in {positions[idx].subevent_id for idx in group}:
+                        if se not in {positions[idx][1] for idx in group}:
                             group.append(subevent_to_idx[se].pop())
                             if not subevent_to_idx[se]:
                                 break
@@ -469,8 +432,6 @@ class Discount(LoggedModel):
                     positions,
                     [idx for idx in g if idx in condition_candidates],
                     [idx for idx in g if idx in benefit_candidates],
-                    result,
-                    None,
-                    None
+                    result
                 )
         return result

src/pretix/base/models/event.py

@@ -313,38 +313,9 @@ class EventMixin:
             items=GroupConcat('pk', delimiter=',')
         ).values('items')
 
-        q_variation = (
-            Q(active=True)
-            & Q(Q(available_from__isnull=True) | Q(available_from__lte=time_machine_now()))
-            & Q(Q(available_until__isnull=True) | Q(available_until__gte=time_machine_now()))
-            & Q(item__active=True)
-            & Q(Q(item__available_from__isnull=True) | Q(item__available_from__lte=time_machine_now()))
-            & Q(Q(item__available_until__isnull=True) | Q(item__available_until__gte=time_machine_now()))
-            & Q(Q(item__category__isnull=True) | Q(item__category__is_addon=False))
-            & Q(item__require_bundling=False)
-            & Q(quotas__pk=OuterRef('pk'))
-        )
-
-        if isinstance(channel, str):
-            q_variation &= Q(Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=channel))
-            q_variation &= Q(Q(item__all_sales_channels=True) | Q(item__limit_sales_channels__identifier=channel))
-        else:
-            q_variation &= Q(Q(all_sales_channels=True) | Q(limit_sales_channels=channel))
-            q_variation &= Q(Q(item__all_sales_channels=True) | Q(item__limit_sales_channels=channel))
-
-        if voucher:
-            if voucher.variation_id:
-                q_variation &= Q(pk=voucher.variation_id)
-            elif voucher.item_id:
-                q_variation &= Q(item_id=voucher.item_id)
-            elif voucher.quota_id:
-                q_variation &= Q(quotas__in=[voucher.quota_id])
-
-        if not voucher or not voucher.show_hidden_items:
-            q_variation &= Q(hide_without_voucher=False)
-            q_variation &= Q(item__hide_without_voucher=False)
-
-        sq_active_variation = ItemVariation.objects.filter(q_variation).order_by().values_list('quotas__pk').annotate(
+        sq_active_variation = ItemVariation.objects.filter_available(channel=channel, voucher=voucher).filter(
+            Q(quotas__pk=OuterRef('pk'))
+        ).order_by().values_list('quotas__pk').annotate(
             items=GroupConcat('pk', delimiter=',')
         ).values('items')
         quota_base_qs = Quota.objects.using(settings.DATABASE_REPLICA).filter(
@@ -870,12 +841,10 @@ class Event(EventMixin, LoggedModel):
         for i in Item.objects.filter(event=other).prefetch_related(
             'variations', 'limit_sales_channels', 'require_membership_types',
             'variations__limit_sales_channels', 'variations__require_membership_types',
-            'matched_by_cross_selling_categories',
         ):
             vars = list(i.variations.all())
             require_membership_types = list(i.require_membership_types.all())
             limit_sales_channels = list(i.limit_sales_channels.all())
-            matched_by_cross_selling_categories = list(i.matched_by_cross_selling_categories.all())
             item_map[i.pk] = i
             i.pk = None
             i.event = self
@@ -913,9 +882,6 @@ class Event(EventMixin, LoggedModel):
                 if not v.all_sales_channels:
                     v.limit_sales_channels.set(self.organizer.sales_channels.filter(identifier__in=[s.identifier for s in limit_sales_channels]))
 
-            if matched_by_cross_selling_categories:
-                i.matched_by_cross_selling_categories.set([category_map[c.pk] for c in matched_by_cross_selling_categories])
-
         for i in self.items.filter(hidden_if_item_available__isnull=False):
             i.hidden_if_item_available = item_map[i.hidden_if_item_available_id]
             i.save()
@@ -1024,9 +990,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 = {}
@@ -1038,6 +1005,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

@@ -63,13 +63,14 @@ from django_countries.fields import Country
 from django_scopes import ScopedManager
 from i18nfield.fields import I18nCharField, I18nTextField
 
-from pretix.base.media import MEDIA_TYPES
-from pretix.base.models import Event, SubEvent
 from pretix.base.models.base import LoggedModel
 from pretix.base.models.fields import MultiStringField
 from pretix.base.models.tax import TaxedPrice
 from pretix.base.timemachine import time_machine_now
-from pretix.helpers.images import ImageSizeValidator
+
+from ...helpers.images import ImageSizeValidator
+from ..media import MEDIA_TYPES
+from .event import Event, SubEvent
 
 
 class ItemCategory(LoggedModel):
@@ -110,33 +111,6 @@ class ItemCategory(LoggedModel):
                     'only be bought in combination with a product that has this category configured as a possible '
                     'source for add-ons.')
     )
-    CROSS_SELLING_MODES = (
-        (None, _('Normal category')),
-        ('both', _('Normal + cross-selling category')),
-        ('only', _('Cross-selling category')),
-    )
-    cross_selling_mode = models.CharField(
-        choices=CROSS_SELLING_MODES,
-        null=True,
-        max_length=5
-    )
-    CROSS_SELLING_CONDITION = (
-        ('always', _('Always show in cross-selling step')),
-        ('discounts', _('Only show products that qualify for a discount according to discount rules')),
-        ('products', _('Only show if the cart contains one of the following products')),
-    )
-    cross_selling_condition = models.CharField(
-        verbose_name=_("Cross-selling condition"),
-        choices=CROSS_SELLING_CONDITION,
-        null=True,
-        max_length=10,
-    )
-    cross_selling_match_products = models.ManyToManyField(
-        'pretixbase.Item',
-        blank=True,
-        verbose_name=_("Cross-selling condition products"),
-        related_name="matched_by_cross_selling_categories",
-    )
 
     class Meta:
         verbose_name = _("Product category")
@@ -145,31 +119,19 @@ class ItemCategory(LoggedModel):
 
     def __str__(self):
         name = self.internal_name or self.name
-        if self.category_type != 'normal':
-            return _('{category} ({category_type})').format(category=str(name),
-                                                            category_type=self.get_category_type_display())
+        if self.is_addon:
+            return _('{category} (Add-On products)').format(category=str(name))
         return str(name)
 
     def get_category_type_display(self):
         if self.is_addon:
-            return _('Add-on category')
-        elif self.cross_selling_mode:
-            return self.get_cross_selling_mode_display()
+            return _('Add-On products')
         else:
-            return _('Normal category')
+            return None
 
     @property
     def category_type(self):
-        return 'addon' if self.is_addon else self.cross_selling_mode or 'normal'
-
-    @category_type.setter
-    def category_type(self, new_value):
-        if new_value == 'addon':
-            self.is_addon = True
-            self.cross_selling_mode = None
-        else:
-            self.is_addon = False
-            self.cross_selling_mode = None if new_value == 'normal' else new_value
+        return 'addon' if self.is_addon else 'normal'
 
     def delete(self, *args, **kwargs):
         super().delete(*args, **kwargs)
@@ -308,7 +270,7 @@ class SubEventItemVariation(models.Model):
         return True
 
 
-def filter_available(qs, channel='web', voucher=None, allow_addons=False, allow_cross_sell=False):
+def filter_available(qs, channel='web', voucher=None, allow_addons=False):
     # Channel can currently be a SalesChannel or a str, since we need that compatibility, but a SalesChannel
     # makes the query SIGNIFICANTLY faster
     from .organizer import SalesChannel
@@ -329,8 +291,6 @@ def filter_available(qs, channel='web', voucher=None, allow_addons=False, allow_
 
     if not allow_addons:
         q &= Q(Q(category__isnull=True) | Q(category__is_addon=False))
-    if not allow_cross_sell:
-        q &= Q(Q(category__isnull=True) | ~Q(category__cross_selling_mode='only'))
 
     if voucher:
         if voucher.item_id:
@@ -343,9 +303,51 @@ def filter_available(qs, channel='web', voucher=None, allow_addons=False, allow_
     return qs.filter(q)
 
 
+def filter_variations_available(qs, channel='web', voucher=None, allow_addons=False):
+    # Channel can currently be a SalesChannel or a str, since we need that compatibility, but a SalesChannel
+    # makes the query SIGNIFICANTLY faster
+    from .organizer import SalesChannel
+
+    assert isinstance(channel, (SalesChannel, str))
+    q = (
+        Q(active=True)
+        & Q(Q(available_from__isnull=True) | Q(available_from__lte=time_machine_now()))
+        & Q(Q(available_until__isnull=True) | Q(available_until__gte=time_machine_now()))
+        & Q(item__active=True)
+        & Q(Q(item__available_from__isnull=True) | Q(item__available_from__lte=time_machine_now()))
+        & Q(Q(item__available_until__isnull=True) | Q(item__available_until__gte=time_machine_now()))
+        & Q(Q(item__category__isnull=True) | Q(item__category__is_addon=False))
+        & Q(item__require_bundling=False)
+    )
+
+    if isinstance(channel, str):
+        q &= Q(Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=channel))
+        q &= Q(Q(item__all_sales_channels=True) | Q(item__limit_sales_channels__identifier=channel))
+    else:
+        q &= Q(Q(all_sales_channels=True) | Q(limit_sales_channels=channel))
+        q &= Q(Q(item__all_sales_channels=True) | Q(item__limit_sales_channels=channel))
+
+    if not allow_addons:
+        q &= Q(Q(item__category__isnull=True) | Q(item__category__is_addon=False))
+
+    if voucher:
+        if voucher.variation_id:
+            q &= Q(pk=voucher.variation_id)
+        elif voucher.item_id:
+            q &= Q(item_id=voucher.item_id)
+        elif voucher.quota_id:
+            q &= Q(quotas__in=[voucher.quota_id])
+
+    if not voucher or not voucher.show_hidden_items:
+        q &= Q(hide_without_voucher=False)
+        q &= Q(item__hide_without_voucher=False)
+
+    return qs.filter(q)
+
+
 class ItemQuerySet(models.QuerySet):
-    def filter_available(self, channel='web', voucher=None, allow_addons=False, allow_cross_sell=False):
-        return filter_available(self, channel, voucher, allow_addons, allow_cross_sell)
+    def filter_available(self, channel='web', voucher=None, allow_addons=False):
+        return filter_available(self, channel, voucher, allow_addons)
 
 
 class ItemQuerySetManager(ScopedManager(organizer='event__organizer').__class__):
@@ -353,8 +355,22 @@ class ItemQuerySetManager(ScopedManager(organizer='event__organizer').__class__)
         super().__init__()
         self._queryset_class = ItemQuerySet
 
-    def filter_available(self, channel='web', voucher=None, allow_addons=False, allow_cross_sell=False):
-        return filter_available(self.get_queryset(), channel, voucher, allow_addons, allow_cross_sell)
+    def filter_available(self, channel='web', voucher=None, allow_addons=False):
+        return filter_available(self.get_queryset(), channel, voucher, allow_addons)
+
+
+class ItemVariationQuerySet(models.QuerySet):
+    def filter_available(self, channel='web', voucher=None, allow_addons=False):
+        return filter_variations_available(self, channel, voucher, allow_addons)
+
+
+class ItemVariationQuerySetManager(ScopedManager(organizer='item__event__organizer').__class__):
+    def __init__(self):
+        super().__init__()
+        self._queryset_class = ItemVariationQuerySet
+
+    def filter_available(self, channel='web', voucher=None, allow_addons=False):
+        return filter_variations_available(self.get_queryset(), channel, voucher, allow_addons)
 
 
 class Item(LoggedModel):
@@ -1118,12 +1134,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,
@@ -1238,7 +1255,7 @@ class ItemVariation(models.Model):
         help_text=_('This text will be shown by the check-in app if a ticket of this type is scanned.')
     )
 
-    objects = ScopedManager(organizer='item__event__organizer')
+    objects = ItemVariationQuerySetManager()
 
     class Meta:
         verbose_name = _("Product variation")

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

@@ -40,7 +40,6 @@ import json
 import logging
 import operator
 import string
-import warnings
 from collections import Counter
 from datetime import datetime, time, timedelta
 from decimal import Decimal
@@ -242,7 +241,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 +316,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
@@ -382,28 +381,8 @@ class Order(LockModel, LoggedModel):
         self.event.cache.delete('complain_testmode_orders')
         self.delete()
 
-    def email_confirm_secret(self):
-        return self.tagged_secret("email_confirm", 9)
-
     def email_confirm_hash(self):
-        warnings.warn('Use email_confirm_secret() instead of email_confirm_hash().',
-                      DeprecationWarning)
-        return self.email_confirm_secret()
-
-    def check_email_confirm_secret(self, received_secret):
-        return (
-            hmac.compare_digest(
-                self.tagged_secret("email_confirm", 9),
-                received_secret[:9].lower()
-            ) or any(
-                # TODO: remove this clause after a while (compatibility with old secrets currently in flight)
-                hmac.compare_digest(
-                    hashlib.sha256(sk.encode() + self.secret.encode()).hexdigest()[:9],
-                    received_secret
-                )
-                for sk in [settings.SECRET_KEY, *settings.SECRET_KEY_FALLBACKS]
-            )
-        )
+        return hashlib.sha256(settings.SECRET_KEY.encode() + self.secret.encode()).hexdigest()[:9]
 
     def get_extended_status_display(self):
         # Changes in this method should to be replicated in pretixcontrol/orders/fragment_order_status.html
@@ -3204,9 +3183,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)
@@ -3391,74 +3370,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/tax.py

@@ -304,24 +304,10 @@ class TaxRule(LoggedModel):
                     subtract_from_gross = Decimal('0.00')
                 rate = adjust_rate
 
-        def _limit_subtract(base_price, subtract_from_gross):
-            if not subtract_from_gross:
-                return base_price
-            if base_price >= Decimal('0.00'):
-                # For positive prices, make sure they don't go negative because of bundles
-                return max(Decimal('0.00'), base_price - subtract_from_gross)
-            else:
-                # If the price is already negative, we don't really care any more
-                return base_price - subtract_from_gross
-
         if rate == Decimal('0.00'):
-            gross = _limit_subtract(base_price, subtract_from_gross)
             return TaxedPrice(
-                net=gross,
-                gross=gross,
-                tax=Decimal('0.00'),
-                rate=rate,
-                name=self.name,
+                net=base_price - subtract_from_gross, gross=base_price - subtract_from_gross, tax=Decimal('0.00'),
+                rate=rate, name=self.name
             )
 
         if base_price_is == 'auto':
@@ -331,14 +317,19 @@ class TaxRule(LoggedModel):
                 base_price_is = 'net'
 
         if base_price_is == 'gross':
-            gross = _limit_subtract(base_price, subtract_from_gross)
+            if base_price >= Decimal('0.00'):
+                # For positive prices, make sure they don't go negative because of bundles
+                gross = max(Decimal('0.00'), base_price - subtract_from_gross)
+            else:
+                # If the price is already negative, we don't really care any more
+                gross = base_price - subtract_from_gross
             net = round_decimal(gross - (gross * (1 - 100 / (100 + rate))),
                                 currency)
         elif base_price_is == 'net':
             net = base_price
             gross = round_decimal((net * (1 + rate / 100)), currency)
             if subtract_from_gross:
-                gross = _limit_subtract(gross, subtract_from_gross)
+                gross -= subtract_from_gross
                 net = round_decimal(gross - (gross * (1 - 100 / (100 + rate))),
                                     currency)
         else:

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/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]):
@@ -1545,9 +1542,10 @@ def add_items_to_cart(self, event: int, items: List[dict], cart_id: str=None, lo
 @app.task(base=ProfiledEventTask, bind=True, max_retries=5, default_retry_delay=1, throws=(CartError,))
 def apply_voucher(self, event: Event, voucher: str, cart_id: str=None, locale='en', sales_channel='web', override_now_dt: datetime=None) -> None:
     """
+    Removes a list of items from a user's cart.
     :param event: The event ID in question
     :param voucher: A voucher code
-    :param cart_id: The cart ID of the cart to modify
+    :param session: Session ID of a guest
     """
     with language(locale), time_machine_now_assigned(override_now_dt):
         try:
@@ -1568,10 +1566,10 @@ def apply_voucher(self, event: Event, voucher: str, cart_id: str=None, locale='e
 @app.task(base=ProfiledEventTask, bind=True, max_retries=5, default_retry_delay=1, throws=(CartError,))
 def remove_cart_position(self, event: Event, position: int, cart_id: str=None, locale='en', sales_channel='web', override_now_dt: datetime=None) -> None:
     """
-    Removes an item specified by its position ID from a user's cart.
+    Removes a list of items from a user's cart.
     :param event: The event ID in question
     :param position: A cart position ID
-    :param cart_id: The cart ID of the cart to modify
+    :param session: Session ID of a guest
     """
     with language(locale), time_machine_now_assigned(override_now_dt):
         try:
@@ -1592,9 +1590,9 @@ def remove_cart_position(self, event: Event, position: int, cart_id: str=None, l
 @app.task(base=ProfiledEventTask, bind=True, max_retries=5, default_retry_delay=1, throws=(CartError,))
 def clear_cart(self, event: Event, cart_id: str=None, locale='en', sales_channel='web', override_now_dt: datetime=None) -> None:
     """
-    Removes all items from a user's cart.
+    Removes a list of items from a user's cart.
     :param event: The event ID in question
-    :param cart_id: The cart ID of the cart to modify
+    :param session: Session ID of a guest
     """
     with language(locale), time_machine_now_assigned(override_now_dt):
         try:
@@ -1613,15 +1611,13 @@ def clear_cart(self, event: Event, cart_id: str=None, locale='en', sales_channel
 
 
 @app.task(base=ProfiledEventTask, bind=True, max_retries=5, default_retry_delay=1, throws=(CartError,))
-def set_cart_addons(self, event: Event, addons: List[dict], add_to_cart_items: List[dict], cart_id: str=None, locale='en',
+def set_cart_addons(self, event: Event, addons: List[dict], cart_id: str=None, locale='en',
                     invoice_address: int=None, sales_channel='web', override_now_dt: datetime=None) -> None:
     """
-    Assigns addons to eligible products in a user's cart, adding and removing the addon products as necessary to
-    ensure the requested addon state.
+    Removes a list of items from a user's cart.
     :param event: The event ID in question
     :param addons: A list of dicts with the keys addon_to, item, variation
-    :param add_to_cart_items: A list of dicts with the keys item, variation, count, custom_price, voucher, seat ID
-    :param cart_id: The cart ID of the cart to modify
+    :param session: Session ID of a guest
     """
     with language(locale), time_machine_now_assigned(override_now_dt):
         ia = False
@@ -1639,7 +1635,6 @@ def set_cart_addons(self, event: Event, addons: List[dict], add_to_cart_items: L
             try:
                 cm = CartManager(event=event, cart_id=cart_id, invoice_address=ia, sales_channel=sales_channel)
                 cm.set_addons(addons)
-                cm.add_new_items(add_to_cart_items)
                 cm.commit()
             except LockTimeoutException:
                 self.retry()

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

@@ -1,234 +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 collections import defaultdict
-from decimal import Decimal
-from itertools import groupby
-from math import inf
-from typing import List
-
-from django.utils.functional import cached_property
-
-from pretix.base.models import CartPosition, ItemCategory, SalesChannel
-from pretix.presale.views.event import get_grouped_items
-
-
-class DummyCategory:
-    """
-    Used to create fake category objects for displaying the same cross-selling category multiple times,
-    once for each subevent
-    """
-
-    def __init__(self, category: ItemCategory, subevent):
-        self.id = category.id
-        self.name = str(category.name)
-        self.subevent_name = str(subevent)
-        self.description = category.description
-
-
-class CrossSellingService:
-    def __init__(self, event, sales_channel: SalesChannel, cartpositions: List[CartPosition], customer):
-        self.event = event
-        self.sales_channel = sales_channel
-        self.cartpositions = cartpositions
-        self.customer = customer
-
-    def get_data(self):
-        if self.event.has_subevents:
-            subevents = set(pos.subevent for pos in self.cartpositions)
-            result = (
-                (DummyCategory(category, subevent),
-                 self._prepare_items(subevent, items_qs, discount_info),
-                 f'subevent_{subevent.pk}_')
-                for subevent in subevents
-                for (category, items_qs, discount_info) in self._applicable_categories(subevent.pk)
-            )
-        else:
-            result = (
-                (category,
-                 self._prepare_items(None, items_qs, discount_info),
-                 '')
-                for (category, items_qs, discount_info) in self._applicable_categories(0)
-            )
-        result = [(category, items, form_prefix) for (category, items, form_prefix) in result if len(items) > 0]
-        for category, items, form_prefix in result:
-            category.category_has_discount = any(item.original_price or (
-                item.has_variations and any(var.original_price for var in item.available_variations)
-            ) for item in items)
-        return result
-
-    def _applicable_categories(self, subevent_id):
-        return [
-            (c, products_qs, discount_info) for (c, products_qs, discount_info) in
-            (
-                (c, *self._get_visible_items_for_category(subevent_id, c))
-                for c in self.event.categories.filter(cross_selling_mode__isnull=False).prefetch_related('items')
-            )
-            if products_qs is not None
-        ]
-
-    def _get_visible_items_for_category(self, filter_subevent_id, category: ItemCategory):
-        """
-        If this category should be visible in the cross-selling step for a given cart and sales_channel, this method
-        returns a queryset of the items that should be displayed, as well as a dict giving additional information on them.
-
-        :returns: (QuerySet<Item>, dict<(subevent_id, item_pk): (max_count, discount_rule)>)
-            max_count is `inf` if the item should not be limited
-            discount_rule is None if the item will not be discounted
-        """
-        if category.cross_selling_mode is None:
-            return None, {}
-        if category.cross_selling_condition == 'always':
-            return category.items.all(), {}
-        if category.cross_selling_condition == 'products':
-            match = set(match.pk for match in category.cross_selling_match_products.only('pk'))  # TODO prefetch this
-            return (category.items.all(), {}) if any(pos.item.pk in match for pos in self.cartpositions) else (None, {})
-        if category.cross_selling_condition == 'discounts':
-            my_item_pks = [item.id for item in category.items.all()]
-            potential_discount_items = {
-                item.pk: (max_count, discount_rule)
-                for subevent_id, item, max_count, discount_rule in self._potential_discounts_by_subevent_and_item_for_current_cart
-                if max_count > 0 and item.pk in my_item_pks and item.is_available() and (subevent_id == filter_subevent_id or subevent_id is None)
-            }
-            return category.items.filter(pk__in=potential_discount_items), potential_discount_items
-
-    @cached_property
-    def _potential_discounts_by_subevent_and_item_for_current_cart(self):
-        potential_discounts_by_cartpos = defaultdict(list)
-
-        from ..services.pricing import apply_discounts
-        self._discounted_prices = apply_discounts(
-            self.event,
-            self.sales_channel,
-            [
-                (cp.item_id, cp.subevent_id, cp.line_price_gross, bool(cp.addon_to), cp.is_bundled,
-                 cp.listed_price - cp.price_after_voucher)
-                for cp in self.cartpositions
-            ],
-            collect_potential_discounts=potential_discounts_by_cartpos
-        )
-
-        # flatten potential_discounts_by_cartpos (a dict of lists of potential discounts) into a set of potential discounts
-        # (which is technically stored as a dict, but we use it as an OrderedSet here)
-        potential_discount_set = dict.fromkeys(
-            info for lst in potential_discounts_by_cartpos.values() for info in lst)
-
-        # sum up the max_counts and pass them on (also pass on the discount_rules so we can calculate actual discounted prices later):
-        # group by benefit product
-        # - max_count for product: sum up max_counts
-        # - discount_rule for product: take first discount_rule
-
-        def discount_info(subevent_id, item, infos_for_item):
-            infos_for_item = list(infos_for_item)
-            return (
-                subevent_id,
-                item,
-                sum(max_count for (subevent_id, item, discount_rule, max_count, i) in infos_for_item),
-                next(discount_rule for (subevent_id, item, discount_rule, max_count, i) in infos_for_item),
-            )
-
-        return [
-            discount_info(subevent_id, item, infos_for_item) for (subevent_id, item), infos_for_item in
-            groupby(
-                sorted(
-                    (
-                        (subevent_id, item, discount_rule, max_count, i)
-                        for (discount_rule, max_count, i, subevent_id) in potential_discount_set.keys()
-                        for item in discount_rule.benefit_limit_products.all()
-                    ),
-                    key=lambda tup: (tup[0], tup[1].pk)
-                ),
-                lambda tup: (tup[0], tup[1]))
-        ]
-
-    def _prepare_items(self, subevent, items_qs, discount_info):
-        items, _btn = get_grouped_items(
-            self.event,
-            subevent=subevent,
-            voucher=None,
-            channel=self.sales_channel,
-            base_qs=items_qs,
-            allow_addons=False,
-            allow_cross_sell=True,
-            memberships=(
-                self.customer.usable_memberships(
-                    for_event=subevent or self.event,
-                    testmode=self.event.testmode
-                )
-                if self.customer else None
-            ),
-        )
-        new_items = list()
-        for item in items:
-            max_count = inf
-            if item.pk in discount_info:
-                (max_count, discount_rule) = discount_info[item.pk]
-
-                # only benefit_only_apply_to_cheapest_n_matches discounted items have a max_count, all others get 'inf'
-                if not max_count:
-                    max_count = inf
-
-                # calculate discounted price
-                if discount_rule and discount_rule.benefit_discount_matching_percent > 0:
-                    if not item.has_variations:
-                        item.original_price = item.original_price or item.display_price
-                        previous_price = item.display_price
-                        new_price = (
-                            previous_price * (
-                                (Decimal('100.00') - discount_rule.benefit_discount_matching_percent) / Decimal('100.00'))
-                        )
-                        item.display_price = new_price
-                    else:
-                        # discounts always match "whole" items, not specific variations -> we apply the discount to all
-                        # available variations of the item
-                        for var in item.available_variations:
-                            var.original_price = var.original_price or var.display_price
-                            previous_price = var.display_price
-                            new_price = (
-                                previous_price * (
-                                    (Decimal('100.00') - discount_rule.benefit_discount_matching_percent) / Decimal('100.00'))
-                            )
-                            var.display_price = new_price
-
-            if not item.has_variations:
-                # reduce order_max by number of items already in cart (prevent recommending a product the user can't add anyway)
-                item.order_max = min(
-                    item.order_max - sum(1 for pos in self.cartpositions if pos.item_id == item.pk),
-                    max_count
-                )
-                if item.order_max > 0:
-                    new_items.append(item)
-            else:
-                new_vars = list()
-                for var in item.available_variations:
-                    # reduce order_max by number of items already in cart (prevent recommending a product the user can't add anyway)
-                    var.order_max = min(
-                        var.order_max - sum(1 for pos in self.cartpositions if pos.item_id == item.pk and pos.variation_id == var.pk),
-                        max_count
-                    )
-                    if var.order_max > 0:
-                        new_vars.append(var)
-                if len(new_vars):
-                    item.available_variations = new_vars
-                    new_items.append(item)
-
-        return new_items

src/pretix/base/services/mail.py

@@ -301,7 +301,7 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
                         order.event, 'presale:event.order.open', kwargs={
                             'order': order.code,
                             'secret': order.secret,
-                            'hash': order.email_confirm_secret()
+                            'hash': order.email_confirm_hash()
                         }
                     )
                 )
@@ -315,7 +315,7 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
                     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)

src/pretix/base/services/placeholders.py

@@ -209,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
@@ -273,7 +262,7 @@ def base_placeholders(sender, **kwargs):
                 'presale:event.order.open', kwargs={
                     'order': order.code,
                     'secret': order.secret,
-                    'hash': order.email_confirm_secret()
+                    'hash': order.email_confirm_hash()
                 }
             ), lambda event: build_absolute_uri(
                 event,
@@ -454,7 +443,7 @@ def base_placeholders(sender, **kwargs):
                         'organizer': event.organizer.slug,
                         'order': order.code,
                         'secret': order.secret,
-                        'hash': order.email_confirm_secret(),
+                        'hash': order.email_confirm_hash(),
                     }),
                 )
                 for order in orders

src/pretix/base/services/pricing.py

@@ -20,9 +20,8 @@
 # <https://www.gnu.org/licenses/>.
 #
 import re
-from collections import defaultdict
 from decimal import Decimal
-from typing import List, Optional, Tuple, Union
+from typing import List, Optional, Tuple
 
 from django import forms
 from django.db.models import Q
@@ -32,7 +31,6 @@ from pretix.base.models import (
     AbstractPosition, InvoiceAddress, Item, ItemAddOn, ItemVariation,
     SalesChannel, Voucher,
 )
-from pretix.base.models.discount import Discount, PositionInfo
 from pretix.base.models.event import Event, SubEvent
 from pretix.base.models.tax import TAXED_ZERO, TaxedPrice, TaxRule
 from pretix.base.timemachine import time_machine_now
@@ -157,22 +155,14 @@ def get_line_price(price_after_voucher: Decimal, custom_price_input: Decimal, cu
     return price
 
 
-def apply_discounts(event: Event, sales_channel: Union[str, SalesChannel],
-                    positions: List[Tuple[int, Optional[int], Decimal, bool, bool, Decimal]],
-                    collect_potential_discounts: Optional[defaultdict]=None) -> List[Tuple[Decimal, Optional[Discount]]]:
+def apply_discounts(event: Event, sales_channel: str,
+                    positions: List[Tuple[int, Optional[int], Decimal, bool, bool]]) -> List[Decimal]:
     """
     Applies any dynamic discounts to a cart
 
     :param event: Event the cart belongs to
     :param sales_channel: Sales channel the cart was created with
     :param positions: Tuple of the form ``(item_id, subevent_id, line_price_gross, is_addon_to, is_bundled, voucher_discount)``
-    :param collect_potential_discounts: If a `defaultdict(list)` is supplied, all discounts that could be applied to the cart
-    based on the "consumed" items, but lack matching "benefitting" items will be collected therein.
-    The dict will contain a mapping from index in the `positions` list of the item that could be consumed, to a list
-    of tuples describing the discounts that could be applied in the form `(discount, max_count, grouping_id)`.
-    `max_count` is either the maximum number of benefitting items that the discount would apply to, or `inf` if that number
-    is not limited. The `grouping_id` can be used to distinguish several occurrences of the same discount.
-
     :return: A list of ``(new_gross_price, discount)`` tuples in the same order as the input
     """
     if isinstance(sales_channel, SalesChannel):
@@ -187,10 +177,10 @@ def apply_discounts(event: Event, sales_channel: Union[str, SalesChannel],
     ).prefetch_related('condition_limit_products', 'benefit_limit_products').order_by('position', 'pk')
     for discount in discount_qs:
         result = discount.apply({
-            idx: PositionInfo(item_id, subevent_id, line_price_gross, is_addon_to, voucher_discount)
+            idx: (item_id, subevent_id, line_price_gross, is_addon_to, voucher_discount)
             for idx, (item_id, subevent_id, line_price_gross, is_addon_to, is_bundled, voucher_discount) in enumerate(positions)
             if not is_bundled and idx not in new_prices
-        }, collect_potential_discounts)
+        })
         for k in result.keys():
             result[k] = (result[k], discount)
         new_prices.update(result)

src/pretix/base/services/vouchers.py

@@ -53,7 +53,7 @@ def vouchers_send(event: Event, vouchers: list, subject: str, message: str, reci
                     v.tag = r.get('tag')
                 if v.comment:
                     v.comment += '\n\n'
-                v.comment += gettext('The voucher has been sent to {recipient}.').format(recipient=r['email'])
+                v.comment = gettext('The voucher has been sent to {recipient}.').format(recipient=r['email'])
                 logs.append(v.log_action(
                     'pretix.voucher.sent',
                     user=user,

src/pretix/base/settings.py

@@ -550,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'}),
         )
@@ -571,7 +571,7 @@ DEFAULTS = {
         'form_class': I18nFormField,
         'serializer_class': I18nField,
         'form_kwargs': dict(
-            label=_("Custom recipient field label"),
+            label=_("Custom recipient field"),
             widget=I18nTextInput,
             help_text=_("If you want to add a custom text field, e.g. for a country-specific registration number, to "
                         "your invoice address form, please fill in the label here. This label will both be used for "
@@ -580,18 +580,6 @@ DEFAULTS = {
                         "The field will not be required.")
         )
     },
-    'invoice_address_custom_field_helptext': {
-        'default': '',
-        'type': LazyI18nString,
-        'form_class': I18nFormField,
-        'serializer_class': I18nField,
-        'form_kwargs': dict(
-            label=_("Custom recipient field help text"),
-            widget=I18nTextInput,
-            help_text=_("If you use the custom recipient field, you can specify a help text which will be displayed "
-                        "underneath the field. It will not be displayed on the invoice.")
-        )
-    },
     'invoice_address_vatid': {
         'default': 'False',
         'type': bool,

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``.
@@ -838,12 +838,3 @@ is given as the first argument.
 
 The ``sender`` keyword argument will contain the organizer.
 """
-
-device_info_updated = django.dispatch.Signal()
-"""
-Arguments: ``old_device``, ``new_device``
-
-This signal is sent out each time the information for a Device is modified.
-Both the original and updated versions of the Device are included to allow
-receivers to see what has been updated.
-"""

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

@@ -143,7 +143,7 @@
         </tr>
     </table>
     <div class="order-button">
-        <a href="{% abseventurl event "presale:event.order.open" hash=order.email_confirm_secret order=order.code secret=order.secret %}" class="button">
+        <a href="{% abseventurl event "presale:event.order.open" hash=order.email_confirm_hash order=order.code secret=order.secret %}" class="button">
             {% trans "View order details" %}
         </a>
     </div>

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/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
         )
 
@@ -308,7 +308,7 @@ def markdown_compile_email(source, allowed_tags=ALLOWED_TAGS, allowed_attributes
             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/timeline.py

@@ -103,7 +103,7 @@ def timeline_for_event(event, subevent=None):
         tl.append(TimelineEvent(
             event=event, subevent=subevent,
             datetime=rd.datetime(ev),
-            description=pgettext_lazy('timeline', 'Customers can no longer modify their order information'),
+            description=pgettext_lazy('timeline', 'Customers can no longer modify their orders'),
             edit_url=ev_edit_url
         ))
 
@@ -159,18 +159,6 @@ def timeline_for_event(event, subevent=None):
             })
         ))
 
-    rd = event.settings.get('change_allow_user_until', as_type=RelativeDateWrapper)
-    if rd and event.settings.change_allow_user_until:
-        tl.append(TimelineEvent(
-            event=event, subevent=subevent,
-            datetime=rd.datetime(ev),
-            description=pgettext_lazy('timeline', 'Customers can no longer make changes to their orders'),
-            edit_url=reverse('control:event.settings.cancel', kwargs={
-                'event': event.slug,
-                'organizer': event.organizer.slug
-            })
-        ))
-
     rd = event.settings.get('waiting_list_auto_disable', as_type=RelativeDateWrapper)
     if rd and event.settings.waiting_list_enabled:
         tl.append(TimelineEvent(

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

@@ -36,7 +36,6 @@ import sys
 from importlib import import_module
 
 from django.conf import settings
-from django.core.cache import cache
 from django.db.models import Q
 from django.urls import Resolver404, get_script_prefix, resolve
 from django.utils.translation import get_language
@@ -153,8 +152,6 @@ def _default_context(request):
             ctx['warning_update_available'] = True
         if not gs.settings.update_check_ack and 'runserver' not in sys.argv:
             ctx['warning_update_check_active'] = True
-        if not cache.get('pretix_runperiodic_executed') and not settings.DEBUG:
-            ctx['warning_cronjob'] = True
 
     ctx['ie_deprecation_warning'] = 'MSIE' in request.headers.get('User-Agent', '') or 'Trident/' in request.headers.get('User-Agent', '')
 

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

@@ -136,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 "
@@ -228,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'))
@@ -854,7 +844,6 @@ class InvoiceSettingsForm(EventSettingsValidationMixin, SettingsForm):
         'invoice_address_company_required',
         'invoice_address_beneficiary',
         'invoice_address_custom_field',
-        'invoice_address_custom_field_helptext',
         'invoice_name_required',
         'invoice_address_not_asked_free',
         'invoice_include_free',

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.")