Fix missing CSS in seatingframe

2024-06-27 08:55:11 +02:00
238 changed files with 117037 additions and 128734 deletions
@@ -20,12 +20,8 @@ id                                       integer                    Internal ID
 active                                   boolean                    The discount will be ignored if this is ``false``
 internal_name                            string                     A name for the rule used in the backend
 position                                 integer                    An integer, used for sorting the rules which are applied in order
-all_sales_channels                       boolean                    If ``true`` (default), the discount is available on all sales channels
+sales_channels                           list of strings            Sales channels this discount is available on, such as
-                                                                    that support discounts.
+                                                                    ``"web"`` or ``"resellers"``. Defaults to ``["web"]``.
 limit_sales_channels                     list of strings            List of sales channel identifiers the discount is available on
                                                                    if ``all_sales_channels`` is ``false``.
 sales_channels                           list of strings            **DEPRECATED.** Legacy interface, use ``all_sales_channels``
                                                                    and ``limit_sales_channels`` instead.
 available_from                           datetime                   The first date time at which this discount can be applied
                                                                    (or ``null``).
 available_until                          datetime                   The last date time at which this discount can be applied
@@ -99,8 +95,6 @@ Endpoints
            "active": true,
            "internal_name": "3 for 2",
            "position": 1,
            "all_sales_channels": false,
            "limit_sales_channels": ["web"],
            "sales_channels": ["web"],
            "available_from": null,
            "available_until": null,
@@ -157,8 +151,6 @@ Endpoints
        "active": true,
        "internal_name": "3 for 2",
        "position": 1,
        "all_sales_channels": false,
        "limit_sales_channels": ["web"],
        "sales_channels": ["web"],
        "available_from": null,
        "available_until": null,
@@ -201,8 +193,6 @@ Endpoints
        "active": true,
        "internal_name": "3 for 2",
        "position": 1,
        "all_sales_channels": false,
        "limit_sales_channels": ["web"],
        "sales_channels": ["web"],
        "available_from": null,
        "available_until": null,
@@ -234,8 +224,6 @@ Endpoints
        "active": true,
        "internal_name": "3 for 2",
        "position": 1,
        "all_sales_channels": false,
        "limit_sales_channels": ["web"],
        "sales_channels": ["web"],
        "available_from": null,
        "available_until": null,
@@ -296,8 +284,6 @@ Endpoints
        "active": false,
        "internal_name": "3 for 2",
        "position": 1,
        "all_sales_channels": false,
        "limit_sales_channels": ["web"],
        "sales_channels": ["web"],
        "available_from": null,
        "available_until": null,
@@ -49,11 +49,8 @@ item_meta_properties                  object                     Item-specific m
 valid_keys                            object                     Cryptographic keys for non-default signature schemes.
                                                                 For performance reason, value is omitted in lists and
                                                                 only contained in detail views. Value can be cached.
-all_sales_channels                    boolean                    If ``true`` (default), the event is available on all sales channels.
+sales_channels                        list                       A list of sales channels this event is available for
-limit_sales_channels                  list of strings            List of sales channel identifiers the event is available on
+                                                                 sale on.
                                                                 if ``all_sales_channels`` is ``false``.
 sales_channels                        list of strings            **DEPRECATED.** Legacy interface, use ``all_sales_channels``
                                                                 and ``limit_sales_channels`` instead.
 public_url                            string                     The public, customer-facing URL of the event (read-only).
 ===================================== ========================== =======================================================
@@ -134,13 +131,11 @@ Endpoints
              "pretix.plugins.paypal",
              "pretix.plugins.ticketoutputpdf"
            ],
-            "all_sales_channels": false,
+            "sales_channels": [
            "limit_sales_channels": [
              "web",
              "pretixpos",
              "resellers"
            ],
            "sales_channels": [],
            "public_url": "https://pretix.eu/bigevents/sampleconf/"
          }
        ]
@@ -230,8 +225,6 @@ Endpoints
            "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUNvd0JRWURLMlZ3QXlFQTdBRDcvdkZBMzNFc1k0ejJQSHI3aVpQc1o4bjVkaDBhalA4Z3l6Tm1tSXM9Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo="
          ]
        },
        "all_sales_channels": true,
        "limit_sales_channels": [],
        "sales_channels": [
          "web",
          "pretixpos",
@@ -289,8 +282,11 @@ Endpoints
          "pretix.plugins.stripe",
          "pretix.plugins.paypal"
        ],
-        "all_sales_channels": true,
+        "sales_channels": [
-        "limit_sales_channels": []
+          "web",
          "pretixpos",
          "resellers"
        ]
      }
   **Example response**:
@@ -326,8 +322,6 @@ Endpoints
          "pretix.plugins.stripe",
          "pretix.plugins.paypal"
        ],
        "all_sales_channels": true,
        "limit_sales_channels": [],
        "sales_channels": [
          "web",
          "pretixpos",
@@ -393,8 +387,11 @@ Endpoints
          "pretix.plugins.stripe",
          "pretix.plugins.paypal"
        ],
-        "all_sales_channels": true,
+        "sales_channels": [
-        "limit_sales_channels": []
+          "web",
          "pretixpos",
          "resellers"
        ]
      }
   **Example response**:
@@ -430,8 +427,6 @@ Endpoints
          "pretix.plugins.stripe",
          "pretix.plugins.paypal"
        ],
        "all_sales_channels": true,
        "limit_sales_channels": [],
        "sales_channels": [
          "web",
          "pretixpos",
@@ -507,8 +502,6 @@ Endpoints
          "pretix.plugins.paypal",
          "pretix.plugins.pretixdroid"
        ],
        "all_sales_channels": true,
        "limit_sales_channels": [],
        "sales_channels": [
          "web",
          "pretixpos",
@@ -30,7 +30,6 @@ at :ref:`plugin-docs`.
   checkinlists
   waitinglist
   customers
   saleschannels
   membershiptypes
   memberships
   giftcards
@@ -38,14 +38,11 @@ require_membership                    boolean                    If ``true``, bo
 require_membership_hidden             boolean                    If ``true`` and ``require_membership`` is set, this variation will
                                                                 be hidden from users without a valid membership.
 require_membership_types              list of integers           Internal IDs of membership types valid if ``require_membership`` is ``true``
-all_sales_channels                    boolean                    If ``true`` (default), the variation is available on all sales channels.
+sales_channels                        list of strings            Sales channels this variation is available on, such as
-limit_sales_channels                  list of strings            List of sales channel identifiers the variation is available on
+                                                                 ``"web"`` or ``"resellers"``. Defaults to all existing sales channels.
                                                                 if ``all_sales_channels`` is ``false``.
                                                                 The item-level list takes precedence, i.e. a sales
-                                                                 channel needs to be on both lists for the variation to be
+                                                                 channel needs to be on both lists for the item to be
-                                                                 available (unless ``all_sales_channels`` is used).
+                                                                 available.
 sales_channels                        list of strings            **DEPRECATED.** Legacy interface, use ``all_sales_channels``
                                                                 and ``limit_sales_channels`` instead.
 available_from                        datetime                   The first date time at which this variation can be bought
                                                                 (or ``null``).
 available_from_mode                   string                     If ``hide`` (the default), this variation is hidden in the shop
@@ -114,8 +111,6 @@ Endpoints
            "require_membership": false,
            "require_membership_hidden": false,
            "require_membership_types": [],
            "all_sales_channels": false,
            "limit_sales_channels": ["web"],
            "sales_channels": ["web"],
            "available_from": null,
            "available_from_mode": "hide",
@@ -144,8 +139,6 @@ Endpoints
            "require_membership": false,
            "require_membership_hidden": false,
            "require_membership_types": [],
            "all_sales_channels": false,
            "limit_sales_channels": ["web"],
            "sales_channels": ["web"],
            "available_from": null,
            "available_from_mode": "hide",
@@ -209,8 +202,6 @@ Endpoints
        "require_membership": false,
        "require_membership_hidden": false,
        "require_membership_types": [],
        "all_sales_channels": false,
        "limit_sales_channels": ["web"],
        "sales_channels": ["web"],
        "available_from": null,
        "available_from_mode": "hide",
@@ -253,8 +244,7 @@ Endpoints
        "require_membership": false,
        "require_membership_hidden": false,
        "require_membership_types": [],
-        "all_sales_channels": false,
+        "sales_channels": ["web"],
        "limit_sales_channels": ["web"],
        "available_from": null,
        "available_from_mode": "hide",
        "available_until": null,
@@ -287,8 +277,6 @@ Endpoints
        "require_membership": false,
        "require_membership_hidden": false,
        "require_membership_types": [],
        "all_sales_channels": false,
        "limit_sales_channels": ["web"],
        "sales_channels": ["web"],
        "available_from": null,
        "available_from_mode": "hide",
@@ -353,8 +341,6 @@ Endpoints
        "require_membership": false,
        "require_membership_hidden": false,
        "require_membership_types": [],
        "all_sales_channels": false,
        "limit_sales_channels": ["web"],
        "sales_channels": ["web"],
        "available_from": null,
        "available_from_mode": "hide",
@@ -46,11 +46,8 @@ personalized                            boolean                    ``true`` for
 position                                integer                    An integer, used for sorting
 picture                                 file                       A product picture to be displayed in the shop
                                                                   (can be ``null``).
-all_sales_channels                      boolean                    If ``true`` (default), the item is available on all sales channels.
+sales_channels                          list of strings            Sales channels this product is available on, such as
-limit_sales_channels                    list of strings            List of sales channel identifiers the item is available on
+                                                                   ``"web"`` or ``"resellers"``. Defaults to ``["web"]``.
                                                                   if ``all_sales_channels`` is ``false``.
 sales_channels                          list of strings            **DEPRECATED.** Legacy interface, use ``all_sales_channels``
                                                                   and ``limit_sales_channels`` instead.
 available_from                          datetime                   The first date time at which this item can be bought
                                                                   (or ``null``).
 available_from_mode                     string                     If ``hide`` (the default), this item is hidden in the shop
@@ -160,14 +157,11 @@ variations                              list of objects            A list with o
                                                                   be hidden from users without a valid membership.
 ├ require_membership_types              list of integers           Internal IDs of membership types valid if ``require_membership`` is ``true``
                                                                   Markdown syntax or can be ``null``.
-├ all_sales_channels                    boolean                    If ``true`` (default), the variation is available on all sales channels.
+├ sales_channels                        list of strings            Sales channels this variation is available on, such as
-├ limit_sales_channels                  list of strings            List of sales channel identifiers the variation is available on
+                                                                   ``"web"`` or ``"resellers"``. Defaults to all existing sales channels.
                                                                   if ``all_sales_channels`` is ``false``.
                                                                   The item-level list takes precedence, i.e. a sales
-                                                                   channel needs to be on both lists for the variation to be
+                                                                   channel needs to be on both lists for the item to be
-                                                                   available (unless ``all_sales_channels`` is used).
+                                                                   available.
 ├ sales_channels                        list of strings            **DEPRECATED.** Legacy interface, use ``all_sales_channels``
                                                                   and ``limit_sales_channels`` instead.
 ├ available_from                        datetime                   The first date time at which this variation can be bought
                                                                   (or ``null``).
 ├ available_from_mode                   string                     If ``hide`` (the default), this variation is hidden in the shop
@@ -282,8 +276,6 @@ Endpoints
            "id": 1,
            "name": {"en": "Standard ticket"},
            "internal_name": "",
            "all_sales_channels": false,
            "limit_sales_channels": ["web"],
            "sales_channels": ["web"],
            "default_price": "23.00",
            "original_price": null,
@@ -348,8 +340,6 @@ Endpoints
                 "require_approval": false,
                 "require_membership": false,
                 "require_membership_types": [],
                 "all_sales_channels": false,
                 "limit_sales_channels": ["web"],
                 "sales_channels": ["web"],
                 "available_from": null,
                 "available_from_mode": "hide",
@@ -372,8 +362,6 @@ Endpoints
                 "require_approval": false,
                 "require_membership": false,
                 "require_membership_types": [],
                 "all_sales_channels": false,
                 "limit_sales_channels": ["web"],
                 "sales_channels": ["web"],
                 "available_from": null,
                 "available_from_mode": "hide",
@@ -432,8 +420,6 @@ Endpoints
        "id": 1,
        "name": {"en": "Standard ticket"},
        "internal_name": "",
        "all_sales_channels": false,
        "limit_sales_channels": ["web"],
        "sales_channels": ["web"],
        "default_price": "23.00",
        "original_price": null,
@@ -499,8 +485,6 @@ Endpoints
             "require_membership": false,
             "require_membership_types": [],
             "description": null,
             "all_sales_channels": false,
             "limit_sales_channels": ["web"],
             "sales_channels": ["web"],
             "available_from": null,
             "available_from_mode": "hide",
@@ -522,8 +506,6 @@ Endpoints
             "require_approval": false,
             "require_membership": false,
             "require_membership_types": [],
             "all_sales_channels": false,
             "limit_sales_channels": ["web"],
             "sales_channels": ["web"],
             "available_from": null,
             "available_from_mode": "hide",
@@ -563,8 +545,7 @@ Endpoints
        "id": 1,
        "name": {"en": "Standard ticket"},
        "internal_name": "",
-        "all_sales_channels": false,
+        "sales_channels": ["web"],
        "limit_sales_channels": ["web"],
        "default_price": "23.00",
        "original_price": null,
        "category": null,
@@ -627,8 +608,7 @@ Endpoints
             "require_approval": false,
             "require_membership": false,
             "require_membership_types": [],
-             "all_sales_channels": false,
+             "sales_channels": ["web"],
             "limit_sales_channels": ["web"],
             "available_from": null,
             "available_from_mode": "hide",
             "available_until": null,
@@ -650,8 +630,7 @@ Endpoints
             "require_approval": false,
             "require_membership": false,
             "require_membership_types": [],
-             "all_sales_channels": false,
+             "sales_channels": ["web"],
             "limit_sales_channels": ["web"],
             "available_from": null,
             "available_from_mode": "hide",
             "available_until": null,
@@ -678,8 +657,6 @@ Endpoints
        "id": 1,
        "name": {"en": "Standard ticket"},
        "internal_name": "",
        "all_sales_channels": false,
        "limit_sales_channels": ["web"],
        "sales_channels": ["web"],
        "default_price": "23.00",
        "original_price": null,
@@ -744,8 +721,6 @@ Endpoints
             "require_approval": false,
             "require_membership": false,
             "require_membership_types": [],
             "all_sales_channels": false,
             "limit_sales_channels": ["web"],
             "sales_channels": ["web"],
             "available_from": null,
             "available_from_mode": "hide",
@@ -768,8 +743,6 @@ Endpoints
             "require_approval": false,
             "require_membership": false,
             "require_membership_types": [],
             "all_sales_channels": false,
             "limit_sales_channels": ["web"],
             "sales_channels": ["web"],
             "available_from": null,
             "available_from_mode": "hide",
@@ -828,8 +801,6 @@ Endpoints
        "id": 1,
        "name": {"en": "Ticket"},
        "internal_name": "",
        "all_sales_channels": false,
        "limit_sales_channels": ["web"],
        "sales_channels": ["web"],
        "default_price": "25.00",
        "original_price": null,
@@ -894,8 +865,6 @@ Endpoints
             "require_approval": false,
             "require_membership": false,
             "require_membership_types": [],
             "all_sales_channels": false,
             "limit_sales_channels": ["web"],
             "sales_channels": ["web"],
             "available_from": null,
             "available_from_mode": "hide",
@@ -918,8 +887,6 @@ Endpoints
             "require_approval": false,
             "require_membership": false,
             "require_membership_types": [],
             "all_sales_channels": false,
             "limit_sales_channels": ["web"],
             "sales_channels": ["web"],
             "available_from": null,
             "available_from_mode": "hide",
@@ -1,219 +0,0 @@
 Sales channels
 ==============
 Resource description
 --------------------
 The sales channel resource contains the following public fields:
 .. rst-class:: rest-resource-table
 ===================================== ========================== =======================================================
 Field                                 Type                       Description
 ===================================== ========================== =======================================================
 identifier                            string                     Internal ID of the sales channel. For sales channel types
                                                                 that allow only one instance, this is the same as ``type``.
                                                                 For sales channel types that allow multiple instances, this
                                                                 is always prefixed with ``type.``.
 label                                 multi-lingual string       Human-readable name of the sales channel
 type                                  string                     Type of the sales channel. Only channels with type ``api``
                                                                 can currently be created through the API.
 position                              integer                    Position for sorting lists of sales channels
 ===================================== ========================== =======================================================
 Endpoints
 ---------
 .. http:get:: /api/v1/organizers/(organizer)/saleschannels/
   Returns a list of all sales channels within a given organizer.
   **Example request**:
   .. sourcecode:: http
      GET /api/v1/organizers/bigevents/saleschannels/ HTTP/1.1
      Host: pretix.eu
      Accept: application/json, text/javascript
   **Example response**:
   .. sourcecode:: http
      HTTP/1.1 200 OK
      Vary: Accept
      Content-Type: application/json
      {
        "count": 1,
        "next": null,
        "previous": null,
        "results": [
          {
            "identifier": "web",
            "name": {
              "en": "Online shop"
            },
            "type": "web",
            "position": 0
          }
        ]
      }
   :query integer page: The page number in case of a multi-page result set, default is 1
   :param organizer: The ``slug`` field of the organizer to fetch
   :statuscode 200: no error
   :statuscode 401: Authentication failure
   :statuscode 403: The requested organizer does not exist **or** you have no permission to view this resource.
 .. http:get:: /api/v1/organizers/(organizer)/saleschannels/(identifier)/
   Returns information on one sales channel, identified by its identifier.
   **Example request**:
   .. sourcecode:: http
      GET /api/v1/organizers/bigevents/saleschannels/web/ HTTP/1.1
      Host: pretix.eu
      Accept: application/json, text/javascript
   **Example response**:
   .. sourcecode:: http
      HTTP/1.1 200 OK
      Vary: Accept
      Content-Type: application/json
      {
        "identifier": "web",
        "name": {
          "en": "Online shop"
        },
        "type": "web",
        "position": 0
      }
   :param organizer: The ``slug`` field of the organizer to fetch
   :param identifier: The ``identifier`` field of the sales channel to fetch
   :statuscode 200: no error
   :statuscode 401: Authentication failure
   :statuscode 403: The requested organizer does not exist **or** you have no permission to view this resource.
 .. http:post:: /api/v1/organizers/(organizer)/saleschannels/
   Creates a sales channel
   **Example request**:
   .. sourcecode:: http
      POST /api/v1/organizers/bigevents/saleschannels/ HTTP/1.1
      Host: pretix.eu
      Accept: application/json, text/javascript
      Content-Type: application/json
      {
        "identifier": "api.custom",
        "name": {
          "en": "Custom integration"
        },
        "type": "api",
        "position": 2
      }
   **Example response**:
   .. sourcecode:: http
      HTTP/1.1 201 Created
      Vary: Accept
      Content-Type: application/json
      {
        "identifier": "api.custom",
        "name": {
          "en": "Custom integration"
        },
        "type": "api",
        "position": 2
      }
   :param organizer: The ``slug`` field of the organizer to create a sales channel for
   :statuscode 201: no error
   :statuscode 400: The sales channel could not be created due to invalid submitted data.
   :statuscode 401: Authentication failure
   :statuscode 403: The requested organizer does not exist **or** you have no permission to create this resource.
 .. http:patch:: /api/v1/organizers/(organizer)/saleschannels/(identifier)/
   Update a sales channel. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
   want to change.
   You can change all fields of the resource except the ``identifier`` and ``type`` fields.
   **Example request**:
   .. sourcecode:: http
      PATCH /api/v1/organizers/bigevents/saleschannels/web/ HTTP/1.1
      Host: pretix.eu
      Accept: application/json, text/javascript
      Content-Type: application/json
      Content-Length: 94
      {
        "position": 5
      }
   **Example response**:
   .. sourcecode:: http
      HTTP/1.1 200 OK
      Vary: Accept
      Content-Type: application/json
      {
        "identifier": "web",
        "name": {
          "en": "Online shop"
        },
        "type": "web",
        "position": 5
      }
   :param organizer: The ``slug`` field of the organizer to modify
   :param identifier: The ``identifier`` field of the sales channel to modify
   :statuscode 200: no error
   :statuscode 400: The sales channel could not be modified due to invalid submitted data
   :statuscode 401: Authentication failure
   :statuscode 403: The requested organizer does not exist **or** you have no permission to change this resource.
 .. http:delete:: /api/v1/organizers/(organizer)/saleschannels/(identifier)/
   Delete a sales channel. You can not delete sales channels which have already been used or which are integral parts
   of the system.
   **Example request**:
   .. sourcecode:: http
      DELETE /api/v1/organizers/bigevents/saleschannels/api.custom/ HTTP/1.1
      Host: pretix.eu
      Accept: application/json, text/javascript
   **Example response**:
   .. sourcecode:: http
      HTTP/1.1 204 No Content
      Vary: Accept
   :param organizer: The ``slug`` field of the organizer to modify
   :param identifier: The ``identifier`` field of the sales channel to delete
   :statuscode 204: no error
   :statuscode 401: Authentication failure
   :statuscode 403: The requested organizer does not exist **or** you have no permission to delete this resource **or** the sales channel is currently in use.
@@ -12,7 +12,7 @@ Core
 .. automodule:: pretix.base.signals
   :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,
+      item_copy_data, register_sales_channels, register_global_settings, quota_availability, global_email_filter,
      register_ticket_secret_generators, gift_card_transaction_display,
      register_text_placeholders, register_mail_placeholders
@@ -100,7 +100,6 @@ ALL_LANGUAGES = [
    ('ro', _('Romanian')),
    ('ru', _('Russian')),
    ('sk', _('Slovak')),
    ('sv', _('Swedish')),
    ('es', _('Spanish')),
    ('tr', _('Turkish')),
    ('uk', _('Ukrainian')),
@@ -21,7 +21,6 @@
 #
 import json
 from django.core.exceptions import ValidationError
 from rest_framework import serializers
@@ -62,57 +61,3 @@ class CompatibleJSONField(serializers.JSONField):
        if value:
            return json.loads(value)
        return value
 class SalesChannelMigrationMixin:
    """
    Translates between the old field "sales_channels" and the new field combo "all_sales_channels"/"limit_sales_channels".
    """
    @property
    def organizer(self):
        if "organizer" in self.context:
            return self.context["organizer"]
        elif "event" in self.context:
            return self.context["event"].organizer
        else:
            raise ValueError("organizer not in context")
    def to_internal_value(self, data):
        if "sales_channels" in data:
            all_channels = {
                s.identifier for s in
                self.organizer.sales_channels.all()
            }
            if data.get("all_sales_channels") and set(data["sales_channels"]) != all_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(
                    "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
                data["limit_sales_channels"] = []
            else:
                data["all_sales_channels"] = False
                data["limit_sales_channels"] = data["sales_channels"]
            del data["sales_channels"]
        return super().to_internal_value(data)
    def to_representation(self, value):
        value = super().to_representation(value)
        if value.get("all_sales_channels"):
            value["sales_channels"] = sorted([
                s.identifier for s in
                self.organizer.sales_channels.all()
            ])
        else:
            value["sales_channels"] = value["limit_sales_channels"]
        return value
@@ -33,7 +33,7 @@ from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.api.serializers.order import (
    AnswerCreateSerializer, AnswerSerializer, InlineSeatSerializer,
 )
-from pretix.base.models import SalesChannel, Seat, Voucher
+from pretix.base.models import Seat, Voucher
 from pretix.base.models.orders import CartPosition
@@ -212,11 +212,7 @@ class CartPositionCreateSerializer(BaseCartPositionCreateSerializer):
    addons = BaseCartPositionCreateSerializer(many=True, required=False)
    bundled = BaseCartPositionCreateSerializer(many=True, required=False)
    seat = serializers.CharField(required=False, allow_null=True)
-    sales_channel = serializers.SlugRelatedField(
+    sales_channel = serializers.CharField(required=False, default='sales_channel')
        slug_field='identifier',
        queryset=SalesChannel.objects.none(),
        required=False,
    )
    voucher = serializers.CharField(required=False, allow_null=True)
    class Meta:
@@ -225,10 +221,6 @@ class CartPositionCreateSerializer(BaseCartPositionCreateSerializer):
            'cart_id', 'expires', 'addons', 'bundled', 'seat', 'sales_channel', 'voucher'
        )
    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
        self.fields["sales_channel"].queryset = self.context["event"].organizer.sales_channels.all()
    def validate_cart_id(self, cid):
        if cid and not cid.endswith('@api'):
            raise ValidationError('Cart ID should end in @api or be empty.')
@@ -25,20 +25,14 @@ from rest_framework.exceptions import ValidationError
 from pretix.api.serializers.event import SubEventSerializer
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.media import MEDIA_TYPES
-from pretix.base.models import Checkin, CheckinList, SalesChannel
+from pretix.base.models import Checkin, CheckinList
 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
@@ -49,8 +43,6 @@ class CheckinListSerializer(I18nAwareModelSerializer):
    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)
@@ -80,6 +72,10 @@ class CheckinListSerializer(I18nAwareModelSerializer):
            if full_data.get('subevent'):
                raise ValidationError(_('The subevent does not belong to this event.'))
        for channel in full_data.get('auto_checkin_sales_channels') or []:
            if channel not in get_all_sales_channels():
                raise ValidationError(_('Unknown sales channel.'))
        CheckinList.validate_rules(data.get('rules'))
        return data
@@ -19,27 +19,18 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
 from rest_framework import serializers
 from pretix.api.serializers import SalesChannelMigrationMixin
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
-from pretix.base.models import Discount, SalesChannel
+from pretix.base.models import Discount
-class DiscountSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
+class DiscountSerializer(I18nAwareModelSerializer):
    limit_sales_channels = serializers.SlugRelatedField(
        slug_field="identifier",
        queryset=SalesChannel.objects.none(),
        required=False,
        allow_empty=True,
        many=True,
    )
    class Meta:
        model = Discount
-        fields = ('id', 'active', 'internal_name', 'position', 'all_sales_channels', 'limit_sales_channels',
+        fields = ('id', 'active', 'internal_name', 'position', 'sales_channels', 'available_from',
-                  'available_from', 'available_until', 'subevent_mode', 'condition_all_products',
+                  'available_until', 'subevent_mode', 'condition_all_products', 'condition_limit_products',
-                  'condition_limit_products', 'condition_apply_to_addons', 'condition_min_count', 'condition_min_value',
+                  'condition_apply_to_addons', 'condition_min_count', 'condition_min_value',
                  'benefit_discount_matching_percent', 'benefit_only_apply_to_cheapest_n_matches',
                  'benefit_same_products', 'benefit_limit_products', 'benefit_apply_to_addons',
                  'benefit_ignore_voucher_discounted', 'condition_ignore_voucher_discounted')
@@ -48,7 +39,6 @@ class DiscountSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
        super().__init__(*args, **kwargs)
        self.fields['condition_limit_products'].queryset = self.context['event'].items.all()
        self.fields['benefit_limit_products'].queryset = self.context['event'].items.all()
        self.fields['limit_sales_channels'].child_relation.queryset = self.context['event'].organizer.sales_channels.all()
    def validate(self, data):
        data = super().validate(data)
@@ -46,14 +46,10 @@ from rest_framework import serializers
 from rest_framework.fields import ChoiceField, Field
 from rest_framework.relations import SlugRelatedField
-from pretix.api.serializers import (
+from pretix.api.serializers import CompatibleJSONField
    CompatibleJSONField, SalesChannelMigrationMixin,
 )
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.api.serializers.settings import SettingsSerializer
-from pretix.base.models import (
+from pretix.base.models import Device, Event, TaxRule, TeamAPIToken
    Device, Event, SalesChannel, TaxRule, TeamAPIToken,
 )
 from pretix.base.models.event import SubEvent
 from pretix.base.models.items import (
    ItemMetaProperty, SubEventItem, SubEventItemVariation,
@@ -165,7 +161,7 @@ class ValidKeysField(Field):
        }
-class EventSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
+class EventSerializer(I18nAwareModelSerializer):
    meta_data = MetaDataField(required=False, source='*')
    item_meta_properties = MetaPropertyField(required=False, source='*')
    plugins = PluginsField(required=False, source='*')
@@ -174,13 +170,6 @@ class EventSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
    valid_keys = ValidKeysField(source='*', read_only=True)
    best_availability_state = serializers.IntegerField(allow_null=True, read_only=True)
    public_url = serializers.SerializerMethodField('get_event_url', read_only=True)
    limit_sales_channels = serializers.SlugRelatedField(
        slug_field="identifier",
        queryset=SalesChannel.objects.none(),
        required=False,
        allow_empty=True,
        many=True,
    )
    def get_event_url(self, event):
        return build_absolute_uri(event, 'presale:event.index')
@@ -191,7 +180,7 @@ class EventSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
                  'date_to', 'date_admission', 'is_public', 'presale_start',
                  'presale_end', 'location', 'geo_lat', 'geo_lon', 'has_subevents', 'meta_data', 'seating_plan',
                  'plugins', 'seat_category_mapping', 'timezone', 'item_meta_properties', 'valid_keys',
-                  'all_sales_channels', 'limit_sales_channels', 'best_availability_state', 'public_url')
+                  'sales_channels', 'best_availability_state', 'public_url')
    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
