Tests python3.11 compat

Fix test case
fix display dependency in category settings
2024-10-14 13:20:07 +02:00 · 2024-10-14 12:06:27 +02:00 · 2024-10-14 10:23:34 +02:00 · 2024-10-14 10:23:34 +02:00 · 2024-10-11 13:59:22 +02:00 · 2024-10-11 11:34:13 +02:00
241 changed files with 98660 additions and 107790 deletions
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'
@@ -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:
@@ -294,10 +294,6 @@ Example::
    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``.

@@ -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,
@@ -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**:

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

@@ -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",
@@ -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
@@ -1,4 +1,4 @@
-.. _`rest-seats`:
+.. _`rest-reusablemedia`:

 Seats
 =====
@@ -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.
@@ -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:
@@ -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
@@ -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


@@ -84,6 +84,8 @@ convenient to you:

   .. automethod:: _register_fonts

+   .. automethod:: _register_event_fonts
+
   .. automethod:: _on_first_page

   .. automethod:: _on_other_page
@@ -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

@@ -1,5 +1,5 @@
 KulturPass
-==========
+=========

 .. note::

@@ -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
@@ -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
@@ -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",
@@ -55,7 +55,7 @@ dependencies = [
  "django-scopes==2.0.*",
  "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.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,7 +102,7 @@ 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]
@@ -110,17 +111,18 @@ dev = [
  "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.*",
@@ -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.11.0.dev0"
+__version__ = "2024.10.0.dev0"
@@ -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
@@ -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,
+    )
+}
@@ -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):
@@ -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)

@@ -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)

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

@@ -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(
@@ -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',
                )
            ),
@@ -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()
@@ -1122,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']

@@ -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)

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

@@ -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",),
-            },
-        ),
-    ]
@@ -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",
-        ),
-    ]
@@ -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]

@@ -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()
@@ -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)
@@ -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
@@ -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
@@ -1024,9 +1024,10 @@ class Event(EventMixin, LoggedModel):

        checkin_list_map = {}
        for cl in other.checkin_lists.filter(subevent__isnull=True).prefetch_related(
-            'limit_products'
+            'limit_products', 'auto_checkin_sales_channels'
        ):
            items = list(cl.limit_products.all())
+            auto_checkin_sales_channels = list(cl.auto_checkin_sales_channels.all())
            checkin_list_map[cl.pk] = cl
            cl.pk = None
            cl._prefetched_objects_cache = {}
@@ -1038,6 +1039,8 @@ class Event(EventMixin, LoggedModel):
            cl.log_action('pretix.object.cloned')
            for i in items:
                cl.limit_products.add(item_map[i.pk])
+            if auto_checkin_sales_channels:
+                cl.auto_checkin_sales_channels.set(self.organizer.sales_channels.filter(identifier__in=[s.identifier for s in auto_checkin_sales_channels]))

        if other.seating_plan:
            if other.seating_plan.organizer_id == self.organizer_id:
@@ -145,9 +145,9 @@ 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())
+        category_type = self.get_category_type_display()
+        if category_type:
+            return _('{category} ({category_type})').format(category=str(name), category_type=category_type)
        return str(name)

    def get_category_type_display(self):
@@ -156,7 +156,7 @@ class ItemCategory(LoggedModel):
        elif self.cross_selling_mode:
            return self.get_cross_selling_mode_display()
        else:
-            return _('Normal category')
+            return None

    @property
    def category_type(self):
@@ -1118,12 +1118,13 @@ class ItemVariation(models.Model):
    :param original_price: The item's "original" price. Will not be used for any calculations, will just be shown.
    :type original_price: decimal.Decimal
    :param require_approval: If set to ``True``, orders containing this variation can only be processed and paid after
-                             approval by an administrator
+    approval by an administrator
    :type require_approval: bool
    :param all_sales_channels: A flag indicating that this variation is available on all channels and limit_sales_channels will be ignored.
    :type all_sales_channels: bool
    :param limit_sales_channels: A list of sales channel identifiers, that this variation is available for sale on.
    :type limit_sales_channels: list
+
    """
    item = models.ForeignKey(
        Item,
@@ -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
@@ -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
@@ -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:
@@ -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):
    """
@@ -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:
@@ -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]):
@@ -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):
@@ -71,9 +71,7 @@ class CrossSellingService:
            )
        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)
+            category.category_has_discount = any(item.original_price for item in items)
        return result

    def _applicable_categories(self, subevent_id):
@@ -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()
                        }
                    )
                )