@@ -199,7 +188,6 @@ class EventSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
            self.fields.pop('valid_keys')
        if not self.context.get('request') or 'with_availability_for' not in self.context['request'].GET:
            self.fields.pop('best_availability_state')
        self.fields['limit_sales_channels'].child_relation.queryset = self.context['organizer'].sales_channels.all()
    def validate(self, data):
        data = super().validate(data)
@@ -42,27 +42,19 @@ from django.utils.functional import cached_property, lazy
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 from pretix.api.serializers import SalesChannelMigrationMixin
 from pretix.api.serializers.event import MetaDataField
 from pretix.api.serializers.fields import UploadedFileField
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.base.models import (
    Item, ItemAddOn, ItemBundle, ItemCategory, ItemMetaValue, ItemVariation,
-    ItemVariationMetaValue, Question, QuestionOption, Quota, SalesChannel,
+    ItemVariationMetaValue, Question, QuestionOption, Quota,
 )
-class InlineItemVariationSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
+class InlineItemVariationSerializer(I18nAwareModelSerializer):
    price = serializers.DecimalField(read_only=True, decimal_places=2, max_digits=13,
                                     coerce_to_string=True)
    meta_data = MetaDataField(required=False, source='*')
    limit_sales_channels = serializers.SlugRelatedField(
        slug_field="identifier",
        queryset=SalesChannel.objects.none(),
        required=False,
        allow_empty=True,
        many=True,
    )
    class Meta:
        model = ItemVariation
@@ -71,12 +63,11 @@ class InlineItemVariationSerializer(SalesChannelMigrationMixin, I18nAwareModelSe
                  'require_membership', 'require_membership_types', 'require_membership_hidden',
                  'checkin_attention', 'checkin_text',
                  'available_from', 'available_from_mode', 'available_until', 'available_until_mode',
-                  'all_sales_channels', 'limit_sales_channels', 'hide_without_voucher', 'meta_data')
+                  'sales_channels', 'hide_without_voucher', 'meta_data')
    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
        self.fields['require_membership_types'].queryset = lazy(lambda: self.context['event'].organizer.membership_types.all(), QuerySet)
        self.fields['limit_sales_channels'].child_relation.queryset = lazy(lambda: self.context['event'].organizer.sales_channels.all(), QuerySet)
    def validate_meta_data(self, value):
        for key in value['meta_data'].keys():
@@ -85,17 +76,10 @@ class InlineItemVariationSerializer(SalesChannelMigrationMixin, I18nAwareModelSe
        return value
-class ItemVariationSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
+class ItemVariationSerializer(I18nAwareModelSerializer):
    price = serializers.DecimalField(read_only=True, decimal_places=2, max_digits=13,
                                     coerce_to_string=True)
    meta_data = MetaDataField(required=False, source='*')
    limit_sales_channels = serializers.SlugRelatedField(
        slug_field="identifier",
        queryset=SalesChannel.objects.none(),
        required=False,
        allow_empty=True,
        many=True,
    )
    class Meta:
        model = ItemVariation
@@ -104,12 +88,11 @@ class ItemVariationSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializ
                  'require_membership', 'require_membership_types', 'require_membership_hidden',
                  'checkin_attention', 'checkin_text',
                  'available_from', 'available_from_mode', 'available_until', 'available_until_mode',
-                  'all_sales_channels', 'limit_sales_channels', 'hide_without_voucher', 'meta_data')
+                  'sales_channels', 'hide_without_voucher', 'meta_data')
    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
        self.fields['require_membership_types'].queryset = self.context['event'].organizer.membership_types.all()
        self.fields['limit_sales_channels'].child_relation.queryset = self.context['event'].organizer.sales_channels.all()
    @transaction.atomic
    def create(self, validated_data):
@@ -240,7 +223,7 @@ class ItemTaxRateField(serializers.Field):
            return str(Decimal('0.00'))
-class ItemSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
+class ItemSerializer(I18nAwareModelSerializer):
    addons = InlineItemAddOnSerializer(many=True, required=False)
    bundles = InlineItemBundleSerializer(many=True, required=False)
    variations = InlineItemVariationSerializer(many=True, required=False)
@@ -249,18 +232,11 @@ class ItemSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
    picture = UploadedFileField(required=False, allow_null=True, allowed_types=(
        'image/png', 'image/jpeg', 'image/gif'
    ), max_size=settings.FILE_UPLOAD_MAX_SIZE_IMAGE)
    limit_sales_channels = serializers.SlugRelatedField(
        slug_field="identifier",
        queryset=SalesChannel.objects.none(),
        required=False,
        allow_empty=True,
        many=True,
    )
    class Meta:
        model = Item
-        fields = ('id', 'category', 'name', 'internal_name', 'active', 'all_sales_channels', 'limit_sales_channels',
+        fields = ('id', 'category', 'name', 'internal_name', 'active', 'sales_channels', 'description',
-                  'description', 'default_price', 'free_price', 'free_price_suggestion', 'tax_rate', 'tax_rule', 'admission',
+                  'default_price', 'free_price', 'free_price_suggestion', 'tax_rate', 'tax_rule', 'admission',
                  'personalized', 'position', 'picture',
                  'available_from', 'available_from_mode', 'available_until', 'available_until_mode',
                  'require_voucher', 'hide_without_voucher', 'allow_cancel', 'require_bundling',
@@ -283,7 +259,6 @@ class ItemSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
        if not self.read_only:
            self.fields['require_membership_types'].queryset = self.context['event'].organizer.membership_types.all()
            self.fields['grant_membership_type'].queryset = self.context['event'].organizer.membership_types.all()
            self.fields['limit_sales_channels'].child_relation.queryset = self.context['event'].organizer.sales_channels.all()
    def validate(self, data):
        data = super().validate(data)
@@ -360,10 +335,7 @@ class ItemSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
        meta_data = validated_data.pop('meta_data', None)
        picture = validated_data.pop('picture', None)
        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:
            item.limit_sales_channels.add(*limit_sales_channels)
        if picture:
            item.picture.save(os.path.basename(picture.name), picture)
        if require_membership_types:
@@ -46,12 +46,13 @@ from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.api.serializers.item import (
    InlineItemVariationSerializer, ItemSerializer, QuestionSerializer,
 )
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.decimal import round_decimal
 from pretix.base.i18n import language
 from pretix.base.models import (
    CachedFile, Checkin, Customer, Invoice, InvoiceAddress, InvoiceLine, Item,
    ItemVariation, Order, OrderPosition, Question, QuestionAnswer,
-    ReusableMedium, SalesChannel, Seat, SubEvent, TaxRule, Voucher,
+    ReusableMedium, Seat, SubEvent, TaxRule, Voucher,
 )
 from pretix.base.models.orders import (
    BlockedTicketSecret, CartPosition, OrderFee, OrderPayment, OrderRefund,
@@ -713,11 +714,6 @@ class OrderSerializer(I18nAwareModelSerializer):
    payment_provider = OrderPaymentTypeField(source='*', read_only=True)
    url = OrderURLField(source='*', read_only=True)
    customer = serializers.SlugRelatedField(slug_field='identifier', read_only=True)
    sales_channel = serializers.SlugRelatedField(
        slug_field='identifier',
        queryset=SalesChannel.objects.none(),
        required=False,
    )
    class Meta:
        model = Order
@@ -736,10 +732,6 @@ class OrderSerializer(I18nAwareModelSerializer):
    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
        if "organizer" in self.context:
            self.fields["sales_channel"].queryset = self.context["organizer"].sales_channels.all()
        else:
            self.fields["sales_channel"].queryset = self.context["event"].organizer.sales_channels.all()
        if not self.context['pdf_data']:
            self.fields['positions'].child.fields.pop('pdf_data', None)
@@ -1041,18 +1033,12 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
    require_approval = serializers.BooleanField(default=False, required=False)
    simulate = serializers.BooleanField(default=False, required=False)
    customer = serializers.SlugRelatedField(slug_field='identifier', queryset=Customer.objects.none(), required=False)
    sales_channel = serializers.SlugRelatedField(
        slug_field='identifier',
        queryset=SalesChannel.objects.none(),
        required=False,
    )
    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
        self.fields['positions'].child.fields['voucher'].queryset = self.context['event'].vouchers.all()
        self.fields['customer'].queryset = self.context['event'].organizer.customers.all()
        self.fields['expires'].required = False
        self.fields["sales_channel"].queryset = self.context["event"].organizer.sales_channels.all()
    class Meta:
        model = Order
@@ -1073,6 +1059,11 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
            raise ValidationError('Expiration date must be in the future.')
        return expires
    def validate_sales_channel(self, channel):
        if channel not in get_all_sales_channels():
            raise ValidationError('Unknown sales channel.')
        return channel
    def validate_code(self, code):
        if code and Order.objects.filter(event__organizer=self.context['event'].organizer, code=code).exists():
            raise ValidationError(
@@ -1134,6 +1125,20 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
            raise ValidationError(errs)
        return data
    def validate_testmode(self, testmode):
        if 'sales_channel' in self.initial_data:
            try:
                sales_channel = get_all_sales_channels()[self.initial_data['sales_channel']]
                if testmode and not sales_channel.testmode_supported:
                    raise ValidationError('This sales channel does not provide support for test mode.')
            except KeyError:
                # We do not need to raise a ValidationError here, since there is another check to validate the
                # sales_channel
                pass
        return testmode
    def create(self, validated_data):
        fees_data = validated_data.pop('fees') if 'fees' in validated_data else []
        positions_data = validated_data.pop('positions') if 'positions' in validated_data else []
@@ -1142,16 +1147,9 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
        payment_date = validated_data.pop('payment_date', now())
        force = validated_data.pop('force', False)
        simulate = validated_data.pop('simulate', False)
        if not validated_data.get("sales_channel"):
            validated_data["sales_channel"] = self.context['event'].organizer.sales_channels.get(identifier="web")
        if validated_data.get("testmode") and not validated_data["sales_channel"].type_instance.testmode_supported:
            raise ValidationError({"testmode": ["This sales channel does not provide support for test mode."]})
        self._send_mail = validated_data.pop('send_email', False)
        if self._send_mail is None:
-            self._send_mail = validated_data["sales_channel"].identifier in self.context['event'].settings.mail_sales_channel_placed_paid
+            self._send_mail = validated_data.get('sales_channel') in self.context['event'].settings.mail_sales_channel_placed_paid
        if 'invoice_address' in validated_data:
            iadata = validated_data.pop('invoice_address')
@@ -1311,8 +1309,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                    errs[i]['seat'] = ['The specified seat does not exist.']
                else:
                    seat_usage[seat] += 1
-                    sales_channel_id = validated_data['sales_channel'].identifier
+                    if (seat_usage[seat] > 0 and not seat.is_available(sales_channel=validated_data.get('sales_channel', 'web'))) or seat_usage[seat] > 1:
                    if (seat_usage[seat] > 0 and not seat.is_available(sales_channel=sales_channel_id)) or seat_usage[seat] > 1:
                        errs[i]['seat'] = [gettext_lazy('The selected seat "{seat}" is not available.').format(seat=seat.name)]
            elif seated:
                errs[i]['seat'] = ['The specified product requires to choose a seat.']
@@ -1371,7 +1368,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
        if validated_data.get('locale', None) is None:
            validated_data['locale'] = self.context['event'].settings.locale
        order = Order(event=self.context['event'], **validated_data)
        if not validated_data.get('expires'):
            order.set_expires(subevents=[p.get('subevent') for p in positions_data])
@@ -38,7 +38,7 @@ from pretix.base.i18n import get_language_without_region
 from pretix.base.models import (
    Customer, Device, GiftCard, GiftCardAcceptance, GiftCardTransaction,
    Membership, MembershipType, OrderPosition, Organizer, ReusableMedium,
-    SalesChannel, SeatingPlan, Team, TeamAPIToken, TeamInvite, User,
+    SeatingPlan, Team, TeamAPIToken, TeamInvite, User,
 )
 from pretix.base.models.seating import SeatingPlanLayoutValidator
 from pretix.base.services.mail import SendMailException, mail
@@ -165,36 +165,6 @@ class FlexibleTicketRelatedField(serializers.PrimaryKeyRelatedField):
        self.fail('incorrect_type', data_type=type(data).__name__)
 class SalesChannelSerializer(I18nAwareModelSerializer):
    type = serializers.CharField(default="api")
    class Meta:
        model = SalesChannel
        fields = ('identifier', 'type', 'label', 'position')
    def validate_type(self, value):
        if (not self.instance or not self.instance.pk) and value != "api":
            raise ValidationError(
                "You can currently only create channels of type 'api' through the API."
            )
        if value and self.instance and self.instance.pk and self.instance.type != value:
            raise ValidationError(
                "You cannot change the type of a sales channel."
            )
        return value
    def validate_identifier(self, value):
        if (not self.instance or not self.instance.pk) and not value.startswith("api."):
            raise ValidationError(
                "Your identifier needs to start with 'api.'."
            )
        if value and self.instance and self.instance.pk and self.instance.identifier != value:
            raise ValidationError(
                "You cannot change the identifier of a sales channel."
            )
        return value
 class GiftCardSerializer(I18nAwareModelSerializer):
    value = serializers.DecimalField(max_digits=13, decimal_places=2, min_value=Decimal('0.00'))
    owner_ticket = FlexibleTicketRelatedField(required=False, allow_null=True, queryset=OrderPosition.all.none())
@@ -56,7 +56,6 @@ orga_router.register(r'webhooks', webhooks.WebHookViewSet)
 orga_router.register(r'seatingplans', organizer.SeatingPlanViewSet)
 orga_router.register(r'giftcards', organizer.GiftCardViewSet)
 orga_router.register(r'customers', organizer.CustomerViewSet)
 orga_router.register(r'saleschannels', organizer.SalesChannelViewSet)
 orga_router.register(r'memberships', organizer.MembershipViewSet)
 orga_router.register(r'membershiptypes', organizer.MembershipTypeViewSet)
 orga_router.register(r'reusablemedia', media.ReusableMediaViewSet)
@@ -211,12 +211,8 @@ class CartPositionViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnly
                    if validated_data.get('seat'):
                        # Assumption: Add-ons currently can't have seats, thus we only need to check the main product
                        if validated_data.get('sales_channel'):
                            sales_channel_id = validated_data.get('sales_channel').identifier
                        else:
                            sales_channel_id = "web"
                        if not validated_data['seat'].is_available(
-                            sales_channel=sales_channel_id,
+                            sales_channel=validated_data.get('sales_channel', 'web'),
                            distance_ignore_cart_id=validated_data['cart_id'],
                            ignore_voucher_id=validated_data['voucher'].pk if validated_data.get('voucher') else None,
                        ):
@@ -115,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', 'auto_checkin_sales_channels'
+                'subevent__seat_category_mappings', 'subevent__meta_values'
            )
        return qs
@@ -60,9 +60,7 @@ class DiscountViewSet(ConditionalListView, viewsets.ModelViewSet):
    write_permission = 'can_change_items'
    def get_queryset(self):
-        return self.request.event.discounts.prefetch_related(
+        return self.request.event.discounts.all()
            'limit_sales_channels',
        )
    def perform_create(self, serializer):
        serializer.save(event=self.request.event)
@@ -113,10 +113,7 @@ with scopes_disabled():
                return queryset.exclude(expr)
        def sales_channel_qs(self, queryset, name, value):
-            return queryset.filter(
+            return queryset.filter(sales_channels__contains=value)
                Q(all_sales_channels=True) |
                Q(limit_sales_channels__identifier=value)
            )
        def search_qs(self, queryset, name, value):
            return queryset.filter(
@@ -138,12 +135,6 @@ class EventViewSet(viewsets.ModelViewSet):
    ordering_fields = ('date_from', 'slug')
    filterset_class = EventFilter
    def get_serializer_context(self):
        return {
            **super().get_serializer_context(),
            "organizer": self.request.organizer,
        }
    def get_copy_from_queryset(self):
        if isinstance(self.request.auth, (TeamAPIToken, Device)):
            return self.request.auth.get_events_with_any_permission()
@@ -169,7 +160,6 @@ class EventViewSet(viewsets.ModelViewSet):
            'meta_values',
            'meta_values__property',
            'item_meta_properties',
            'limit_sales_channels',
            Prefetch(
                'seat_category_mappings',
                to_attr='_seat_category_mappings',
@@ -278,6 +268,8 @@ class EventViewSet(viewsets.ModelViewSet):
                new_event.is_public = serializer.validated_data['is_public']
            if 'testmode' in serializer.validated_data:
                new_event.testmode = serializer.validated_data['testmode']
            if 'sales_channels' in serializer.validated_data:
                new_event.sales_channels = serializer.validated_data['sales_channels']
            if 'has_subevents' in serializer.validated_data:
                new_event.has_subevents = serializer.validated_data['has_subevents']
            if 'date_admission' in serializer.validated_data:
@@ -285,10 +277,6 @@ class EventViewSet(viewsets.ModelViewSet):
            new_event.save()
            if 'timezone' in serializer.validated_data:
                new_event.settings.timezone = serializer.validated_data['timezone']
            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']
                new_event.limit_sales_channels.set(serializer.validated_data['limit_sales_channels'])
        else:
            serializer.instance.set_defaults()
@@ -391,10 +379,7 @@ with scopes_disabled():
                return queryset.exclude(expr)
        def sales_channel_qs(self, queryset, name, value):
-            return queryset.filter(
+            return queryset.filter(event__sales_channels__contains=value)
                Q(event__all_sales_channels=True) |
                Q(event__limit_sales_channels__identifier=value)
            )
        def search_qs(self, queryset, name, value):
            return queryset.filter(
@@ -87,7 +87,6 @@ class ItemViewSet(ConditionalListView, viewsets.ModelViewSet):
            'variations', 'addons', 'bundles', 'meta_values', 'meta_values__property',
            'variations__meta_values', 'variations__meta_values__property',
            'require_membership_types', 'variations__require_membership_types',
            'limit_sales_channels', 'variations__limit_sales_channels',
        ).all()
    def perform_create(self, serializer):
@@ -153,8 +152,7 @@ class ItemVariationViewSet(viewsets.ModelViewSet):
        return self.item.variations.all().prefetch_related(
            'meta_values',
            'meta_values__property',
-            'require_membership_types',
+            'require_membership_types'
            'limit_sales_channels',
        )
    def get_serializer_context(self):
@@ -229,7 +229,7 @@ class OrderViewSetMixin:
        if 'customer' not in self.request.GET.getlist('exclude'):
            qs = qs.select_related('customer')
-        qs = qs.select_related('sales_channel').prefetch_related(self._positions_prefetch(self.request))
+        qs = qs.prefetch_related(self._positions_prefetch(self.request))
        return qs
    def _positions_prefetch(self, request):
@@ -316,11 +316,6 @@ class OrganizerOrderViewSet(OrderViewSetMixin, viewsets.ReadOnlyModelViewSet):
        else:
            raise PermissionDenied()
    def get_serializer_context(self):
        ctx = super().get_serializer_context()
        ctx['organizer'] = self.request.organizer
        return ctx
 class EventOrderViewSet(OrderViewSetMixin, viewsets.ModelViewSet):
    permission = 'can_view_orders'
@@ -43,13 +43,13 @@ from pretix.api.serializers.organizer import (
    CustomerCreateSerializer, CustomerSerializer, DeviceSerializer,
    GiftCardSerializer, GiftCardTransactionSerializer, MembershipSerializer,
    MembershipTypeSerializer, OrganizerSerializer, OrganizerSettingsSerializer,
-    SalesChannelSerializer, SeatingPlanSerializer, TeamAPITokenSerializer,
+    SeatingPlanSerializer, TeamAPITokenSerializer, TeamInviteSerializer,
-    TeamInviteSerializer, TeamMemberSerializer, TeamSerializer,
+    TeamMemberSerializer, TeamSerializer,
 )
 from pretix.base.models import (
    Customer, Device, GiftCard, GiftCardTransaction, Membership,
-    MembershipType, Organizer, SalesChannel, SeatingPlan, Team, TeamAPIToken,
+    MembershipType, Organizer, SeatingPlan, Team, TeamAPIToken, TeamInvite,
-    TeamInvite, User,
+    User,
 )
 from pretix.helpers import OF_SELF
 from pretix.helpers.dicts import merge_dicts
@@ -675,68 +675,3 @@ class MembershipViewSet(viewsets.ModelViewSet):
            data=self.request.data,
        )
        return inst
 with scopes_disabled():
    class SalesChannelFilter(FilterSet):
        class Meta:
            model = SalesChannel
            fields = ['type', 'identifier']
 class SalesChannelViewSet(viewsets.ModelViewSet):
    serializer_class = SalesChannelSerializer
    queryset = SalesChannel.objects.none()
    permission = 'can_change_organizer_settings'
    write_permission = 'can_change_organizer_settings'
    filter_backends = (DjangoFilterBackend,)
    filterset_class = SalesChannelFilter
    lookup_field = 'identifier'
    lookup_url_kwarg = 'identifier'
    lookup_value_regex = r"[a-zA-Z0-9.\-_]+"
    def get_queryset(self):
        return self.request.organizer.sales_channels.all()
    def get_serializer_context(self):
        ctx = super().get_serializer_context()
        ctx['organizer'] = self.request.organizer
        return ctx
    @transaction.atomic()
    def perform_create(self, serializer):
        inst = serializer.save(
            organizer=self.request.organizer,
            type="api"
        )
        inst.log_action(
            'pretix.saleschannel.created',
            user=self.request.user,
            auth=self.request.auth,
            data=merge_dicts(self.request.data, {'id': inst.pk})
        )
    @transaction.atomic()
    def perform_update(self, serializer):
        inst = serializer.save(
            type=serializer.instance.type,
            identifier=serializer.instance.identifier,
        )
        inst.log_action(
            'pretix.sales_channel.changed',
            user=self.request.user,
            auth=self.request.auth,
            data=self.request.data,
        )
        return inst
    def perform_destroy(self, instance):
        if not instance.allow_delete():
            raise PermissionDenied("Can only be deleted if unused.")
        instance.log_action(
            'pretix.saleschannel.deleted',
            user=self.request.user,
            auth=self.request.auth,
            data={'id': instance.pk}
        )
        instance.delete()
@@ -20,83 +20,56 @@
 # <https://www.gnu.org/licenses/>.
 #
 import logging
 import warnings
 from collections import OrderedDict
 from django.dispatch import receiver
 from django.utils.translation import gettext_lazy as _
-from pretix.base.signals import (
+from pretix.base.signals import register_sales_channels
    register_sales_channel_types, register_sales_channels,
 )
 logger = logging.getLogger(__name__)
-_ALL_CHANNEL_TYPES = None
+_ALL_CHANNELS = None
-class SalesChannelType:
+class SalesChannel:
    def __repr__(self):
-        return '<SalesChannelType: {}>'.format(self.identifier)
+        return '<SalesChannel: {}>'.format(self.identifier)
    @property
    def identifier(self) -> str:
        """
-        The internal identifier of this sales channel type.
+        The internal identifier of this sales channel.
        """
        raise NotImplementedError()  # NOQA
    @property
    def verbose_name(self) -> str:
        """
-        A human-readable name of this sales channel type.
+        A human-readable name of this sales channel.
        """
        raise NotImplementedError()  # NOQA
    @property
    def description(self) -> str:
        """
        A human-readable description of this sales channel type.
        """
        return ""
    @property
    def icon(self) -> str:
        """
-        This can be:
+        The name of a Font Awesome icon to represent this channel
        - The name of a Font Awesome icon to represent this channel type.
        - The name of a SVG icon file that is resolvable through the static file system. We recommend to design for a size of 18x14 pixels.
        """
        return "circle"
    @property
    def default_created(self) -> bool:
        """
        Indication, if a sales channel of this type should automatically be created for every organizer
        """
        return True
    @property
    def multiple_allowed(self) -> bool:
        """
        Indication, if multiple sales channels of this type may exist in the same organizer
        """
        return False
    @property
    def testmode_supported(self) -> bool:
        """
-        Indication, if a sales channel of this type supports test mode orders
+        Indication, if a saleschannels supports test mode orders
        """
        return True
    @property
    def payment_restrictions_supported(self) -> bool:
        """
-        If this property is ``True``, organizers can restrict the usage of payment providers to this sales channel type.
+        If this property is ``True``, organizers can restrict the usage of payment providers to this sales channel.
-        Example: pretixPOS provides its own sales channel type, ignores the configured payment providers completely and
+        Example: pretixPOS provides its own sales channel, ignores the configured payment providers completely and
-        handles payments locally. Therefore, this property should be set to ``False`` for the pretixPOS sales channel as
+        handles payments locally. Therefor, this property should be set to ``False`` for the pretixPOS sales channel as
        the event organizer cannot restrict the usage of any payment provider through the backend.
        """
        return True
@@ -104,8 +77,8 @@ class SalesChannelType:
    @property
    def unlimited_items_per_order(self) -> bool:
        """
-        If this property is ``True``, purchases made using sales channels of this type are not limited to the maximum
+        If this property is ``True``, purchases made using this sales channel are not limited to the maximum amount of
-        amount of items defined in the event settings.
+        items defined in the event settings.
        """
        return False
@@ -123,67 +96,34 @@ class SalesChannelType:
        """
        return True
    @property
    def required_event_plugin(self) -> str:
        """
        Name of an event plugin that is required for this sales channel to be useful. Defaults to ``None``.
        """
        return
 def get_all_sales_channels():
    global _ALL_CHANNELS
-def get_all_sales_channel_types():
+    if _ALL_CHANNELS:
-    from pretix.base.signals import register_sales_channel_types
+        return _ALL_CHANNELS
    global _ALL_CHANNEL_TYPES
    if _ALL_CHANNEL_TYPES:
        return _ALL_CHANNEL_TYPES
    channels = []
-    for recv, ret in register_sales_channel_types.send(None):
+    for recv, ret in register_sales_channels.send(None):
        if isinstance(ret, (list, tuple)):
            channels += ret
        else:
            channels.append(ret)
    for recv, ret in register_sales_channels.send(None):  # todo: remove me
        if isinstance(ret, (list, tuple)):
            channels += ret
        else:
            channels.append(ret)
    channels.sort(key=lambda c: c.identifier)
-    _ALL_CHANNEL_TYPES = OrderedDict([(c.identifier, c) for c in channels])
+    _ALL_CHANNELS = OrderedDict([(c.identifier, c) for c in channels])
-    if 'web' in _ALL_CHANNEL_TYPES:
+    if 'web' in _ALL_CHANNELS:
-        _ALL_CHANNEL_TYPES.move_to_end('web', last=False)
+        _ALL_CHANNELS.move_to_end('web', last=False)
-    return _ALL_CHANNEL_TYPES
+    return _ALL_CHANNELS
-def get_all_sales_channels():
+class WebshopSalesChannel(SalesChannel):
    # TODO: remove me
    warnings.warn('Using get_all_sales_channels() is no longer appropriate, use get_al_sales_channel_types() instead.',
                  DeprecationWarning, stacklevel=2)
    return get_all_sales_channel_types()
 class WebshopSalesChannelType(SalesChannelType):
    identifier = "web"
    verbose_name = _('Online shop')
    icon = "globe"
-class ApiSalesChannelType(SalesChannelType):
+@receiver(register_sales_channels, dispatch_uid="base_register_default_sales_channels")
    identifier = "api"
    verbose_name = _('API')
    description = _('API sales channels come with no built-in functionality, but may be used for custom integrations.')
    icon = "exchange"
    default_created = False
    multiple_allowed = True
 SalesChannel = SalesChannelType  # TODO: remove me
@receiver(register_sales_channel_types, dispatch_uid="base_register_default_sales_channel_types")
 def base_sales_channels(sender, **kwargs):
    return (
-        WebshopSalesChannelType(),
+        WebshopSalesChannel(),
        ApiSalesChannelType(),
    )
@@ -27,6 +27,7 @@ from openpyxl.styles import Alignment
 from openpyxl.utils import get_column_letter
 from ...helpers.safe_openpyxl import SafeCell
 from ..channels import get_all_sales_channels
 from ..exporter import ListExporter
 from ..models import ItemMetaValue, ItemVariation, ItemVariationMetaValue
 from ..signals import register_data_exporters
@@ -52,7 +53,7 @@ class ItemDataExporter(ListExporter):
    def iterate_list(self, form_data):
        locales = self.event.settings.locales
-        scs = self.organizer.sales_channels.all()
+        scs = get_all_sales_channels()
        header = [
            _("Product ID"),
            _("Variation ID"),
@@ -140,15 +141,9 @@ class ItemDataExporter(ListExporter):
                        row.append(i.name.localize(l))
                    for l in locales:
                        row.append(v.value.localize(l))
                    sales_channels = list(scs)
                    if not i.all_sales_channels:
                        sales_channels = [s for s in sales_channels if s.identifier in (p.identifier for p in i.limit_sales_channels.all())]
                    if not v.all_sales_channels:
                        sales_channels = [s for s in sales_channels if s.identifier in (p.identifier for p in v.limit_sales_channels.all())]
                    row += [
                        _("Yes") if i.active and v.active else "",
-                        ", ".join([str(sn.label) for sn in sales_channels]),
+                        ", ".join([str(sn.verbose_name) for s, sn in scs.items() if s in i.sales_channels and s in v.sales_channels]),
                        v.default_price or i.default_price,
                        _("Yes") if i.free_price else "",
                        str(i.tax_rule) if i.tax_rule else "",
@@ -191,12 +186,9 @@ class ItemDataExporter(ListExporter):
                    row.append(i.name.localize(l))
                for l in locales:
                    row.append("")
                sales_channels = list(scs)
                if not i.all_sales_channels:
                    sales_channels = [s for s in sales_channels if s.identifier in (p.identifier for p in i.limit_sales_channels.all())]
                row += [
                    _("Yes") if i.active else "",
-                    ", ".join([str(sn.label) for sn in sales_channels]),
+                    ", ".join([str(sn.verbose_name) for s, sn in scs.items() if s in i.sales_channels]),
                    i.default_price,
                    _("Yes") if i.free_price else "",
                    str(i.tax_rule) if i.tax_rule else "",
@@ -54,7 +54,6 @@ class JSONExporter(BaseExporter):
                               'import in third-party systems.')
    def render(self, form_data):
        all_sales_channels = self.event.organizer.sales_channels.all()
        jo = {
            'event': {
                'name': str(self.event.name),
@@ -86,7 +85,7 @@ class JSONExporter(BaseExporter):
                        'admission': item.admission,
                        'personalized': item.personalized,
                        'active': item.active,
-                        'sales_channels': [c.identifier for c in (all_sales_channels if item.all_sales_channels else item.limit_sales_channels.all())],
+                        'sales_channels': item.sales_channels,
                        'description': str(item.description),
                        'available_from': item.available_from,
                        'available_until': item.available_until,
@@ -115,9 +114,7 @@ class JSONExporter(BaseExporter):
                                'checkin_text': variation.checkin_text,
                                'require_approval': variation.require_approval,
                                'require_membership': variation.require_membership,
-                                'sales_channels': [
+                                'sales_channels': variation.sales_channels,
                                    c.identifier for c in (all_sales_channels if variation.all_sales_channels else variation.limit_sales_channels.all())
                                ],
                                'available_from': variation.available_from,
                                'available_until': variation.available_until,
                                'hide_without_voucher': variation.hide_without_voucher,
@@ -125,7 +122,6 @@ class JSONExporter(BaseExporter):
                            } for variation in item.variations.all()
                        ]
                    } for item in self.event.items.select_related('tax_rule').prefetch_related(
                        'limit_sales_channels',
                        Prefetch(
                            'meta_values',
                            ItemMetaValue.objects.select_related('property'),
@@ -134,7 +130,6 @@ class JSONExporter(BaseExporter):
                        Prefetch(
                            'variations',
                            queryset=ItemVariation.objects.prefetch_related(
                                'limit_sales_channels',
                                Prefetch(
                                    'meta_values',
                                    ItemVariationMetaValue.objects.select_related('property'),
@@ -172,7 +167,7 @@ class JSONExporter(BaseExporter):
                        'require_approval': order.require_approval,
                        'checkin_attention': order.checkin_attention,
                        'checkin_text': order.checkin_text,
-                        'sales_channel': order.sales_channel.identifier,
+                        'sales_channel': order.sales_channel,
                        'expires': order.expires,
                        'datetime': order.datetime,
                        'fees': [
@@ -256,6 +256,8 @@ class SecurityMiddleware(MiddlewareMixin):
            # pages
            return resp
        resp['X-XSS-Protection'] = '1'
        # We just need to have a P3P, not matter whats in there
        # https://blogs.msdn.microsoft.com/ieinternals/2013/09/17/a-quick-look-at-p3p/
        # https://github.com/pretix/pretix/issues/765
@@ -2,7 +2,7 @@
 from django.db import migrations
-from pretix.base.channels import get_all_sales_channel_types
+from pretix.base.channels import get_all_sales_channels
 def set_sales_channels(apps, schema_editor):
@@ -11,7 +11,7 @@ def set_sales_channels(apps, schema_editor):
    # Therefore, for existing events, we enable all sales channels
    Event_SettingsStore = apps.get_model('pretixbase', 'Event_SettingsStore')
    Event = apps.get_model('pretixbase', 'Event')
-    all_sales_channels = "[" + ", ".join('"' + sc + '"' for sc in get_all_sales_channel_types()) + "]"
+    all_sales_channels = "[" + ", ".join('"' + sc + '"' for sc in get_all_sales_channels()) + "]"
    batch_size = 1000
    Event_SettingsStore.objects.bulk_create([
        Event_SettingsStore(
@@ -3,7 +3,7 @@
 from django.db import migrations
 import pretix.base.models.fields
-from pretix.base.channels import get_all_sales_channel_types
+from pretix.base.channels import get_all_sales_channels
 class Migration(migrations.Migration):
@@ -15,6 +15,6 @@ class Migration(migrations.Migration):
        migrations.AddField(
            model_name='event',
            name='sales_channels',
-            field=pretix.base.models.fields.MultiStringField(default=list(get_all_sales_channel_types().keys())),
+            field=pretix.base.models.fields.MultiStringField(default=list(get_all_sales_channels().keys())),
        ),
    ]
@@ -1,110 +0,0 @@
 # Generated by Django 4.2.8 on 2024-03-24 17:43
 import django.db.models.deletion
 import i18nfield.fields
 from django.db import migrations, models
 import pretix.base.models.fields
 class Migration(migrations.Migration):
    dependencies = [
        ("pretixbase", "0264_order_internal_secret"),
    ]
    operations = [
        migrations.CreateModel(
            name="SalesChannel",
            fields=[
                (
                    "id",
                    models.BigAutoField(
                        auto_created=True, primary_key=True, serialize=False
                    ),
                ),
                ("label", i18nfield.fields.I18nCharField(max_length=200)),
                ("identifier", models.CharField(max_length=200)),
                ("type", models.CharField(max_length=200)),
                ("position", models.PositiveIntegerField(default=0)),
                ("configuration", models.JSONField(default=dict)),
            ],
        ),
        migrations.RenameField(
            model_name="checkinlist",
            old_name="auto_checkin_sales_channels",
            new_name="auto_checkin_sales_channel_types",
        ),
        migrations.AddField(
            model_name="discount",
            name="all_sales_channels",
            field=models.BooleanField(default=True),
        ),
        migrations.AddField(
            model_name="event",
            name="all_sales_channels",
            field=models.BooleanField(default=True),
        ),
        migrations.AddField(
            model_name="item",
            name="all_sales_channels",
            field=models.BooleanField(default=True),
        ),
        migrations.AddField(
            model_name="itemvariation",
            name="all_sales_channels",
            field=models.BooleanField(default=True),
        ),
        migrations.RenameField(
            model_name="order",
            old_name="sales_channel",
            new_name="sales_channel_type",
        ),
        migrations.AddField(
            model_name="saleschannel",
            name="organizer",
            field=models.ForeignKey(
                on_delete=django.db.models.deletion.CASCADE,
                related_name="sales_channels",
                to="pretixbase.organizer",
            ),
        ),
        migrations.AddField(
            model_name="discount",
            name="limit_sales_channels",
            field=models.ManyToManyField(to="pretixbase.saleschannel"),
        ),
        migrations.AddField(
            model_name="event",
            name="limit_sales_channels",
            field=models.ManyToManyField(to="pretixbase.saleschannel"),
        ),
        migrations.AddField(
            model_name="item",
            name="limit_sales_channels",
            field=models.ManyToManyField(to="pretixbase.saleschannel"),
        ),
        migrations.AddField(
            model_name="itemvariation",
            name="limit_sales_channels",
            field=models.ManyToManyField(to="pretixbase.saleschannel"),
        ),
        migrations.AddField(
            model_name="checkinlist",
            name="auto_checkin_sales_channels",
            field=models.ManyToManyField(to="pretixbase.saleschannel"),
        ),
        migrations.AddField(
            model_name="order",
            name="sales_channel",
            field=models.ForeignKey(
                null=True,
                on_delete=django.db.models.deletion.PROTECT,
                to="pretixbase.saleschannel",
            ),
        ),
        migrations.AlterUniqueTogether(
            name="saleschannel",
            unique_together={("organizer", "identifier")},
        ),
    ]
@@ -1,84 +0,0 @@
 # Generated by Django 4.2.8 on 2024-03-24 17:55
 from django.db import migrations
 from i18nfield.strings import LazyI18nString
 from pretix.base.channels import get_all_sales_channel_types
 def create_sales_channels(apps, schema_editor):
    channel_types = get_all_sales_channel_types()
    type_to_channel = dict()
    full_discount_set = set()
    full_set = set()
    Organizer = apps.get_model("pretixbase", "Organizer")
    for o in Organizer.objects.all().iterator():
        for i, t in enumerate(channel_types.values()):
            if not t.default_created:
                continue
            type_to_channel[t.identifier, o.pk] = o.sales_channels.get_or_create(
                type=t.identifier,
                defaults=dict(
                    position=i,
                    identifier=t.identifier,
                    label=LazyI18nString.from_gettext(t.verbose_name),
                ),
            )[0]
            full_set.add(t.identifier)
            if t.discounts_supported:
                full_discount_set.add(t.identifier)
    Event = apps.get_model("pretixbase", "Event")
    for d in Event.objects.all().iterator():
        if set(d.sales_channels) != full_set:
            d.all_sales_channels = False
            d.save()
            for s in d.sales_channels:
                d.limit_sales_channels.add(type_to_channel[s, d.organizer_id])
    Item = apps.get_model("pretixbase", "Item")
    for d in Item.objects.select_related("event").iterator():
        if set(d.sales_channels) != full_set:
            d.all_sales_channels = False
            d.save()
            for s in d.sales_channels:
                d.limit_sales_channels.add(type_to_channel[s, d.event.organizer_id])
    ItemVariation = apps.get_model("pretixbase", "ItemVariation")
    for d in ItemVariation.objects.select_related("item__event").iterator():
        if set(d.sales_channels) != full_set:
            d.all_sales_channels = False
            d.save()
            for s in d.sales_channels:
                d.limit_sales_channels.add(type_to_channel[s, d.item.event.organizer_id])
    Discount = apps.get_model("pretixbase", "Discount")
    for d in Discount.objects.select_related("event").iterator():
        if set(d.sales_channels) != full_discount_set:
            d.all_sales_channels = False
            d.save()
            for s in d.sales_channels:
                d.limit_sales_channels.add(type_to_channel[s, d.event.organizer_id])
    CheckinList = apps.get_model("pretixbase", "CheckinList")
    for c in CheckinList.objects.select_related("event").iterator():
        for s in c.auto_checkin_sales_channel_types:
            c.auto_checkin_sales_channels.add(type_to_channel[s, c.event.organizer_id])
    Order = apps.get_model("pretixbase", "Order")
    for (k, orgid), v in type_to_channel.items():
        Order.objects.filter(sales_channel_type=k, event__organizer_id=orgid, sales_channel__isnull=True).update(
            sales_channel=v
        )
 class Migration(migrations.Migration):
    dependencies = [
        ("pretixbase", "0265_saleschannel_and_more"),
    ]
    operations = [
        migrations.RunPython(create_sales_channels, migrations.RunPython.noop),
    ]
@@ -1,46 +0,0 @@
 # Generated by Django 4.2.8 on 2024-03-25 13:34
 import django.db.models.deletion
 from django.db import migrations, models
 class Migration(migrations.Migration):
    dependencies = [
        ("pretixbase", "0266_saleschannel_migrate_data"),
    ]
    operations = [
        migrations.RemoveField(
            model_name="checkinlist",
            name="auto_checkin_sales_channel_types",
        ),
        migrations.RemoveField(
            model_name="discount",
            name="sales_channels",
        ),
        migrations.RemoveField(
            model_name="event",
            name="sales_channels",
        ),
        migrations.RemoveField(
            model_name="item",
            name="sales_channels",
        ),
        migrations.RemoveField(
            model_name="itemvariation",
            name="sales_channels",
        ),
        migrations.RemoveField(
            model_name="order",
            name="sales_channel_type",
        ),
        migrations.AlterField(
            model_name="order",
            name="sales_channel",
            field=models.ForeignKey(
                on_delete=django.db.models.deletion.PROTECT,
                to="pretixbase.saleschannel",
            ),
        ),
    ]
@@ -1,31 +0,0 @@
 # Generated by Django 4.2.8 on 2024-07-01 09:26
 from django.db import migrations, models
 import pretix.base.models.orders
 class Migration(migrations.Migration):
    dependencies = [
        ("pretixbase", "0267_remove_old_sales_channels"),
    ]
    operations = [
        migrations.RemoveField(
            model_name="subevent",
            name="items",
        ),
        migrations.RemoveField(
            model_name="subevent",
            name="variations",
        ),
        migrations.AlterField(
            model_name="order",
            name="internal_secret",
            field=models.CharField(
                default=pretix.base.models.orders.generate_secret,
                max_length=32,
                null=True,
            ),
        ),
    ]
@@ -38,6 +38,7 @@ from i18nfield.strings import LazyI18nString
 from phonenumber_field.phonenumber import to_python
 from phonenumbers import SUPPORTED_REGIONS
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.forms.questions import guess_country
 from pretix.base.modelimport import (
    DatetimeColumnMixin, DecimalColumnMixin, ImportColumn, SubeventColumnMixin,
@@ -537,28 +538,18 @@ class Expires(DatetimeColumnMixin, ImportColumn):
 class Saleschannel(ImportColumn):
    identifier = 'sales_channel'
    verbose_name = gettext_lazy('Sales channel')
    default_value = None
    initial = 'static:web'
    @cached_property
    def channels(self):
        return list(self.event.organizer.sales_channels.all())
    def static_choices(self):
        return [
-            (c.identifier, str(c.label)) for c in self.channels
+            (sc.identifier, sc.verbose_name) for sc in get_all_sales_channels().values()
        ]
    def clean(self, value, previous_values):
-        matches = [
+        if not value:
-            p for p in self.channels
+            value = 'web'
-            if p.identifier == value or any((v and v == value) for v in i18n_flat(p.label))
+        if value not in get_all_sales_channels():
        ]
        if len(matches) == 0:
            raise ValidationError(_("Please enter a valid sales channel."))
-        if len(matches) > 1:
+        return value
            raise ValidationError(_("Please enter a valid sales channel."))
        return matches[0]
    def assign(self, value, order, position, invoice_address, **kwargs):
        order.sales_channel = value
@@ -51,8 +51,7 @@ from .orders import (
    generate_secret,
 )
 from .organizer import (
-    Organizer, Organizer_SettingsStore, SalesChannel, Team, TeamAPIToken,
+    Organizer, Organizer_SettingsStore, Team, TeamAPIToken, TeamInvite,
    TeamInvite,
 )
 from .seating import Seat, SeatCategoryMapping, SeatingPlan
 from .tax import TaxRule
@@ -46,6 +46,7 @@ from django_scopes import ScopedManager, scopes_disabled
 from pretix.base.media import MEDIA_TYPES
 from pretix.base.models import LoggedModel
 from pretix.base.models.fields import MultiStringField
 from pretix.helpers import PostgresWindowFrame
@@ -99,13 +100,13 @@ class CheckinList(LoggedModel):
        verbose_name=_('Automatically check out everyone at'),
        null=True, blank=True
    )
-    auto_checkin_sales_channels = models.ManyToManyField(
+    auto_checkin_sales_channels = MultiStringField(
-        "SalesChannel",
+        default=[],
        blank=True,
        verbose_name=_('Sales channels to automatically check in'),
        help_text=_('All items on this check-in list will be automatically marked as checked-in when purchased through '
                    'any of the selected sales channels. This option can be useful when tickets sold at the box office '
-                    'are not checked again before entry and should be considered validated directly upon purchase.'),
+                    'are not checked again before entry and should be considered validated directly upon purchase.')
        blank=True,
    )
    rules = models.JSONField(default=dict, blank=True)
@@ -34,6 +34,7 @@ from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager
 from pretix.base.decimal import round_decimal
 from pretix.base.models import fields
 from pretix.base.models.base import LoggedModel
@@ -64,14 +65,10 @@ class Discount(LoggedModel):
        default=0,
        verbose_name=_("Position")
    )
-    all_sales_channels = models.BooleanField(
+    sales_channels = fields.MultiStringField(
-        verbose_name=_("All supported sales channels"),
+        verbose_name=_('Sales channels'),
-        default=True,
+        default=['web'],
-    )
+        blank=False,
    limit_sales_channels = models.ManyToManyField(
        "SalesChannel",
        verbose_name=_("Sales channels"),
        blank=True,
    )
    available_from = models.DateTimeField(
@@ -36,7 +36,6 @@ import logging
 import os
 import string
 import uuid
 import warnings
 from collections import Counter, OrderedDict, defaultdict
 from datetime import datetime, time, timedelta
 from operator import attrgetter
@@ -67,6 +66,7 @@ from django_scopes import ScopedManager, scopes_disabled
 from i18nfield.fields import I18nCharField, I18nTextField
 from pretix.base.models.base import LoggedModel
 from pretix.base.models.fields import MultiStringField
 from pretix.base.reldate import RelativeDateWrapper
 from pretix.base.timemachine import time_machine_now
 from pretix.base.validators import EventSlugBanlistValidator
@@ -307,7 +307,6 @@ class EventMixin:
    def annotated(cls, qs, channel='web', voucher=None):
        from pretix.base.models import Item, ItemVariation, Quota
        assert isinstance(channel, str)
        sq_active_item = Item.objects.using(settings.DATABASE_REPLICA).filter_available(channel=channel, voucher=voucher).filter(
            Q(variations__isnull=True)
            & Q(quotas__pk=OuterRef('pk'))
@@ -317,14 +316,14 @@ class EventMixin:
        q_variation = (
            Q(active=True)
-            & Q(Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=channel))
+            & Q(sales_channels__contains=channel)
            & Q(Q(available_from__isnull=True) | Q(available_from__lte=time_machine_now()))
            & Q(Q(available_until__isnull=True) | Q(available_until__gte=time_machine_now()))
            & Q(item__active=True)
            & Q(Q(item__available_from__isnull=True) | Q(item__available_from__lte=time_machine_now()))
            & Q(Q(item__available_until__isnull=True) | Q(item__available_until__gte=time_machine_now()))
            & Q(Q(item__category__isnull=True) | Q(item__category__is_addon=False))
-            & Q(Q(item__all_sales_channels=True) | Q(item__limit_sales_channels__identifier=channel))
+            & Q(item__sales_channels__contains=channel)
            & Q(item__require_bundling=False)
            & Q(quotas__pk=OuterRef('pk'))
        )
@@ -468,7 +467,6 @@ class EventMixin:
        return best_state_found, num_tickets_found, num_tickets_possible
    def free_seats(self, ignore_voucher=None, sales_channel='web', include_blocked=False):
        assert isinstance(sales_channel, str) or sales_channel is None
        qs_annotated = self._seats(ignore_voucher=ignore_voucher)
        qs = qs_annotated.filter(has_order=False, has_cart=False, has_voucher=False)
@@ -497,13 +495,10 @@ class EventMixin:
        return qs.filter(q)
-def default_sales_channels():  # kept for legacy migration
+def default_sales_channels():
-    from ..channels import get_all_sales_channel_types
+    from ..channels import get_all_sales_channels
-    if "PYTEST_CURRENT_TEST" not in os.environ:
+    return list(get_all_sales_channels().keys())
        warnings.warn('Method should not be used in new code.', DeprecationWarning)
    return list(get_all_sales_channel_types().keys())
@settings_hierarkey.add(parent_field='organizer', cache_namespace='event')
@@ -540,10 +535,8 @@ class Event(EventMixin, LoggedModel):
    :type plugins: str
    :param has_subevents: Enable event series functionality
    :type has_subevents: bool
-    :param all_sales_channels: A flag indicating that this event is available on all channels and limit_sales_channels will be ignored.
+    :param sales_channels: A list of sales channel identifiers, that this event is available for sale on
-    :type all_sales_channels: bool
+    :type sales_channels: list
    :param limit_sales_channels: A list of sales channel identifiers, that this event is available for sale on
    :type limit_sales_channels: list
    """
    settings_namespace = 'event'
@@ -635,14 +628,10 @@ class Event(EventMixin, LoggedModel):
        auto_now=True, db_index=True
    )
-    all_sales_channels = models.BooleanField(
+    sales_channels = MultiStringField(
-        verbose_name=_("Sell on all sales channels"),
+        verbose_name=_('Restrict to specific sales channels'),
-        default=True,
+        help_text=_('Only sell tickets for this event on the following sales channels.'),
-    )
+        default=default_sales_channels,
    limit_sales_channels = models.ManyToManyField(
        "SalesChannel",
        verbose_name=_("Restrict to specific sales channels"),
        blank=True,
    )
    objects = ScopedManager(organizer='organizer')
@@ -816,17 +805,10 @@ class Event(EventMixin, LoggedModel):
        if other.date_admission:
            self.date_admission = self.date_from + (other.date_admission - other.date_from)
        self.testmode = other.testmode
-        self.all_sales_channels = other.all_sales_channels
+        self.sales_channels = other.sales_channels
        self.save()
        self.log_action('pretix.object.cloned', data={'source': other.slug, 'source_id': other.pk})
        if not self.all_sales_channels:
            self.limit_sales_channels.set(
                self.organizer.sales_channels.filter(
                    identifier__in=other.limit_sales_channels.values_list("identifier", flat=True)
                )
            )
        if not skip_meta_data:
            for emv in EventMetaValue.objects.filter(event=other):
                emv.pk = None
@@ -864,17 +846,12 @@ class Event(EventMixin, LoggedModel):
        item_map = {}
        variation_map = {}
-        for i in Item.objects.filter(event=other).prefetch_related(
+        for i in Item.objects.filter(event=other).prefetch_related('variations'):
            'variations', 'limit_sales_channels', 'require_membership_types',
            'variations__limit_sales_channels', 'variations__require_membership_types',
        ):
            vars = list(i.variations.all())
            require_membership_types = list(i.require_membership_types.all())
            limit_sales_channels = list(i.limit_sales_channels.all())
            item_map[i.pk] = i
            i.pk = None
            i.event = self
            i._prefetched_objects_cache = {}
            if i.picture:
                i.picture.save(os.path.basename(i.picture.name), i.picture)
            if i.category_id:
@@ -891,23 +868,12 @@ class Event(EventMixin, LoggedModel):
            if require_membership_types and other.organizer_id == self.organizer_id:
                i.require_membership_types.set(require_membership_types)
            if not i.all_sales_channels:
                i.limit_sales_channels.set(self.organizer.sales_channels.filter(identifier__in=[s.identifier for s in limit_sales_channels]))
            for v in vars:
                require_membership_types = list(v.require_membership_types.all())
                limit_sales_channels = list(v.limit_sales_channels.all())
                variation_map[v.pk] = v
                v.pk = None
                v.item = i
                v._prefetched_objects_cache = {}
                v.save(force_insert=True)
                if require_membership_types and other.organizer_id == self.organizer_id:
                    v.require_membership_types.set(require_membership_types)
                if not v.all_sales_channels:
                    v.limit_sales_channels.set(self.organizer.sales_channels.filter(identifier__in=[s.identifier for s in limit_sales_channels]))
        for i in self.items.filter(hidden_if_item_available__isnull=False):
            i.hidden_if_item_available = item_map[i.hidden_if_item_available_id]
            i.save()
@@ -945,7 +911,6 @@ class Event(EventMixin, LoggedModel):
            vars = list(q.variations.all())
            oldid = q.pk
            q.pk = None
            q._prefetched_objects_cache = {}
            q.event = self
            q.closed = False
            q.save(force_insert=True)
@@ -957,15 +922,11 @@ class Event(EventMixin, LoggedModel):
                q.variations.add(variation_map[v.pk])
            self.items.filter(hidden_if_available_id=oldid).update(hidden_if_available=q)
-        for d in Discount.objects.filter(event=other).prefetch_related(
+        for d in Discount.objects.filter(event=other).prefetch_related('condition_limit_products'):
            'condition_limit_products', 'benefit_limit_products', 'limit_sales_channels'
        ):
            c_items = list(d.condition_limit_products.all())
            b_items = list(d.benefit_limit_products.all())
            limit_sales_channels = list(v.limit_sales_channels.all())
            d.pk = None
            d.event = self
            d._prefetched_objects_cache = {}
            d.save(force_insert=True)
            d.log_action('pretix.object.cloned')
            for i in c_items:
@@ -975,16 +936,12 @@ class Event(EventMixin, LoggedModel):
                if i.pk in item_map:
                    d.benefit_limit_products.add(item_map[i.pk])
            if not d.all_sales_channels:
                d.limit_sales_channels.set(self.organizer.sales_channels.filter(identifier__in=[s.identifier for s in limit_sales_channels]))
        question_map = {}
        for q in Question.objects.filter(event=other).prefetch_related('items', 'options'):
            items = list(q.items.all())
            opts = list(q.options.all())
            question_map[q.pk] = q
            q.pk = None
            q._prefetched_objects_cache = {}
            q.event = self
            q.save(force_insert=True)
            q.log_action('pretix.object.cloned')
@@ -1015,14 +972,10 @@ class Event(EventMixin, LoggedModel):
                    _walk_rules(i)
        checkin_list_map = {}
-        for cl in other.checkin_lists.filter(subevent__isnull=True).prefetch_related(
+        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 = {}
            cl.event = self
            rules = cl.rules
            _walk_rules(rules)
@@ -1031,8 +984,6 @@ 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:
@@ -34,10 +34,8 @@
 # License for the specific language governing permissions and limitations under the License.
 import calendar
 import os
 import sys
 import uuid
 import warnings
 from collections import Counter, OrderedDict
 from datetime import date, datetime, time, timedelta
 from decimal import Decimal, DecimalException
@@ -63,6 +61,7 @@ from django_countries.fields import Country
 from django_scopes import ScopedManager
 from i18nfield.fields import I18nCharField, I18nTextField
 from pretix.base.models import fields
 from pretix.base.models.base import LoggedModel
 from pretix.base.models.fields import MultiStringField
 from pretix.base.models.tax import TaxedPrice
@@ -271,15 +270,13 @@ class SubEventItemVariation(models.Model):
 def filter_available(qs, channel='web', voucher=None, allow_addons=False):
    assert isinstance(channel, str)
    q = (
        # IMPORTANT: If this is updated, also update the ItemVariation query
        # in models/event.py: EventMixin.annotated()
        Q(active=True)
        & Q(Q(available_from__isnull=True) | Q(available_from__lte=time_machine_now()) | Q(available_from_mode='info'))
        & Q(Q(available_until__isnull=True) | Q(available_until__gte=time_machine_now()) | Q(available_until_mode='info'))
-        & Q(Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=channel))
+        & Q(sales_channels__contains=channel) & Q(require_bundling=False)
        & Q(require_bundling=False)
    )
    if not allow_addons:
        q &= Q(Q(category__isnull=True) | Q(category__is_addon=False))
@@ -356,10 +353,8 @@ class Item(LoggedModel):
    :type original_price: decimal.Decimal
    :param require_approval: If set to ``True``, orders containing this product can only be processed and paid after approved by an administrator
    :type require_approval: bool
-    :param all_sales_channels: A flag indicating that this item is available on all channels and limit_sales_channels will be ignored.
+    :param sales_channels: Sales channels this item is available on.
-    :type all_sales_channels: bool
+    :type sales_channels: bool
    :param limit_sales_channels: A list of sales channel identifiers, that this item is available for sale on.
    :type limit_sales_channels: list
    :param issue_giftcard: If ``True``, buying this product will give you a gift card with the value of the product's price
    :type issue_giftcard: bool
    :param validity_mode: Instruction how to set ``valid_from``/``valid_until`` on tickets, ``null`` is default event validity.
@@ -614,14 +609,9 @@ class Item(LoggedModel):
        help_text=_('If set, this will be displayed next to the current price to show that the current price is a '
                    'discounted one. This is just a cosmetic setting and will not actually impact pricing.')
    )
-    all_sales_channels = models.BooleanField(
+    sales_channels = fields.MultiStringField(
-        verbose_name=_("Sell on all sales channels"),
+        verbose_name=_('Sales channels'),
-        default=True,
+        default=['web'],
    )
    limit_sales_channels = models.ManyToManyField(
        "SalesChannel",
        verbose_name=_("Restrict to specific sales channels"),
        help_text=_('Only sell tickets for this product on the selected sales channels.'),
        blank=True,
    )
    issue_giftcard = models.BooleanField(
@@ -1043,13 +1033,9 @@ class Item(LoggedModel):
            return None, None
-def _all_sales_channels_identifiers():  # kept for legacy migrations
+def _all_sales_channels_identifiers():
-    from pretix.base.channels import get_all_sales_channel_types
+    from pretix.base.channels import get_all_sales_channels
-
+    return list(get_all_sales_channels().keys())
    if "PYTEST_CURRENT_TEST" not in os.environ:
        warnings.warn('Method should not be used in new code.', DeprecationWarning)
    return list(get_all_sales_channel_types().keys())
 class ItemVariation(models.Model):
@@ -1072,10 +1058,6 @@ class ItemVariation(models.Model):
    :param require_approval: If set to ``True``, orders containing this variation can only be processed and paid after
    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(
@@ -1161,13 +1143,9 @@ class ItemVariation(models.Model):
        default=Item.UNAVAIL_MODE_HIDDEN,
        max_length=16,
    )
-    all_sales_channels = models.BooleanField(
+    sales_channels = fields.MultiStringField(
-        verbose_name=_("Sell on all sales channels the product is sold on"),
+        verbose_name=_('Sales channels'),
-        default=True,
+        default=_all_sales_channels_identifiers,
    )
    limit_sales_channels = models.ManyToManyField(
        "SalesChannel",
        verbose_name=_("Restrict to specific sales channels"),
        help_text=_('The sales channel selection for the product as a whole takes precedence, so if a sales channel is '
                    'selected here but not on product level, the variation will not be available.'),
        blank=True,
@@ -187,8 +187,8 @@ class Order(LockModel, LoggedModel):
    :type require_approval: bool
    :param meta_info: Additional meta information on the order, JSON-encoded.
    :type meta_info: str
-    :param sales_channel: Foreign key to the sales channel this order was created through.
+    :param sales_channel: Identifier of the sales channel this order was created through.
-    :type sales_channel: SalesChannel
+    :type sales_channel: str
    """
    STATUS_PENDING = "n"
@@ -305,10 +305,7 @@ class Order(LockModel, LoggedModel):
    require_approval = models.BooleanField(
        default=False
    )
-    sales_channel = models.ForeignKey(
+    sales_channel = models.CharField(max_length=190, default="web")
        "SalesChannel",
        on_delete=models.PROTECT,
    )
    email_known_to_work = models.BooleanField(
        default=False,
        verbose_name=_('E-mail address verified')
@@ -1935,7 +1932,7 @@ class OrderPayment(models.Model):
                    trigger_pdf=not send_mail or not self.order.event.settings.invoice_email_attachment
                )
-        if send_mail and self.order.sales_channel.identifier in self.order.event.settings.mail_sales_channel_placed_paid:
+        if send_mail and self.order.sales_channel in self.order.event.settings.mail_sales_channel_placed_paid:
            self._send_paid_mail(invoice, user, mail_text)
            if self.order.event.settings.mail_send_order_paid_attendee:
                for p in self.order.positions.all():
@@ -46,9 +46,7 @@ from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
 from django.utils.timezone import get_current_timezone, make_aware, now
 from django.utils.translation import gettext_lazy as _
 from django_scopes import ScopedManager, scope
 from i18nfield.fields import I18nCharField
 from i18nfield.strings import LazyI18nString
 from pretix.base.models.base import LoggedModel
 from pretix.base.validators import OrganizerSlugBanlistValidator
@@ -106,8 +104,6 @@ class Organizer(LoggedModel):
        if is_new:
            kwargs.pop('update_fields', None)  # does not make sense here
            self.set_defaults()
            with scope(organizer=self):
                self.create_default_sales_channels()
        else:
            self.get_cache().clear()
        return obj
@@ -216,24 +212,6 @@ class Organizer(LoggedModel):
        else:
            return get_connection(fail_silently=False)
    def create_default_sales_channels(self):
        from pretix.base.channels import get_all_sales_channel_types
        i = 0
        for channel in get_all_sales_channel_types().values():
            if not channel.default_created:
                continue
            self.sales_channels.get_or_create(
                identifier=channel.identifier,
                defaults={
                    'label': LazyI18nString.from_gettext(channel.verbose_name),
                    'type': channel.identifier,
                },
                position=i
            )
            i += 1
 def generate_invite_token():
    return get_random_string(length=32, allowed_chars=string.ascii_lowercase + string.digits)
@@ -526,58 +504,3 @@ class OrganizerFooterLink(models.Model):
    def save(self, *args, **kwargs):
        super().save(*args, **kwargs)
        self.organizer.cache.clear()
 class SalesChannel(LoggedModel):
    organizer = models.ForeignKey('Organizer', on_delete=models.CASCADE, related_name='sales_channels')
    label = I18nCharField(
        max_length=200,
        verbose_name=_("Name"),
    )
    identifier = models.CharField(
        verbose_name=_("Identifier"),
        max_length=200,
        validators=[
            RegexValidator(
                regex=r"^[a-zA-Z0-9.\-_]+$",
                message=_("The identifier may only contain letters, numbers, dots, dashes, and underscores."),
            ),
        ],
    )
    type = models.CharField(
        verbose_name=_("Type"),
        max_length=200,
    )
    position = models.PositiveIntegerField(
        default=0,
        verbose_name=_("Position")
    )
    configuration = models.JSONField(default=dict)
    objects = ScopedManager(organizer="organizer")
    class Meta:
        ordering = ("position", "type", "identifier", "id")
        unique_together = ("organizer", "identifier")
    def __str__(self):
        return str(self.label)
    @cached_property
    def type_instance(self):
        from ..channels import get_all_sales_channel_types
        types = get_all_sales_channel_types()
        return types[self.type]
    @property
    def icon(self):
        return self.type_instance.icon
    def allow_delete(self):
        from . import Order
        if self.type_instance.default_created:
            return False
        return not Order.objects.filter(sales_channel=self).exists()
@@ -243,14 +243,10 @@ class Seat(models.Model):
            qs_annotated = qs_annotated.annotate(has_closeby_taken=Exists(sq_closeby))
        return qs_annotated
-    def is_available(self, ignore_cart=None, ignore_orderpos=None, ignore_voucher_id=None,
+    def is_available(self, ignore_cart=None, ignore_orderpos=None, ignore_voucher_id=None, sales_channel='web',
                     sales_channel='web',
                     ignore_distancing=False, distance_ignore_cart_id=None):
        from .orders import Order
        from .organizer import SalesChannel
        if isinstance(sales_channel, SalesChannel):
            sales_channel = sales_channel.identifier
        if self.blocked and sales_channel not in self.event.settings.seating_allow_blocked_seats_for_channel:
            return False
        opqs = self.orderposition_set.filter(
@@ -56,6 +56,7 @@ from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from i18nfield.forms import I18nFormField, I18nTextarea, I18nTextInput
 from i18nfield.strings import LazyI18nString
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.forms import I18nMarkdownTextarea, PlaceholderValidator
 from pretix.base.models import (
    CartPosition, Event, GiftCard, InvoiceAddress, Order, OrderPayment,
@@ -416,8 +417,8 @@ class BasePaymentProvider:
             forms.MultipleChoiceField(
                 label=_('Restrict to specific sales channels'),
                 choices=(
-                     (c.identifier, c.label) for c in self.event.organizer.sales_channels.all()
+                     (c.identifier, c.verbose_name) for c in get_all_sales_channels().values()
-                     if c.type_instance.payment_restrictions_supported
+                     if c.payment_restrictions_supported
                 ),
                 initial=['web'],
                 widget=forms.CheckboxSelectMultiple,
@@ -852,7 +853,7 @@ class BasePaymentProvider:
                if str(ia.country) != '' and str(ia.country) not in restricted_countries:
                    return False
-        if order.sales_channel.identifier not in self.settings.get('_restrict_to_sales_channels', as_type=list, default=['web']):
+        if order.sales_channel not in self.settings.get('_restrict_to_sales_channels', as_type=list, default=['web']):
            return False
        return self._is_available_by_time(order=order)
@@ -52,11 +52,12 @@ from django.utils.translation import (
 )
 from django_scopes import scopes_disabled
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.i18n import language
 from pretix.base.media import MEDIA_TYPES
 from pretix.base.models import (
-    CartPosition, Event, InvoiceAddress, Item, ItemVariation, SalesChannel,
+    CartPosition, Event, InvoiceAddress, Item, ItemVariation, Seat,
-    Seat, SeatCategoryMapping, Voucher,
+    SeatCategoryMapping, Voucher,
 )
 from pretix.base.models.event import SubEvent
 from pretix.base.models.orders import OrderFee
@@ -274,8 +275,8 @@ class CartManager:
        AddOperation: 30
    }
-    def __init__(self, event: Event, cart_id: str, sales_channel: SalesChannel,
+    def __init__(self, event: Event, cart_id: str, invoice_address: InvoiceAddress=None, widget_data=None,
-                 invoice_address: InvoiceAddress=None, widget_data=None):
+                 sales_channel='web'):
        self.event = event
        self.cart_id = cart_id
        self.real_now_dt = now()
@@ -383,7 +384,7 @@ class CartManager:
        })
    def _check_max_cart_size(self):
-        if not self._sales_channel.type_instance.unlimited_items_per_order:
+        if not get_all_sales_channels()[self._sales_channel].unlimited_items_per_order:
            cartsize = self.positions.filter(addon_to__isnull=True).count()
            cartsize += sum([op.count for op in self._operations if isinstance(op, self.AddOperation) and not op.addon_to])
            cartsize -= len([1 for op in self._operations if isinstance(op, self.RemoveOperation) if
@@ -421,13 +422,8 @@ class CartManager:
            elif op.item.media_policy == Item.MEDIA_POLICY_REUSE:
                raise CartError(error_messages['media_usage_not_implemented'])
-            if not op.item.all_sales_channels:
+            if self._sales_channel not in op.item.sales_channels or (op.variation and self._sales_channel not in op.variation.sales_channels):
-                if self._sales_channel.identifier not in (s.identifier for s in op.item.limit_sales_channels.all()):
+                raise CartError(error_messages['unavailable'])
                    raise CartError(error_messages['unavailable'])
            if op.variation and not op.variation.all_sales_channels:
                if self._sales_channel.identifier not in (s.identifier for s in op.variation.limit_sales_channels.all()):
                    raise CartError(error_messages['unavailable'])
            if op.subevent and op.item.pk in op.subevent.item_overrides and not op.subevent.item_overrides[op.item.pk].is_available():
                raise CartError(error_messages['not_for_sale'])
@@ -461,14 +457,7 @@ class CartManager:
                raise CartError(error_messages['ended'])
            seated = self._is_seated(op.item, op.subevent)
-            if (
+            if seated and (not op.seat or (op.seat.blocked and self._sales_channel not in self.event.settings.seating_allow_blocked_seats_for_channel)):
                seated and (
                    not op.seat or (
                        op.seat.blocked and
                        self._sales_channel.identifier not in self.event.settings.seating_allow_blocked_seats_for_channel
                    )
                )
            ):
                raise CartError(error_messages['seat_invalid'])
            elif op.seat and not seated:
                raise CartError(error_messages['seat_forbidden'])
@@ -1382,7 +1371,7 @@ class CartManager:
        discount_results = apply_discounts(
            self.event,
-            self._sales_channel.identifier,
+            self._sales_channel,
            [
                (cp.item_id, cp.subevent_id, cp.line_price_gross, bool(cp.addon_to), cp.is_bundled, cp.listed_price - cp.price_after_voucher)
                for cp in positions
@@ -1516,11 +1505,6 @@ def add_items_to_cart(self, event: int, items: List[dict], cart_id: str=None, lo
            except InvoiceAddress.DoesNotExist:
                pass
        try:
            sales_channel = event.organizer.sales_channels.get(identifier=sales_channel)
        except SalesChannel.DoesNotExist:
            raise CartError("Invalid sales channel.")
        try:
            try:
                cm = CartManager(event=event, cart_id=cart_id, invoice_address=ia, widget_data=widget_data,
@@ -1542,10 +1526,6 @@ def apply_voucher(self, event: Event, voucher: str, cart_id: str=None, locale='e
    :param session: Session ID of a guest
    """
    with language(locale), time_machine_now_assigned(override_now_dt):
        try:
            sales_channel = event.organizer.sales_channels.get(identifier=sales_channel)
        except SalesChannel.DoesNotExist:
            raise CartError("Invalid sales channel.")
        try:
            try:
                cm = CartManager(event=event, cart_id=cart_id, sales_channel=sales_channel)
@@ -1566,10 +1546,6 @@ def remove_cart_position(self, event: Event, position: int, cart_id: str=None, l
    :param session: Session ID of a guest
    """
    with language(locale), time_machine_now_assigned(override_now_dt):
        try:
            sales_channel = event.organizer.sales_channels.get(identifier=sales_channel)
        except SalesChannel.DoesNotExist:
            raise CartError("Invalid sales channel.")
        try:
            try:
                cm = CartManager(event=event, cart_id=cart_id, sales_channel=sales_channel)
@@ -1589,10 +1565,6 @@ def clear_cart(self, event: Event, cart_id: str=None, locale='en', sales_channel
    :param session: Session ID of a guest
    """
    with language(locale), time_machine_now_assigned(override_now_dt):
        try:
            sales_channel = event.organizer.sales_channels.get(identifier=sales_channel)
        except SalesChannel.DoesNotExist:
            raise CartError("Invalid sales channel.")
        try:
            try:
                cm = CartManager(event=event, cart_id=cart_id, sales_channel=sales_channel)
@@ -1621,10 +1593,6 @@ def set_cart_addons(self, event: Event, addons: List[dict], cart_id: str=None, l
                    ia = InvoiceAddress.objects.get(pk=invoice_address)
            except InvoiceAddress.DoesNotExist:
                pass
        try:
            sales_channel = event.organizer.sales_channels.get(identifier=sales_channel)
        except SalesChannel.DoesNotExist:
            raise CartError("Invalid sales channel.")
        try:
            try:
                cm = CartManager(event=event, cart_id=cart_id, invoice_address=ia, sales_channel=sales_channel)
@@ -1159,7 +1159,7 @@ 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(
+    cls = list(event.checkin_lists.filter(auto_checkin_sales_channels__contains=order.sales_channel).prefetch_related(
        'limit_products'))
    if not cls:
        return
@@ -420,7 +420,7 @@ def invoice_pdf_task(invoice: int):
 def invoice_qualified(order: Order):
    if order.total == Decimal('0.00') or order.require_approval or \
-            order.sales_channel.identifier not in order.event.settings.get('invoice_generate_sales_channels'):
+            order.sales_channel not in order.event.settings.get('invoice_generate_sales_channels'):
        return False
    return True
@@ -443,11 +443,8 @@ def build_preview_invoice_pdf(event):
        locale = event.settings.locale
    with rolledback_transaction(), language(locale, event.settings.region):
-        order = event.orders.create(
+        order = event.orders.create(status=Order.STATUS_PENDING, datetime=timezone.now(),
-            status=Order.STATUS_PENDING, datetime=timezone.now(),
+                                    expires=timezone.now(), code="PREVIEW", total=100 * event.tax_rules.count())
            expires=timezone.now(), code="PREVIEW", total=100 * event.tax_rules.count(),
            sales_channel=event.organizer.sales_channels.get(identifier="web"),
        )
        invoice = Invoice(
            order=order, event=event, invoice_no="PREVIEW",
            date=timezone.now().date(), locale=locale, organizer=event.organizer
@@ -62,6 +62,7 @@ from django.utils.translation import gettext as _, gettext_lazy, ngettext_lazy
 from django_scopes import scopes_disabled
 from pretix.api.models import OAuthApplication
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.email import get_email_context
 from pretix.base.i18n import get_language_without_region, language
 from pretix.base.media import MEDIA_TYPES
@@ -75,7 +76,7 @@ from pretix.base.models.orders import (
    BlockedTicketSecret, InvoiceAddress, OrderFee, OrderRefund,
    generate_secret,
 )
-from pretix.base.models.organizer import SalesChannel, TeamAPIToken
+from pretix.base.models.organizer import TeamAPIToken
 from pretix.base.models.tax import TAXED_ZERO, TaxedPrice, TaxRule
 from pretix.base.payment import GiftCardPayment, PaymentException
 from pretix.base.reldate import RelativeDateWrapper
@@ -649,7 +650,8 @@ def _check_date(event: Event, now_dt: datetime):
 def _check_positions(event: Event, now_dt: datetime, time_machine_now_dt: datetime, positions: List[CartPosition],
-                     sales_channel: SalesChannel, address: InvoiceAddress=None, customer=None):
+                     address: InvoiceAddress = None,
                     sales_channel='web', customer=None):
    err = None
    _check_date(event, time_machine_now_dt)
@@ -773,7 +775,7 @@ def _check_positions(event: Event, now_dt: datetime, time_machine_now_dt: dateti
        if cp.seat:
            # Unlike quotas (which we blindly trust as long as the position is not expired), we check seats every
            # time, since we absolutely can not overbook a seat.
-            if not cp.seat.is_available(ignore_cart=cp, ignore_voucher_id=cp.voucher_id, sales_channel=sales_channel.identifier):
+            if not cp.seat.is_available(ignore_cart=cp, ignore_voucher_id=cp.voucher_id, sales_channel=sales_channel):
                err = err or error_messages['seat_unavailable']
                delete(cp)
                continue
@@ -871,7 +873,7 @@ def _check_positions(event: Event, now_dt: datetime, time_machine_now_dt: dateti
    sorted_positions = [cp for cp in sorted_positions if cp.pk and cp.pk not in deleted_positions]
    discount_results = apply_discounts(
        event,
-        sales_channel.identifier,
+        sales_channel,
        [
            (cp.item_id, cp.subevent_id, cp.line_price_gross, bool(cp.addon_to), cp.is_bundled, cp.listed_price - cp.price_after_voucher)
            for cp in sorted_positions
@@ -957,11 +959,12 @@ def _get_fees(positions: List[CartPosition], payment_requests: List[dict], addre
    return fees
-def _create_order(event: Event, *, email: str, positions: List[CartPosition], now_dt: datetime,
+def _create_order(event: Event, email: str, positions: List[CartPosition], now_dt: datetime,
-                  payment_requests: List[dict], sales_channel: SalesChannel, locale: str=None,
+                  payment_requests: List[dict], locale: str=None, address: InvoiceAddress=None,
-                  address: InvoiceAddress=None, meta_info: dict=None, shown_total=None,
+                  meta_info: dict=None, sales_channel: str='web', shown_total=None,
                  customer=None, valid_if_pending=False):
    payments = []
    sales_channel = get_all_sales_channels()[sales_channel]
    try:
        validate_memberships_in_order(customer, positions, event, lock=True, testmode=event.testmode)
@@ -983,10 +986,10 @@ def _create_order(event: Event, *, email: str, positions: List[CartPosition], no
        datetime=now_dt,
        locale=get_language_without_region(locale),
        total=total,
-        testmode=True if sales_channel.type_instance.testmode_supported and event.testmode else False,
+        testmode=True if sales_channel.testmode_supported and event.testmode else False,
        meta_info=json.dumps(meta_info or {}),
        require_approval=require_approval,
-        sales_channel=sales_channel,
+        sales_channel=sales_channel.identifier,
        customer=customer,
        valid_if_pending=valid_if_pending,
    )
@@ -1105,11 +1108,6 @@ def _perform_order(event: Event, payment_requests: List[dict], position_ids: Lis
    if customer:
        customer = event.organizer.customers.get(pk=customer)
    try:
        sales_channel = event.organizer.sales_channels.get(identifier=sales_channel)
    except SalesChannel.DoesNotExist:
        raise OrderError("Invalid sales channel.")
    if email == settings.PRETIX_EMAIL_NONE_VALUE:
        email = None
@@ -1188,20 +1186,9 @@ def _perform_order(event: Event, payment_requests: List[dict], position_ids: Lis
            if 'sleep-after-quota-check' in debugflags_var.get():
                sleep(2)
-            order, payment_objs = _create_order(
+            order, payment_objs = _create_order(event, email, positions, real_now_dt, payment_requests,
-                event,
+                                                locale=locale, address=addr, meta_info=meta_info, sales_channel=sales_channel,
-                email=email,
+                                                shown_total=shown_total, customer=customer, valid_if_pending=valid_if_pending)
                positions=positions,
                now_dt=real_now_dt,
                payment_requests=payment_requests,
                locale=locale,
                address=addr,
                meta_info=meta_info,
                sales_channel=sales_channel,
                shown_total=shown_total,
                customer=customer,
                valid_if_pending=valid_if_pending
            )
            try:
                for p in payment_objs:
@@ -1285,7 +1272,7 @@ def _perform_order(event: Event, payment_requests: List[dict], position_ids: Lis
            email_attendees_template = event.settings.mail_text_order_placed_attendee
            subject_attendees_template = event.settings.mail_subject_order_placed_attendee
-        if sales_channel.identifier in event.settings.mail_sales_channel_placed_paid:
+        if sales_channel in event.settings.mail_sales_channel_placed_paid:
            _order_placed_email(event, order, email_template, subject_template, log_entry, invoice, payment_objs,
                                is_free=free_order_flow)
            if email_attendees:
@@ -1437,7 +1424,7 @@ def send_download_reminders(sender, **kwargs):
        if days is None:
            continue
-        if o.sales_channel.identifier not in event.settings.mail_sales_channel_download_reminder:
+        if o.sales_channel not in event.settings.mail_sales_channel_download_reminder:
            continue
        reminder_date = (o.first_date - timedelta(days=days)).replace(hour=0, minute=0, second=0, microsecond=0)
@@ -1939,13 +1926,9 @@ class OrderChangeManager:
            if not item.is_available() or (variation and not variation.is_available()):
                raise OrderError(error_messages['unavailable'])
-            if not item.all_sales_channels:
+            if self.order.sales_channel not in item.sales_channels or (
-                if self.order.sales_channel.identifier not in (s.identifier for s in item.limit_sales_channels.all()):
+                    variation and self.order.sales_channel not in variation.sales_channels):
-                    raise OrderError(error_messages['unavailable'])
+                raise OrderError(error_messages['unavailable'])
            if variation and not variation.all_sales_channels:
                if self.order.sales_channel.identifier not in (s.identifier for s in variation.limit_sales_channels.all()):
                    raise OrderError(error_messages['unavailable'])
            if subevent and item.pk in subevent.item_overrides and not subevent.item_overrides[item.pk].is_available():
                raise OrderError(error_messages['not_for_sale'])
@@ -2044,10 +2027,7 @@ class OrderChangeManager:
                            (a.variation and a.variation.unavailability_reason(has_voucher=True, subevent=a.subevent))
                            or (a.variation and self.order.sales_channel not in a.variation.sales_channels)
                            or a.item.unavailability_reason(has_voucher=True, subevent=a.subevent)
-                            or (
+                            or self.order.sales_channel not in item.sales_channels
                                not item.all_sales_channels and
                                not item.limit_sales_channels.contains(self.order.sales_channel)
                            )
                        )
                        if is_unavailable:
                            continue
@@ -28,8 +28,7 @@ from django.db.models import Q
 from pretix.base.decimal import round_decimal
 from pretix.base.models import (
-    AbstractPosition, InvoiceAddress, Item, ItemAddOn, ItemVariation,
+    AbstractPosition, InvoiceAddress, Item, ItemAddOn, ItemVariation, Voucher,
    SalesChannel, Voucher,
 )
 from pretix.base.models.event import Event, SubEvent
 from pretix.base.models.tax import TAXED_ZERO, TaxedPrice, TaxRule
@@ -165,14 +164,12 @@ def apply_discounts(event: Event, sales_channel: str,
    :param positions: Tuple of the form ``(item_id, subevent_id, line_price_gross, is_addon_to, is_bundled, voucher_discount)``
    :return: A list of ``(new_gross_price, discount)`` tuples in the same order as the input
    """
    if isinstance(sales_channel, SalesChannel):
        sales_channel = sales_channel.identifier
    new_prices = {}
    discount_qs = event.discounts.filter(
        Q(available_from__isnull=True) | Q(available_from__lte=time_machine_now()),
        Q(available_until__isnull=True) | Q(available_until__gte=time_machine_now()),
-        Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=sales_channel),
+        sales_channels__contains=sales_channel,
        active=True,
    ).prefetch_related('condition_limit_products', 'benefit_limit_products').order_by('position', 'pk')
    for discount in discount_qs:
@@ -294,16 +294,13 @@ This signal is sent out when a notification is sent.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
-register_sales_channel_types = django.dispatch.Signal()
+register_sales_channels = django.dispatch.Signal()
 """
 This signal is sent out to get all known sales channels types. Receivers should return an
-instance of a subclass of ``pretix.base.channels.SalesChannelType`` or a list of such
+instance of a subclass of ``pretix.base.channels.SalesChannel`` or a list of such
 instances.
 """
 register_sales_channels = DeprecatedSignal()  # TODO: remove me
 register_data_exporters = EventPluginSignal()
 """
 This signal is sent out to get all known data exporters. Receivers should return a
@@ -1,19 +0,0 @@
 {% load rich_text %}
 {% load static %}
 {% load i18n %}
 {% if widget.wrap_label %}<label{% if widget.attrs.id %} for="{{ widget.attrs.id }}"{% endif %}>{% endif %}
 {% include "django/forms/widgets/input.html" %}
 {% if widget.wrap_label %}
 {% if "." in widget.value.instance.type_instance.icon %}
 <img class="fa-like-image" src="{% static widget.value.instance.type_instance.icon %}" alt="">
 {% else %}
 <span class="fa fa-fw fa-{{ widget.value.instance.type_instance.icon }} text-muted"></span>
 {% endif %}
 {% if widget.plugin_missing %}
    <del>
 {% endif %}
 {{ widget.label }}{% if widget.plugin_missing %}</del>
    <span class="fa fa-info-circle" data-toggle="tooltip" title="{% trans "This sales channel cannot be used properly since the respective plugin is not active for this event." %}"></span>
 {% endif %}
 </label>
 {% endif %}
@@ -438,20 +438,3 @@ class ButtonGroupRadioSelect(forms.RadioSelect):
        attrs['icon'] = self.option_icons[value]
        opt = super().create_option(name, value, label, selected, index, subindex, attrs)
        return opt
 class SalesChannelCheckboxSelectMultiple(forms.CheckboxSelectMultiple):
    option_template_name = 'pretixbase/forms/widgets/checkbox_sales_channel_option.html'
    def __init__(self, event, attrs=None, choices=()):
        self.event = event
        super().__init__(attrs, choices)
    def create_option(
        self, name, value, label, selected, index, subindex=None, attrs=None
    ):
        plugin = value.instance.type_instance.required_event_plugin
        return {
            **super().create_option(name, value, label, selected, index, subindex, attrs),
            "plugin_missing": plugin and plugin not in self.event.get_plugins(),
        }
@@ -30,12 +30,11 @@ from django_scopes.forms import (
    SafeModelChoiceField, SafeModelMultipleChoiceField,
 )
 from pretix.base.channels import get_all_sales_channels
 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 (
+from pretix.control.forms import ItemMultipleChoiceField
    ItemMultipleChoiceField, SalesChannelCheckboxSelectMultiple,
 )
 from pretix.control.forms.widgets import Select2
@@ -67,9 +66,14 @@ 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'] = forms.MultipleChoiceField(
-        self.fields['auto_checkin_sales_channels'].widget = SalesChannelCheckboxSelectMultiple(
+            label=self.fields['auto_checkin_sales_channels'].label,
-            self.event, choices=self.fields['auto_checkin_sales_channels'].widget.choices
+            help_text=self.fields['auto_checkin_sales_channels'].help_text,
            required=self.fields['auto_checkin_sales_channels'].required,
            choices=(
                (c.identifier, c.verbose_name) for c in get_all_sales_channels().values()
            ),
            widget=forms.CheckboxSelectMultiple
        )
        if not self.event.organizer.gates.exists():
@@ -119,13 +123,13 @@ class CheckinListForm(forms.ModelForm):
            'gates': forms.CheckboxSelectMultiple(attrs={
                'class': 'scrolling-multiple-choice'
            }),
            'auto_checkin_sales_channels': forms.CheckboxSelectMultiple(),
            'exit_all_at': NextTimeInput(attrs={'class': 'timepickerfield'}),
        }
        field_classes = {
            'limit_products': ItemMultipleChoiceField,
            'gates': SafeModelMultipleChoiceField,
            'subevent': SafeModelChoiceField,
            'auto_checkin_sales_channels': SafeModelMultipleChoiceField,
            'exit_all_at': NextTimeField,
        }
@@ -22,16 +22,13 @@
 from decimal import Decimal
 from django import forms
-from django_scopes.forms import SafeModelMultipleChoiceField
+from django.utils.translation import gettext_lazy as _
-from pretix.base.channels import get_all_sales_channel_types
+from pretix.base.channels import get_all_sales_channels
 from pretix.base.forms import I18nModelForm
 from pretix.base.forms.widgets import SplitDateTimePickerWidget
 from pretix.base.models import Discount
-from pretix.control.forms import (
+from pretix.control.forms import ItemMultipleChoiceField, SplitDateTimeField
    ItemMultipleChoiceField, SalesChannelCheckboxSelectMultiple,
    SplitDateTimeField,
 )
 class DiscountForm(I18nModelForm):
@@ -41,8 +38,7 @@ class DiscountForm(I18nModelForm):
        fields = [
            'active',
            'internal_name',
-            'all_sales_channels',
+            'sales_channels',
            'limit_sales_channels',
            'available_from',
            'available_until',
            'subevent_mode',
@@ -64,7 +60,6 @@ class DiscountForm(I18nModelForm):
            'available_until': SplitDateTimeField,
            'condition_limit_products': ItemMultipleChoiceField,
            'benefit_limit_products': ItemMultipleChoiceField,
            'limit_sales_channels': SafeModelMultipleChoiceField,
        }
        widgets = {
            'subevent_mode': forms.RadioSelect,
@@ -88,12 +83,15 @@ class DiscountForm(I18nModelForm):
        self.event = kwargs['event']
        super().__init__(*args, **kwargs)
-        self.fields['limit_sales_channels'].queryset = self.event.organizer.sales_channels.filter(
+        self.fields['sales_channels'] = forms.MultipleChoiceField(
-            type__in=[k for k, v in get_all_sales_channel_types().items() if v.discounts_supported]
+            label=_('Sales channels'),
            required=True,
            choices=(
                (c.identifier, c.verbose_name) for c in get_all_sales_channels().values()
                if c.discounts_supported
            ),
            widget=forms.CheckboxSelectMultiple,
        )
        self.fields['limit_sales_channels'].widget = SalesChannelCheckboxSelectMultiple(self.event, attrs={
            'data-inverse-dependency': '<[name$=all_sales_channels]',
        }, choices=self.fields['limit_sales_channels'].widget.choices)
        self.fields['condition_limit_products'].queryset = self.event.items.all()
        self.fields['benefit_limit_products'].queryset = self.event.items.all()
        self.fields['condition_min_count'].required = False
@@ -44,7 +44,9 @@ from django.conf import settings
 from django.core.exceptions import NON_FIELD_ERRORS, ValidationError
 from django.core.validators import MaxValueValidator
 from django.db.models import Prefetch, Q, prefetch_related_objects
-from django.forms import formset_factory, inlineformset_factory
+from django.forms import (
    CheckboxSelectMultiple, formset_factory, inlineformset_factory,
 )
 from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.html import escape, format_html
@@ -52,12 +54,12 @@ from django.utils.safestring import mark_safe
 from django.utils.timezone import get_current_timezone_name
 from django.utils.translation import gettext, gettext_lazy as _, pgettext_lazy
 from django_countries.fields import LazyTypedChoiceField
 from django_scopes.forms import SafeModelMultipleChoiceField
 from i18nfield.forms import (
    I18nForm, I18nFormField, I18nFormSetMixin, I18nTextInput,
 )
 from pytz import common_timezones
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.forms import (
    I18nMarkdownTextarea, I18nModelForm, PlaceholderValidator, SettingsForm,
 )
@@ -71,8 +73,8 @@ from pretix.base.settings import (
 )
 from pretix.base.validators import multimail_validate
 from pretix.control.forms import (
-    MultipleLanguagesWidget, SalesChannelCheckboxSelectMultiple, SlugWidget,
+    MultipleLanguagesWidget, SlugWidget, SplitDateTimeField,
-    SplitDateTimeField, SplitDateTimePickerWidget,
+    SplitDateTimePickerWidget,
 )
 from pretix.control.forms.widgets import Select2
 from pretix.helpers.countries import CachedCountries
@@ -376,10 +378,16 @@ class EventUpdateForm(I18nModelForm):
                required=False,
                help_text=_('You need to configure the custom domain in the webserver beforehand.')
            )
-        self.fields['limit_sales_channels'].queryset = self.event.organizer.sales_channels.all()
+        self.fields['sales_channels'] = forms.MultipleChoiceField(
-        self.fields['limit_sales_channels'].widget = SalesChannelCheckboxSelectMultiple(self.event, attrs={
+            label=self.fields['sales_channels'].label,
-            'data-inverse-dependency': '<[name$=all_sales_channels]',
+            help_text=self.fields['sales_channels'].help_text,
-        }, choices=self.fields['limit_sales_channels'].widget.choices)
+            required=self.fields['sales_channels'].required,
            initial=self.fields['sales_channels'].initial,
            choices=(
                (c.identifier, c.verbose_name) for c in get_all_sales_channels().values()
            ),
            widget=forms.CheckboxSelectMultiple
        )
    def clean_domain(self):
        d = self.cleaned_data['domain']
@@ -436,8 +444,7 @@ class EventUpdateForm(I18nModelForm):
            'location',
            'geo_lat',
            'geo_lon',
-            'all_sales_channels',
+            'sales_channels'
            'limit_sales_channels',
        ]
        field_classes = {
            'date_from': SplitDateTimeField,
@@ -445,7 +452,6 @@ class EventUpdateForm(I18nModelForm):
            'date_admission': SplitDateTimeField,
            'presale_start': SplitDateTimeField,
            'presale_end': SplitDateTimeField,
            'limit_sales_channels': SafeModelMultipleChoiceField,
        }
        widgets = {
            'date_from': SplitDateTimePickerWidget(),
@@ -453,6 +459,7 @@ class EventUpdateForm(I18nModelForm):
            'date_admission': SplitDateTimePickerWidget(attrs={'data-date-default': '#id_date_from_0'}),
            'presale_start': SplitDateTimePickerWidget(),
            'presale_end': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_presale_start_0'}),
            'sales_channels': CheckboxSelectMultiple(),
        }
@@ -908,7 +915,7 @@ class InvoiceSettingsForm(EventSettingsValidationMixin, SettingsForm):
        locale_names = dict(settings.LANGUAGES)
        self.fields['invoice_language'].choices = [('__user__', _('The user\'s language'))] + [(a, locale_names[a]) for a in event.settings.locales]
        self.fields['invoice_generate_sales_channels'].choices = (
-            (c.identifier, c.label) for c in event.organizer.sales_channels.all()
+            (c.identifier, c.verbose_name) for c in get_all_sales_channels().values()
        )
        self.fields['invoice_numbers_counter_length'].validators.append(MaxValueValidator(15))
@@ -954,7 +961,7 @@ class MailSettingsForm(FormPlaceholderMixin, SettingsForm):
    ]
    mail_sales_channel_placed_paid = forms.MultipleChoiceField(
-        choices=[],
+        choices=lambda: [(ident, sc.verbose_name) for ident, sc in get_all_sales_channels().items()],
        label=_('Sales channels for checkout emails'),
        help_text=_('The order placed and paid emails will only be send to orders from these sales channels. '
                    'The online shop must be enabled.'),
@@ -965,7 +972,7 @@ class MailSettingsForm(FormPlaceholderMixin, SettingsForm):
    )
    mail_sales_channel_download_reminder = forms.MultipleChoiceField(
-        choices=[],
+        choices=lambda: [(ident, sc.verbose_name) for ident, sc in get_all_sales_channels().items()],
        label=_('Sales channels'),
        help_text=_('This email will only be send to orders from these sales channels. The online shop must be enabled.'),
        widget=forms.CheckboxSelectMultiple(
@@ -1360,12 +1367,6 @@ class MailSettingsForm(FormPlaceholderMixin, SettingsForm):
        self.fields['mail_html_renderer'].choices = [
            (r.identifier, r.verbose_name) for r in event.get_html_mail_renderers().values()
        ]
        self.fields['mail_sales_channel_placed_paid'].choices = (
            (c.identifier, c.label) for c in event.organizer.sales_channels.all()
        )
        self.fields['mail_sales_channel_download_reminder'].choices = (
            (c.identifier, c.label) for c in event.organizer.sales_channels.all()
        )
        prefetch_related_objects([self.event.organizer], Prefetch('meta_properties'))
        self.event.meta_values_cached = self.event.meta_values.select_related('property').all()
@@ -50,14 +50,15 @@ from django.utils.timezone import get_current_timezone, make_aware, now
 from django.utils.translation import gettext, gettext_lazy as _, pgettext_lazy
 from django_scopes.forms import SafeModelChoiceField
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.forms.widgets import (
    DatePickerWidget, SplitDateTimePickerWidget, TimePickerWidget,
 )
 from pretix.base.models import (
    Checkin, CheckinList, Device, Event, EventMetaProperty, EventMetaValue,
    Gate, Invoice, InvoiceAddress, Item, Order, OrderPayment, OrderPosition,
-    OrderRefund, Organizer, Question, QuestionAnswer, Quota, SalesChannel,
+    OrderRefund, Organizer, Question, QuestionAnswer, Quota, SubEvent,
-    SubEvent, SubEventMetaValue, Team, TeamAPIToken, TeamInvite, Voucher,
+    SubEventMetaValue, Team, TeamAPIToken, TeamInvite, Voucher,
 )
 from pretix.base.signals import register_payment_providers
 from pretix.control.forms.widgets import Select2, Select2ItemVarQuota
@@ -578,11 +579,9 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
        required=False,
        label=_('Maximal sum of payments and refunds'),
    )
-    sales_channel = SafeModelChoiceField(
+    sales_channel = forms.ChoiceField(
        label=_('Sales channel'),
        required=False,
        queryset=SalesChannel.objects.none(),
        to_field_name="identifier",
    )
    has_checkin = forms.NullBooleanField(
        required=False,
@@ -605,7 +604,9 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
            del self.fields['subevents_from']
            del self.fields['subevents_to']
-        self.fields['sales_channel'].queryset = self.event.organizer.sales_channels.all()
+        self.fields['sales_channel'].choices = [('', '')] + [
            (k, v.verbose_name) for k, v in get_all_sales_channels().items()
        ]
        locale_names = dict(settings.LANGUAGES)
        self.fields['locale'].choices = [('', '')] + [(a, locale_names[a]) for a in self.event.settings.locales]
@@ -718,7 +719,7 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
        if fdata.get('comment'):
            qs = qs.filter(comment__icontains=fdata.get('comment'))
        if fdata.get('sales_channel'):
-            qs = qs.filter(sales_channel__identifier=fdata.get('sales_channel').identifier)
+            qs = qs.filter(sales_channel=fdata.get('sales_channel'))
        if fdata.get('total'):
            qs = qs.filter(total=fdata.get('total'))
        if fdata.get('email_known_to_work') is not None:
@@ -55,6 +55,7 @@ from django_scopes.forms import (
 )
 from i18nfield.forms import I18nFormField, I18nTextarea
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.forms import I18nFormSet, I18nMarkdownTextarea, I18nModelForm
 from pretix.base.forms.widgets import DatePickerWidget
 from pretix.base.models import (
@@ -63,8 +64,7 @@ from pretix.base.models import (
 from pretix.base.models.items import ItemAddOn, ItemBundle, ItemMetaValue
 from pretix.base.signals import item_copy_data
 from pretix.control.forms import (
-    ButtonGroupRadioSelect, ItemMultipleChoiceField,
+    ButtonGroupRadioSelect, ItemMultipleChoiceField, SizeValidationMixin,
    SalesChannelCheckboxSelectMultiple, SizeValidationMixin,
    SplitDateTimeField, SplitDateTimePickerWidget,
 )
 from pretix.control.forms.widgets import Select2, Select2ItemVarMulti
@@ -413,7 +413,7 @@ class ItemCreateForm(I18nModelForm):
                'checkin_text',
                'free_price',
                'original_price',
-                'all_sales_channels',
+                'sales_channels',
                'issue_giftcard',
                'require_approval',
                'allow_waitinglist',
@@ -443,6 +443,9 @@ class ItemCreateForm(I18nModelForm):
            if src.picture:
                self.instance.picture.save(os.path.basename(src.picture.name), src.picture)
        else:
            # Add to all sales channels by default
            self.instance.sales_channels = list(get_all_sales_channels().keys())
        self.instance.position = (self.event.items.aggregate(p=Max('position'))['p'] or 0) + 1
        if not self.instance.admission:
@@ -471,8 +474,6 @@ class ItemCreateForm(I18nModelForm):
                })
        if self.cleaned_data.get('copy_from'):
            if not self.instance.all_sales_channels:
                self.instance.limit_sales_channels.set(self.cleaned_data['copy_from'].limit_sales_channels.all())
            self.instance.require_membership_types.set(
                self.cleaned_data['copy_from'].require_membership_types.all()
            )
@@ -573,10 +574,14 @@ class ItemUpdateForm(I18nModelForm):
        if self.event.tax_rules.exists():
            self.fields['tax_rule'].required = True
        self.fields['description'].widget.attrs['rows'] = '4'
-        self.fields['limit_sales_channels'].queryset = self.event.organizer.sales_channels.all()
+        self.fields['sales_channels'] = forms.MultipleChoiceField(
-        self.fields['limit_sales_channels'].widget = SalesChannelCheckboxSelectMultiple(self.event, attrs={
+            label=_('Sales channels'),
-            'data-inverse-dependency': '<[name$=all_sales_channels]',
+            required=False,
-        }, choices=self.fields['limit_sales_channels'].widget.choices)
+            choices=(
                (c.identifier, c.verbose_name) for c in get_all_sales_channels().values()
            ),
            widget=forms.CheckboxSelectMultiple
        )
        change_decimal_field(self.fields['default_price'], self.event.currency)
        self.fields['available_from_mode'].widget = ButtonGroupRadioSelect(
@@ -767,8 +772,7 @@ class ItemUpdateForm(I18nModelForm):
            'name',
            'internal_name',
            'active',
-            'all_sales_channels',
+            'sales_channels',
            'limit_sales_channels',
            'admission',
            'personalized',
            'description',
@@ -825,7 +829,6 @@ class ItemUpdateForm(I18nModelForm):
            'hidden_if_item_available': SafeModelChoiceField,
            'grant_membership_type': SafeModelChoiceField,
            'require_membership_types': SafeModelMultipleChoiceField,
            'limit_sales_channels': SafeModelMultipleChoiceField,
        }
        widgets = {
            'available_from': SplitDateTimePickerWidget(),
@@ -897,10 +900,18 @@ class ItemVariationForm(I18nModelForm):
        qs = kwargs.pop('membership_types')
        super().__init__(*args, **kwargs)
        change_decimal_field(self.fields['default_price'], self.event.currency)
-        self.fields['limit_sales_channels'].queryset = self.event.organizer.sales_channels.all()
+        self.fields['sales_channels'] = forms.MultipleChoiceField(
-        self.fields['limit_sales_channels'].widget = SalesChannelCheckboxSelectMultiple(self.event, attrs={
+            label=_('Sales channels'),
-            'data-inverse-dependency': '<[name$=all_sales_channels]',
+            required=False,
-        }, choices=self.fields['limit_sales_channels'].widget.choices)
+            choices=(
                (c.identifier, c.verbose_name) for c in get_all_sales_channels().values()
            ),
            help_text=_('The sales channel selection for the product as a whole takes precedence, so if a sales channel is '
                        'selected here but not on product level, the variation will not be available.'),
            widget=forms.CheckboxSelectMultiple
        )
        if not self.instance.pk:
            self.initial.setdefault('sales_channels', list(get_all_sales_channels().keys()))
        self.fields['description'].widget.attrs['rows'] = 3
        if qs:
@@ -972,14 +983,12 @@ class ItemVariationForm(I18nModelForm):
            'available_from_mode',
            'available_until',
            'available_until_mode',
-            'all_sales_channels',
+            'sales_channels',
            'limit_sales_channels',
            'hide_without_voucher',
        ]
        field_classes = {
            'available_from': SplitDateTimeField,
            'available_until': SplitDateTimeField,
            'limit_sales_channels': SafeModelMultipleChoiceField,
        }
        widgets = {
            'available_from': SplitDateTimePickerWidget(),
@@ -50,7 +50,6 @@ from django_scopes.forms import SafeModelChoiceField
 from i18nfield.forms import (
    I18nForm, I18nFormField, I18nFormSetMixin, I18nTextInput,
 )
 from i18nfield.strings import LazyI18nString
 from phonenumber_field.formfields import PhoneNumberField
 from pytz import common_timezones
@@ -69,8 +68,7 @@ from pretix.base.forms.widgets import (
 )
 from pretix.base.models import (
    Customer, Device, EventMetaProperty, Gate, GiftCard, GiftCardAcceptance,
-    Membership, MembershipType, OrderPosition, Organizer, ReusableMedium,
+    Membership, MembershipType, OrderPosition, Organizer, ReusableMedium, Team,
    SalesChannel, Team,
 )
 from pretix.base.models.customers import CustomerSSOClient, CustomerSSOProvider
 from pretix.base.models.organizer import OrganizerFooterLink
@@ -1092,40 +1090,3 @@ class GiftCardAcceptanceInviteForm(forms.Form):
        if self.organizer.gift_card_acceptor_acceptance.filter(acceptor=acceptor).exists():
            raise ValidationError(_('The selected organizer has already been invited.'))
        return acceptor
 class SalesChannelForm(I18nModelForm):
    class Meta:
        model = SalesChannel
        fields = ['label', 'identifier']
        widgets = {
            'default': forms.TextInput(),
        }
    def __init__(self, *args, **kwargs):
        self.type = kwargs.pop("type")
        super().__init__(*args, **kwargs)
        if not self.type.multiple_allowed or (self.instance and self.instance.pk):
            self.fields["identifier"].initial = self.type.identifier
            self.fields["identifier"].disabled = True
            self.fields["label"].initial = LazyI18nString.from_gettext(self.type.verbose_name)
    def clean(self):
        d = super().clean()
        if self.instance.pk:
            d["identifier"] = self.instance.identifier
        elif self.type.multiple_allowed:
            d["identifier"] = self.type.identifier + "." + d["identifier"]
        else:
            d["identifier"] = self.type.identifier
        if not self.instance.pk:
            # self.event is actually the organizer, sorry I18nModelForm!
            if self.event.sales_channels.filter(identifier=d["identifier"]).exists():
                raise ValidationError(
                    _("A sales channel with the same identifier already exists.")
                )
        return d
@@ -357,9 +357,6 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
        'pretix.membershiptype.created': _('The membership type has been created.'),
        'pretix.membershiptype.changed': _('The membership type has been changed.'),
        'pretix.membershiptype.deleted': _('The membership type has been deleted.'),
        'pretix.saleschannel.created': _('The sales channel has been created.'),
        'pretix.saleschannel.changed': _('The sales channel has been changed.'),
        'pretix.saleschannel.deleted': _('The sales channel has been deleted.'),
        'pretix.customer.created': _('The account has been created.'),
        'pretix.customer.changed': _('The account has been changed.'),
        'pretix.customer.membership.created': _('A membership for this account has been added.'),
@@ -502,13 +502,6 @@ def get_organizer_navigation(request):
                    }),
                    'active': url.url_name == 'organizer.settings.mail',
                },
                {
                    'label': _('Sales channels'),
                    'url': reverse('control:organizer.channels', kwargs={
                        'organizer': request.organizer.slug
                    }),
                    'active': url.url_name.startswith('organizer.channel'),
                },
                {
                    'label': _('Webhooks'),
                    'url': reverse('control:organizer.webhooks', kwargs={
@@ -1,7 +1,6 @@
 {% extends "pretixcontrol/items/base.html" %}
 {% load i18n %}
 {% load bootstrap3 %}
 {% load static %}
 {% load urlreplace %}
 {% block title %}{% trans "Check-in lists" %}{% endblock %}
 {% block inside %}
@@ -138,14 +137,9 @@
                            {% endif %}
                        {% endif %}
                        <td>
-                            {% for channel in cl.auto_checkin_sales_channels.all %}
+                            {% for channel in cl.auto_checkin_sales_channels %}
-                                {% if "." in channel.icon %}
+                                <span class="fa fa-{{ channel.icon }} text-muted"
-                                    <img src="{% static channel.icon %}" class="fa-like-image"
+                                      data-toggle="tooltip" title="{% trans channel.verbose_name %}"></span>
                                         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>
@@ -1,6 +1,5 @@
 {% extends "pretixcontrol/event/settings_base.html" %}
 {% load i18n %}
 {% load static %}
 {% load bootstrap3 %}
 {% block inside %}
    <h1>{% trans "Payment settings" %}</h1>
@@ -31,13 +30,8 @@
                            </td>
                            <td class="iconcol">
                                {% for channel in provider.sales_channels %}
-                                    {% if "." in channel.icon %}
+                                    <span class="fa fa-{{ channel.icon }} text-muted"
-                                        <img src="{% static channel.icon %}" class="fa-like-image"
+                                          data-toggle="tooltip" title="{% trans channel.verbose_name %}"></span>
                                             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 class="text-right flip">
@@ -32,8 +32,7 @@
                {% bootstrap_field sform.contact_mail layout="control" %}
                {% bootstrap_field sform.imprint_url layout="control" %}
                {% bootstrap_field form.is_public layout="control" %}
-                {% bootstrap_field form.all_sales_channels layout="control" %}
+                {% bootstrap_field form.sales_channels layout="control" %}
                {% bootstrap_field form.limit_sales_channels layout="control" %}
                {% if meta_forms %}
                    <div class="form-group metadata-group">
@@ -1,7 +1,6 @@
 {% load i18n %}
 {% load bootstrap3 %}
 {% load formset_tags %}
 {% load static %}
 {% load getitem %}
 <div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}" id="item_variations">
    {{ formset.management_form }}
@@ -41,14 +40,9 @@
                                  title="{% trans "Require a valid membership" %}"></span>
                        </div>
                        <div class="col-md-2 col-xs-6">
-                            {% for c in sales_channels %}
+                            {% for k, c in sales_channels.items %}
-                                {% if "." in c.icon %}
+                                <span class="fa fa-fw fa-{{ c.icon }} text-muted variation-channel-{{ k }} variation-icon-hidden"
-                                    <img src="{% static c.icon %}" class="fa-like-image variation-channel-{{ c.id }} variation-icon-hidden"
+                                      data-toggle="tooltip" title="{% trans c.verbose_name %}"></span>
                                         data-toggle="tooltip" title="{{ c.label }}">
                                {% else %}
                                    <span class="fa fa-fw fa-{{ c.icon }} text-muted variation-channel-{{ c.id }} variation-icon-hidden"
                                          data-toggle="tooltip" title="{{ c.label }}"></span>
                                {% endif %}
                            {% endfor %}
                        </div>
                        <div class="col-md-1 col-xs-6 text-right flip variation-price">
@@ -103,8 +97,7 @@
                    {% endif %}
                    {% bootstrap_field form.available_from visibility_field=form.available_from_mode layout="control_with_visibility"  %}
                    {% bootstrap_field form.available_until visibility_field=form.available_until_mode layout="control_with_visibility" %}
-                    {% bootstrap_field form.all_sales_channels layout="control" %}
+                    {% bootstrap_field form.sales_channels layout="control" %}
                    {% bootstrap_field form.limit_sales_channels layout="control" %}
                    {% bootstrap_field form.hide_without_voucher layout="control" %}
                    {% bootstrap_field form.require_approval layout="control" %}
                    {% if form.require_membership %}
@@ -155,14 +148,9 @@
                                  title="{% trans "Require a valid membership" %}"></span>
                        </div>
                        <div class="col-md-2 col-xs-6">
-                            {% for c in sales_channels %}
+                            {% for k, c in sales_channels.items %}
-                                {% if "." in c.icon %}
+                                <span class="fa fa-fw fa-{{ c.icon }} text-muted variation-channel-{{ k }} variation-icon-hidden"
-                                    <img src="{% static c.icon %}" class="fa-like-image variation-channel-{{ c.id }} variation-icon-hidden"
+                                      data-toggle="tooltip" title="{% trans c.verbose_name %}"></span>
                                         data-toggle="tooltip" title="{{ c.label }}">
                                {% else %}
                                    <span class="fa fa-fw fa-{{ c.icon }} text-muted variation-channel-{{ c.id }} variation-icon-hidden"
                                          data-toggle="tooltip" title="{{ c.label }}"></span>
                                {% endif %}
                            {% endfor %}
                        </div>
                        <div class="col-md-1 col-xs-6 text-right flip variation-price">
@@ -209,8 +197,7 @@
                    {% bootstrap_field formset.empty_form.available_from visibility_field=formset.empty_form.available_from_mode layout="control_with_visibility"  %}
                    {% bootstrap_field formset.empty_form.available_until visibility_field=formset.empty_form.available_until_mode layout="control_with_visibility" %}
                    {% bootstrap_field formset.empty_form.available_until layout="control" %}
-                    {% bootstrap_field formset.empty_form.all_sales_channels layout="control" %}
+                    {% bootstrap_field formset.empty_form.sales_channels layout="control" %}
                    {% bootstrap_field formset.empty_form.limit_sales_channels layout="control" %}
                    {% bootstrap_field formset.empty_form.hide_without_voucher layout="control" %}
                    {% bootstrap_field formset.empty_form.require_approval layout="control" %}
                    {% if formset.empty_form.require_membership %}
@@ -152,8 +152,9 @@
                    </fieldset>
                    <fieldset>
                        <legend>{% trans "Availability" %}</legend>
-                        {% bootstrap_field form.all_sales_channels layout="control" horizontal_field_class="col-md-7" %}
+
-                        {% bootstrap_field form.limit_sales_channels layout="control" horizontal_field_class="col-md-7" %}
+
                        {% bootstrap_field form.sales_channels layout="control" horizontal_field_class="col-md-7" %}
                        {% bootstrap_field form.available_from visibility_field=form.available_from_mode layout="control_with_visibility"  %}
                        {% bootstrap_field form.available_until visibility_field=form.available_until_mode layout="control_with_visibility" %}
                        {% bootstrap_field form.max_per_order layout="control" horizontal_field_class="col-md-7" %}
@@ -15,8 +15,7 @@
                    {% bootstrap_field form.internal_name layout="control" %}
                    {% bootstrap_field form.available_from layout="control" %}
                    {% bootstrap_field form.available_until layout="control" %}
-                    {% bootstrap_field form.all_sales_channels layout="control" %}
+                    {% bootstrap_field form.sales_channels layout="control" %}
                    {% bootstrap_field form.limit_sales_channels layout="control" %}
                </fieldset>
                <fieldset>
                    <legend>{% trans "Condition" context "discount" %}</legend>
@@ -1,6 +1,5 @@
 {% extends "pretixcontrol/items/base.html" %}
 {% load i18n %}
 {% load static %}
 {% block title %}{% trans "Automatic discounts" %}{% endblock %}
 {% block inside %}
    <h1>{% trans "Automatic discounts" %}</h1>
@@ -79,15 +78,10 @@
                                {% endif %}
                            </td>
                            <td>
-                                {% for c in sales_channels %}
+                                {% for k, c in sales_channels.items %}
-                                    {% if d.all_sales_channels or c in d.limit_sales_channels.all %}
+                                    {% if k in d.sales_channels %}
-                                        {% if "." in c.icon %}
+                                        <span class="fa fa-fw fa-{{ c.icon }} text-muted"
-                                            <img src="{% static c.icon %}" class="fa-like-image"
+                                              data-toggle="tooltip" title="{% trans c.verbose_name %}"></span>
                                                 data-toggle="tooltip" title="{{ c.label }}">
                                        {% else %}
                                            <span class="fa fa-fw fa-{{ c.icon }} text-muted"
                                                  data-toggle="tooltip" title="{{ c.label }}"></span>
                                        {% endif %}
                                    {% else %}
                                    {% endif %}
                                {% endfor %}
@@ -1,7 +1,6 @@
 {% extends "pretixcontrol/items/base.html" %}
 {% load i18n %}
 {% load money %}
 {% load static %}
 {% block title %}{% trans "Products" %}{% endblock %}
 {% block inside %}
    {% blocktrans asvar s_taxes %}taxes{% endblocktrans %}
@@ -67,15 +66,10 @@
                                <br>
                                <small class="text-muted">
                                    #{{ i.pk }}
-                                    {% for c in sales_channels %}
+                                    {% for k, c in sales_channels.items %}
-                                        {% if i.all_sales_channels or c in i.limit_sales_channels.all %}
+                                        {% if k in i.sales_channels %}
-                                            {% if "." in c.icon %}
+                                            <span class="fa fa-fw fa-{{ c.icon }} text-muted"
-                                                <img src="{% static c.icon %}" class="fa-like-image"
+                                                  data-toggle="tooltip" title="{% trans c.verbose_name %}"></span>
                                                     data-toggle="tooltip" title="{{ c.label }}">
                                            {% else %}
                                                <span class="fa fa-fw fa-{{ c.icon }} text-muted"
                                                      data-toggle="tooltip" title="{{ c.label }}"></span>
                                            {% endif %}
                                        {% else %}
                                        {% endif %}
                                    {% endfor %}
@@ -185,9 +185,9 @@
                            <dt>{% trans "Cancellation date" %}</dt>
                            <dd>{{ order.cancellation_date|date:"SHORT_DATETIME_FORMAT" }}</dd>
                        {% endif %}
-                        {% if order.sales_channel %}
+                        {% if sales_channel %}
                            <dt>{% trans "Sales channel" %}</dt>
-                            <dd>{{ order.sales_channel.label }}</dd>
+                            <dd>{{ sales_channel.verbose_name }}</dd>
                        {% endif %}
                        <dt>{% trans "Order locale" %}</dt>
                        <dd>
@@ -4,7 +4,6 @@
 {% load urlreplace %}
 {% load money %}
 {% load bootstrap3 %}
 {% load static %}
 {% block title %}{% trans "Orders" %}{% endblock %}
 {% block content %}
    <h1>{% trans "Orders" %}</h1>
@@ -202,13 +201,8 @@
                                {% endif %}
                            </td>
                            <td>
-                                {% if "." in o.sales_channel.icon %}
+                                <span class="fa fa-fw fa-{{ o.sales_channel_obj.icon }} text-muted"
-                                    <img src="{% static o.sales_channel.icon %}" class="fa-like-image"
+                                      data-toggle="tooltip" title="{% trans o.sales_channel_obj.verbose_name %}"></span>
                                         data-toggle="tooltip" title="{{ o.sales_channel.label }}">
                                {% else %}
                                    <span class="fa fa-fw fa-{{ o.sales_channel.icon }} text-muted"
                                          data-toggle="tooltip" title="{{ o.sales_channel.label }}"></span>
                                {% endif %}
                                {{ o.datetime|date:"SHORT_DATETIME_FORMAT" }}
                            </td>
                            <td class="text-right flip">
@@ -1,27 +0,0 @@
 {% extends "pretixcontrol/organizers/base.html" %}
 {% load i18n %}
 {% load formset_tags %}
 {% load bootstrap3 %}
 {% block inner %}
    <h1>{% trans "Add sales channel" %}</h1>
    <form class="form-horizontal" action="" method="post">
        {% csrf_token %}
        {% bootstrap_form_errors form layout="control" %}
        {% bootstrap_field form.label layout="control" %}
        <div class="form-group">
            <label class="col-md-3 control-label" for="id_identifier">{% trans "Channel type" %}</label>
            <div class="col-md-9">
                <input type="text" value="{{ type.verbose_name }}" class="form-control" disabled>
            </div>
        </div>
        {% bootstrap_field form.identifier addon_before=identifier_prefix layout="control" %}
        <div class="form-group submit-group">
            <button type="submit" class="btn btn-primary btn-save">
                {% trans "Save" %}
            </button>
        </div>
    </form>
 {% endblock %}
@@ -1,26 +0,0 @@
 {% extends "pretixcontrol/organizers/base.html" %}
 {% load i18n %}
 {% load static %}
 {% load bootstrap3 %}
 {% block inner %}
    <h1>{% trans "Add sales channel" %}</h1>
    <div class="list-group large-link-group">
        {% for t in types %}
            <a class="list-group-item" href="?type={{ t.identifier }}">
                <h4>
                    {% if "." in t.icon %}
                        <img class="fa-like-image" src="{% static t.icon %}" alt="">
                    {% else %}
                        <span class="fa fa-fw fa-{{ t.icon }} text-muted"></span>
                    {% endif %}
                    {{ t.verbose_name }}
                </h4>
                {% if t.description %}
                    <p>
                        {{ t.description }}
                    </p>
                {% endif %}
            </a>
        {% endfor %}
    </div>
 {% endblock %}
@@ -1,33 +0,0 @@
 {% extends "pretixcontrol/organizers/base.html" %}
 {% load i18n %}
 {% load bootstrap3 %}
 {% block inner %}
    <h1>{% trans "Delete sales channel:" %} {{ channel.label }}</h1>
    <form action="" method="post" class="form-horizontal">
        {% csrf_token %}
        {% if is_allowed %}
            <p>
                {% blocktrans trimmed %}
                    Are you sure you want to delete this sales channel?
                {% endblocktrans %}
        {% else %}
            <div class="alert alert-danger">
                {% blocktrans trimmed %}
                    This sales channel cannot be deleted since it has already been used to sell orders or because it is
                    a core element of the system.
                {% endblocktrans %}
            </div>
        {% endif %}
        <div class="form-group submit-group">
            <a href="{% url "control:organizer.channels" organizer=request.organizer.slug %}"
               class="btn btn-default btn-cancel">
                {% trans "Cancel" %}
            </a>
            {% if is_allowed %}
                <button type="submit" class="btn btn-danger btn-save">
                    {% trans "Delete" %}
                </button>
            {% endif %}
        </div>
    </form>
 {% endblock %}
@@ -1,27 +0,0 @@
 {% extends "pretixcontrol/organizers/base.html" %}
 {% load i18n %}
 {% load formset_tags %}
 {% load bootstrap3 %}
 {% block inner %}
    <h1>{% trans "Sales channel:" %} {{ channel.label }}</h1>
    <form class="form-horizontal" action="" method="post">
        {% csrf_token %}
        {% bootstrap_form_errors form layout="control" %}
        {% bootstrap_field form.label layout="control" %}
        <div class="form-group">
            <label class="col-md-3 control-label" for="id_identifier">{% trans "Channel type" %}</label>
            <div class="col-md-9">
                <input type="text" value="{{ type.verbose_name }}" class="form-control" disabled>
            </div>
        </div>
        {% bootstrap_field form.identifier layout="control" %}
        <div class="form-group submit-group">
            <button type="submit" class="btn btn-primary btn-save">
                {% trans "Save" %}
            </button>
        </div>
    </form>
 {% endblock %}
@@ -1,64 +0,0 @@
 {% extends "pretixcontrol/organizers/base.html" %}
 {% load i18n %}
 {% load bootstrap3 %}
 {% load static %}
 {% block inner %}
    <h1>{% trans "Sales channels" %}</h1>
    <p>
        {% blocktrans trimmed %}
            On this page, you can manage the different channels your tickets can be sold through. This is useful
            to unlock new revenue streams or to separate revenue between different sources for reporting purchases.
        {% endblocktrans %}
    </p>
    <a href="{% url "control:organizer.channel.add" organizer=request.organizer.slug %}" class="btn btn-default">
        <span class="fa fa-plus"></span>
        {% trans "Add a new channel" %}
    </a>
    <form method="post">
        {% csrf_token %}
        <table class="table table-condensed table-hover">
            <thead>
            <tr>
                <th>{% trans "Channel" %}</th>
                <th>{% trans "Identifier" %}</th>
                <th>{% trans "Channel type" %}</th>
                <th class="action-col-2"></th>
                <th class="action-col-2"></th>
            </tr>
            </thead>
            <tbody data-dnd-url="{% url "control:organizer.channels.reorder" organizer=request.organizer.slug %}">
            {% for c in channels %}
                <tr data-dnd-id="{{ c.pk }}">
                    <td><strong>
                        <a href="{% url "control:organizer.channel.edit" organizer=request.organizer.slug channel=c.identifier %}">
                            {{ c.label }}
                        </a>
                    </strong></td>
                    <td>
                        <code>{{ c.identifier }}</code>
                    </td>
                    <td>
                        {% if "." in c.type_instance.icon %}
                            <img class="fa-like-image" src="{% static c.icon %}" alt="">
                        {% else %}
                            <span class="fa fa-fw fa-{{ c.type_instance.icon }} text-muted"></span>
                        {% endif %}
                        {{ c.type_instance.verbose_name }}
                    </td>
                    <td>
                        <button formaction="{% url "control:organizer.channel.up" organizer=request.organizer.slug channel=c.identifier %}" class="btn btn-default btn-sm sortable-up"{% if forloop.counter0 == 0 and not page_obj.has_previous %} disabled{% endif %}><i class="fa fa-arrow-up"></i></button>
                        <button formaction="{% url "control:organizer.channel.down" organizer=request.organizer.slug channel=c.identifier %}" class="btn btn-default btn-sm sortable-down"{% if forloop.revcounter0 == 0 and not page_obj.has_next %} disabled{% endif %}><i class="fa fa-arrow-down"></i></button>
                        <span class="dnd-container"></span>
                    </td>
                    <td class="text-right flip">
                        <a href="{% url "control:organizer.channel.edit" organizer=request.organizer.slug channel=c.identifier %}"
                                class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
                        <a href="{% url "control:organizer.channel.delete" organizer=request.organizer.slug channel=c.identifier %}"
                                class="btn btn-danger btn-sm {% if c.type_instance.default_created %}disabled{% endif %}"><i class="fa fa-trash"></i></a>
                    </td>
                </tr>
            {% endfor %}
            </tbody>
        </table>
    </form>
 {% endblock %}
@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load bootstrap3 %}
 {% load money %}
 {% load static %}
 {% block title %}
    {% blocktrans trimmed with id=customer.identifier %}
        Customer #{{ id }}
@@ -226,13 +225,8 @@
                                {{ o.event }}
                            </td>
                            <td>
-                                {% if "." in o.sales_channel.icon %}
+                            <span class="fa fa-{{ o.sales_channel_obj.icon }} text-muted"
-                                    <img src="{% static o.sales_channel.icon %}" class="fa-like-image"
+                                    data-toggle="tooltip" title="{% trans o.sales_channel_obj.verbose_name %}"></span>
                                          data-toggle="tooltip" title="{{ o.sales_channel.label }}">
                                {% else %}
                                    <span class="fa fa-{{ o.sales_channel.icon }} text-muted"
                                          data-toggle="tooltip" title="{{ o.sales_channel.label }}"></span>
                                {% endif %}
                                {{ o.datetime|date:"SHORT_DATETIME_FORMAT" }}
                                {% if o.customer_id != customer.pk %}
                                    <span class="fa fa-link text-muted"
@@ -136,19 +136,6 @@ urlpatterns = [
            name='organizer.property.down'),
    re_path(r'^organizer/(?P<organizer>[^/]+)/property/reorder$', organizer.reorder_meta_properties,
            name='organizer.properties.reorder'),
    re_path(r'^organizer/(?P<organizer>[^/]+)/channels$', organizer.ChannelListView.as_view(), name='organizer.channels'),
    re_path(r'^organizer/(?P<organizer>[^/]+)/channel/add$', organizer.ChannelCreateView.as_view(),
            name='organizer.channel.add'),
    re_path(r'^organizer/(?P<organizer>[^/]+)/channel/(?P<channel>[^/]+)/edit$', organizer.ChannelUpdateView.as_view(),
            name='organizer.channel.edit'),
    re_path(r'^organizer/(?P<organizer>[^/]+)/channel/(?P<channel>[^/]+)/delete$', organizer.ChannelDeleteView.as_view(),
            name='organizer.channel.delete'),
    re_path(r'^organizer/(?P<organizer>[^/]+)/channel/(?P<channel>[^/]+)/up$', organizer.channel_move_up,
            name='organizer.channel.up'),
    re_path(r'^organizer/(?P<organizer>[^/]+)/channel/(?P<channel>[^/]+)/down$', organizer.channel_move_down,
            name='organizer.channel.down'),
    re_path(r'^organizer/(?P<organizer>[^/]+)/channel/reorder$', organizer.reorder_channels,
            name='organizer.channels.reorder'),
    re_path(r'^organizer/(?P<organizer>[^/]+)/membershiptypes$', organizer.MembershipTypeListView.as_view(), name='organizer.membershiptypes'),
    re_path(r'^organizer/(?P<organizer>[^/]+)/membershiptype/add$', organizer.MembershipTypeCreateView.as_view(),
            name='organizer.membershiptype.add'),
@@ -49,6 +49,7 @@ from django.views.generic import FormView, ListView, TemplateView
 from i18nfield.strings import LazyI18nString
 from pretix.api.views.checkin import _redeem_process
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.models import Checkin, Order, OrderPosition
 from pretix.base.models.checkin import CheckinList
 from pretix.base.services.checkin import (
@@ -295,9 +296,7 @@ class CheckinListList(EventPermissionRequiredMixin, PaginationMixin, ListView):
    ordering = ('subevent__date_from', 'name', 'pk')
    def get_queryset(self):
-        qs = self.request.event.checkin_lists.select_related('subevent').prefetch_related(
+        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():
            qs = self.filter_form.filter_qs(qs)
@@ -306,10 +305,12 @@ class CheckinListList(EventPermissionRequiredMixin, PaginationMixin, ListView):
    def get_context_data(self, **kwargs):
        ctx = super().get_context_data(**kwargs)
        clists = list(ctx['checkinlists'])
        sales_channels = get_all_sales_channels()
        for cl in clists:
            if cl.subevent:
                cl.subevent.event = self.request.event  # re-use same event object to make sure settings are cached
            cl.auto_checkin_sales_channels = [sales_channels[channel] for channel in cl.auto_checkin_sales_channels]
        ctx['checkinlists'] = clists
        ctx['can_change_organizer_settings'] = self.request.user.has_organizer_permission(
@@ -43,6 +43,7 @@ from pretix.control.permissions import (
 )
 from pretix.helpers.models import modelcopy
 from ...base.channels import get_all_sales_channels
 from ...helpers.compat import CompatDeleteView
 from . import CreateView, PaginationMixin, UpdateView
@@ -189,14 +190,11 @@ class DiscountList(PaginationMixin, ListView):
    template_name = 'pretixcontrol/items/discounts.html'
    def get_queryset(self):
-        return self.request.event.discounts.prefetch_related('condition_limit_products', 'limit_sales_channels')
+        return self.request.event.discounts.prefetch_related('condition_limit_products')
    def get_context_data(self, **kwargs):
        ctx = super().get_context_data(**kwargs)
-        ctx['sales_channels'] = [
+        ctx['sales_channels'] = get_all_sales_channels()
            c for c in self.request.organizer.sales_channels.all()
            if c.type_instance.discounts_supported
        ]
        return ctx
@@ -71,6 +71,7 @@ from django.views.generic.detail import SingleObjectMixin
 from i18nfield.strings import LazyI18nString
 from i18nfield.utils import I18nJSONEncoder
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.email import get_available_placeholders
 from pretix.base.forms import PlaceholderValidator
 from pretix.base.models import Event, LogEntry, Order, TaxRule, Voucher
@@ -558,7 +559,7 @@ class PaymentSettings(EventSettingsViewMixin, EventSettingsFormView):
            key=lambda s: s.verbose_name
        )
-        sales_channels = {s.identifier: s for s in self.request.organizer.sales_channels.all()}
+        sales_channels = get_all_sales_channels()
        for p in context['providers']:
            p.show_enabled = p.is_enabled
            p.sales_channels = [sales_channels[channel] for channel in p.settings.get('_restrict_to_sales_channels', as_type=list, default=['web'])]
@@ -785,11 +786,8 @@ class MailSettingsRendererPreview(MailSettingsPreview):
        renderers = request.event.get_html_mail_renderers()
        if request.GET.get('renderer') in renderers:
            with rolledback_transaction():
-                order = request.event.orders.create(
+                order = request.event.orders.create(status=Order.STATUS_PENDING, datetime=now(),
-                    status=Order.STATUS_PENDING, datetime=now(),
+                                                    expires=now(), code="PREVIEW", total=119)
                    expires=now(), code="PREVIEW", total=119,
                    sales_channel=request.organizer.sales_channels.get(identifier="web")
                )
                item = request.event.items.create(name=gettext("Sample product"), default_price=42.23,
                                                  description=gettext("Sample product description"))
                order.positions.create(item=item, attendee_name_parts={'_legacy': gettext("John Doe")},
@@ -1470,7 +1468,7 @@ class QuickSetupView(FormView):
                admission=True,
                personalized=True,
                position=i,
-                all_sales_channels=True,
+                sales_channels=list(get_all_sales_channels().keys())
            )
            item.log_action('pretix.event.item.added', user=self.request.user, data=dict(f.cleaned_data))
            if f.cleaned_data['quota'] or not form.cleaned_data['total_quota']:
@@ -84,6 +84,7 @@ from pretix.control.permissions import (
 from pretix.control.signals import item_forms, item_formsets
 from pretix.helpers.models import modelcopy
 from ...base.channels import get_all_sales_channels
 from ...helpers.compat import CompatDeleteView
 from . import ChartContainingView, CreateView, PaginationMixin, UpdateView
@@ -105,14 +106,14 @@ class ItemList(ListView):
            event=self.request.event
        ).annotate(
            var_count=Count('variations')
-        ).prefetch_related("category", "limit_sales_channels").order_by(
+        ).prefetch_related("category").order_by(
            F('category__position').asc(nulls_first=True),
            'category', 'position'
        )
    def get_context_data(self, **kwargs):
        ctx = super().get_context_data(**kwargs)
-        ctx['sales_channels'] = self.request.organizer.sales_channels.all()
+        ctx['sales_channels'] = get_all_sales_channels()
        items_by_category = {cat: list(items) for cat, items in groupby(ctx['items'], lambda item: item.category)}
        ctx['cat_list'] = [(cat, items_by_category.get(cat, [])) for cat in [None, *self.request.event.categories.all()]]
        return ctx
@@ -1502,7 +1503,7 @@ class ItemUpdateGeneral(ItemDetailMixin, EventPermissionRequiredMixin, MetaDataE
                                          "Your participants won't be able to buy the bundle unless you remove this "
                                          "item from it."))
-        ctx['sales_channels'] = self.request.organizer.sales_channels.all()
+        ctx['sales_channels'] = get_all_sales_channels()
        return ctx
    @cached_property
@@ -1514,9 +1515,7 @@ class ItemUpdateGeneral(ItemDetailMixin, EventPermissionRequiredMixin, MetaDataE
                can_order=True, can_delete=True, extra=0
            )(
                self.request.POST if self.request.method == "POST" else None,
-                queryset=ItemVariation.objects.filter(item=self.get_object()).prefetch_related(
+                queryset=ItemVariation.objects.filter(item=self.get_object()).prefetch_related('meta_values', 'require_membership_types'),
                    'meta_values', 'limit_sales_channels', 'require_membership_types'
                ),
                event=self.request.event, prefix="variations"
            )),
            ('addons', inlineformset_factory(
@@ -71,6 +71,7 @@ from django.views.generic import (
 )
 from i18nfield.strings import LazyI18nString
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.decimal import round_decimal
 from pretix.base.email import get_email_context
 from pretix.base.exporter import MultiSheetListExporter
@@ -374,7 +375,7 @@ class OrderList(OrderSearchMixin, EventPermissionRequiredMixin, PaginationMixin,
    def get_queryset(self):
        qs = Order.objects.filter(
            event=self.request.event
-        ).select_related('invoice_address').prefetch_related("sales_channel")
+        ).select_related('invoice_address')
        if self.filter_form.is_valid():
            qs = self.filter_form.filter_qs(qs)
@@ -419,6 +420,7 @@ class OrderList(OrderSearchMixin, EventPermissionRequiredMixin, PaginationMixin,
            )
        }
        scs = get_all_sales_channels()
        for o in ctx['orders']:
            if o.pk not in annotated:
                continue
@@ -431,6 +433,7 @@ class OrderList(OrderSearchMixin, EventPermissionRequiredMixin, PaginationMixin,
            o.has_cancellation_request = annotated.get(o.pk)['has_cancellation_request']
            o.computed_payment_refund_sum = annotated.get(o.pk)['computed_payment_refund_sum']
            o.icnt = annotated.get(o.pk)['icnt']
            o.sales_channel_obj = scs[o.sales_channel]
        if ctx['page_obj'].paginator.count < 1000:
            # Performance safeguard: Only count positions if the data set is small
@@ -517,6 +520,7 @@ class OrderDetail(OrderView):
        ctx['display_locale'] = dict(settings.LANGUAGES)[self.object.locale or self.request.event.settings.locale]
        ctx['overpaid'] = self.order.pending_sum * -1
        ctx['sales_channel'] = get_all_sales_channels().get(self.order.sales_channel)
        ctx['download_buttons'] = self.download_buttons
        ctx['payment_refund_sum'] = self.order.payment_refund_sum
        ctx['pending_sum'] = self.order.pending_sum
@@ -56,7 +56,7 @@ from django.forms import DecimalField
 from django.http import (
    Http404, HttpResponse, HttpResponseBadRequest, JsonResponse,
 )
-from django.shortcuts import get_object_or_404, redirect, render
+from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
 from django.utils.formats import date_format
 from django.utils.functional import cached_property
@@ -71,7 +71,7 @@ from django.views.generic import (
 from pretix.api.models import ApiCall, WebHook
 from pretix.api.webhooks import manually_retry_all_calls
 from pretix.base.auth import get_auth_backends
-from pretix.base.channels import get_all_sales_channel_types
+from pretix.base.channels import get_all_sales_channels
 from pretix.base.exporter import (
    MultiSheetListExporter, OrganizerLevelExportMixin,
 )
@@ -87,7 +87,7 @@ from pretix.base.models.giftcards import (
    GiftCardAcceptance, GiftCardTransaction, gen_giftcard_secret,
 )
 from pretix.base.models.orders import CancellationRequest
-from pretix.base.models.organizer import SalesChannel, TeamAPIToken
+from pretix.base.models.organizer import TeamAPIToken
 from pretix.base.payment import PaymentException
 from pretix.base.services.export import multiexport, scheduled_organizer_export
 from pretix.base.services.mail import SendMailException, mail
@@ -107,8 +107,8 @@ from pretix.control.forms.organizer import (
    MailSettingsForm, MembershipTypeForm, MembershipUpdateForm,
    OrganizerDeleteForm, OrganizerFooterLinkFormset, OrganizerForm,
    OrganizerSettingsForm, OrganizerUpdateForm, ReusableMediumCreateForm,
-    ReusableMediumUpdateForm, SalesChannelForm, SSOClientForm, SSOProviderForm,
+    ReusableMediumUpdateForm, SSOClientForm, SSOProviderForm, TeamForm,
-    TeamForm, WebHookForm,
+    WebHookForm,
 )
 from pretix.control.forms.rrule import RRuleForm
 from pretix.control.logdisplay import OVERVIEW_BANLIST
@@ -2206,7 +2206,7 @@ def meta_property_move_down(request, organizer, property):
@transaction.atomic
-@organizer_permission_required("can_change_organizer_settings")
+@organizer_permission_required("can_change_items")
@require_http_methods(["POST"])
 def reorder_meta_properties(request, organizer):
    try:
@@ -2643,7 +2643,7 @@ class CustomerDetailView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMi
            q |= Q(email__iexact=self.customer.email)
        qs = Order.objects.filter(
            q
-        ).select_related('event').prefetch_related('sales_channel').order_by('-datetime', 'pk')
+        ).select_related('event').order_by('-datetime', 'pk')
        return qs
    @cached_property
@@ -2720,6 +2720,7 @@ class CustomerDetailView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMi
            )
        }
        scs = get_all_sales_channels()
        for o in ctx['orders']:
            if o.pk not in annotated:
                continue
@@ -2732,6 +2733,7 @@ class CustomerDetailView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMi
            o.has_cancellation_request = annotated.get(o.pk)['has_cancellation_request']
            o.computed_payment_refund_sum = annotated.get(o.pk)['computed_payment_refund_sum']
            o.icnt = annotated.get(o.pk)['icnt']
            o.sales_channel_obj = scs[o.sales_channel]
        ctx["lifetime_spending"] = (
            self.get_queryset()
@@ -3038,242 +3040,3 @@ class ReusableMediumUpdateView(OrganizerDetailViewMixin, OrganizerPermissionRequ
            'organizer': self.request.organizer.slug,
            'pk': self.object.pk,
        })
 class ChannelListView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin, ListView):
    model = SalesChannel
    template_name = 'pretixcontrol/organizers/channels.html'
    permission = 'can_change_organizer_settings'
    context_object_name = 'channels'
    def get_queryset(self):
        return self.request.organizer.sales_channels.all()
 class ChannelEditorMixin:
    form_class = SalesChannelForm
    def get_form_kwargs(self):
        return {
            **super().get_form_kwargs(),
            'event': self.request.organizer,
        }
 class ChannelCreateView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin, ChannelEditorMixin, CreateView):
    model = SalesChannel
    permission = 'can_change_organizer_settings'
    template_name = 'pretixcontrol/organizers/channel_add.html'
    def get_object(self, queryset=None):
        return SalesChannel()
    @property
    def allowed_types(self):
        existing_types = set(self.request.organizer.sales_channels.values_list("type", flat=True))
        return {
            k: t for k, t in get_all_sales_channel_types().items()
            if t.multiple_allowed or t.identifier not in existing_types
        }
    @cached_property
    def selected_type(self):
        try:
            return self.allowed_types[self.request.GET.get("type")]
        except KeyError:
            return None
    def post(self, request, *args, **kwargs):
        if not self.selected_type:
            return render(request, "pretixcontrol/organizers/channel_add_choice.html", {
                "types": self.allowed_types.values()
            })
        return super().post(request, *args, **kwargs)
    def get(self, request, *args, **kwargs):
        if not self.selected_type:
            return render(request, "pretixcontrol/organizers/channel_add_choice.html", {
                "types": self.allowed_types.values()
            })
        return super().get(request, *args, **kwargs)
    def get_success_url(self):
        return reverse('control:organizer.channels', kwargs={
            'organizer': self.request.organizer.slug,
        })
    def get_context_data(self, **kwargs):
        ctx = super().get_context_data(**kwargs)
        ctx["type"] = self.selected_type
        if self.selected_type.multiple_allowed:
            ctx["identifier_prefix"] = self.selected_type.identifier + "."
        return ctx
    def get_form_kwargs(self):
        return {
            **super().get_form_kwargs(),
            "type": self.selected_type,
        }
    def form_valid(self, form):
        messages.success(self.request, _('The sales channel has been created.'))
        form.instance.organizer = self.request.organizer
        form.instance.type = self.selected_type.identifier
        form.instance.position = (self.request.organizer.sales_channels.aggregate(m=Max("position"))["m"] or 0) + 1
        ret = super().form_valid(form)
        form.instance.log_action('pretix.saleschannel.created', user=self.request.user, data={
            k: getattr(self.object, k) for k in form.changed_data
        })
        return ret
    def form_invalid(self, form):
        messages.error(self.request, _('Your changes could not be saved.'))
        return super().form_invalid(form)
 class ChannelUpdateView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin, ChannelEditorMixin, UpdateView):
    model = SalesChannel
    permission = 'can_change_organizer_settings'
    context_object_name = 'channel'
    template_name = 'pretixcontrol/organizers/channel_edit.html'
    def get_object(self, queryset=None):
        return get_object_or_404(SalesChannel, organizer=self.request.organizer, identifier=self.kwargs.get('channel'))
    def get_success_url(self):
        return reverse('control:organizer.channels', kwargs={
            'organizer': self.request.organizer.slug,
        })
    @cached_property
    def type(self):
        return get_all_sales_channel_types()[self.object.type]
    def get_context_data(self, **kwargs):
        ctx = super().get_context_data(**kwargs)
        ctx["type"] = self.type
        return ctx
    def get_form_kwargs(self):
        return {
            **super().get_form_kwargs(),
            "type": self.type,
        }
    def form_valid(self, form):
        if form.has_changed() or self.formset.has_changed():
            self.object.log_action('pretix.saleschannel.changed', user=self.request.user, data={
                k: getattr(self.object, k)
                for k in form.changed_data
            })
        messages.success(self.request, _('Your changes have been saved.'))
        return super().form_valid(form)
    def form_invalid(self, form):
        messages.error(self.request, _('Your changes could not be saved.'))
        return super().form_invalid(form)
 class ChannelDeleteView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin, CompatDeleteView):
    model = SalesChannel
    template_name = 'pretixcontrol/organizers/channel_delete.html'
    permission = 'can_change_organizer_settings'
    context_object_name = 'channel'
    def get_object(self, queryset=None):
        return get_object_or_404(SalesChannel, organizer=self.request.organizer, identifier=self.kwargs.get('channel'))
    def get_success_url(self):
        return reverse('control:organizer.channels', kwargs={
            'organizer': self.request.organizer.slug,
        })
    def get_context_data(self, **kwargs):
        ctx = super().get_context_data()
        ctx["is_allowed"] = self.get_object().allow_delete
        return ctx
    @transaction.atomic
    def delete(self, request, *args, **kwargs):
        self.object = self.get_object()
        success_url = self.get_success_url()
        if not self.object.allow_delete():
            messages.error(self.request, _('This channel can not be deleted.'))
            return redirect(success_url)
        try:
            self.object.log_action('pretix.saleschannel.deleted', user=self.request.user)
            self.object.delete()
            messages.success(request, _('The selected sales channel has been deleted.'))
        except ProtectedError:
            messages.error(self.request, _('The channel could not be deleted as some constraints (e.g. data created by '
                                           'plug-ins) did not allow it.'))
        return redirect(success_url)
 def channel_move(request, channel, up=True):
    channel = get_object_or_404(request.organizer.sales_channels, identifier=channel)
    channels = list(request.organizer.sales_channels.order_by("position"))
    index = channels.index(channel)
    if index != 0 and up:
        channels[index - 1], channels[index] = channels[index], channels[index - 1]
    elif index != len(channels) - 1 and not up:
        channels[index + 1], channels[index] = channels[index], channels[index + 1]
    for i, prop in enumerate(channels):
        if prop.position != i:
            prop.position = i
            prop.save()
            prop.log_action(
                'pretix.saleschannel.reordered', user=request.user, data={
                    'position': i,
                }
            )
    messages.success(request, _('The order of sales channels has been updated.'))
@organizer_permission_required("can_change_organizer_settings")
@require_http_methods(["POST"])
 def channel_move_up(request, organizer, channel):
    channel_move(request, channel, up=True)
    return redirect('control:organizer.channels',
                    organizer=request.organizer.slug)
@organizer_permission_required("can_change_organizer_settings")
@require_http_methods(["POST"])
 def channel_move_down(request, organizer, channel):
    channel_move(request, channel, up=False)
    return redirect('control:organizer.channels',
                    organizer=request.organizer.slug)
@transaction.atomic
@organizer_permission_required("can_change_organizer_settings")
@require_http_methods(["POST"])
 def reorder_channels(request, organizer):
    try:
        ids = json.loads(request.body.decode('utf-8'))['ids']
    except (JSONDecodeError, KeyError, ValueError):
        return HttpResponseBadRequest("expected JSON: {ids:[]}")
    input_channels = list(request.organizer.sales_channels.filter(id__in=[i for i in ids if i.isdigit()]))
    if len(input_channels) != len(ids):
        raise Http404(_("Some of the provided object ids are invalid."))
    if len(input_channels) != request.organizer.sales_channels.count():
        raise Http404(_("Not all objects have been selected."))
    for c in input_channels:
        pos = ids.index(str(c.pk))
        if pos != c.position:  # Save unneccessary UPDATE queries
            c.position = pos
            c.save(update_fields=['position'])
            c.log_action(
                'pretix.saleschannel.reordered', user=request.user, data={
                    'position': pos,
                }
            )
    return HttpResponse()
@@ -98,7 +98,6 @@ class BaseEditorView(EventPermissionRequiredMixin, TemplateView):
        from pretix.base.models import Order
        order = self.request.event.orders.create(status=Order.STATUS_PENDING, datetime=now(),
                                                 email='sample@pretix.eu',
                                                 sales_channel=self.request.event.organizer.sales_channels.get(identifier="web"),
                                                 locale=self.request.event.settings.locale,
                                                 expires=now(), code="PREVIEW1234", total=Decimal('119.00'))
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-06-24 08:20+0000\n"
-"PO-Revision-Date: 2024-06-30 21:07+0000\n"
+"PO-Revision-Date: 2024-06-20 15:00+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix-js/"
 "de/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.6.1\n"
+"X-Generator: Weblate 5.5.5\n"
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -237,11 +237,11 @@ msgstr "storniert"
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:46
 msgid "Confirmed"
-msgstr "bestätigt"
+msgstr ""
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:47
 msgid "Approval pending"
-msgstr "Freigabe ausstehend"
+msgstr ""
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:48
 msgid "Redeemed"
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-06-24 08:20+0000\n"
-"PO-Revision-Date: 2024-06-30 21:07+0000\n"
+"PO-Revision-Date: 2024-06-20 15:00+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German (informal) <https://translate.pretix.eu/projects/"
 "pretix/pretix-js/de_Informal/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.6.1\n"
+"X-Generator: Weblate 5.5.5\n"
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -237,11 +237,11 @@ msgstr "storniert"
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:46
 msgid "Confirmed"
-msgstr "Bestätigt"
+msgstr ""
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:47
 msgid "Approval pending"
-msgstr "Freigabe ausstehend"
+msgstr ""
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:48
 msgid "Redeemed"
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-30 18:56+0000\n"
+"POT-Creation-Date: 2024-06-24 08:20+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"
--- a/Show More
+++ b/Show More