@@ -262,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,
@@ -443,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
@@ -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,
@@ -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,
@@ -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.
-"""
@@ -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>
@@ -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,
@@ -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(
@@ -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', '')

@@ -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,
        }

@@ -844,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',
@@ -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'))
@@ -609,49 +609,6 @@ class OrderFeeChangeForm(forms.Form):
        change_decimal_field(self.fields['value'], instance.order.event.currency)


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

-from pretix.api.auth.devicesecurity import get_all_security_profiles
 from pretix.api.models import WebHook
 from pretix.api.webhooks import get_all_webhook_events
 from pretix.base.customersso.oidc import oidc_validate_and_complete_config
@@ -312,11 +311,6 @@ class DeviceForm(forms.ModelForm):
            '-has_subevents', '-date_from'
        )
        self.fields['gate'].queryset = organizer.gates.all()
-        self.fields['security_profile'] = forms.ChoiceField(
-            label=self.fields['security_profile'].label,
-            help_text=self.fields['security_profile'].help_text,
-            choices=[(k, v.verbose_name) for k, v in get_all_security_profiles().items()],
-        )

    def clean(self):
        d = super().clean()
@@ -350,11 +344,6 @@ class DeviceBulkEditForm(forms.ModelForm):
            '-has_subevents', '-date_from'
        )
        self.fields['gate'].queryset = organizer.gates.all()
-        self.fields['security_profile'] = forms.ChoiceField(
-            label=self.fields['security_profile'].label,
-            help_text=self.fields['security_profile'].help_text,
-            choices=[(k, v.verbose_name) for k, v in get_all_security_profiles().items()],
-        )

    def clean(self):
        d = super().clean()
@@ -239,14 +239,11 @@ class VoucherForm(I18nModelForm):
                self.instance.event, self.instance.quota, self.instance.item, self.instance.variation
            )
        Voucher.clean_voucher_code(data, self.instance.event, self.instance.pk)
-        if 'seat' in self.fields:
-            if data.get('seat'):
-                self.instance.seat = Voucher.clean_seat_id(
-                    data, self.instance.item, self.instance.quota, self.instance.event, self.instance.pk
-                )
-                self.instance.item = self.instance.seat.product
-            else:
-                self.instance.seat = None
+        if 'seat' in self.fields and data.get('seat'):
+            self.instance.seat = Voucher.clean_seat_id(
+                data, self.instance.item, self.instance.quota, self.instance.event, self.instance.pk
+            )
+            self.instance.item = self.instance.seat.product

        voucher_form_validation.send(sender=self.instance.event, form=self, data=data)

@@ -51,7 +51,6 @@ from pretix.base.models import (
    Checkin, CheckinList, Event, ItemVariation, LogEntry, OrderPosition,
    TaxRule,
 )
-from pretix.base.models.orders import PrintLog
 from pretix.base.signals import logentry_display, orderposition_blocked_display
 from pretix.base.templatetags.money import money_filter

@@ -613,7 +612,7 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):

    if logentry.action_type == 'pretix.event.order.consent':
        return _('The user confirmed the following message: "{}"').format(
-            bleach.clean(logentry.parsed_data.get('msg'), tags=set(), strip=True)
+            bleach.clean(logentry.parsed_data.get('msg'), tags=[], strip=True)
        )

    if logentry.action_type == 'pretix.event.order.canceled':
@@ -640,16 +639,6 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
    if sender and logentry.action_type.startswith('pretix.event.checkin'):
        return _display_checkin(sender, logentry)

-    if logentry.action_type == 'pretix.event.order.print':
-        return _('Position #{posid} has been printed at {datetime} with type "{type}".').format(
-            posid=data.get('positionid'),
-            datetime=date_format(
-                dateutil.parser.parse(data["datetime"]).astimezone(sender.timezone),
-                "SHORT_DATETIME_FORMAT"
-            ),
-            type=dict(PrintLog.PRINT_TYPES)[data["type"]],
-        )
-
    if logentry.action_type == 'pretix.control.views.checkin':
        # deprecated
        dt = dateutil.parser.parse(data.get('datetime'))
@@ -421,14 +421,6 @@
                            </a>
                        </div>
                    {% endif %}
-                    {% if warning_cronjob %}
-                        <div class="alert alert-warning">
-                            {% blocktrans trimmed %}
-                                The cronjob component of pretix was not executed in the last hours. Please check that
-                                you have completed all installation steps and your cronjob is executed correctly.
-                            {% endblocktrans %}
-                        </div>
-                    {% endif %}

                    {% if debug_warning %}
                        <div class="alert alert-danger">
@@ -67,6 +67,7 @@
                {% bootstrap_field form.allow_entry_after_exit layout="control" %}
                {% bootstrap_field form.addon_match layout="control" %}
                {% bootstrap_field form.exit_all_at layout="control" %}
+                {% bootstrap_field form.auto_checkin_sales_channels layout="control" %}
                {% if form.gates %}
                    {% bootstrap_field form.gates layout="control" %}
                {% endif %}
@@ -101,6 +101,7 @@
                            <a href="?{% url_replace request 'ordering' 'subevent' %}"><i class="fa fa-caret-up"></i></a>
                        </th>
                    {% endif %}
+                    <th class="iconcol">{% trans "Automated check-in" %}</th>
                    <th>{% trans "Products" %}</th>
                    <th class="action-col-2"></th>
                </tr>
@@ -136,6 +137,17 @@
                                </td>
                            {% endif %}
                        {% endif %}
+                        <td>
+                            {% for channel in cl.auto_checkin_sales_channels.all %}
+                                {% if "." in channel.icon %}
+                                    <img src="{% static channel.icon %}" class="fa-like-image"
+                                         data-toggle="tooltip" title="{{ channel.label }}">
+                                {% else %}
+                                    <span class="fa fa-{{ channel.icon }} text-muted"
+                                          data-toggle="tooltip" title="{{ channel.label }}"></span>
+                                {% endif %}
+                            {% endfor %}
+                        </td>
                        <td>
                            {% if cl.all_products %}
                                <em>{% trans "All" %}</em>
@@ -32,7 +32,6 @@
                {% bootstrap_field form.invoice_address_beneficiary layout="control" %}
                {% bootstrap_field form.invoice_address_not_asked_free layout="control" %}
                {% bootstrap_field form.invoice_address_custom_field layout="control" %}
-                {% bootstrap_field form.invoice_address_custom_field_helptext layout="control" %}
                {% bootstrap_field form.invoice_address_explanation_text layout="control" %}
            </fieldset>
            <fieldset>
@@ -12,22 +12,10 @@
    {% endif %}
    {% if object.id and not object.quotas.exists %}
        <div class="alert alert-warning">
-            <div class="row">
-                <div class="col-lg-8">
-                    {% blocktrans trimmed %}
-                        Please note that your product will <strong>not</strong> be available for sale until you have added your
-                        item to an existing or newly created quota.
-                    {% endblocktrans %}
-                </div>
-                <div class="col-lg-4 text-right">
-                    <a class="btn btn-default btn-sm" href="{% url "control:event.items.quotas" organizer=request.event.organizer.slug event=request.event.slug %}">
-                        <i class="fa fa-wrench"></i> {% trans "Manage quotas" %}
-                    </a>
-                    <a class="btn btn-default btn-sm" href="{% url "control:event.items.quotas.add" organizer=request.event.organizer.slug event=request.event.slug %}?{% if object.has_variations %}{% for var in object.variations.all %}product={{ object.pk }}-{{ var.pk }}&{% endfor %}{% else %}product={{ object.pk }}{% endif %}">
-                        <i class="fa fa-plus"></i> {% trans "Create a new quota" %}
-                    </a>
-                </div>
-            </div>
+            {% blocktrans trimmed %}
+                Please note that your product will <strong>not</strong> be available for sale until you have added your
+                item to an existing or newly created quota.
+            {% endblocktrans %}
        </div>
    {% elif object.pk and not object.is_available_by_time %}
        <div class="alert alert-warning">
@@ -67,22 +67,10 @@
                <div class="panel-body form-horizontal">
                    {% if form.instance.pk and not form.instance.quotas.exists %}
                        <div class="alert alert-warning">
-                            <div class="row">
-                                <div class="col-lg-8">
-                                    {% blocktrans trimmed %}
-                                        Please note that your variation will <strong>not</strong> be available for sale
-                                        until you have added it to an existing or newly created quota.
-                                    {% endblocktrans %}
-                                </div>
-                                <div class="col-lg-4 text-right">
-                                    <a class="btn btn-default btn-xs" href="{% url "control:event.items.quotas" organizer=request.event.organizer.slug event=request.event.slug %}">
-                                        <i class="fa fa-wrench"></i> {% trans "Manage quotas" %}
-                                    </a>
-                                    <a class="btn btn-default btn-xs" href="{% url "control:event.items.quotas.add" organizer=request.event.organizer.slug event=request.event.slug %}?product={{ form.instance.item.pk }}-{{ form.instance.pk }}">
-                                        <i class="fa fa-plus"></i> {% trans "Create a new quota" %}
-                                    </a>
-                                </div>
-                            </div>
+                            {% blocktrans trimmed %}
+                                Please note that your variation will <strong>not</strong> be available for sale
+                                until you have added it to an existing or newly created quota.
+                            {% endblocktrans %}
                        </div>
                    {% endif %}
                    {% bootstrap_form_errors form %}
@@ -16,18 +16,8 @@
                        {% bootstrap_field form.internal_name layout="control" %}
                    </div>
                    {% bootstrap_field form.description layout="control" %}
-                    {% bootstrap_field form.category_type layout="control" horizontal_field_class="big-radio-wrapper col-md-9" %}
-                    <div class="row" data-display-dependency="#id_category_type_2">
-                        <div class="col-md-offset-3 col-md-9">
-                            <div class="alert alert-info">
-                                {% blocktrans trimmed %}
-                                Please note that cross-selling categories are intended as a marketing feature and are not
-                                suitable for strictly ensuring that products are only available in certain combinations.
-                                {% endblocktrans %}
-                            </div>
-                        </div>
-                    </div>
-                    {% bootstrap_field form.cross_selling_condition layout="control" horizontal_field_class="col-md-9" %}
+                    {% bootstrap_field form.category_type layout="control" horizontal_field_class="big-radio-wrapper col-lg-9" %}
+                    {% bootstrap_field form.cross_selling_condition layout="control" horizontal_field_class="col-lg-9" %}
                    {% bootstrap_field form.cross_selling_match_products layout="control" %}
                </fieldset>
            </div>
@@ -13,52 +13,31 @@
            {% trans "Edit question" %}
        </a>
    </h1>
-
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">{% trans "Filter" %}</h3>
-        </div>
-        <form class="panel-body filter-form" action="" method="get">
-            <div class="row">
-                <div class="col-lg-2 col-sm-6 col-xs-6">
-                    <select name="status" class="form-control">
-                        <option value="" {% if request.GET.status == "" %}selected="selected"{% endif %}>{% trans "All orders" %}</option>
-                        <option value="p" {% if request.GET.status == "p" %}selected="selected"{% endif %}>{% trans "Paid" %}</option>
-                        <option value="pv" {% if request.GET.status == "pv" %}selected="selected"{% endif %}>{% trans "Paid or confirmed" %}</option>
-                        <option value="n" {% if request.GET.status == "n" %}selected="selected"{% endif %}>{% trans "Pending" %}</option>
-                        <option value="np" {% if request.GET.status == "np" or "status" not in request.GET %}selected="selected"{% endif %}>{% trans "Pending or paid" %}</option>
-                        <option value="o" {% if request.GET.status == "o" %}selected="selected"{% endif %}>{% trans "Pending (overdue)" %}</option>
-                        <option value="e" {% if request.GET.status == "e" %}selected="selected"{% endif %}>{% trans "Expired" %}</option>
-                        <option value="ne" {% if request.GET.status == "ne" %}selected="selected"{% endif %}>{% trans "Pending or expired" %}</option>
-                        <option value="c" {% if request.GET.status == "c" %}selected="selected"{% endif %}>{% trans "Canceled" %}</option>
-                    </select>
-                </div>
-                <div class="col-lg-5 col-sm-6 col-xs-6">
-                    <select name="item" class="form-control">
-                        <option value="">{% trans "All products" %}</option>
-                        {% for item in items %}
-                            <option value="{{ item.id }}"
-                                    {% if request.GET.item|add:0 == item.id %}selected="selected"{% endif %}>
-                                {{ item.name }}
-                            </option>
-                        {% endfor %}
-                    </select>
-                </div>
-                {% if request.event.has_subevents %}
-                    <div class="col-lg-5 col-sm-6 col-xs-6">
-                        {% include "pretixcontrol/event/fragment_subevent_choice_simple.html" %}
-                    </div>
-                {% endif %}
-            </div>
-            <div class="text-right">
-                <button class="btn btn-primary btn-lg" type="submit">
-                    <span class="fa fa-filter"></span>
-                    {% trans "Filter" %}
-                </button>
-            </div>
-        </form>
-    </div>
-
+    <form class="form-inline helper-display-inline" action="" method="get">
+        <p>
+            <select name="status" class="form-control">
+                <option value="" {% if request.GET.status == "" %}selected="selected"{% endif %}>{% trans "All orders" %}</option>
+                <option value="p" {% if request.GET.status == "p" %}selected="selected"{% endif %}>{% trans "Paid" %}</option>
+                <option value="pv" {% if request.GET.status == "pv" %}selected="selected"{% endif %}>{% trans "Paid or confirmed" %}</option>
+                <option value="n" {% if request.GET.status == "n" %}selected="selected"{% endif %}>{% trans "Pending" %}</option>
+                <option value="np" {% if request.GET.status == "np" or "status" not in request.GET %}selected="selected"{% endif %}>{% trans "Pending or paid" %}</option>
+                <option value="o" {% if request.GET.status == "o" %}selected="selected"{% endif %}>{% trans "Pending (overdue)" %}</option>
+                <option value="e" {% if request.GET.status == "e" %}selected="selected"{% endif %}>{% trans "Expired" %}</option>
+                <option value="ne" {% if request.GET.status == "ne" %}selected="selected"{% endif %}>{% trans "Pending or expired" %}</option>
+                <option value="c" {% if request.GET.status == "c" %}selected="selected"{% endif %}>{% trans "Canceled" %}</option>
+            </select>
+            <select name="item" class="form-control">
+                <option value="">{% trans "All products" %}</option>
+                {% for item in items %}
+                    <option value="{{ item.id }}"
+                            {% if request.GET.item|add:0 == item.id %}selected="selected"{% endif %}>
+                        {{ item.name }}
+                    </option>
+                {% endfor %}
+            </select>
+            <button class="btn btn-primary" type="submit">{% trans "Filter" %}</button>
+        </p>
+    </form>
    <div class="row" id="question-stats">
        {% if not stats %}
            <div class="empty-collection col-md-10 col-xs-12">
@@ -96,7 +75,7 @@
                    {% for stat in stats %}
                        <tr>
                            <td>
-                                <a href="{% url "control:event.orders" event=request.event.slug organizer=request.event.organizer.slug %}?status={{ request.GET.status|default:"np" }}&item={{ request.GET.item }}&subevent={{ request.GET.subevent }}&question={{ question.pk }}&answer={{ stat.alink|default:stat.answer|urlencode }}">
+                                <a href="{% url "control:event.orders" event=request.event.slug organizer=request.event.organizer.slug %}?status={{ request.GET.status|default:"np" }}&item={{ request.GET.item }}&question={{ question.pk }}&answer={{ stat.alink|default:stat.answer|urlencode }}">
                                    {{ stat.answer }}
                                </a>
                            </td>
@@ -296,11 +296,11 @@
        {% endfor %}


-        <div class="formset" data-formset data-formset-prefix="{{ add_position_formset.prefix }}">
-            {{ add_position_formset.management_form }}
-            {% bootstrap_formset_errors add_position_formset %}
+        <div class="formset" data-formset data-formset-prefix="{{ add_formset.prefix }}">
+            {{ add_formset.management_form }}
+            {% bootstrap_formset_errors add_formset %}
            <div data-formset-body>
-                {% for add_form in add_position_formset %}
+                {% for add_form in add_formset %}
                    <div class="panel panel-default items" data-formset-form data-subevent="0">
                        <div class="panel-heading">
                            <h3 class="panel-title">
@@ -351,25 +351,25 @@
                                </button>
                                {% trans "Add product" %}
                                <div class="sr-only">
-                                    {{ add_position_formset.empty_form.id }}
-                                    {% bootstrap_field add_position_formset.empty_form.DELETE form_group_class="" layout="inline" %}
+                                    {{ add_formset.empty_form.id }}
+                                    {% bootstrap_field add_formset.empty_form.DELETE form_group_class="" layout="inline" %}
                                </div>
                            </h3>
                        </div>
                        <div class="panel-body">
                            <div class="form-horizontal">
-                                {% bootstrap_field add_position_formset.empty_form.itemvar layout="control" %}
-                                {% bootstrap_field add_position_formset.empty_form.price addon_after=request.event.currency layout="control" %}
-                                {% if add_position_formset.empty_form.addon_to %}
-                                    {% bootstrap_field add_position_formset.empty_form.addon_to layout="control" %}
+                                {% bootstrap_field add_formset.empty_form.itemvar layout="control" %}
+                                {% bootstrap_field add_formset.empty_form.price addon_after=request.event.currency layout="control" %}
+                                {% if add_formset.empty_form.addon_to %}
+                                    {% bootstrap_field add_formset.empty_form.addon_to layout="control" %}
                                {% endif %}
-                                {% if add_position_formset.empty_form.subevent %}
-                                    {% bootstrap_field add_position_formset.empty_form.subevent layout="control" %}
+                                {% if add_formset.empty_form.subevent %}
+                                    {% bootstrap_field add_formset.empty_form.subevent layout="control" %}
                                {% endif %}
-                                {% if add_position_formset.empty_form.used_membership %}
-                                    {% bootstrap_field add_position_formset.empty_form.used_membership layout="control" %}
+                                {% if add_formset.empty_form.used_membership %}
+                                    {% bootstrap_field add_formset.empty_form.used_membership layout="control" %}
                                {% endif %}
-                                {% bootstrap_field add_position_formset.empty_form.seat layout="control" %}
+                                {% bootstrap_field add_formset.empty_form.seat layout="control" %}
                            </div>
                        </div>
                    </div>
@@ -431,77 +431,13 @@
                        {% bootstrap_field fee.form.operation_cancel layout='inline' %}
                        {% if fee.fee_type == "payment" %}
                            <em class="text-danger">
-                                {% trans "Manually modifying payment fees is discouraged since they might automatically be updated on subsequent order changes or when choosing a different payment method." %}
+                                {% trans "Manually modifying payment fees is discouraged since they might automatically be on subsequent order changes or when choosing a different payment method." %}
                            </em>
                        {% endif %}
                    </div>
                </div>
            </div>
        {% endfor %}
-
-        <div class="formset" data-formset data-formset-prefix="{{ add_fee_formset.prefix }}">
-            {{ add_fee_formset.management_form }}
-            {% bootstrap_formset_errors add_fee_formset %}
-            <div data-formset-body>
-                {% for add_form in add_fee_formset %}
-                    <div class="panel panel-default items" data-formset-form data-subevent="0">
-                        <div class="panel-heading">
-                            <h3 class="panel-title">
-                                <button type="button" class="btn btn-danger btn-xs pull-right flip"
-                                        data-formset-delete-button>
-                                    <i class="fa fa-trash"></i>
-                                </button>
-                                {% trans "Add fee" %}
-                                <div class="sr-only">
-                                    {{ add_form.id }}
-                                    {% bootstrap_field add_form.DELETE form_group_class="" layout="inline" %}
-                                </div>
-                            </h3>
-                        </div>
-                        <div class="panel-body">
-                            <div class="form-horizontal">
-                                {% bootstrap_field add_form.fee_type layout='control' %}
-                                {% bootstrap_field add_form.value addon_after=request.event.currency layout='control' %}
-                                {% bootstrap_field add_form.tax_rule layout='control' %}
-                                {% bootstrap_field add_form.description layout='control' %}
-                            </div>
-                        </div>
-                    </div>
-                {% endfor %}
-            </div>
-            <script type="form-template" data-formset-empty-form>
-                {% escapescript %}
-                    <div class="panel panel-default items" data-formset-form data-subevent="0">
-                        <div class="panel-heading">
-                            <h3 class="panel-title">
-                                <button type="button" class="btn btn-danger btn-xs pull-right flip"
-                                        data-formset-delete-button>
-                                    <i class="fa fa-trash"></i>
-                                </button>
-                                {% trans "Add fee" %}
-                                <div class="sr-only">
-                                    {{ add_fee_formset.empty_form.id }}
-                                    {% bootstrap_field add_fee_formset.empty_form.DELETE form_group_class="" layout="inline" %}
-                                </div>
-                            </h3>
-                        </div>
-                        <div class="panel-body">
-                            <div class="form-horizontal">
-                                {% bootstrap_field add_fee_formset.empty_form.fee_type layout='control' %}
-                                {% bootstrap_field add_fee_formset.empty_form.value addon_after=request.event.currency layout='control' %}
-                                {% bootstrap_field add_fee_formset.empty_form.tax_rule layout='control' %}
-                                {% bootstrap_field add_fee_formset.empty_form.description layout='control' %}
-                            </div>
-                        </div>
-                    </div>
-                {% endescapescript %}
-            </script>
-            <p>
-                <button type="button" class="btn btn-primary" data-formset-add>
-                    <i class="fa fa-plus"></i> {% trans "Add fee" %}</button>
-            </p>
-        </div>
-
        <div class="panel panel-default items">
            <div class="panel-heading">
                <h3 class="panel-title">
@@ -198,7 +198,7 @@
                                </a>
                            {% endif %}
                        </dd>
-                        {% if order.status == "n" and not order.require_approval %}
+                        {% if order.status == "n" %}
                            <dt>{% trans "Expiry date" %}</dt>
                            <dd>
                                {{ order.expires|date:"SHORT_DATETIME_FORMAT" }}
@@ -21,11 +21,6 @@
            {% trans "The waiting list is no longer active for this event. The waiting list no longer affects quotas and no longer notifies waiting users." %}
        </div>
    {% endif %}
-    {% if request.event.settings.hide_sold_out %}
-        <div class="alert alert-warning">
-            {% trans "According to your event settings, sold out products are hidden from customers. This way, customers will not be able to discover the waiting list." %}
-        </div>
-    {% endif %}
    <div class="row">
        {% if 'can_change_orders' in request.eventpermset %}
            <form method="post" class="col-md-6"
@@ -94,9 +94,7 @@ def process_login(request, user, keep_logged_in):
        pretix_successful_logins.inc(1)
        handle_login_source(user, request)
        auth_login(request, user)
-        t = int(time.time())
-        request.session['pretix_auth_login_time'] = t
-        request.session['pretix_auth_last_used'] = t
+        request.session['pretix_auth_login_time'] = int(time.time())
        if next_url and url_has_allowed_host_and_scheme(next_url, allowed_hosts=None):
            return redirect_to_url(next_url)
        return redirect('control:index')
@@ -39,7 +39,7 @@ from django.contrib import messages
 from django.core.exceptions import PermissionDenied
 from django.db import transaction
 from django.db.models import Exists, Max, OuterRef, Prefetch, Q, Subquery
-from django.http import Http404, HttpResponseNotAllowed, HttpResponseRedirect
+from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.utils.functional import cached_property
@@ -193,9 +193,6 @@ class CheckInListShow(EventPermissionRequiredMixin, PaginationMixin, CheckInList
 class CheckInListBulkRevertConfirmView(CheckInListQueryMixin, EventPermissionRequiredMixin, TemplateView):
    template_name = "pretixcontrol/checkin/bulk_revert_confirm.html"

-    def get(self, request, *args, **kwargs):
-        return HttpResponseNotAllowed(permitted_methods=["POST"])
-
    def post(self, request, *args, **kwargs):
        self.list = get_object_or_404(self.request.event.checkin_lists.all(), pk=kwargs.get("list"))
        return super().get(request, *args, **kwargs)
@@ -299,7 +296,7 @@ class CheckinListList(EventPermissionRequiredMixin, PaginationMixin, ListView):

    def get_queryset(self):
        qs = self.request.event.checkin_lists.select_related('subevent').prefetch_related(
-            "limit_products",
+            "limit_products", "auto_checkin_sales_channels"
        )

        if self.filter_form.is_valid():
@@ -257,7 +257,7 @@ class CategoryUpdate(EventPermissionRequiredMixin, UpdateView):
        messages.success(self.request, _('Your changes have been saved.'))
        if form.has_changed():
            self.object.log_action(
-                'pretix.event.category.changed', user=self.request.user, data={
+                'pretix.event.category.reordered', user=self.request.user, data={
                    k: form.cleaned_data.get(k) for k in form.changed_data
                }
            )
@@ -302,8 +302,6 @@ class CategoryCreate(EventPermissionRequiredMixin, CreateView):
            i = modelcopy(self.copy_from)
            i.pk = None
            kwargs['instance'] = i
-            kwargs.setdefault('initial', {})
-            kwargs['initial']['cross_selling_match_products'] = [str(i.pk) for i in self.copy_from.cross_selling_match_products.all()]
        else:
            kwargs['instance'] = ItemCategory(event=self.request.event)
        return kwargs
@@ -663,10 +661,6 @@ class QuestionView(EventPermissionRequiredMixin, QuestionMixin, ChartContainingV
            question=self.object, orderposition__isnull=False,
            orderposition__order__event=self.request.event
        )
-
-        if self.request.GET.get("subevent", "") != "":
-            qs = qs.filter(orderposition__subevent=self.request.GET["subevent"])
-
        s = self.request.GET.get("status", "np")
        if s != "":
            if s == 'o':
@@ -920,19 +914,16 @@ class QuotaCreate(EventPermissionRequiredMixin, CreateView):
    def get_form_kwargs(self):
        kwargs = super().get_form_kwargs()

-        kwargs.setdefault('initial', {})
        if self.copy_from:
            i = modelcopy(self.copy_from)
            i.pk = None
            kwargs['instance'] = i
+            kwargs.setdefault('initial', {})
            kwargs['initial']['itemvars'] = [str(i.pk) for i in self.copy_from.items.all()] + [
                '{}-{}'.format(v.item_id, v.pk) for v in self.copy_from.variations.all()
            ]
        else:
            kwargs['instance'] = Quota(event=self.request.event)
-            if 'product' in self.request.GET:
-                kwargs['initial']['itemvars'] = self.request.GET.getlist('product')
-
        return kwargs

    def form_invalid(self, form):
@@ -122,11 +122,10 @@ from pretix.control.forms.filter import (
 )
 from pretix.control.forms.orders import (
    CancelForm, CommentForm, DenyForm, EventCancelForm, ExporterForm,
-    ExtendForm, MarkPaidForm, OrderContactForm, OrderFeeAddForm,
-    OrderFeeAddFormset, OrderFeeChangeForm, OrderLocaleForm, OrderMailForm,
-    OrderPositionAddForm, OrderPositionAddFormset, OrderPositionChangeForm,
-    OrderPositionMailForm, OrderRefundForm, OtherOperationsForm,
-    ReactivateOrderForm,
+    ExtendForm, MarkPaidForm, OrderContactForm, OrderFeeChangeForm,
+    OrderLocaleForm, OrderMailForm, OrderPositionAddForm,
+    OrderPositionAddFormset, OrderPositionChangeForm, OrderPositionMailForm,
+    OrderRefundForm, OtherOperationsForm, ReactivateOrderForm,
 )
 from pretix.control.forms.rrule import RRuleForm
 from pretix.control.permissions import EventPermissionRequiredMixin
@@ -1875,30 +1874,18 @@ class OrderChange(OrderView):
                                   data=self.request.POST if self.request.method == "POST" else None)

    @cached_property
-    def add_position_formset(self):
+    def add_formset(self):
        ff = formset_factory(
            OrderPositionAddForm, formset=OrderPositionAddFormset,
            can_order=False, can_delete=True, extra=0
        )
        return ff(
-            prefix='add_position',
+            prefix='add',
            order=self.order,
            items=self.items,
            data=self.request.POST if self.request.method == "POST" else None
        )

-    @cached_property
-    def add_fee_formset(self):
-        ff = formset_factory(
-            OrderFeeAddForm, formset=OrderFeeAddFormset,
-            can_order=False, can_delete=True, extra=0
-        )
-        return ff(
-            prefix='add_fee',
-            order=self.order,
-            data=self.request.POST if self.request.method == "POST" else None
-        )
-
    @cached_property
    def items(self):
        return self.request.event.items.prefetch_related('variations', 'tax_rule').all()
@@ -1927,8 +1914,7 @@ class OrderChange(OrderView):
        ctx = super().get_context_data(**kwargs)
        ctx['positions'] = self.positions
        ctx['fees'] = self.fees
-        ctx['add_position_formset'] = self.add_position_formset
-        ctx['add_fee_formset'] = self.add_fee_formset
+        ctx['add_formset'] = self.add_formset
        ctx['other_form'] = self.other_form
        ctx['use_revocation_list'] = self.request.event.ticket_secret_generator.use_revocation_list
        return ctx
@@ -1943,35 +1929,12 @@ class OrderChange(OrderView):
                )
            return True

-    def _process_add_fees(self, ocm):
-        if not self.add_fee_formset.is_valid():
+    def _process_add(self, ocm):
+        if not self.add_formset.is_valid():
            return False
        else:
-            for f in self.add_fee_formset.forms:
-                if f in self.add_fee_formset.deleted_forms or not f.has_changed():
-                    continue
-
-                f = OrderFee(
-                    fee_type=f.cleaned_data['fee_type'],
-                    value=f.cleaned_data['value'],
-                    order=ocm.order,
-                    tax_rule=f.cleaned_data['tax_rule'],
-                    description=f.cleaned_data['description'],
-                )
-                f._calculate_tax()
-                try:
-                    ocm.add_fee(f)
-                except OrderError as e:
-                    f.custom_error = str(e)
-                    return False
-        return True
-
-    def _process_add_positions(self, ocm):
-        if not self.add_position_formset.is_valid():
-            return False
-        else:
-            for f in self.add_position_formset.forms:
-                if f in self.add_position_formset.deleted_forms or not f.has_changed():
+            for f in self.add_formset.forms:
+                if f in self.add_formset.deleted_forms or not f.has_changed():
                    continue

                if '-' in f.cleaned_data['itemvar']:
@@ -1996,7 +1959,7 @@ class OrderChange(OrderView):
                    return False
        return True

-    def _process_change_fees(self, ocm):
+    def _process_fees(self, ocm):
        for f in self.fees:
            if not f.form.is_valid():
                return False
@@ -2017,7 +1980,7 @@ class OrderChange(OrderView):
                return False
        return True

-    def _process_change_positions(self, ocm):
+    def _process_change(self, ocm):
        for p in self.positions:
            if not p.form.is_valid():
                return False
@@ -2098,11 +2061,7 @@ class OrderChange(OrderView):
            notify=notify,
            reissue_invoice=self.other_form.cleaned_data['reissue_invoice'] if self.other_form.is_valid() else True
        )
-        form_valid = (self._process_add_fees(ocm) and
-                      self._process_add_positions(ocm) and
-                      self._process_change_fees(ocm) and
-                      self._process_change_positions(ocm) and
-                      self._process_other(ocm))
+        form_valid = self._process_add(ocm) and self._process_fees(ocm) and self._process_change(ocm) and self._process_other(ocm)

        if not form_valid:
            messages.error(self.request, _('An error occurred. Please see the details below.'))
@@ -156,7 +156,7 @@ def event_list(request):
        max_fromto=Greatest(Max('subevents__date_to'), Max('subevents__date_from'))
    ).annotate(
        order_from=Coalesce('min_from', 'date_from'),
-    ).order_by('-order_from', 'slug')
+    ).order_by('-order_from')

    total = qs.count()
    pagesize = 20
@@ -318,7 +318,7 @@ def nav_context_list(request):
        max_fromto=Greatest(Max('subevents__date_to'), Max('subevents__date_from'))
    ).annotate(
        order_from=Coalesce('min_from', 'date_from'),
-    ).order_by('-order_from', 'slug')
+    ).order_by('-order_from')

    if request.user.has_active_staff_session(request.session.session_key):
        qs_orga = Organizer.objects.all()
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-08 13:45+0000\n"
+"POT-Creation-Date: 2024-08-27 13:34+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -622,40 +622,40 @@ msgid ""
 "darker shade."
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:496
-#: pretix/static/pretixcontrol/js/ui/main.js:516
+#: pretix/static/pretixcontrol/js/ui/main.js:491
+#: pretix/static/pretixcontrol/js/ui/main.js:511
 msgid "Search query"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:514
+#: pretix/static/pretixcontrol/js/ui/main.js:509
 msgid "All"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:515
+#: pretix/static/pretixcontrol/js/ui/main.js:510
 msgid "None"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:519
+#: pretix/static/pretixcontrol/js/ui/main.js:514
 msgid "Selected only"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:862
+#: pretix/static/pretixcontrol/js/ui/main.js:847
 msgid "Enter page number between 1 and %(max)s."
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:865
+#: pretix/static/pretixcontrol/js/ui/main.js:850
 msgid "Invalid page number."
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:1023
+#: pretix/static/pretixcontrol/js/ui/main.js:1008
 msgid "Use a different name internally"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:1063
+#: pretix/static/pretixcontrol/js/ui/main.js:1048
 msgid "Click to close"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:1138
+#: pretix/static/pretixcontrol/js/ui/main.js:1123
 msgid "You have unsaved changes!"
 msgstr ""

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-08 13:45+0000\n"
+"POT-Creation-Date: 2024-08-27 13:34+0000\n"
 "PO-Revision-Date: 2021-09-15 11:22+0000\n"
 "Last-Translator: Mohamed Tawfiq <mtawfiq@wafyapp.com>\n"
 "Language-Team: Arabic <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -656,40 +656,40 @@ msgid ""
 "darker shade."
 msgstr "تباين اللون سيئ للخلفية البيضاء، الرجاء اختيار لون غامق."

-#: pretix/static/pretixcontrol/js/ui/main.js:496
-#: pretix/static/pretixcontrol/js/ui/main.js:516
+#: pretix/static/pretixcontrol/js/ui/main.js:491
+#: pretix/static/pretixcontrol/js/ui/main.js:511
 msgid "Search query"
 msgstr "البحث في الاستفسارات"

-#: pretix/static/pretixcontrol/js/ui/main.js:514
+#: pretix/static/pretixcontrol/js/ui/main.js:509
 msgid "All"
 msgstr "الكل"

-#: pretix/static/pretixcontrol/js/ui/main.js:515
+#: pretix/static/pretixcontrol/js/ui/main.js:510
 msgid "None"
 msgstr "لا شيء"

-#: pretix/static/pretixcontrol/js/ui/main.js:519
+#: pretix/static/pretixcontrol/js/ui/main.js:514
 msgid "Selected only"
 msgstr "المختارة فقط"

-#: pretix/static/pretixcontrol/js/ui/main.js:862
+#: pretix/static/pretixcontrol/js/ui/main.js:847
 msgid "Enter page number between 1 and %(max)s."
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:865
+#: pretix/static/pretixcontrol/js/ui/main.js:850
 msgid "Invalid page number."
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:1023
+#: pretix/static/pretixcontrol/js/ui/main.js:1008
 msgid "Use a different name internally"
 msgstr "قم باستخدم اسم مختلف داخليا"

-#: pretix/static/pretixcontrol/js/ui/main.js:1063
+#: pretix/static/pretixcontrol/js/ui/main.js:1048
 msgid "Click to close"
 msgstr "اضغط لاغلاق الصفحة"

-#: pretix/static/pretixcontrol/js/ui/main.js:1138
+#: pretix/static/pretixcontrol/js/ui/main.js:1123
 msgid "You have unsaved changes!"
 msgstr "لم تقم بحفظ التعديلات!"

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-08 13:45+0000\n"
+"POT-Creation-Date: 2024-08-27 13:34+0000\n"
 "PO-Revision-Date: 2020-12-19 07:00+0000\n"
 "Last-Translator: albert <albert.serra.monner@gmail.com>\n"
 "Language-Team: Catalan <https://translate.pretix.eu/projects/pretix/pretix-"
@@ -623,40 +623,40 @@ msgid ""
 "darker shade."
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:496
-#: pretix/static/pretixcontrol/js/ui/main.js:516
+#: pretix/static/pretixcontrol/js/ui/main.js:491
+#: pretix/static/pretixcontrol/js/ui/main.js:511
 msgid "Search query"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:514
+#: pretix/static/pretixcontrol/js/ui/main.js:509
 msgid "All"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:515
+#: pretix/static/pretixcontrol/js/ui/main.js:510
 msgid "None"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:519
+#: pretix/static/pretixcontrol/js/ui/main.js:514
 msgid "Selected only"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:862
+#: pretix/static/pretixcontrol/js/ui/main.js:847
 msgid "Enter page number between 1 and %(max)s."
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:865
+#: pretix/static/pretixcontrol/js/ui/main.js:850
 msgid "Invalid page number."
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:1023
+#: pretix/static/pretixcontrol/js/ui/main.js:1008
 msgid "Use a different name internally"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:1063
+#: pretix/static/pretixcontrol/js/ui/main.js:1048
 msgid "Click to close"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:1138
+#: pretix/static/pretixcontrol/js/ui/main.js:1123
 msgid "You have unsaved changes!"
 msgstr ""

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-08 13:45+0000\n"
+"POT-Creation-Date: 2024-08-27 13:34+0000\n"
 "PO-Revision-Date: 2023-09-15 06:00+0000\n"
 "Last-Translator: Michael <michael.happl@gmx.at>\n"
 "Language-Team: Czech <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -650,40 +650,40 @@ msgstr ""
 "Tato barva je pro text na bílém pozadí špatně kontrastní, zvolte prosím "
 "tmavší odstín."

-#: pretix/static/pretixcontrol/js/ui/main.js:496
-#: pretix/static/pretixcontrol/js/ui/main.js:516
+#: pretix/static/pretixcontrol/js/ui/main.js:491
+#: pretix/static/pretixcontrol/js/ui/main.js:511
 msgid "Search query"
 msgstr "Hledaný výraz"

-#: pretix/static/pretixcontrol/js/ui/main.js:514
+#: pretix/static/pretixcontrol/js/ui/main.js:509
 msgid "All"
 msgstr "Všechny"

-#: pretix/static/pretixcontrol/js/ui/main.js:515
+#: pretix/static/pretixcontrol/js/ui/main.js:510
 msgid "None"
 msgstr "Žádný"

-#: pretix/static/pretixcontrol/js/ui/main.js:519
+#: pretix/static/pretixcontrol/js/ui/main.js:514
 msgid "Selected only"
 msgstr "Pouze vybrané"

-#: pretix/static/pretixcontrol/js/ui/main.js:862
+#: pretix/static/pretixcontrol/js/ui/main.js:847
 msgid "Enter page number between 1 and %(max)s."
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:865
+#: pretix/static/pretixcontrol/js/ui/main.js:850
 msgid "Invalid page number."
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:1023
+#: pretix/static/pretixcontrol/js/ui/main.js:1008
 msgid "Use a different name internally"
 msgstr "Interně používat jiný název"

-#: pretix/static/pretixcontrol/js/ui/main.js:1063
+#: pretix/static/pretixcontrol/js/ui/main.js:1048
 msgid "Click to close"
 msgstr "Kliknutím zavřete"

-#: pretix/static/pretixcontrol/js/ui/main.js:1138
+#: pretix/static/pretixcontrol/js/ui/main.js:1123
 msgid "You have unsaved changes!"
 msgstr "Máte neuložené změny!"

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-08 13:45+0000\n"
+"POT-Creation-Date: 2024-08-27 13:34+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -623,40 +623,40 @@ msgid ""
 "darker shade."
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:496
-#: pretix/static/pretixcontrol/js/ui/main.js:516
+#: pretix/static/pretixcontrol/js/ui/main.js:491
+#: pretix/static/pretixcontrol/js/ui/main.js:511
 msgid "Search query"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:514
+#: pretix/static/pretixcontrol/js/ui/main.js:509
 msgid "All"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:515
+#: pretix/static/pretixcontrol/js/ui/main.js:510
 msgid "None"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:519
+#: pretix/static/pretixcontrol/js/ui/main.js:514
 msgid "Selected only"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:862
+#: pretix/static/pretixcontrol/js/ui/main.js:847
 msgid "Enter page number between 1 and %(max)s."
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:865
+#: pretix/static/pretixcontrol/js/ui/main.js:850
 msgid "Invalid page number."
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:1023
+#: pretix/static/pretixcontrol/js/ui/main.js:1008
 msgid "Use a different name internally"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:1063
+#: pretix/static/pretixcontrol/js/ui/main.js:1048
 msgid "Click to close"
 msgstr ""

-#: pretix/static/pretixcontrol/js/ui/main.js:1138
+#: pretix/static/pretixcontrol/js/ui/main.js:1123
 msgid "You have unsaved changes!"
 msgstr ""

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mira Weller	2848d85511	Tests python3.11 compat	2024-10-14 13:20:07 +02:00
Mira Weller	21707f8407	Fix test case	2024-10-14 12:06:27 +02:00
Mira Weller	711479bfed	fix display dependency in category settings	2024-10-14 10:23:34 +02:00
Mira Weller	c401e54831	improve formatting for subevents	2024-10-14 10:23:34 +02:00
Mira	27cfd4dbdd	Update src/pretix/control/templates/pretixcontrol/items/category.html Co-authored-by: Richard Schreiber <schreiber@rami.io>	2024-10-11 13:59:22 +02:00
Mira Weller	e5ab1b08a2	reformat code	2024-10-11 11:34:13 +02:00
Mira	7d22fe1a54	Update src/pretix/static/pretixcontrol/js/ui/main.js Co-authored-by: Richard Schreiber <schreiber@rami.io>	2024-10-11 11:11:40 +02:00
Mira	6c52cc8157	Apply suggestions from code review Co-authored-by: Richard Schreiber <schreiber@rami.io>	2024-10-11 11:11:08 +02:00
Mira Weller	0191d258ab	accessibility	2024-10-09 12:17:53 +02:00
Mira Weller	b312a21e5e	remove erroneous paste	2024-10-09 12:15:30 +02:00
Mira Weller	f9ca9a781e	one loop less	2024-10-09 12:13:11 +02:00
Mira Weller	a314d219b8	fix iteration	2024-10-09 12:01:47 +02:00
Mira Weller	9a6756ce5d	show discount notice on all categories with an available discount, not only those with cross_selling_condition=discount	2024-10-09 11:52:46 +02:00
Mira Weller	b3ca02d8e5	change style of discount notice	2024-10-09 11:38:04 +02:00
Mira Weller	88936b5e7a	improve wording of category types	2024-10-09 11:37:41 +02:00
Mira	6b9eefd231	Update src/pretix/static/pretixpresale/scss/_checkout.scss Co-authored-by: Richard Schreiber <schreiber@rami.io>	2024-10-07 21:19:02 +02:00
Mira Weller	6587cca608	add discount label	2024-10-02 12:12:43 +02:00
Mira Weller	3856095088	improve category type label for CROSS_SELLING_MODES=both	2024-10-02 09:57:16 +02:00
Mira Weller	a84a27cc0b	transfer cross_selling_match_products on event clone	2024-10-02 09:53:32 +02:00
Mira Weller	7d6b2d6df8	better description for CROSS_SELLING_CONDITION=discounts	2024-10-02 09:31:59 +02:00
Mira Weller	d4f997c345	describe new category options in docs	2024-10-02 09:29:05 +02:00
Mira Weller	bef88bf0d0	fix SUBEVENT_MODE_DISTINCT discounts	2024-10-01 18:46:44 +02:00
Mira Weller	159717c19f	formatting	2024-10-01 18:36:24 +02:00
Mira Weller	5e9b5a9c24	support for variations	2024-10-01 18:35:07 +02:00
Mira Weller	52849f8fdd	bugfix	2024-10-01 18:34:57 +02:00
Mira Weller	4f1ee82c4f	remove unused vars	2024-10-01 18:15:59 +02:00
Mira Weller	d5e480b7fd	fix cross selling recommendations for SUBEVENT_MODE_SAME discounts	2024-10-01 18:14:46 +02:00
Mira Weller	fd6ae65f23	add another test case	2024-10-01 18:14:17 +02:00
Mira Weller	94733135f0	add failing test for SUBEVENT_MODE_SAME	2024-10-01 17:29:25 +02:00
Mira Weller	e51927c4e0	update query numbers	2024-10-01 16:54:24 +02:00
Mira Weller	11c7c950cb	add subevent support to test framework	2024-10-01 16:52:47 +02:00
Mira Weller	0695365526	improved layout	2024-10-01 15:05:14 +02:00
Mira	0947476b41	Update src/pretix/base/services/cross_selling.py	2024-09-30 21:19:24 +02:00
Mira Weller	7a4aead22d	rename id_prefix to form_prefix	2024-09-30 21:16:17 +02:00
Mira	44de4bb26b	Apply suggestions from code review Co-authored-by: Raphael Michel <michel@rami.io>	2024-09-30 21:13:19 +02:00
Mira Weller	d879637b73	update query counts	2024-09-30 16:53:34 +02:00
Mira Weller	b5fc227fca	rebase migration	2024-09-27 16:36:54 +02:00
Mira Weller	1fb1696863	Merge remote-tracking branch 'origin/master' into cross-selling	2024-09-27 16:27:47 +02:00
Mira Weller	939d50061b	Merge remote-tracking branch 'origin/master' into cross-selling # Conflicts: # src/pretix/presale/templates/pretixpresale/event/fragment_product_list.html	2024-08-29 13:49:28 +02:00
Mira Weller	c1a5e8d912	codestyle	2024-08-01 23:01:11 +02:00
Mira Weller	106026045e	fix sqlite compat	2024-08-01 22:59:51 +02:00
Mira Weller	badbb64f4f	add validation to ItemCategorySerializer	2024-07-26 20:05:03 +02:00
Mira Weller	537a0993b0	add more detailed description of collect_potential_discounts parameter	2024-07-26 19:40:28 +02:00
Mira Weller	9337ad1f70	add prefetching, add test cases checking number of queries	2024-07-25 14:37:19 +02:00
Mira Weller	5087e654e2	cleanup	2024-07-22 11:26:14 +02:00
Mira Weller	dac2209243	rebase migration	2024-07-19 14:21:24 +02:00
Mira Weller	9cb708cf6f	fix typing	2024-07-19 14:21:24 +02:00
Mira Weller	e18c699529	formatting, refactoring	2024-07-19 14:21:24 +02:00
Mira Weller	9c3150ccde	add license header	2024-07-19 14:21:24 +02:00
Mira Weller	923798ea5f	fix cross-selling recommendation logic bug	2024-07-19 14:21:24 +02:00
Mira Weller	b8d2372cf6	store apply_discounts result for use in test cases	2024-07-19 14:21:24 +02:00
Mira Weller	e01e9151c3	correct type annotation	2024-07-19 14:21:24 +02:00
Mira Weller	09398ad7c7	add more test cases	2024-07-19 14:21:24 +02:00
Mira Weller	d1de8f5863	remove redundant check (this is already checked using the 'if not self.condition_min_count or self.condition_min_value' condition directly above)	2024-07-19 14:21:24 +02:00
Mira Weller	bee0eaa2fa	add some unit tests for cross-selling logic	2024-07-19 14:21:24 +02:00
Mira Weller	ac771b8ca8	refactor cross-selling logic into its own module	2024-07-19 14:21:24 +02:00
Mira Weller	cb635b2c37	add TODO for known error	2024-07-19 14:21:24 +02:00
Mira Weller	3fe6919bef	add typing	2024-07-19 14:21:24 +02:00
Mira Weller	8cfb69c265	clarifications	2024-07-19 14:21:24 +02:00
Mira Weller	77fc13605e	new sales channel compat	2024-07-19 14:21:24 +02:00
Mira Weller	a95976ed50	translate comments	2024-07-19 14:21:24 +02:00
Mira Weller	2e3a611498	isort	2024-07-19 14:21:24 +02:00
Mira Weller	6bf16f1510	Use namedtuple	2024-07-19 14:21:24 +02:00
Mira Weller	d29b183801	fix test case	2024-07-19 14:21:24 +02:00
Mira Weller	188ef5f463	isort	2024-07-19 14:21:24 +02:00
Mira Weller	a7e292ea58	fix case	2024-07-19 14:21:24 +02:00
Mira Weller	d04b855cce	category_type refactoring	2024-07-19 14:21:24 +02:00
Mira Weller	01b535a0af	cache potential discount information relevant if shop has multiple categories with cross_selling_condition=discounts	2024-07-19 14:21:23 +02:00
Mira Weller	d9f31aae8c	better var names	2024-07-19 14:21:23 +02:00
Mira Weller	715347cb35	filter non-buyable items from list	2024-07-19 14:21:23 +02:00
Mira Weller	32cc45f19a	make cross-selling-applicable more specific and cache state (only show if really applicable, e.g. don't show if product can't be bought due to order_max)	2024-07-19 14:21:23 +02:00
Mira Weller	cadf8dd39d	better order_max handling	2024-07-19 14:21:23 +02:00
Mira Weller	b136ac37c8	Hide addon text if only cross-selling, no addons in addon step	2024-07-19 14:21:23 +02:00
Mira Weller	8627eefebc	first round of cleanup	2024-07-19 14:21:23 +02:00
Mira Weller	e71d3e21ca	display discounted prices, limit number of products according to discount rule	2024-07-19 14:21:23 +02:00
Mira Weller	a18adb8a88	wip	2024-07-19 14:21:23 +02:00
Mira Weller	f56d67ec9c	add todo notes	2024-07-19 14:21:23 +02:00
Mira Weller	c156581ad1	fix discount collection (?)	2024-07-19 14:21:23 +02:00
Mira Weller	8791280d0b	Implement discount prediction (very WIP!)	2024-07-19 14:21:23 +02:00
Mira Weller	97925e2d77	migration, show category type in ui	2024-07-19 14:21:23 +02:00
Mira Weller	a0d865cf4f	implement cross_selling_visibility "always" and "products"	2024-07-19 14:21:21 +02:00
Mira Weller	2cd5d87da4	Refactor fragment_product_list.html	2024-07-19 14:21:00 +02:00
Mira Weller	e5c7c85e75	Allow adding products from multiple subevents to the cart at once	2024-07-19 14:21:00 +02:00
Mira Weller	3e0992a7a7	Make the comments in cart.py less incorrect	2024-07-19 14:21:00 +02:00
Mira Weller	f19e5bef72	Cross-selling category configuration	2024-07-19 14:21:00 +02:00