Fix Pillow version

.github/workflows/tests.yml

@@ -61,9 +61,6 @@ jobs:
       - name: Run checks
         run: python manage.py check
         working-directory: ./src
-      - name: Install JS dependencies
-        working-directory: ./src
-        run: make npminstall
       - name: Compile
         working-directory: ./src
         run: make all compress

.gitlab-ci.yml

@@ -28,7 +28,6 @@ pypi:
         - python -m pretix migrate
         - python -m pretix check
         - check-manifest
-        - make npminstall
         - python setup.py sdist bdist_wheel
         - twine check dist/*
         - twine upload dist/*

Dockerfile

@@ -31,11 +31,7 @@ RUN apt-get update && \
     useradd -ms /bin/bash -d /pretix -u 15371 pretixuser && \
     echo 'pretixuser ALL=(ALL) NOPASSWD:SETENV: /usr/bin/supervisord' >> /etc/sudoers && \
     mkdir /static && \
-    mkdir /etc/supervisord && \
-	curl -fsSL https://deb.nodesource.com/setup_15.x | sudo -E bash - && \
-    apt-get install -y nodejs && \
-    curl -qL https://www.npmjs.com/install.sh | sh
-
+    mkdir /etc/supervisord
 
 ENV LC_ALL=C.UTF-8 \
     DJANGO_SETTINGS_MODULE=production_settings

doc/admin/indexes.rst

@@ -60,10 +60,7 @@ Here is the currently recommended set of commands::
     CREATE INDEX CONCURRENTLY pretix_addidx_ia_company
         ON pretixbase_invoiceaddress
         USING gin (upper("company") gin_trgm_ops);
-    CREATE INDEX CONCURRENTLY pretix_addidx_orderpos_email_upper
-        ON public.pretixbase_orderposition (upper((attendee_email)::text));
-    CREATE INDEX CONCURRENTLY pretix_addidx_voucher_code_upper
-        ON public.pretixbase_voucher (upper((code)::text));
+    CREATE INDEX CONCURRENTLY pretix_addidx_orderpos_email_upper ON public.pretixbase_orderposition (upper((attendee_email)::text));
 
 
 Also, if you use our ``pretix-shipping`` plugin::

doc/api/resources/checkinlists.rst

@@ -49,10 +49,6 @@ exit_all_at                           datetime                   Automatically c
 
     The ``exit_all_at`` attribute has been added.
 
-.. versionchanged:: 3.17
-
-    The ``ends_after`` and ``expand`` query parameters have been added.
-
 Endpoints
 ---------
 
@@ -104,8 +100,6 @@ Endpoints
    :query integer page: The page number in case of a multi-page result set, default is 1
    :query integer subevent: Only return check-in lists of the sub-event with the given ID
    :query integer subevent_match: Only return check-in lists that are valid for the sub-event with the given ID (i.e. also lists valid for all subevents)
-   :query string ends_after: Exclude all check-in lists attached to a sub-event that is already in the past at the given time.
-   :query string expand: Expand a field into a full object. Currently only ``subevent`` is supported. Can be passed multiple times.
    :query string exclude: Exclude a field from the output, e.g. ``checkin_count``. Can be used as a performance optimization. Can be passed multiple times.
    :param organizer: The ``slug`` field of the organizer to fetch
    :param event: The ``slug`` field of the event to fetch
@@ -453,7 +447,6 @@ Order position endpoints
                            ``attendee_name,positionid``
    :query string order: Only return positions of the order with the given order code
    :query string search: Fuzzy search matching the attendee name, order code, invoice address name as well as to the beginning of the secret.
-   :query string expand: Expand a field into a full object. Currently only ``subevent``, ``item``, and ``variation`` are supported. Can be passed multiple times.
    :query integer item: Only return positions with the purchased item matching the given ID.
    :query integer item__in: Only return positions with the purchased item matching one of the given comma-separated IDs.
    :query integer variation: Only return positions with the purchased item variation matching the given ID.

doc/api/resources/teams.rst

@@ -1,4 +1,4 @@
-.. spelling:: fullname checkin
+.. spelling:: fullname
 
 .. _`rest-teams`:
 
@@ -32,7 +32,6 @@ can_view_orders                       boolean
 can_change_orders                     boolean
 can_view_vouchers                     boolean
 can_change_vouchers                   boolean
-can_checkin_orders                    boolean
 ===================================== ========================== =======================================================
 
 Team member resource

doc/development/setup.rst

@@ -67,10 +67,6 @@ Then, create the local database::
 A first user with username ``admin@localhost`` and password ``admin`` will be automatically
 created.
 
-You will also need to install a few JavaScript dependencies::
-
-    make npminstall
-
 If you want to see pretix in a different language than English, you have to compile our language
 files::
 

doc/user/organizers/teams.rst

@@ -59,8 +59,6 @@ Permissions separate into two areas:
    * Can view vouchers – This permission allows viewing the list of vouchers including the voucher codes themselves and
      their redemption status.
 
-   * Can perform check-ins – This permission allows using web-based features to perform ticket search and check-in.
-
    * Can change vouchers – This permission allows to create and modify vouchers in all their details. It only works
      properly if the same users also have the "Can view vouchers" permission.
 

src/.gitignore

@@ -8,5 +8,3 @@ dist/
 *.egg-info/
 *.bak
 pretix/static/jsi18n/
-node_modules/
-

src/MANIFEST.in

@@ -26,5 +26,3 @@ recursive-include pretix/plugins/badges/templates *
 recursive-include pretix/plugins/badges/static *
 recursive-include pretix/plugins/returnurl/templates *
 recursive-include pretix/plugins/returnurl/static *
-recursive-include pretix/plugins/webcheckin/templates *
-recursive-include pretix/plugins/webcheckin/static *

src/Makefile

@@ -12,7 +12,7 @@ localegen:
 staticfiles: jsi18n
 	./manage.py collectstatic --noinput
 
-compress: npminstall
+compress:
 	./manage.py compress
 
 jsi18n: localecompile
@@ -25,8 +25,6 @@ coverage:
 	coverage run -m py.test
 
 npminstall:
-	# keep this in sync with setup.py!
-	mkdir -p pretix/static.dist/node_prefix/
-	cp -r pretix/static/npm_dir/* pretix/static.dist/node_prefix/
-	npm install --prefix=pretix/static.dist/node_prefix
+	mkdir -p pretix/static.dist/node_prefix
+	npm install --prefix=pretix/static.dist/node_prefix pretix/static/npm_dir/
 

src/pretix/__init__.py

@@ -1 +1 @@
-__version__ = "3.17.2"
+__version__ = "3.17.0.dev0"

src/pretix/api/auth/devicesecurity.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class FullAccessSecurityProfile:
@@ -10,7 +10,7 @@ class FullAccessSecurityProfile:
 
 
 class AllowListSecurityProfile:
-    allowlist = ()
+    allowlist = tuple()
 
     def is_allowed(self, request):
         key = (request.method, f"{request.resolver_match.namespace}:{request.resolver_match.url_name}")
@@ -95,8 +95,6 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:taxrule-list'),
         ('GET', 'api-v1:ticketlayout-list'),
         ('GET', 'api-v1:ticketlayoutitem-list'),
-        ('GET', 'api-v1:badgelayout-list'),
-        ('GET', 'api-v1:badgeitem-list'),
         ('GET', 'api-v1:order-list'),
         ('POST', 'api-v1:order-list'),
         ('GET', 'api-v1:order-detail'),
@@ -114,7 +112,6 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
         ('POST', 'plugins:pretix_posbackend:posreceipt-list'),
         ('POST', 'plugins:pretix_posbackend:posclosing-list'),
         ('POST', 'plugins:pretix_posbackend:posdebugdump-list'),
-        ('GET', 'plugins:pretix_posbackend:poscashier-list'),
         ('POST', 'plugins:pretix_posbackend:stripeterminal.token'),
         ('GET', 'api-v1:revokedsecrets-list'),
         ('GET', 'api-v1:event.settings'),

src/pretix/api/auth/permission.py

@@ -46,12 +46,8 @@ class EventPermission(BasePermission):
             else:
                 request.eventpermset = perm_holder.get_event_permission_set(request.organizer, request.event)
 
-            if isinstance(required_permission, (list, tuple)):
-                if not any(p in request.eventpermset for p in required_permission):
-                    return False
-            else:
-                if required_permission and required_permission not in request.eventpermset:
-                    return False
+            if required_permission and required_permission not in request.eventpermset:
+                return False
 
         elif 'organizer' in request.resolver_match.kwargs:
             if not request.organizer or not perm_holder.has_organizer_permission(request.organizer, request=request):
@@ -61,12 +57,8 @@ class EventPermission(BasePermission):
             else:
                 request.orgapermset = perm_holder.get_organizer_permission_set(request.organizer)
 
-            if isinstance(required_permission, (list, tuple)):
-                if not any(p in request.eventpermset for p in required_permission):
-                    return False
-            else:
-                if required_permission and required_permission not in request.orgapermset:
-                    return False
+            if required_permission and required_permission not in request.orgapermset:
+                return False
 
         if isinstance(request.auth, OAuthAccessToken):
             if not request.auth.allow_scopes(['write']) and request.method not in SAFE_METHODS:

src/pretix/api/serializers/checkin.py

@@ -2,7 +2,6 @@ from django.utils.translation import gettext as _
 from rest_framework import serializers
 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.models import CheckinList
@@ -21,9 +20,6 @@ class CheckinListSerializer(I18nAwareModelSerializer):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        if 'subevent' in self.context['request'].query_params.getlist('expand'):
-            self.fields['subevent'] = SubEventSerializer(read_only=True)
-
         for exclude_field in self.context['request'].query_params.getlist('exclude'):
             p = exclude_field.split('.')
             if p[0] in self.fields:
@@ -54,6 +50,4 @@ class CheckinListSerializer(I18nAwareModelSerializer):
             if channel not in get_all_sales_channels():
                 raise ValidationError(_('Unknown sales channel.'))
 
-        CheckinList.validate_rules(data.get('rules'))
-
         return data

src/pretix/api/serializers/event.py

@@ -309,7 +309,7 @@ class EventSerializer(I18nAwareModelSerializer):
 
         # Item Meta properties
         if item_meta_properties is not None:
-            current = list(event.item_meta_properties.all())
+            current = [imp for imp in event.item_meta_properties.all()]
             for key, value in item_meta_properties.items():
                 prop = self.item_meta_props.get(key)
                 if prop in current:
@@ -628,7 +628,6 @@ class EventSettingsSerializer(SettingsSerializer):
         'redirect_to_checkout_directly',
         'frontpage_subevent_ordering',
         'event_list_type',
-        'event_list_available_only',
         'frontpage_text',
         'event_info_text',
         'attendee_names_asked',

src/pretix/api/serializers/exporters.py

@@ -18,18 +18,18 @@ class FormFieldWrapperField(serializers.Field):
 
 
 simple_mappings = (
-    (forms.DateField, serializers.DateField, ()),
-    (forms.TimeField, serializers.TimeField, ()),
-    (forms.SplitDateTimeField, serializers.DateTimeField, ()),
-    (forms.DateTimeField, serializers.DateTimeField, ()),
+    (forms.DateField, serializers.DateField, tuple()),
+    (forms.TimeField, serializers.TimeField, tuple()),
+    (forms.SplitDateTimeField, serializers.DateTimeField, tuple()),
+    (forms.DateTimeField, serializers.DateTimeField, tuple()),
     (forms.DecimalField, serializers.DecimalField, ('max_digits', 'decimal_places', 'min_value', 'max_value')),
-    (forms.FloatField, serializers.FloatField, ()),
-    (forms.IntegerField, serializers.IntegerField, ()),
-    (forms.EmailField, serializers.EmailField, ()),
-    (forms.UUIDField, serializers.UUIDField, ()),
-    (forms.URLField, serializers.URLField, ()),
-    (forms.NullBooleanField, serializers.NullBooleanField, ()),
-    (forms.BooleanField, serializers.BooleanField, ()),
+    (forms.FloatField, serializers.FloatField, tuple()),
+    (forms.IntegerField, serializers.IntegerField, tuple()),
+    (forms.EmailField, serializers.EmailField, tuple()),
+    (forms.UUIDField, serializers.UUIDField, tuple()),
+    (forms.URLField, serializers.URLField, tuple()),
+    (forms.NullBooleanField, serializers.NullBooleanField, tuple()),
+    (forms.BooleanField, serializers.BooleanField, tuple()),
 )
 
 

src/pretix/api/serializers/order.py

@@ -13,11 +13,7 @@ from rest_framework.exceptions import ValidationError
 from rest_framework.relations import SlugRelatedField
 from rest_framework.reverse import reverse
 
-from pretix.api.serializers.event import SubEventSerializer
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
-from pretix.api.serializers.item import (
-    InlineItemVariationSerializer, ItemSerializer,
-)
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.decimal import round_decimal
 from pretix.base.i18n import language
@@ -353,9 +349,8 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        request = self.context.get('request')
-        if not request or not self.context['request'].query_params.get('pdf_data', 'false') == 'true' or 'can_view_orders' not in request.eventpermset:
-            self.fields.pop('pdf_data', None)
+        if 'request' in self.context and not self.context['request'].query_params.get('pdf_data', 'false') == 'true':
+            self.fields.pop('pdf_data')
 
     def validate(self, data):
         if data.get('attendee_name') and data.get('attendee_name_parts'):
@@ -489,18 +484,6 @@ class CheckinListOrderPositionSerializer(OrderPositionSerializer):
                   'downloads', 'answers', 'tax_rule', 'pseudonymization_id', 'pdf_data', 'seat', 'require_attention',
                   'order__status')
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        if 'subevent' in self.context['request'].query_params.getlist('expand'):
-            self.fields['subevent'] = SubEventSerializer(read_only=True)
-
-        if 'item' in self.context['request'].query_params.getlist('expand'):
-            self.fields['item'] = ItemSerializer(read_only=True)
-
-        if 'variation' in self.context['request'].query_params.getlist('expand'):
-            self.fields['variation'] = InlineItemVariationSerializer(read_only=True)
-
 
 class OrderPaymentTypeField(serializers.Field):
     # TODO: Remove after pretix 2.2
@@ -601,7 +584,7 @@ class OrderSerializer(I18nAwareModelSerializer):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if not self.context['request'].query_params.get('pdf_data', 'false') == 'true':
-            self.fields['positions'].child.fields.pop('pdf_data', None)
+            self.fields['positions'].child.fields.pop('pdf_data')
 
         for exclude_field in self.context['request'].query_params.getlist('exclude'):
             p = exclude_field.split('.')

src/pretix/api/serializers/organizer.py

@@ -95,7 +95,7 @@ class TeamSerializer(serializers.ModelSerializer):
             'id', 'name', 'all_events', 'limit_events', 'can_create_events', 'can_change_teams',
             'can_change_organizer_settings', 'can_manage_gift_cards', 'can_change_event_settings',
             'can_change_items', 'can_view_orders', 'can_change_orders', 'can_view_vouchers',
-            'can_change_vouchers', 'can_checkin_orders'
+            'can_change_vouchers'
         )
 
     def validate(self, data):

src/pretix/api/signals.py

@@ -8,9 +8,7 @@ from pretix.api.models import ApiCall, WebHookCall
 from pretix.base.signals import periodic_task
 from pretix.helpers.periodic import minimum_interval
 
-register_webhook_events = Signal(
-    providing_args=[]
-)
+register_webhook_events = Signal()
 """
 This signal is sent out to get all known webhook events. Receivers should return an
 instance of a subclass of pretix.api.webhooks.WebhookEvent or a list of such

src/pretix/api/urls.py

@@ -1,7 +1,7 @@
 import importlib
 
 from django.apps import apps
-from django.conf.urls import include, url
+from django.conf.urls import include, re_path
 from rest_framework import routers
 
 from pretix.api.views import cart
@@ -72,30 +72,32 @@ for app in apps.get_app_configs():
             importlib.import_module(app.name + '.urls')
 
 urlpatterns = [
-    url(r'^', include(router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/', include(orga_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/settings/$', organizer.OrganizerSettingsView.as_view(),
-        name="organizer.settings"),
-    url(r'^organizers/(?P<organizer>[^/]+)/giftcards/(?P<giftcard>[^/]+)/', include(giftcard_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/settings/$', event.EventSettingsView.as_view(),
-        name="event.settings"),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/', include(event_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/teams/(?P<team>[^/]+)/', include(team_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/items/(?P<item>[^/]+)/', include(item_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/questions/(?P<question>[^/]+)/',
-        include(question_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/checkinlists/(?P<list>[^/]+)/',
-        include(checkinlist_router.urls)),
-    url(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/orders/(?P<order>[^/]+)/', include(order_router.urls)),
-    url(r"^oauth/authorize$", oauth.AuthorizationView.as_view(), name="authorize"),
-    url(r"^oauth/token$", oauth.TokenView.as_view(), name="token"),
-    url(r"^oauth/revoke_token$", oauth.RevokeTokenView.as_view(), name="revoke-token"),
-    url(r"^device/initialize$", device.InitializeView.as_view(), name="device.initialize"),
-    url(r"^device/update$", device.UpdateView.as_view(), name="device.update"),
-    url(r"^device/roll$", device.RollKeyView.as_view(), name="device.roll"),
-    url(r"^device/revoke$", device.RevokeKeyView.as_view(), name="device.revoke"),
-    url(r"^device/eventselection$", device.EventSelectionView.as_view(), name="device.eventselection"),
-    url(r"^upload$", upload.UploadView.as_view(), name="upload"),
-    url(r"^me$", user.MeView.as_view(), name="user.me"),
-    url(r"^version$", version.VersionView.as_view(), name="version"),
+    re_path(r'^', include(router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/', include(orga_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/settings/$', organizer.OrganizerSettingsView.as_view(),
+            name="organizer.settings"),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/giftcards/(?P<giftcard>[^/]+)/', include(giftcard_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/settings/$', event.EventSettingsView.as_view(),
+            name="event.settings"),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/', include(event_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/teams/(?P<team>[^/]+)/', include(team_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/items/(?P<item>[^/]+)/',
+            include(item_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/questions/(?P<question>[^/]+)/',
+            include(question_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/checkinlists/(?P<list>[^/]+)/',
+            include(checkinlist_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/orders/(?P<order>[^/]+)/',
+            include(order_router.urls)),
+    re_path(r"^oauth/authorize$", oauth.AuthorizationView.as_view(), name="authorize"),
+    re_path(r"^oauth/token$", oauth.TokenView.as_view(), name="token"),
+    re_path(r"^oauth/revoke_token$", oauth.RevokeTokenView.as_view(), name="revoke-token"),
+    re_path(r"^device/initialize$", device.InitializeView.as_view(), name="device.initialize"),
+    re_path(r"^device/update$", device.UpdateView.as_view(), name="device.update"),
+    re_path(r"^device/roll$", device.RollKeyView.as_view(), name="device.roll"),
+    re_path(r"^device/revoke$", device.RevokeKeyView.as_view(), name="device.revoke"),
+    re_path(r"^device/eventselection$", device.EventSelectionView.as_view(), name="device.eventselection"),
+    re_path(r"^upload$", upload.UploadView.as_view(), name="upload"),
+    re_path(r"^me$", user.MeView.as_view(), name="user.me"),
+    re_path(r"^version$", version.VersionView.as_view(), name="version"),
 ]

src/pretix/api/views/checkin.py

@@ -25,14 +25,13 @@ from pretix.base.models import (
     CachedFile, Checkin, CheckinList, Event, Order, OrderPosition, Question,
 )
 from pretix.base.services.checkin import (
-    CheckInError, RequiredQuestionsError, SQLLogic, perform_checkin,
+    CheckInError, RequiredQuestionsError, perform_checkin,
 )
 from pretix.helpers.database import FixedOrderBy
 
 with scopes_disabled():
     class CheckinListFilter(FilterSet):
         subevent_match = django_filters.NumberFilter(method='subevent_match_qs')
-        ends_after = django_filters.rest_framework.IsoDateTimeFilter(method='ends_after_qs')
 
         class Meta:
             model = CheckinList
@@ -43,35 +42,19 @@ with scopes_disabled():
                 Q(subevent_id=value) | Q(subevent_id__isnull=True)
             )
 
-        def ends_after_qs(self, queryset, name, value):
-            expr = (
-                Q(subevent__isnull=True) |
-                Q(
-                    Q(Q(subevent__date_to__isnull=True) & Q(subevent__date_from__gte=value))
-                    | Q(Q(subevent__date_to__isnull=False) & Q(subevent__date_to__gte=value))
-                )
-            )
-            return queryset.filter(expr)
-
 
 class CheckinListViewSet(viewsets.ModelViewSet):
     serializer_class = CheckinListSerializer
     queryset = CheckinList.objects.none()
     filter_backends = (DjangoFilterBackend,)
     filterset_class = CheckinListFilter
-    permission = ('can_view_orders', 'can_checkin_orders',)
+    permission = 'can_view_orders'
     write_permission = 'can_change_event_settings'
 
     def get_queryset(self):
         qs = self.request.event.checkin_lists.prefetch_related(
             'limit_products',
         )
-
-        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'
-            )
         return qs
 
     def perform_create(self, serializer):
@@ -172,37 +155,15 @@ class CheckinListViewSet(viewsets.ModelViewSet):
 
 with scopes_disabled():
     class CheckinOrderPositionFilter(OrderPositionFilter):
-        check_rules = django_filters.rest_framework.BooleanFilter(method='check_rules_qs')
-        # check_rules is currently undocumented on purpose, let's get a feel for the performance impact first
-
-        def __init__(self, *args, **kwargs):
-            self.checkinlist = kwargs.pop('checkinlist')
-            super().__init__(*args, **kwargs)
 
         def has_checkin_qs(self, queryset, name, value):
             return queryset.filter(last_checked_in__isnull=not value)
 
-        def check_rules_qs(self, queryset, name, value):
-            if not self.checkinlist.rules:
-                return queryset
-            return queryset.filter(SQLLogic(self.checkinlist).apply(self.checkinlist.rules))
-
-
-class ExtendedBackend(DjangoFilterBackend):
-    def get_filterset_kwargs(self, request, queryset, view):
-        kwargs = super().get_filterset_kwargs(request, queryset, view)
-
-        # merge filterset kwargs provided by view class
-        if hasattr(view, 'get_filterset_kwargs'):
-            kwargs.update(view.get_filterset_kwargs())
-
-        return kwargs
-
 
 class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = CheckinListOrderPositionSerializer
     queryset = OrderPosition.all.none()
-    filter_backends = (ExtendedBackend, RichOrderingFilter)
+    filter_backends = (DjangoFilterBackend, RichOrderingFilter)
     ordering = ('attendee_name_cached', 'positionid')
     ordering_fields = (
         'order__code', 'order__datetime', 'positionid', 'attendee_name',
@@ -226,13 +187,8 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
     }
 
     filterset_class = CheckinOrderPositionFilter
-    permission = ('can_view_orders', 'can_checkin_orders')
-    write_permission = ('can_change_orders', 'can_checkin_orders')
-
-    def get_filterset_kwargs(self):
-        return {
-            'checkinlist': self.checkinlist,
-        }
+    permission = 'can_view_orders'
+    write_permission = 'can_change_orders'
 
     @cached_property
     def checkinlist(self):
@@ -253,7 +209,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
             order__event=self.request.event,
         ).annotate(
             last_checked_in=Subquery(cqs)
-        ).prefetch_related('order__event', 'order__event__organizer')
+        )
         if self.checkinlist.subevent:
             qs = qs.filter(
                 subevent=self.checkinlist.subevent
@@ -299,22 +255,6 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
         if not self.checkinlist.all_products and not ignore_products:
             qs = qs.filter(item__in=self.checkinlist.limit_products.values_list('id', flat=True))
 
-        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'
-            )
-
-        if 'item' in self.request.query_params.getlist('expand'):
-            qs = qs.prefetch_related('item', 'item__addons', 'item__bundles', 'item__meta_values', 'item__variations').select_related('item__tax_rule')
-
-        if 'variation' in self.request.query_params.getlist('expand'):
-            qs = qs.prefetch_related('variation')
-
-        if 'pk' not in self.request.resolver_match.kwargs and 'can_view_orders' not in self.request.eventpermset \
-                and len(self.request.query_params.get('search', '')) < 3:
-            qs = qs.none()
-
         return qs
 
     @action(detail=False, methods=['POST'], url_name='redeem', url_path='(?P<pk>.*)/redeem')

src/pretix/api/views/device.py

@@ -53,8 +53,8 @@ class DeviceSerializer(serializers.ModelSerializer):
 
 
 class InitializeView(APIView):
-    authentication_classes = ()
-    permission_classes = ()
+    authentication_classes = tuple()
+    permission_classes = tuple()
 
     def post(self, request, format=None):
         serializer = InitializationRequestSerializer(data=request.data)

src/pretix/api/views/event.py

@@ -259,7 +259,7 @@ class SubEventViewSet(ConditionalListView, viewsets.ModelViewSet):
         qs = filter_qs_by_attr(qs, self.request)
 
         return qs.prefetch_related(
-            'subeventitem_set', 'subeventitemvariation_set', 'seat_category_mappings', 'meta_values'
+            'subeventitem_set', 'subeventitemvariation_set', 'seat_category_mappings'
         )
 
     def list(self, request, **kwargs):

src/pretix/api/views/item.py

@@ -49,9 +49,7 @@ class ItemViewSet(ConditionalListView, viewsets.ModelViewSet):
     write_permission = 'can_change_items'
 
     def get_queryset(self):
-        return self.request.event.items.select_related('tax_rule').prefetch_related(
-            'variations', 'addons', 'bundles', 'meta_values'
-        ).all()
+        return self.request.event.items.select_related('tax_rule').prefetch_related('variations', 'addons', 'bundles').all()
 
     def perform_create(self, serializer):
         serializer.save(event=self.request.event)

src/pretix/api/webhooks.py

@@ -257,7 +257,7 @@ def register_default_webhook_events(sender, **kwargs):
     )
 
 
-@app.task(base=TransactionAwareTask, max_retries=9, default_retry_delay=900, acks_late=True)
+@app.task(base=TransactionAwareTask, acks_late=True)
 def notify_webhooks(logentry_ids: list):
     if not isinstance(logentry_ids, list):
         logentry_ids = [logentry_ids]

src/pretix/base/exporters/orderlist.py

@@ -1,22 +1,18 @@
 from collections import OrderedDict
 from decimal import Decimal
 
-import dateutil
 import pytz
 from django import forms
 from django.db.models import (
-    Case, CharField, Count, DateTimeField, F, IntegerField, Max, Min, OuterRef,
-    Q, Subquery, Sum, When,
+    CharField, Count, DateTimeField, IntegerField, Max, OuterRef, Subquery,
+    Sum,
 )
-from django.db.models.functions import Coalesce, TruncDate
 from django.dispatch import receiver
 from django.utils.functional import cached_property
-from django.utils.timezone import get_current_timezone, now
 from django.utils.translation import gettext as _, gettext_lazy, pgettext
 
 from pretix.base.models import (
-    GiftCard, GiftCardTransaction, Invoice, InvoiceAddress, Order,
-    OrderPosition, Question,
+    GiftCard, Invoice, InvoiceAddress, Order, OrderPosition, Question,
 )
 from pretix.base.models.orders import OrderFee, OrderPayment, OrderRefund
 from pretix.base.services.quotas import QuotaAvailability
@@ -49,61 +45,28 @@ class OrderListExporter(MultiSheetListExporter):
 
     @property
     def additional_form_fields(self):
-        d = [
-            ('paid_only',
-             forms.BooleanField(
-                 label=_('Only paid orders'),
-                 initial=True,
-                 required=False
-             )),
-            ('include_payment_amounts',
-             forms.BooleanField(
-                 label=_('Include payment amounts'),
-                 initial=False,
-                 required=False
-             )),
-            ('group_multiple_choice',
-             forms.BooleanField(
-                 label=_('Show multiple choice answers grouped in one column'),
-                 initial=False,
-                 required=False
-             )),
-            ('date_from',
-             forms.DateField(
-                 label=_('Start date'),
-                 widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
-                 required=False,
-                 help_text=_('Only include orders created on or after this date.')
-             )),
-            ('date_to',
-             forms.DateField(
-                 label=_('End date'),
-                 widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
-                 required=False,
-                 help_text=_('Only include orders issued on or before this date.')
-             )),
-            ('event_date_from',
-             forms.DateField(
-                 label=_('Start event date'),
-                 widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
-                 required=False,
-                 help_text=_('Only include orders including at least one ticket for a date on or after this date. '
-                             'Will also include other dates in case of mixed orders!')
-             )),
-            ('event_date_to',
-             forms.DateField(
-                 label=_('End event date'),
-                 widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
-                 required=False,
-                 help_text=_('Only include orders including at least one ticket for a date on or after this date. '
-                             'Will also include other dates in case of mixed orders!')
-             )),
-        ]
-        d = OrderedDict(d)
-        if not self.is_multievent and not self.event.has_subevents:
-            del d['event_date_from']
-            del d['event_date_to']
-        return d
+        return OrderedDict(
+            [
+                ('paid_only',
+                 forms.BooleanField(
+                     label=_('Only paid orders'),
+                     initial=True,
+                     required=False
+                 )),
+                ('include_payment_amounts',
+                 forms.BooleanField(
+                     label=_('Include payment amounts'),
+                     initial=False,
+                     required=False
+                 )),
+                ('group_multiple_choice',
+                 forms.BooleanField(
+                     label=_('Show multiple choice answers grouped in one column'),
+                     initial=False,
+                     required=False
+                 )),
+            ]
+        )
 
     def _get_all_payment_methods(self, qs):
         pps = dict(get_all_payment_providers())
@@ -141,52 +104,6 @@ class OrderListExporter(MultiSheetListExporter):
     def event_object_cache(self):
         return {e.pk: e for e in self.events}
 
-    def _date_filter(self, qs, form_data, rel):
-        annotations = {}
-        filters = {}
-
-        if form_data.get('date_from'):
-            date_value = form_data.get('date_from')
-            if isinstance(date_value, str):
-                date_value = dateutil.parser.parse(date_value).date()
-
-            annotations['date'] = TruncDate(f'{rel}datetime')
-            filters['date__gte'] = date_value
-
-        if form_data.get('date_to'):
-            date_value = form_data.get('date_to')
-            if isinstance(date_value, str):
-                date_value = dateutil.parser.parse(date_value).date()
-
-            annotations['date'] = TruncDate(f'{rel}datetime')
-            filters['date__lte'] = date_value
-
-        if form_data.get('event_date_from'):
-            date_value = form_data.get('event_date_from')
-            if isinstance(date_value, str):
-                date_value = dateutil.parser.parse(date_value).date()
-
-            annotations['event_date_max'] = Case(
-                When(**{f'{rel}event__has_subevents': True}, then=Max(f'{rel}all_positions__subevent__date_from')),
-                default=F(f'{rel}event__date_from'),
-            )
-            filters['event_date_max__gte'] = date_value
-
-        if form_data.get('event_date_to'):
-            date_value = form_data.get('event_date_to')
-            if isinstance(date_value, str):
-                date_value = dateutil.parser.parse(date_value).date()
-
-            annotations['event_date_min'] = Case(
-                When(**{f'{rel}event__has_subevents': True}, then=Min(f'{rel}all_positions__subevent__date_from')),
-                default=F(f'{rel}event__date_from'),
-            )
-            filters['event_date_min__lte'] = date_value
-
-        if filters:
-            return qs.annotate(**annotations).filter(**filters)
-        return qs
-
     def iterate_orders(self, form_data: dict):
         p_date = OrderPayment.objects.filter(
             order=OuterRef('pk'),
@@ -223,9 +140,6 @@ class OrderListExporter(MultiSheetListExporter):
             invoice_numbers=Subquery(i_numbers, output_field=CharField()),
             pcnt=Subquery(s, output_field=IntegerField())
         ).select_related('invoice_address')
-
-        qs = self._date_filter(qs, form_data, rel='')
-
         if form_data['paid_only']:
             qs = qs.filter(status=Order.STATUS_PAID)
         tax_rates = self._get_all_tax_rates(qs)
@@ -391,8 +305,6 @@ class OrderListExporter(MultiSheetListExporter):
         if form_data['paid_only']:
             qs = qs.filter(order__status=Order.STATUS_PAID)
 
-        qs = self._date_filter(qs, form_data, rel='order__')
-
         headers = [
             _('Event slug'),
             _('Order code'),
@@ -491,8 +403,6 @@ class OrderListExporter(MultiSheetListExporter):
         if form_data['paid_only']:
             qs = qs.filter(order__status=Order.STATUS_PAID)
 
-        qs = self._date_filter(qs, form_data, rel='order__')
-
         has_subevents = self.events.filter(has_subevents=True).exists()
 
         headers = [
@@ -872,116 +782,6 @@ class GiftcardRedemptionListExporter(ListExporter):
             return '{}_giftcardredemptions'.format(self.event.slug)
 
 
-def generate_GiftCardListExporter(organizer):  # hackhack
-    class GiftcardListExporter(ListExporter):
-        identifier = 'giftcardlist'
-        verbose_name = gettext_lazy('Gift cards')
-
-        @property
-        def additional_form_fields(self):
-            return OrderedDict(
-                [
-                    ('date', forms.DateTimeField(
-                        label=_('Show value at'),
-                        initial=now(),
-                    )),
-                    ('testmode', forms.ChoiceField(
-                        label=_('Test mode'),
-                        choices=(
-                            ('', _('All')),
-                            ('yes', _('Test mode')),
-                            ('no', _('Live')),
-                        ),
-                        initial='no',
-                        required=False
-                    )),
-                    ('state', forms.ChoiceField(
-                        label=_('Status'),
-                        choices=(
-                            ('', _('All')),
-                            ('empty', _('Empty')),
-                            ('valid_value', _('Valid and with value')),
-                            ('expired_value', _('Expired and with value')),
-                            ('expired', _('Expired')),
-                        ),
-                        initial='valid_value',
-                        required=False
-                    ))
-                ]
-            )
-
-        def iterate_list(self, form_data):
-            s = GiftCardTransaction.objects.filter(
-                card=OuterRef('pk'),
-                datetime__lte=form_data['date']
-            ).order_by().values('card').annotate(s=Sum('value')).values('s')
-            qs = organizer.issued_gift_cards.filter(
-                issuance__lte=form_data['date']
-            ).annotate(
-                cached_value=Coalesce(Subquery(s), Decimal('0.00')),
-            ).order_by('issuance').prefetch_related(
-                'transactions', 'transactions__order', 'transactions__order__event', 'transactions__order__invoices'
-            )
-
-            if form_data.get('testmode') == 'yes':
-                qs = qs.filter(testmode=True)
-            elif form_data.get('testmode') == 'no':
-                qs = qs.filter(testmode=False)
-
-            if form_data.get('state') == 'empty':
-                qs = qs.filter(cached_value=0)
-            elif form_data.get('state') == 'valid_value':
-                qs = qs.exclude(cached_value=0).filter(Q(expires__isnull=True) | Q(expires__gte=form_data['date']))
-            elif form_data.get('state') == 'expired_value':
-                qs = qs.exclude(cached_value=0).filter(expires__lt=form_data['date'])
-            elif form_data.get('state') == 'expired':
-                qs = qs.filter(expires__lt=form_data['date'])
-
-            headers = [
-                _('Gift card code'),
-                _('Test mode card'),
-                _('Creation date'),
-                _('Expiry date'),
-                _('Special terms and conditions'),
-                _('Currency'),
-                _('Current value'),
-                _('Created in order'),
-                _('Last invoice number of order'),
-                _('Last invoice date of order'),
-            ]
-            yield headers
-
-            tz = get_current_timezone()
-            for obj in qs:
-                o = None
-                i = None
-                trans = list(obj.transactions.all())
-                if trans:
-                    o = trans[0].order
-                if o:
-                    invs = list(o.invoices.all())
-                    if invs:
-                        i = invs[-1]
-                row = [
-                    obj.secret,
-                    _('Yes') if obj.testmode else _('No'),
-                    obj.issuance.astimezone(tz).date().strftime('%Y-%m-%d'),
-                    obj.expires.astimezone(tz).date().strftime('%Y-%m-%d') if obj.expires else '',
-                    obj.conditions or '',
-                    obj.currency,
-                    obj.cached_value,
-                    o.full_code if o else '',
-                    i.number if i else '',
-                    i.date.strftime('%Y-%m-%d') if i else '',
-                ]
-                yield row
-
-        def get_filename(self):
-            return '{}_giftcards'.format(organizer.slug)
-
-    return GiftcardListExporter
-
-
 @receiver(register_data_exporters, dispatch_uid="exporter_orderlist")
 def register_orderlist_exporter(sender, **kwargs):
     return OrderListExporter
@@ -1015,8 +815,3 @@ def register_giftcardredemptionlist_exporter(sender, **kwargs):
 @receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_giftcardredemptionlist")
 def register_multievent_i_giftcardredemptionlist_exporter(sender, **kwargs):
     return GiftcardRedemptionListExporter
-
-
-@receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_giftcardlist")
-def register_multievent_i_giftcardlist_exporter(sender, **kwargs):
-    return generate_GiftCardListExporter(sender)

src/pretix/base/forms/questions.py

@@ -100,7 +100,7 @@ class NamePartsWidget(forms.MultiWidget):
         if not isinstance(value, list):
             value = self.decompress(value)
         output = []
-        final_attrs = self.build_attrs(attrs or {})
+        final_attrs = self.build_attrs(attrs or dict())
         if 'required' in final_attrs:
             del final_attrs['required']
         id_ = final_attrs.get('id', None)
@@ -122,8 +122,6 @@ class NamePartsWidget(forms.MultiWidget):
                     these_attrs.pop('data-no-required-attr', None)
                 these_attrs['autocomplete'] = (self.attrs.get('autocomplete', '') + ' ' + self.autofill_map.get(self.scheme['fields'][i][0], 'off')).strip()
                 these_attrs['data-size'] = self.scheme['fields'][i][2]
-                if len(self.widgets) > 1:
-                    these_attrs['aria-label'] = self.scheme['fields'][i][1]
             else:
                 these_attrs = final_attrs
             output.append(widget.render(name + '_%s' % i, widget_value, these_attrs, renderer=renderer))
@@ -222,7 +220,7 @@ class WrappedPhonePrefixSelect(Select):
                 country_name = locale.territories.get(country_code)
                 if country_name:
                     choices.append((prefix, "{} {}".format(country_name, prefix)))
-        super().__init__(choices=sorted(choices, key=lambda item: item[1]), attrs={'aria-label': pgettext_lazy('phonenumber', 'International area code')})
+        super().__init__(choices=sorted(choices, key=lambda item: item[1]))
 
     def render(self, name, value, *args, **kwargs):
         return super().render(name, value or self.initial, *args, **kwargs)
@@ -245,10 +243,7 @@ class WrappedPhonePrefixSelect(Select):
 class WrappedPhoneNumberPrefixWidget(PhoneNumberPrefixWidget):
 
     def __init__(self, attrs=None, initial=None):
-        attrs = {
-            'aria-label': pgettext_lazy('phonenumber', 'Phone number (without international area code)')
-        }
-        widgets = (WrappedPhonePrefixSelect(initial), forms.TextInput(attrs=attrs))
+        widgets = (WrappedPhonePrefixSelect(initial), forms.TextInput())
         super(PhoneNumberPrefixWidget, self).__init__(widgets, attrs)
 
     def render(self, name, value, attrs=None, renderer=None):

src/pretix/base/invoice.py

@@ -445,7 +445,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
         if self.invoice.custom_field:
             story.append(Paragraph(
                 '{}: {}'.format(
-                    bleach.clean(str(self.invoice.event.settings.invoice_address_custom_field), tags=[]).strip().replace('\n', '<br />\n'),
+                    bleach.clean(self.invoice.event.settings.invoice_address_custom_field, tags=[]).strip().replace('\n', '<br />\n'),
                     bleach.clean(self.invoice.custom_field, tags=[]).strip().replace('\n', '<br />\n'),
                 ),
                 self.stylesheet['Normal']

src/pretix/base/migrations/0102_auto_20181017_0024.py

@@ -1,6 +1,6 @@
 # Generated by Django 2.1 on 2018-10-17 00:24
 
-import jsonfallback.fields
+
 from django.core.exceptions import ImproperlyConfigured
 from django.db import migrations
 from django_mysql.checks import mysql_connections
@@ -77,19 +77,19 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='cartposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(null=False, default=dict),
+            field=models.JSONField(null=False, default=dict),
             preserve_default=False,
         ),
         migrations.AddField(
             model_name='orderposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(null=False, default=dict),
+            field=models.JSONField(null=False, default=dict),
             preserve_default=False,
         ),
         migrations.AddField(
             model_name='invoiceaddress',
             name='name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
             preserve_default=False,
         ),
         migrations.RunPython(set_attendee_name_parts, migrations.RunPython.noop)

src/pretix/base/migrations/0103_auto_20181121_1224.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.1 on 2018-11-21 12:24
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0104_auto_20181114_1526.py

@@ -2,7 +2,6 @@
 
 import django.db.models.deletion
 import django.db.models.manager
-import jsonfallback.fields
 from django.db import migrations, models
 
 

src/pretix/base/migrations/0105_auto_20190112_1512.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1 on 2019-01-12 15:12
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0107_auto_20190129_1337.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-01-29 13:37
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0108_auto_20190201_1527.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-02-01 15:27
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0108_auto_20190201_1527_squashed_0141_seat_sorting_rank.py

@@ -3,7 +3,6 @@
 from decimal import Decimal
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.conf import settings
 from django.core.cache import cache
 from django.db import migrations, models
@@ -190,7 +189,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='cartposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='cartposition',
@@ -210,7 +209,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='invoiceaddress',
             name='name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='item',
@@ -225,7 +224,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='orderposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='orderposition',

src/pretix/base/migrations/0109_auto_20190208_1432.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1 on 2019-02-08 14:32
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0110_auto_20190219_1245.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-02-19 12:45
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0111_auto_20190219_0949.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-02-19 09:49
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0113_auto_20190312_0942.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-03-12 09:42
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0114_auto_20190316_1014.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.7 on 2019-03-16 10:14
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0115_auto_20190323_2238.py

@@ -3,7 +3,6 @@
 from decimal import Decimal
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0116_auto_20190402_0722.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-04-02 07:22
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0118_auto_20190423_0839.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.2 on 2019-04-23 08:39
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0119_auto_20190509_0654.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.2 on 2019-05-09 06:54
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields

src/pretix/base/migrations/0120_auto_20190509_0736.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.2 on 2019-05-09 07:36
 
 import django.db.models.deletion
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.base.models.fields
@@ -17,7 +16,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='cartposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='cartposition',
@@ -37,7 +36,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='invoiceaddress',
             name='name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='item',
@@ -52,7 +51,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='orderposition',
             name='attendee_name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterField(
             model_name='orderposition',

src/pretix/base/migrations/0152_auto_20200511_1504.py

@@ -2,7 +2,6 @@
 
 import django.db.models.deletion
 import django_countries.fields
-import jsonfallback.fields
 from django.db import migrations, models
 
 import pretix.helpers.countries
@@ -43,7 +42,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='checkinlist',
             name='rules',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AlterUniqueTogether(
             name='checkin',

src/pretix/base/migrations/0177_auto_20210301_1510.py

@@ -1,6 +1,6 @@
 # Generated by Django 3.0.10 on 2021-03-01 15:10
 
-import jsonfallback.fields
+
 import phonenumber_field.modelfields
 from django.db import migrations, models
 
@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='waitinglistentry',
             name='name_parts',
-            field=jsonfallback.fields.FallbackJSONField(default=dict),
+            field=models.JSONField(default=dict),
         ),
         migrations.AddField(
             model_name='waitinglistentry',

src/pretix/base/migrations/0179_auto_20210311_1653.py

@@ -1,50 +0,0 @@
-# Generated by Django 3.0.10 on 2021-03-11 16:53
-
-from django.db import migrations
-
-
-def clean_duplicates(apps, schema_editor):
-    for i in range(100):  # no infinite loops
-        # Double subquery to avoid MySQL error 1093
-        delete_options = """
-            DELETE
-            FROM pretixbase_questionanswer_options
-            WHERE questionanswer_id IN (
-                SELECT minid FROM (
-                    SELECT MIN(qa.id) minid
-                    FROM pretixbase_questionanswer qa
-                    GROUP BY qa.cartposition_id, qa.orderposition_id, qa.question_id
-                    HAVING COUNT(*) > 1
-                ) AS tmptable
-            );
-        """
-        delete_answers = """
-            DELETE
-            FROM pretixbase_questionanswer
-            WHERE pretixbase_questionanswer.id IN (
-                SELECT minid FROM (
-                    SELECT MIN(qa.id) minid
-                    FROM pretixbase_questionanswer qa
-                    GROUP BY qa.cartposition_id, qa.orderposition_id, qa.question_id
-                    HAVING COUNT(*) > 1
-                ) AS tmptable
-            );
-        """
-        with schema_editor.connection.cursor() as cursor:
-            cursor.execute(delete_options)
-            cursor.execute(delete_answers)
-            if cursor.rowcount == 0:
-                return
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0178_auto_20210308_1326'),
-    ]
-
-    operations = [
-        migrations.RunPython(
-            clean_duplicates,
-            migrations.RunPython.noop,
-        ),
-    ]

src/pretix/base/migrations/0180_auto_20210324_1309.py

@@ -1,33 +0,0 @@
-# Generated by Django 3.0.12 on 2021-03-24 13:09
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0179_auto_20210311_1653'),
-    ]
-
-    operations = [
-        migrations.AlterUniqueTogether(
-            name='questionanswer',
-            unique_together={('orderposition', 'question'), ('cartposition', 'question')},
-        ),
-        migrations.RemoveField(
-            model_name='quota',
-            name='cached_availability_number',
-        ),
-        migrations.RemoveField(
-            model_name='quota',
-            name='cached_availability_paid_orders',
-        ),
-        migrations.RemoveField(
-            model_name='quota',
-            name='cached_availability_state',
-        ),
-        migrations.RemoveField(
-            model_name='quota',
-            name='cached_availability_time',
-        ),
-    ]

src/pretix/base/migrations/0181_team_can_checkin_orders.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.0.12 on 2021-03-29 08:12
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0180_auto_20210324_1309'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='team',
-            name='can_checkin_orders',
-            field=models.BooleanField(default=False),
-        ),
-    ]

src/pretix/base/models/checkin.py

@@ -1,11 +1,9 @@
 from django.conf import settings
-from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models import Exists, F, Max, OuterRef, Q, Subquery
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager, scopes_disabled
-from jsonfallback.fields import FallbackJSONField
 
 from pretix.base.models import LoggedModel
 from pretix.base.models.fields import MultiStringField
@@ -48,7 +46,7 @@ class CheckinList(LoggedModel):
                     '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.')
     )
-    rules = FallbackJSONField(default=dict, blank=True)
+    rules = models.JSONField(default=dict, blank=True)
 
     objects = ScopedManager(organizer='event__organizer')
 
@@ -143,54 +141,6 @@ class CheckinList(LoggedModel):
     def __str__(self):
         return self.name
 
-    @classmethod
-    def validate_rules(cls, rules, seen_nonbool=False, depth=0):
-        # While we implement a full jsonlogic machine on Python-level, we also use the logic rules to generate
-        # SQL queries, which is not a full implementation of JSON logic right now, but makes some assumptions,
-        # e.g. it does not support something like (a AND b) == (c OR D)
-        # Every change to our supported JSON logic must be done
-        # * in pretix.base.services.checkin
-        # * in pretix.base.models.checkin
-        # * in checkinrules.js
-        # * in libpretixsync
-        top_level_operators = {
-            '<', '<=', '>', '>=', '==', '!=', 'inList', 'isBefore', 'isAfter', 'or', 'and'
-        }
-        allowed_operators = top_level_operators | {
-            'buildTime', 'objectList', 'lookup', 'var',
-        }
-        allowed_vars = {
-            'product', 'variation', 'now', 'entries_number', 'entries_today', 'entries_days'
-        }
-        if not rules or not isinstance(rules, dict):
-            return
-
-        if len(rules) > 1:
-            raise ValidationError(f'Rules should not include dictionaries with more than one key, found: "{rules}".')
-
-        operator = list(rules.keys())[0]
-
-        if operator not in allowed_operators:
-            raise ValidationError(f'Logic operator "{operator}" is currently not allowed.')
-
-        if depth == 0 and operator not in top_level_operators:
-            raise ValidationError(f'Logic operator "{operator}" is currently not allowed on the first level.')
-
-        values = rules[operator]
-        if not isinstance(values, list) and not isinstance(values, tuple):
-            values = [values]
-
-        if operator == 'var':
-            if values[0] not in allowed_vars:
-                raise ValidationError(f'Logic variable "{values[0]}" is currently not allowed.')
-            return
-
-        if operator in ('or', 'and') and seen_nonbool:
-            raise ValidationError(f'You cannot use OR/AND logic on a level below a comparison operator.')
-
-        for v in values:
-            cls.validate_rules(v, seen_nonbool=seen_nonbool or operator not in ('or', 'and'), depth=depth + 1)
-
 
 class Checkin(models.Model):
     """

src/pretix/base/models/event.py

@@ -212,8 +212,7 @@ class EventMixin:
             & Q(Q(item__available_until__isnull=True) | Q(item__available_until__gte=now()))
             & Q(Q(item__category__isnull=True) | Q(item__category__is_addon=False))
             & Q(item__sales_channels__contains=channel)
-            & Q(item__hide_without_voucher=False)
-            & Q(item__require_bundling=False)
+            & Q(item__hide_without_voucher=False)  # TODO: does this make sense?
             & Q(quotas__pk=OuterRef('pk'))
         ).order_by().values_list('quotas__pk').annotate(
             items=GroupConcat('pk', delimiter=',')
@@ -658,6 +657,10 @@ class Event(EventMixin, LoggedModel):
             oldid = q.pk
             q.pk = None
             q.event = self
+            q.cached_availability_state = None
+            q.cached_availability_number = None
+            q.cached_availability_paid_orders = None
+            q.cached_availability_time = None
             q.closed = False
             q.save()
             q.log_action('pretix.object.cloned')

src/pretix/base/models/items.py

@@ -7,7 +7,6 @@ from typing import Tuple
 
 import dateutil.parser
 import pytz
-from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.validators import RegexValidator
 from django.db import models
@@ -18,7 +17,6 @@ from django.utils.functional import cached_property
 from django.utils.timezone import is_naive, make_aware, now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_countries.fields import Country
-from django_redis import get_redis_connection
 from django_scopes import ScopedManager
 from i18nfield.fields import I18nCharField, I18nTextField
 
@@ -1088,23 +1086,17 @@ class Question(LoggedModel):
     )
     dependency_values = MultiStringField(default=[])
     valid_number_min = models.DecimalField(decimal_places=6, max_digits=16, null=True, blank=True,
-                                           verbose_name=_('Minimum value'),
-                                           help_text=_('Currently not supported in our apps and during check-in'))
+                                           verbose_name=_('Minimum value'), help_text=_('Currently not supported in our apps'))
     valid_number_max = models.DecimalField(decimal_places=6, max_digits=16, null=True, blank=True,
-                                           verbose_name=_('Maximum value'),
-                                           help_text=_('Currently not supported in our apps and during check-in'))
+                                           verbose_name=_('Maximum value'), help_text=_('Currently not supported in our apps'))
     valid_date_min = models.DateField(null=True, blank=True,
-                                      verbose_name=_('Minimum value'),
-                                      help_text=_('Currently not supported in our apps and during check-in'))
+                                      verbose_name=_('Minimum value'), help_text=_('Currently not supported in our apps'))
     valid_date_max = models.DateField(null=True, blank=True,
-                                      verbose_name=_('Maximum value'),
-                                      help_text=_('Currently not supported in our apps and during check-in'))
+                                      verbose_name=_('Maximum value'), help_text=_('Currently not supported in our apps'))
     valid_datetime_min = models.DateTimeField(null=True, blank=True,
-                                              verbose_name=_('Minimum value'),
-                                              help_text=_('Currently not supported in our apps and during check-in'))
+                                              verbose_name=_('Minimum value'), help_text=_('Currently not supported in our apps'))
     valid_datetime_max = models.DateTimeField(null=True, blank=True,
-                                              verbose_name=_('Maximum value'),
-                                              help_text=_('Currently not supported in our apps and during check-in'))
+                                              verbose_name=_('Maximum value'), help_text=_('Currently not supported in our apps'))
 
     objects = ScopedManager(organizer='event__organizer')
 
@@ -1382,6 +1374,10 @@ class Quota(LoggedModel):
         blank=True,
         verbose_name=_("Variations")
     )
+    cached_availability_state = models.PositiveIntegerField(null=True, blank=True)
+    cached_availability_number = models.PositiveIntegerField(null=True, blank=True)
+    cached_availability_paid_orders = models.PositiveIntegerField(null=True, blank=True)
+    cached_availability_time = models.DateTimeField(null=True, blank=True)
 
     close_when_sold_out = models.BooleanField(
         verbose_name=_('Close this quota permanently once it is sold out'),
@@ -1426,10 +1422,14 @@ class Quota(LoggedModel):
             self.event.cache.clear()
 
     def rebuild_cache(self, now_dt=None):
-        if settings.HAS_REDIS:
-            rc = get_redis_connection("redis")
-            rc.hdel(f'quotas:{self.event_id}:availabilitycache', str(self.pk))
-            self.availability(now_dt=now_dt)
+        self.cached_availability_time = None
+        self.cached_availability_number = None
+        self.cached_availability_state = None
+        self.availability(now_dt=now_dt)
+
+    def cache_is_hot(self, now_dt=None):
+        now_dt = now_dt or now()
+        return self.cached_availability_time and (now_dt - self.cached_availability_time).total_seconds() < 120
 
     def availability(
             self, now_dt: datetime=None, count_waitinglist=True, _cache=None, allow_cache=False
@@ -1452,6 +1452,9 @@ class Quota(LoggedModel):
         """
         from ..services.quotas import QuotaAvailability
 
+        if allow_cache and self.cache_is_hot() and count_waitinglist:
+            return self.cached_availability_state, self.cached_availability_number
+
         if _cache and count_waitinglist is not _cache.get('_count_waitinglist', True):
             _cache.clear()
 
@@ -1459,7 +1462,7 @@ class Quota(LoggedModel):
             return _cache[self.pk]
         qa = QuotaAvailability(count_waitinglist=count_waitinglist, early_out=False)
         qa.queue(self)
-        qa.compute(now_dt=now_dt, allow_cache=allow_cache)
+        qa.compute(now_dt=now_dt)
         res = qa.results[self]
 
         if _cache is not None:

src/pretix/base/models/orders.py

@@ -29,7 +29,6 @@ from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_countries.fields import Country
 from django_scopes import ScopedManager, scopes_disabled
 from i18nfield.strings import LazyI18nString
-from jsonfallback.fields import FallbackJSONField
 from phonenumber_field.modelfields import PhoneNumberField
 from phonenumber_field.phonenumber import PhoneNumber
 from phonenumbers import NumberParseException
@@ -983,9 +982,6 @@ class QuestionAnswer(models.Model):
 
     objects = ScopedManager(organizer='question__event__organizer')
 
-    class Meta:
-        unique_together = [['orderposition', 'question'], ['cartposition', 'question']]
-
     @property
     def backend_file_url(self):
         if self.file:
@@ -1135,7 +1131,7 @@ class AbstractPosition(models.Model):
         blank=True, null=True,
         help_text=_("Empty, if this product is not an admission ticket")
     )
-    attendee_name_parts = FallbackJSONField(
+    attendee_name_parts = models.JSONField(
         blank=True, default=dict
     )
     attendee_email = models.EmailField(
@@ -2255,7 +2251,7 @@ class InvoiceAddress(models.Model):
     is_business = models.BooleanField(default=False, verbose_name=_('Business customer'))
     company = models.CharField(max_length=255, blank=True, verbose_name=_('Company name'))
     name_cached = models.CharField(max_length=255, verbose_name=_('Full name'), blank=True)
-    name_parts = FallbackJSONField(default=dict)
+    name_parts = models.JSONField(default=dict)
     street = models.TextField(verbose_name=_('Address'), blank=False)
     zipcode = models.CharField(max_length=30, verbose_name=_('ZIP code'), blank=False)
     city = models.CharField(max_length=255, verbose_name=_('City'), blank=False)

src/pretix/base/models/organizer.py

@@ -174,8 +174,6 @@ class Team(LoggedModel):
     :type can_view_orders: bool
     :param can_change_orders: If ``True``, the members can change details of orders of the associated events.
     :type can_change_orders: bool
-    :param can_checkin_orders: If ``True``, the members can perform check-in related actions.
-    :type can_checkin_orders: bool
     :param can_view_vouchers: If ``True``, the members can inspect details of all vouchers of the associated events.
     :type can_view_vouchers: bool
     :param can_change_vouchers: If ``True``, the members can change and create vouchers for the associated events.
@@ -222,12 +220,6 @@ class Team(LoggedModel):
         default=False,
         verbose_name=_("Can change orders")
     )
-    can_checkin_orders = models.BooleanField(
-        default=False,
-        verbose_name=_("Can perform check-ins"),
-        help_text=_('This includes searching for attendees, which can be used to obtain personal information about '
-                    'attendees. Users with "can change orders" can also perform check-ins.')
-    )
     can_view_vouchers = models.BooleanField(
         default=False,
         verbose_name=_("Can view vouchers")

src/pretix/base/models/waitinglist.py

@@ -5,7 +5,6 @@ from django.db import models, transaction
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager
-from jsonfallback.fields import FallbackJSONField
 from phonenumber_field.modelfields import PhoneNumberField
 
 from pretix.base.email import get_email_context
@@ -45,7 +44,7 @@ class WaitingListEntry(LoggedModel):
         verbose_name=_("Name"),
         blank=True, null=True,
     )
-    name_parts = FallbackJSONField(
+    name_parts = models.JSONField(
         blank=True, default=dict
     )
     email = models.EmailField(

src/pretix/base/notifications.py

@@ -1,6 +1,5 @@
 import logging
 from collections import OrderedDict, namedtuple
-from itertools import groupby
 
 from django.dispatch import receiver
 from django.utils.formats import date_format
@@ -183,33 +182,15 @@ class ParametrizedOrderNotificationType(NotificationType):
             n.add_attribute(pgettext_lazy('subevent', 'Dates'), '\n'.join(ses))
         else:
             n.add_attribute(_('Event date'), order.event.get_date_range_display())
-
-        positions = list(order.positions.select_related('item', 'variation', 'subevent'))
-        fees = list(order.fees.all())
-
         n.add_attribute(_('Order code'), order.code)
-        n.add_attribute(_('Net total'), money_filter(sum([p.net_price for p in positions] + [f.net_value for f in fees]), logentry.event.currency))
         n.add_attribute(_('Order total'), money_filter(order.total, logentry.event.currency))
         n.add_attribute(_('Pending amount'), money_filter(order.pending_sum, logentry.event.currency))
-        n.add_attribute(_('Order date'), date_format(order.datetime.astimezone(logentry.event.timezone), 'SHORT_DATETIME_FORMAT'))
+        n.add_attribute(_('Order date'), date_format(order.datetime, 'SHORT_DATETIME_FORMAT'))
         n.add_attribute(_('Order status'), order.get_status_display())
         n.add_attribute(_('Order positions'), str(order.positions.count()))
-
-        def sortkey(op):
-            return op.item_id, op.variation_id, op.subevent_id
-
-        def groupkey(op):
-            return op.item, op.variation, op.subevent
-
-        cart = [(k, list(v)) for k, v in groupby(sorted(positions, key=sortkey), key=groupkey)]
         items = []
-        for (item, variation, subevent), pos in cart:
-            ele = [str(len(pos)) + 'x ' + str(item)]
-            if variation:
-                ele.append(str(variation.value))
-            if subevent:
-                ele.append(str(subevent))
-            items.append(' – '.join(ele))
+        for it in self.event.items.filter(id__in=order.positions.values_list('item', flat=True)):
+            items.append(str(it.name))
         n.add_attribute(_('Purchased products'), '\n'.join(items))
         n.add_action(_('View order details'), order_url)
         return n

src/pretix/base/services/cart.py

@@ -207,7 +207,7 @@ class CartManager:
     def _update_subevents_cache(self, se_ids: List[int]):
         self._subevents_cache.update({
             i.pk: i
-            for i in self.event.subevents.filter(id__in=[i for i in se_ids if i and i not in self._subevents_cache])
+            for i in self.event.subevents.filter(id__in=[i for i in se_ids if i and i not in self._items_cache])
         })
 
     def _update_items_cache(self, item_ids: List[int], variation_ids: List[int]):
@@ -241,7 +241,7 @@ class CartManager:
                 raise CartError(_(error_messages['max_items']) % (self.event.settings.max_items_per_order,))
 
     def _check_item_constraints(self, op, current_ops=[]):
-        if isinstance(op, (self.AddOperation, self.ExtendOperation)):
+        if isinstance(op, self.AddOperation) or isinstance(op, self.ExtendOperation):
             if not (
                 (isinstance(op, self.AddOperation) and op.addon_to == 'FAKE') or
                 (isinstance(op, self.ExtendOperation) and op.position.is_bundled)
@@ -863,7 +863,7 @@ class CartManager:
                 op.position.addons.all().delete()
                 op.position.delete()
 
-            elif isinstance(op, (self.AddOperation, self.ExtendOperation)):
+            elif isinstance(op, self.AddOperation) or isinstance(op, self.ExtendOperation):
                 # Create a CartPosition for as much items as we can
                 requested_count = quota_available_count = voucher_available_count = op.count
 

src/pretix/base/services/checkin.py

@@ -1,15 +1,9 @@
 from datetime import timedelta
-from functools import partial, reduce
 
 import dateutil
-import dateutil.parser
 from django.core.files import File
 from django.db import transaction
-from django.db.models import (
-    BooleanField, Count, ExpressionWrapper, F, IntegerField, OuterRef, Q,
-    Subquery, Value,
-)
-from django.db.models.functions import Coalesce, TruncDate
+from django.db.models.functions import TruncDate
 from django.dispatch import receiver
 from django.utils.functional import cached_property
 from django.utils.timezone import now, override
@@ -21,18 +15,9 @@ from pretix.base.models import (
 )
 from pretix.base.signals import checkin_created, order_placed, periodic_task
 from pretix.helpers.jsonlogic import Logic
-from pretix.helpers.jsonlogic_query import (
-    Equal, GreaterEqualThan, GreaterThan, InList, LowerEqualThan, LowerThan,
-    tolerance,
-)
 
 
 def get_logic_environment(ev):
-    # Every change to our supported JSON logic must be done
-    # * in pretix.base.services.checkin
-    # * in pretix.base.models.checkin
-    # * in checkinrules.js
-    # * in libpretixsync
     def build_time(t=None, value=None):
         if t == "custom":
             return dateutil.parser.parse(value)
@@ -97,181 +82,10 @@ class LazyRuleVars:
         tz = self._clist.event.timezone
         with override(tz):
             return self._position.checkins.filter(list=self._clist, type=Checkin.TYPE_ENTRY).annotate(
-                day=TruncDate('datetime', tzinfo=tz)
+                day=TruncDate('datetime')
             ).values('day').distinct().count()
 
 
-class SQLLogic:
-    """
-    This is a simplified implementation of JSON logic that creates a Q-object to be used in a QuerySet.
-    It does not implement all operations supported by JSON logic and makes a few simplifying assumptions,
-    but all that can be created through our graphical editor. There's also CheckinList.validate_rules()
-    which tries to validate the same preconditions for rules set throught he API (probably not perfect).
-
-    Assumptions:
-
-    * Only a limited set of operators is used
-    * The top level operator is always a boolean operation (and, or) or a comparison operation (==, !=, …)
-    * Expression operators (var, lookup, buildTime) do not require further recursion
-    * Comparison operators (==, !=, …) never contain boolean operators (and, or) further down in the stack
-    """
-
-    def __init__(self, list):
-        self.list = list
-        self.bool_ops = {
-            "and": lambda *args: reduce(lambda total, arg: total & arg, args),
-            "or": lambda *args: reduce(lambda total, arg: total | arg, args),
-        }
-        self.comparison_ops = {
-            "==": partial(self.comparison_to_q, operator=Equal),
-            "!=": partial(self.comparison_to_q, operator=Equal, negate=True),
-            ">": partial(self.comparison_to_q, operator=GreaterThan),
-            ">=": partial(self.comparison_to_q, operator=GreaterEqualThan),
-            "<": partial(self.comparison_to_q, operator=LowerThan),
-            "<=": partial(self.comparison_to_q, operator=LowerEqualThan),
-            "inList": partial(self.comparison_to_q, operator=InList),
-            "isBefore": partial(self.comparison_to_q, operator=LowerThan, modifier=partial(tolerance, sign=1)),
-            "isAfter": partial(self.comparison_to_q, operator=GreaterThan, modifier=partial(tolerance, sign=-1)),
-        }
-        self.expression_ops = {'buildTime', 'objectList', 'lookup', 'var'}
-
-    def operation_to_expression(self, rule):
-        if not isinstance(rule, dict):
-            return rule
-
-        operator = list(rule.keys())[0]
-        values = rule[operator]
-
-        if not isinstance(values, list) and not isinstance(values, tuple):
-            values = [values]
-
-        if operator == 'buildTime':
-            if values[0] == "custom":
-                return Value(dateutil.parser.parse(values[1]))
-            elif values[0] == 'date_from':
-                return Coalesce(
-                    F(f'subevent__date_from'),
-                    F(f'order__event__date_from'),
-                )
-            elif values[0] == 'date_to':
-                return Coalesce(
-                    F(f'subevent__date_to'),
-                    F(f'subevent__date_from'),
-                    F(f'order__event__date_to'),
-                    F(f'order__event__date_from'),
-                )
-            elif values[0] == 'date_admission':
-                return Coalesce(
-                    F(f'subevent__date_admission'),
-                    F(f'subevent__date_from'),
-                    F(f'order__event__date_admission'),
-                    F(f'order__event__date_from'),
-                )
-            else:
-                raise ValueError(f'Unknown time type {values[0]}')
-        elif operator == 'objectList':
-            return [self.operation_to_expression(v) for v in values]
-        elif operator == 'lookup':
-            return int(values[1])
-        elif operator == 'var':
-            if values[0] == 'now':
-                return Value(now())
-            elif values[0] == 'product':
-                return F('item_id')
-            elif values[0] == 'variation':
-                return F('variation_id')
-            elif values[0] == 'entries_number':
-                return Coalesce(
-                    Subquery(
-                        Checkin.objects.filter(
-                            position_id=OuterRef('pk'),
-                            type=Checkin.TYPE_ENTRY,
-                            list_id=self.list.pk
-                        ).values('position_id').order_by().annotate(
-                            c=Count('*')
-                        ).values('c')
-                    ),
-                    Value(0),
-                    output_field=IntegerField()
-                )
-            elif values[0] == 'entries_today':
-                midnight = now().astimezone(self.list.event.timezone).replace(hour=0, minute=0, second=0, microsecond=0)
-                return Coalesce(
-                    Subquery(
-                        Checkin.objects.filter(
-                            position_id=OuterRef('pk'),
-                            type=Checkin.TYPE_ENTRY,
-                            list_id=self.list.pk,
-                            datetime__gte=midnight,
-                        ).values('position_id').order_by().annotate(
-                            c=Count('*')
-                        ).values('c')
-                    ),
-                    Value(0),
-                    output_field=IntegerField()
-                )
-            elif values[0] == 'entries_days':
-                tz = self.list.event.timezone
-                return Coalesce(
-                    Subquery(
-                        Checkin.objects.filter(
-                            position_id=OuterRef('pk'),
-                            type=Checkin.TYPE_ENTRY,
-                            list_id=self.list.pk,
-                        ).annotate(
-                            day=TruncDate('datetime', tzinfo=tz)
-                        ).values('position_id').order_by().annotate(
-                            c=Count('day', distinct=True)
-                        ).values('c')
-                    ),
-                    Value(0),
-                    output_field=IntegerField()
-                )
-        else:
-            raise ValueError(f'Unknown operator {operator}')
-
-    def comparison_to_q(self, a, b, *args, operator, negate=False, modifier=None):
-        a = self.operation_to_expression(a)
-        b = self.operation_to_expression(b)
-        if modifier:
-            b = modifier(b, *args)
-        q = Q(
-            ExpressionWrapper(
-                operator(
-                    a,
-                    b,
-                ),
-                output_field=BooleanField()
-            )
-        )
-        return ~q if negate else q
-
-    def apply(self, tests):
-        """
-        Convert JSON logic to queryset info, returns an Q object and fills self.annotations
-        """
-        if not tests:
-            return Q()
-        if isinstance(tests, bool):
-            # not really a legal configuration but used in the test suite
-            return Value(tests, output_field=BooleanField())
-
-        operator = list(tests.keys())[0]
-        values = tests[operator]
-
-        # Easy syntax for unary operators, like {"var": "x"} instead of strict
-        # {"var": ["x"]}
-        if not isinstance(values, list) and not isinstance(values, tuple):
-            values = [values]
-
-        if operator in self.bool_ops:
-            return self.bool_ops[operator](*[self.apply(v) for v in values])
-        elif operator in self.comparison_ops:
-            return self.comparison_ops[operator](*values)
-        else:
-            raise ValueError(f'Invalid operator {operator} on first level')
-
-
 class CheckInError(Exception):
     def __init__(self, msg, code):
         self.msg = msg
@@ -393,7 +207,7 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
                 'product'
             )
         elif op.order.status != Order.STATUS_PAID and not force and not (
-                ignore_unpaid and clist.include_pending and op.order.status == Order.STATUS_PENDING
+            ignore_unpaid and clist.include_pending and op.order.status == Order.STATUS_PENDING
         ):
             raise CheckInError(
                 _('This order is not marked as paid.'),

src/pretix/base/services/mail.py

@@ -11,11 +11,9 @@ from typing import Any, Dict, List, Sequence, Union
 from urllib.parse import urljoin, urlparse
 
 import cssutils
-import pytz
 import requests
 from bs4 import BeautifulSoup
 from celery import chain
-from celery.exceptions import MaxRetriesExceededError
 from django.conf import settings
 from django.core.mail import (
     EmailMultiAlternatives, SafeMIMEMultipart, get_connection,
@@ -23,7 +21,6 @@ from django.core.mail import (
 from django.core.mail.message import SafeMIMEText
 from django.db import transaction
 from django.template.loader import get_template
-from django.utils.timezone import override
 from django.utils.translation import gettext as _, pgettext
 from django_scopes import scope, scopes_disabled
 from i18nfield.strings import LazyI18nString
@@ -148,7 +145,6 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
 
         bcc = []
         if event:
-            timezone = event.timezone
             renderer = event.get_html_mail_renderer()
             if event.settings.mail_bcc:
                 for bcc_mail in event.settings.mail_bcc.split(','):
@@ -207,24 +203,19 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
                     )
                 )
             body_plain += "\r\n"
-        elif user:
-            timezone = pytz.timezone(user.timezone)
-        else:
-            timezone = pytz.timezone(settings.TIME_ZONE)
 
-        with override(timezone):
-            try:
-                if 'position' in inspect.signature(renderer.render).parameters:
-                    body_html = renderer.render(content_plain, signature, raw_subject, order, position)
-                else:
-                    # Backwards compatibility
-                    warnings.warn('E-mail renderer called without position argument because position argument is not '
-                                  'supported.',
-                                  DeprecationWarning)
-                    body_html = renderer.render(content_plain, signature, raw_subject, order)
-            except:
-                logger.exception('Could not render HTML body')
-                body_html = None
+        try:
+            if 'position' in inspect.signature(renderer.render).parameters:
+                body_html = renderer.render(content_plain, signature, raw_subject, order, position)
+            else:
+                # Backwards compatibility
+                warnings.warn('E-mail renderer called without position argument because position argument is not '
+                              'supported.',
+                              DeprecationWarning)
+                body_html = renderer.render(content_plain, signature, raw_subject, order)
+        except:
+            logger.exception('Could not render HTML body')
+            body_html = None
 
         send_task = mail_send_task.si(
             to=[email] if isinstance(email, str) else list(email),
@@ -390,25 +381,11 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
 
         try:
             backend.send_messages([email])
-        except (smtplib.SMTPResponseException, smtplib.SMTPSenderRefused) as e:
+        except smtplib.SMTPResponseException as e:
             if e.smtp_code in (101, 111, 421, 422, 431, 442, 447, 452):
-                # Most likely temporary, retry again (but pretty soon)
-                try:
-                    self.retry(max_retries=5, countdown=2 ** (self.request.retries * 3))  # max is 2 ** (4*3) = 4096 seconds = 68 minutes
-                except MaxRetriesExceededError:
-                    if order:
-                        order.log_action(
-                            'pretix.event.order.email.error',
-                            data={
-                                'subject': 'SMTP code {}, max retries exceeded'.format(e.smtp_code),
-                                'message': e.smtp_error.decode() if isinstance(e.smtp_error, bytes) else str(e.smtp_error),
-                                'recipient': '',
-                                'invoices': [],
-                            }
-                        )
-                    raise e
-
+                self.retry(max_retries=5, countdown=2 ** (self.request.retries * 3))  # max is 2 ** (4*3) = 4096 seconds = 68 minutes
             logger.exception('Error sending email')
+
             if order:
                 order.log_action(
                     'pretix.event.order.email.error',
@@ -420,51 +397,10 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
                     }
                 )
 
-            raise SendMailException('Failed to send an email to {}.'.format(to))
-        except smtplib.SMTPRecipientsRefused as e:
-            smtp_codes = [a[0] for a in e.recipients.values()]
-
-            if not any(c >= 500 for c in smtp_codes):
-                # Not a permanent failure (mailbox full, service unavailable), retry later, but with large intervals
-                try:
-                    self.retry(max_retries=5, countdown=2 ** (self.request.retries * 3) * 4)  # max is 2 ** (4*3) * 4 = 16384 seconds = approx 4.5 hours
-                except MaxRetriesExceededError:
-                    # ignore and go on with logging the error
-                    pass
-
-            logger.exception('Error sending email')
-            if order:
-                message = []
-                for e, val in e.recipients.items():
-                    message.append(f'{e}: {val[0]} {val[1].decode()}')
-
-                order.log_action(
-                    'pretix.event.order.email.error',
-                    data={
-                        'subject': 'SMTP error',
-                        'message': '\n'.join(message),
-                        'recipient': '',
-                        'invoices': [],
-                    }
-                )
-
             raise SendMailException('Failed to send an email to {}.'.format(to))
         except Exception as e:
             if isinstance(e, (smtplib.SMTPServerDisconnected, smtplib.SMTPConnectError, ssl.SSLError, OSError)):
-                try:
-                    self.retry(max_retries=5, countdown=2 ** (self.request.retries * 3))  # max is 2 ** (4*3) = 4096 seconds = 68 minutes
-                except MaxRetriesExceededError:
-                    if order:
-                        order.log_action(
-                            'pretix.event.order.email.error',
-                            data={
-                                'subject': 'Internal error',
-                                'message': 'Max retries exceeded',
-                                'recipient': '',
-                                'invoices': [],
-                            }
-                        )
-                    raise e
+                self.retry(max_retries=5, countdown=2 ** (self.request.retries * 3))  # max is 2 ** (4*3) = 4096 seconds = 68 minutes
             if order:
                 order.log_action(
                     'pretix.event.order.email.error',

src/pretix/base/services/notifications.py

@@ -13,7 +13,7 @@ from pretix.celery_app import app
 from pretix.helpers.urls import build_absolute_uri
 
 
-@app.task(base=TransactionAwareTask, acks_late=True, max_retries=9, default_retry_delay=900)
+@app.task(base=TransactionAwareTask, acks_late=True)
 @scopes_disabled()
 def notify(logentry_ids: list):
     if not isinstance(logentry_ids, list):
@@ -70,7 +70,7 @@ def notify(logentry_ids: list):
                 send_notification.apply_async(args=(logentry.id, notification_type.action_type, user.pk, method))
 
 
-@app.task(base=ProfiledTask, acks_late=True, max_retries=9, default_retry_delay=900)
+@app.task(base=ProfiledTask, acks_late=True)
 def send_notification(logentry_id: int, action_type: str, user_id: int, method: str):
     logentry = LogEntry.all.get(id=logentry_id)
     if logentry.event:

src/pretix/base/services/quotas.py

@@ -1,22 +1,25 @@
 import sys
-import time
 from collections import Counter, defaultdict
+from datetime import timedelta
 from itertools import zip_longest
 
 from django.conf import settings
-from django.db import models
+from django.db import OperationalError, models
 from django.db.models import (
     Case, Count, F, Func, Max, OuterRef, Q, Subquery, Sum, Value, When,
 )
+from django.dispatch import receiver
 from django.utils.timezone import now
-from django_redis import get_redis_connection
+from django_scopes import scopes_disabled
 
 from pretix.base.models import (
-    CartPosition, Checkin, Order, OrderPosition, Quota, Voucher,
-    WaitingListEntry,
+    CartPosition, Checkin, Event, LogEntry, Order, OrderPosition, Quota,
+    Voucher, WaitingListEntry,
 )
+from pretix.celery_app import app
 
-from ..signals import quota_availability
+from ...helpers.periodic import minimum_interval
+from ..signals import periodic_task, quota_availability
 
 
 class QuotaAvailability:
@@ -86,11 +89,7 @@ class QuotaAvailability:
     def queue(self, *quota):
         self._queue += quota
 
-    def compute(self, now_dt=None, allow_cache=False, allow_cache_stale=False):
-        """
-        Compute the queued quotas. If ``allow_cache`` is set, results may also be taken from a cache that might
-        be a few minutes outdated. In this case, you may not rely on the results in the ``count_*`` properties.
-        """
+    def compute(self, now_dt=None):
         now_dt = now_dt or now()
         quotas = list(set(self._queue))
         quotas_original = list(self._queue)
@@ -98,36 +97,6 @@ class QuotaAvailability:
         if not quotas:
             return
 
-        if allow_cache:
-            if self._full_results:
-                raise ValueError("You cannot combine full_results and allow_cache.")
-
-            elif not self._count_waitinglist:
-                raise ValueError("If you set allow_cache, you need to set count_waitinglist.")
-
-            elif settings.HAS_REDIS:
-                rc = get_redis_connection("redis")
-                quotas_by_event = defaultdict(list)
-                for q in quotas_original:
-                    quotas_by_event[q.event_id].append(q)
-
-                for eventid, evquotas in quotas_by_event.items():
-                    d = rc.hmget(f'quotas:{eventid}:availabilitycache', [str(q.pk) for q in evquotas])
-                    for redisval, q in zip(d, evquotas):
-                        if redisval is not None:
-                            data = [rv for rv in redisval.decode().split(',')]
-                            # Except for some rare situations, we don't want to use cache entries older than 2 minutes
-                            if time.time() - int(data[2]) < 120 or allow_cache_stale:
-                                quotas_original.remove(q)
-                                quotas.remove(q)
-                                if data[1] == "None":
-                                    self.results[q] = int(data[0]), None
-                                else:
-                                    self.results[q] = int(data[0]), int(data[1])
-
-        if not quotas:
-            return
-
         self._compute(quotas, now_dt)
 
         for q in quotas_original:
@@ -136,51 +105,36 @@ class QuotaAvailability:
                 self.results[q] = resp
 
         self._close(quotas)
-        self._write_cache(quotas, now_dt)
+        try:
+            self._write_cache(quotas, now_dt)
+        except OperationalError as e:
+            # Ignore deadlocks when multiple threads try to write to the cache
+            if 'deadlock' not in str(e).lower():
+                raise e
 
     def _write_cache(self, quotas, now_dt):
-        if not settings.HAS_REDIS or not quotas:
-            return
-
-        rc = get_redis_connection("redis")
-        # We write the computed availability to redis in a per-event hash as
-        #
-        #   quota_id -> (availability_state, availability_number, timestamp).
-        #
-        # We store this in a hash instead of inidividual values to avoid making two many redis requests
-        # which would introduce latency.
-
-        # The individual entries in the hash are "valid" for 120 seconds. This means in a typical peak scenario with
-        # high load *to a specific calendar or event*, lots of parallel web requests will receive an "expired" result
-        # around the same time, recompute quotas and write back to the cache. To avoid overloading redis with lots of
-        # simultaneous write queries for the same page, we place a very naive and simple "lock" on the write process for
-        # these quotas. We choose 10 seconds since that should be well above the duration of a write.
-
-        lock_name = '_'.join([str(p) for p in sorted([q.pk for q in quotas])])
-        if rc.exists(f'quotas:availabilitycachewrite:{lock_name}'):
-            return
-        rc.setex(f'quotas:availabilitycachewrite:{lock_name}', '1', 10)
-
-        update = defaultdict(list)
-        for q in quotas:
-            update[q.event_id].append(q)
-
-        for eventid, quotas in update.items():
-            rc.hmset(f'quotas:{eventid}:availabilitycache', {
-                str(q.id): ",".join(
-                    [str(i) for i in self.results[q]] +
-                    [str(int(time.time()))]
-                ) for q in quotas
-            })
-            # To make sure old events do not fill up our redis instance, we set an expiry on the cache. However, we set it
-            # on 7 days even though we mostly ignore values older than 2 monites. The reasoning is that we have some places
-            # where we set allow_cache_stale and use the old entries anyways to save on performance.
-            rc.expire(f'quotas:{eventid}:availabilitycache', 3600 * 24 * 7)
-
         # We used to also delete item_quota_cache:* from the event cache here, but as the cache
         # gets more complex, this does not seem worth it. The cache is only present for up to
         # 5 seconds to prevent high peaks, and a 5-second delay in availability is usually
         # tolerable
+        update = []
+        for q in quotas:
+            rewrite_cache = self._count_waitinglist and (
+                not q.cache_is_hot(now_dt) or self.results[q][0] > q.cached_availability_state
+                or q.cached_availability_paid_orders is None
+            )
+            if rewrite_cache:
+                q.cached_availability_state = self.results[q][0]
+                q.cached_availability_number = self.results[q][1]
+                q.cached_availability_time = now_dt
+                if q in self.count_paid_orders:
+                    q.cached_availability_paid_orders = self.count_paid_orders[q]
+                update.append(q)
+        if update:
+            Quota.objects.using('default').bulk_update(update, [
+                'cached_availability_state', 'cached_availability_number', 'cached_availability_time',
+                'cached_availability_paid_orders'
+            ], batch_size=50)
 
     def _close(self, quotas):
         for q in quotas:
@@ -450,8 +404,44 @@ class QuotaAvailability:
                 self.results[q] = Quota.AVAILABILITY_GONE, 0
 
 
+@receiver(signal=periodic_task)
+@minimum_interval(minutes_after_success=60)
+def build_all_quota_caches(sender, **kwargs):
+    refresh_quota_caches.apply()
+
+
 def grouper(iterable, n, fillvalue=None):
     """Collect data into fixed-length chunks or blocks"""
     # grouper('ABCDEFG', 3, 'x') --> ABC DEF Gxx
     args = [iter(iterable)] * n
     return zip_longest(fillvalue=fillvalue, *args)
+
+
+@app.task
+@scopes_disabled()
+def refresh_quota_caches():
+    # Active events
+    active = LogEntry.objects.using(settings.DATABASE_REPLICA).filter(
+        datetime__gt=now() - timedelta(days=7)
+    ).order_by().values('event').annotate(
+        last_activity=Max('datetime')
+    )
+    for a in active:
+        try:
+            e = Event.objects.using(settings.DATABASE_REPLICA).get(pk=a['event'])
+        except Event.DoesNotExist:
+            continue
+        quotas = e.quotas.filter(
+            Q(cached_availability_time__isnull=True) |
+            Q(cached_availability_time__lt=a['last_activity']) |
+            Q(cached_availability_time__lt=now() - timedelta(hours=2))
+        ).filter(
+            Q(subevent__isnull=True) |
+            Q(subevent__date_to__isnull=False, subevent__date_to__gte=now() - timedelta(days=14)) |
+            Q(subevent__date_from__gte=now() - timedelta(days=14))
+        )
+
+        for qs in grouper(quotas, 100, None):
+            qa = QuotaAvailability(early_out=False)
+            qa.queue(*[q for q in qs if q is not None])
+            qa.compute()

src/pretix/base/services/vouchers.py

@@ -3,21 +3,22 @@ from i18nfield.strings import LazyI18nString
 
 from pretix.base.email import get_email_context
 from pretix.base.i18n import language
-from pretix.base.models import Event, LogEntry, User, Voucher
+from pretix.base.models import Event, User, Voucher
 from pretix.base.services.mail import mail
+from pretix.base.services.tasks import TransactionAwareProfiledEventTask
+from pretix.celery_app import app
 
 
-def vouchers_send(event: Event, vouchers: list, subject: str, message: str, recipients: list, user: int,
-                  progress=None) -> None:
+@app.task(base=TransactionAwareProfiledEventTask, acks_late=True)
+def vouchers_send(event: Event, vouchers: list, subject: str, message: str, recipients: list, user: int) -> None:
     vouchers = list(Voucher.objects.filter(id__in=vouchers).order_by('id'))
     user = User.objects.get(pk=user)
-    for ir, r in enumerate(recipients):
+    for r in recipients:
         voucher_list = []
         for i in range(r['number']):
             voucher_list.append(vouchers.pop())
         with language(event.settings.locale):
-            email_context = get_email_context(event=event, name=r.get('name') or '',
-                                              voucher_list=[v.code for v in voucher_list])
+            email_context = get_email_context(event=event, name=r.get('name') or '', voucher_list=[v.code for v in voucher_list])
             mail(
                 r['email'],
                 subject,
@@ -26,14 +27,14 @@ def vouchers_send(event: Event, vouchers: list, subject: str, message: str, reci
                 event,
                 locale=event.settings.locale,
             )
-            logs = []
             for v in voucher_list:
                 if r.get('tag') and r.get('tag') != v.tag:
                     v.tag = r.get('tag')
                 if v.comment:
                     v.comment += '\n\n'
                 v.comment = gettext('The voucher has been sent to {recipient}.').format(recipient=r['email'])
-                logs.append(v.log_action(
+                v.save(update_fields=['tag', 'comment'])
+                v.log_action(
                     'pretix.voucher.sent',
                     user=user,
                     data={
@@ -41,11 +42,5 @@ def vouchers_send(event: Event, vouchers: list, subject: str, message: str, reci
                         'name': r.get('name'),
                         'subject': subject,
                         'message': message,
-                    },
-                    save=False
-                ))
-            Voucher.objects.bulk_update(voucher_list, fields=['comment', 'tag'], batch_size=500)
-            LogEntry.objects.bulk_create(logs, batch_size=500)
-
-            if progress and ir % 50 == 0:
-                progress(ir / len(recipients))
+                    }
+                )

src/pretix/base/settings.py

@@ -1138,15 +1138,6 @@ DEFAULTS = {
             help_text=_('If your event series has more than 50 dates in the future, only the month or week calendar can be used.')
         ),
     },
-    'event_list_available_only': {
-        'default': 'False',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_("Hide all unavailable dates from calendar or list views"),
-        )
-    },
     'allow_modifications_after_checkin': {
         'default': 'False',
         'type': bool,
@@ -1808,7 +1799,7 @@ Your {event} team"""))
         ),
     },
     'theme_color_danger': {
-        'default': '#C44F4F',
+        'default': '#D36060',
         'type': str,
         'form_class': forms.CharField,
         'serializer_class': serializers.CharField,

src/pretix/base/signals.py

@@ -164,9 +164,7 @@ class DeprecatedSignal(django.dispatch.Signal):
         super().connect(receiver, sender=None, weak=True, dispatch_uid=None)
 
 
-event_live_issues = EventPluginSignal(
-    providing_args=[]
-)
+event_live_issues = EventPluginSignal()
 """
 This signal is sent out to determine whether an event can be taken live. If you want to
 prevent the event from going live, return a string that will be displayed to the user
@@ -176,9 +174,7 @@ As with all event-plugin signals, the ``sender`` keyword argument will contain t
 """
 
 
-register_payment_providers = EventPluginSignal(
-    providing_args=[]
-)
+register_payment_providers = EventPluginSignal()
 """
 This signal is sent out to get all known payment providers. Receivers should return a
 subclass of pretix.base.payment.BasePaymentProvider or a list of these
@@ -186,9 +182,7 @@ subclass of pretix.base.payment.BasePaymentProvider or a list of these
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_mail_placeholders = EventPluginSignal(
-    providing_args=[]
-)
+register_mail_placeholders = EventPluginSignal()
 """
 This signal is sent out to get all known email text placeholders. Receivers should return
 an instance of a subclass of pretix.base.email.BaseMailTextPlaceholder or a list of these.
@@ -196,9 +190,7 @@ an instance of a subclass of pretix.base.email.BaseMailTextPlaceholder or a list
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_html_mail_renderers = EventPluginSignal(
-    providing_args=[]
-)
+register_html_mail_renderers = EventPluginSignal()
 """
 This signal is sent out to get all known HTML email renderers. Receivers should return a
 subclass of pretix.base.email.BaseHTMLMailRenderer or a list of these
@@ -206,9 +198,7 @@ subclass of pretix.base.email.BaseHTMLMailRenderer or a list of these
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_invoice_renderers = EventPluginSignal(
-    providing_args=[]
-)
+register_invoice_renderers = EventPluginSignal()
 """
 This signal is sent out to get all known invoice renderers. Receivers should return a
 subclass of pretix.base.invoice.BaseInvoiceRenderer or a list of these
@@ -216,9 +206,7 @@ subclass of pretix.base.invoice.BaseInvoiceRenderer or a list of these
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_ticket_secret_generators = EventPluginSignal(
-    providing_args=[]
-)
+register_ticket_secret_generators = EventPluginSignal()
 """
 This signal is sent out to get all known ticket secret generators. Receivers should return a
 subclass of ``pretix.base.secrets.BaseTicketSecretGenerator`` or a list of these
@@ -226,9 +214,7 @@ subclass of ``pretix.base.secrets.BaseTicketSecretGenerator`` or a list of these
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_data_shredders = EventPluginSignal(
-    providing_args=[]
-)
+register_data_shredders = EventPluginSignal()
 """
 This signal is sent out to get all known data shredders. Receivers should return a
 subclass of pretix.base.shredder.BaseDataShredder or a list of these
@@ -236,9 +222,7 @@ subclass of pretix.base.shredder.BaseDataShredder or a list of these
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_ticket_outputs = EventPluginSignal(
-    providing_args=[]
-)
+register_ticket_outputs = EventPluginSignal()
 """
 This signal is sent out to get all known ticket outputs. Receivers should return a
 subclass of pretix.base.ticketoutput.BaseTicketOutput
@@ -246,9 +230,7 @@ subclass of pretix.base.ticketoutput.BaseTicketOutput
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_notification_types = EventPluginSignal(
-    providing_args=[]
-)
+register_notification_types = EventPluginSignal()
 """
 This signal is sent out to get all known notification types. Receivers should return an
 instance of a subclass of pretix.base.notifications.NotificationType or a list of such
@@ -259,18 +241,14 @@ however for this signal, the ``sender`` **may also be None** to allow creating t
 notification settings!
 """
 
-register_sales_channels = django.dispatch.Signal(
-    providing_args=[]
-)
+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.SalesChannel`` or a list of such
 instances.
 """
 
-register_data_exporters = EventPluginSignal(
-    providing_args=[]
-)
+register_data_exporters = EventPluginSignal()
 """
 This signal is sent out to get all known data exporters. Receivers should return a
 subclass of pretix.base.exporter.BaseExporter
@@ -278,21 +256,20 @@ subclass of pretix.base.exporter.BaseExporter
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-register_multievent_data_exporters = django.dispatch.Signal(
-    providing_args=["event"]
-)
+register_multievent_data_exporters = django.dispatch.Signal()
 """
+Arguments: ``event``
+
 This signal is sent out to get all known data exporters, which support exporting data for
 multiple events. Receivers should return a subclass of pretix.base.exporter.BaseExporter
 
 The ``sender`` keyword argument will contain an organizer.
 """
 
-validate_order = EventPluginSignal(
-    providing_args=["payment_provider", "positions", "email", "locale", "invoice_address",
-                    "meta_info"]
-)
+validate_order = EventPluginSignal()
 """
+Arguments: ``payment_provider``, ``positions``, ``email``, ``locale``, ``invoice_address``, ``meta_info``
+
 This signal is sent out when the user tries to confirm the order, before we actually create
 the order. It allows you to inspect the cart positions. Your return value will be ignored,
 but you can raise an OrderError with an appropriate exception message if you like to block
@@ -301,10 +278,10 @@ the order. We strongly discourage making changes to the order here.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-validate_cart = EventPluginSignal(
-    providing_args=["positions"]
-)
+validate_cart = EventPluginSignal()
 """
+Arguments: ``positions``
+
 This signal is sent out before the user starts checkout. It includes an iterable
 with the current CartPosition objects.
 The response of receivers will be ignored, but you can raise a CartError with an
@@ -313,10 +290,10 @@ appropriate exception message.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-validate_cart_addons = EventPluginSignal(
-    providing_args=["addons", "base_position", "iao"]
-)
+validate_cart_addons = EventPluginSignal()
 """
+Arguments: ``addons``, ``base_position``, ``iao``
+
 This signal is sent when a user tries to select a combination of addons. In contrast to
  ``validate_cart``, this is executed before the cart is actually modified. You are passed
 an argument ``addons`` containing a dict of ``(item, variation or None) → count`` tuples as well
@@ -328,10 +305,10 @@ appropriate exception message.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_placed = EventPluginSignal(
-    providing_args=["order"]
-)
+order_placed = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is placed. The order object is given
 as the first argument. This signal is *not* sent out if an order is created through
 splitting an existing order, so you can not expect to see all orders by listening
@@ -340,10 +317,10 @@ to this signal.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_paid = EventPluginSignal(
-    providing_args=["order"]
-)
+order_paid = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is paid. The order object is given
 as the first argument. This signal is *not* sent out if an order is marked as paid
 because an already-paid order has been split.
@@ -351,80 +328,80 @@ because an already-paid order has been split.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_canceled = EventPluginSignal(
-    providing_args=["order"]
-)
+order_canceled = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is canceled. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_reactivated = EventPluginSignal(
-    providing_args=["order"]
-)
+order_reactivated = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time a canceled order is reactivated. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_expired = EventPluginSignal(
-    providing_args=["order"]
-)
+order_expired = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is marked as expired. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_modified = EventPluginSignal(
-    providing_args=["order"]
-)
+order_modified = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order's information is modified. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_changed = EventPluginSignal(
-    providing_args=["order"]
-)
+order_changed = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order's content is changed. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_approved = EventPluginSignal(
-    providing_args=["order"]
-)
+order_approved = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is being approved. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_denied = EventPluginSignal(
-    providing_args=["order"]
-)
+order_denied = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time an order is being denied. The order object is given
 as the first argument.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-order_gracefully_delete = EventPluginSignal(
-    providing_args=["order"]
-)
+order_gracefully_delete = EventPluginSignal()
 """
+Arguments: ``order``
+
 This signal is sent out every time a test-mode order is being deleted. The order object
 is given as the first argument.
 
@@ -435,10 +412,10 @@ the deletion of the order.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-checkin_created = EventPluginSignal(
-    providing_args=["checkin"],
-)
+checkin_created = EventPluginSignal()
 """
+Arguments: ``checkin``
+
 This signal is sent out every time a check-in is created (i.e. an order position is marked as
 checked in). It is not send if the position was already checked in and is force-checked-in a second time.
 The check-in object is given as the first argument
@@ -446,10 +423,10 @@ The check-in object is given as the first argument
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-logentry_display = EventPluginSignal(
-    providing_args=["logentry"]
-)
+logentry_display = EventPluginSignal()
 """
+Arguments: ``logentry``
+
 To display an instance of the ``LogEntry`` model to a human user,
 ``pretix.base.signals.logentry_display`` will be sent out with a ``logentry`` argument.
 
@@ -459,10 +436,10 @@ to the user. The receivers are expected to return plain text.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-logentry_object_link = EventPluginSignal(
-    providing_args=["logentry"]
-)
+logentry_object_link = EventPluginSignal()
 """
+Arguments: ``logentry``
+
 To display the relationship of an instance of the ``LogEntry`` model to another model
 to a human user, ``pretix.base.signals.logentry_object_link`` will be sent out with a
 ``logentry`` argument.
@@ -487,10 +464,10 @@ Make sure that any user content in the HTML code you return is properly escaped!
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-requiredaction_display = EventPluginSignal(
-    providing_args=["action", "request"]
-)
+requiredaction_display = EventPluginSignal()
 """
+Arguments: ``action``, ``request``
+
 To display an instance of the ``RequiredAction`` model to a human user,
 ``pretix.base.signals.requiredaction_display`` will be sent out with a ``action`` argument.
 You will also get the current ``request`` in a different argument.
@@ -501,10 +478,10 @@ to the user. The receivers are expected to return HTML code.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-event_copy_data = EventPluginSignal(
-    providing_args=["other", "tax_map", "category_map", "item_map", "question_map", "variation_map", "checkin_list_map"]
-)
+event_copy_data = EventPluginSignal()
 """
+Arguments: "other", ``tax_map``, ``category_map``, ``item_map``, ``question_map``, ``variation_map``, ``checkin_list_map``
+
 This signal is sent out when a new event is created as a clone of an existing event, i.e.
 the settings from the older event are copied to the newer one. You can listen to this
 signal to copy data or configuration stored within your plugin's models as well.
@@ -519,10 +496,10 @@ keyword argument will contain the event to **copy from**. The keyword arguments
 in the new event of the respective types.
 """
 
-item_copy_data = EventPluginSignal(
-    providing_args=["source", "target"]
-)
+item_copy_data = EventPluginSignal()
 """
+Arguments: ``source``, ``target``
+
 This signal is sent out when a new product is created as a clone of an existing product, i.e.
 the settings from the older product are copied to the newer one. You can listen to this
 signal to copy data or configuration stored within your plugin's models as well.
@@ -546,10 +523,10 @@ All plugins that are installed may send fields for the global settings form, as
 an OrderedDict of (setting name, form field).
 """
 
-order_fee_calculation = EventPluginSignal(
-    providing_args=['positions', 'invoice_address', 'meta_info', 'total', 'gift_cards']
-)
+order_fee_calculation = EventPluginSignal()
 """
+Arguments: 'positions', 'invoice_address', 'meta_info', 'total', 'gift_cards'
+
 This signals allows you to add fees to an order while it is being created. You are expected to
 return a list of ``OrderFee`` objects that are not yet saved to the database
 (because there is no order yet).
@@ -562,10 +539,10 @@ keyword argument will contain the total cart sum without any fees. You should no
 the gift cards in use.
 """
 
-order_fee_type_name = EventPluginSignal(
-    providing_args=['request', 'fee']
-)
+order_fee_type_name = EventPluginSignal()
 """
+Arguments: 'request', 'fee'
+
 This signals allows you to return a human-readable description for a fee type based on the ``fee_type``
 and ``internal_type`` attributes of the ``OrderFee`` model that you get as keyword arguments. You are
 expected to return a string or None, if you don't know about this fee.
@@ -573,20 +550,20 @@ expected to return a string or None, if you don't know about this fee.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-allow_ticket_download = EventPluginSignal(
-    providing_args=['order']
-)
+allow_ticket_download = EventPluginSignal()
 """
+Arguments: 'order'
+
 This signal is sent out to check if tickets for an order can be downloaded. If any receiver returns false,
 a download will not be offered.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-email_filter = EventPluginSignal(
-    providing_args=['message', 'order', 'user']
-)
+email_filter = EventPluginSignal()
 """
+Arguments: 'message', 'order', 'user'
+
 This signal allows you to implement a middleware-style filter on all outgoing emails. You are expected to
 return a (possibly modified) copy of the message object passed to you.
 
@@ -598,10 +575,10 @@ If the email is associated with a specific user, e.g. a notification email, the
 well, otherwise it will be ``None``.
 """
 
-global_email_filter = GlobalSignal(
-    providing_args=['message', 'order', 'user']
-)
+global_email_filter = GlobalSignal()
 """
+Arguments: 'message', 'order', 'user'
+
 This signal allows you to implement a middleware-style filter on all outgoing emails. You are expected to
 return a (possibly modified) copy of the message object passed to you.
 
@@ -666,10 +643,10 @@ a ``subevent`` argument which might be none and you are expected to return a lis
 """
 
 
-quota_availability = EventPluginSignal(
-    providing_args=['quota', 'result', 'count_waitinglist']
-)
+quota_availability = EventPluginSignal()
 """
+Arguments: 'quota', 'result', 'count_waitinglist'
+
 This signal allows you to modify the availability of a quota. You are passed the ``quota`` and an
 ``availability`` result calculated by pretix code or other plugins. ``availability`` is a tuple
 with the first entry being one of the ``Quota.AVAILABILITY_*`` constants and the second entry being
@@ -682,25 +659,23 @@ system really bad.** Also, keep in mind that your response is subject to caching
 quotas might be used for display (not for actual order processing).
 """
 
-order_split = EventPluginSignal(
-    providing_args=["original", "split_order"]
-)
+order_split = EventPluginSignal()
 """
+Arguments: ``original``, ``split_order``
+
 This signal is sent out when an order is split into two orders and allows you to copy related models
 to the new order. You will be passed the old order as ``original`` and the new order as ``split_order``.
 """
 
-invoice_line_text = EventPluginSignal(
-    providing_args=["position"]
-)
+invoice_line_text = EventPluginSignal()
 """
+Arguments: ``position``
+
 This signal is sent out when an invoice is built for an order. You can return additional text that
 should be shown on the invoice for the given ``position``.
 """
 
-order_import_columns = EventPluginSignal(
-    providing_args=[]
-)
+order_import_columns = EventPluginSignal()
 """
 This signal is sent out if the user performs an import of orders from an external source. You can use this
 to define additional columns that can be read during import. You are expected to return a list of instances of
@@ -709,10 +684,10 @@ to define additional columns that can be read during import. You are expected to
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-validate_event_settings = EventPluginSignal(
-    providing_args=["settings_dict"]
-)
+validate_event_settings = EventPluginSignal()
 """
+Arguments: ``settings_dict``
+
 This signal is sent out if the user performs an update of event settings through the API or web interface.
 You are passed a ``settings_dict`` dictionary with the new state of the event settings object and are expected
 to raise a ``django.core.exceptions.ValidationError`` if the new state is not valid.
@@ -723,9 +698,7 @@ serializer field instead.
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-api_event_settings_fields = EventPluginSignal(
-    providing_args=[]
-)
+api_event_settings_fields = EventPluginSignal()
 """
 This signal is sent out to collect serializable settings fields for the API. You are expected to
 return a dictionary mapping names of attributes in the settings store to DRF serializer field instances.

src/pretix/base/templatetags/money.py

@@ -11,7 +11,7 @@ register = template.Library()
 
 @register.filter("money")
 def money_filter(value: Decimal, arg='', hide_currency=False):
-    if isinstance(value, (float, int)):
+    if isinstance(value, float) or isinstance(value, int):
         value = Decimal(value)
     if not isinstance(value, Decimal):
         if value == '':
@@ -47,7 +47,7 @@ def money_filter(value: Decimal, arg='', hide_currency=False):
 
 @register.filter("money_numberfield")
 def money_numberfield_filter(value: Decimal, arg=''):
-    if isinstance(value, (float, int)):
+    if isinstance(value, float) or isinstance(value, int):
         value = Decimal(value)
     if not isinstance(value, Decimal):
         raise TypeError("Invalid data type passed to money filter: %r" % type(value))

src/pretix/base/templatetags/rich_text.py

@@ -153,9 +153,9 @@ def markdown_compile_email(source):
 
 class SnippetExtension(markdown.extensions.Extension):
     def extendMarkdown(self, md, *args, **kwargs):
-        del md.parser.blockprocessors['olist']
-        del md.parser.blockprocessors['ulist']
-        del md.parser.blockprocessors['quote']
+        md.parser.blockprocessors.deregister('olist')
+        md.parser.blockprocessors.deregister('ulist')
+        md.parser.blockprocessors.deregister('quote')
 
 
 def markdown_compile(source, snippet=False):

src/pretix/base/views/errors.py

@@ -48,7 +48,7 @@ def page_not_found(request, exception):
     except (AttributeError, IndexError):
         pass
     else:
-        if isinstance(message, (str, Promise)):
+        if isinstance(message, str) or isinstance(message, Promise):
             exception_repr = str(message)
     context = {
         'request_path': request.path,

src/pretix/base/views/mixins.py

@@ -4,7 +4,6 @@ from decimal import Decimal
 
 from django import forms
 from django.core.files.uploadedfile import UploadedFile
-from django.db import IntegrityError
 from django.db.models import Prefetch, QuerySet
 from django.utils.functional import cached_property
 
@@ -149,24 +148,8 @@ class BaseQuestionsViewMixin:
                                 orderposition=(form.pos if isinstance(form.pos, OrderPosition) else None),
                                 question=field.question,
                             )
-                            try:
-                                self._save_to_answer(field, answer, v)
-                                answer.save()
-                            except IntegrityError:
-                                # Since we prefill ``field.answer`` at form creation time, there's a possible race condition
-                                # here if the users submits their save request a second time while the first one is still running,
-                                # thus leading to duplicate QuestionAnswer objects. Since Django doesn't support UPSERT, the "proper"
-                                # fix would be a transaction with select_for_update(), or at least fetching using get_or_create here
-                                # again. However, both of these approaches have a significant performance overhead for *all* requests,
-                                # while the issue happens very very rarely. So we opt for just catching the error and retrying properly.
-                                answer = QuestionAnswer.objects.get(
-                                    cartposition=(form.pos if isinstance(form.pos, CartPosition) else None),
-                                    orderposition=(form.pos if isinstance(form.pos, OrderPosition) else None),
-                                    question=field.question,
-                                )
-                                self._save_to_answer(field, answer, v)
-                                answer.save()
-
+                            self._save_to_answer(field, answer, v)
+                            answer.save()
                     else:
                         meta_info.setdefault('question_form_data', {})
                         if v is None:

src/pretix/base/views/tasks.py

@@ -4,25 +4,43 @@ import celery.exceptions
 from celery.result import AsyncResult
 from django.conf import settings
 from django.contrib import messages
-from django.core.exceptions import ValidationError
 from django.http import JsonResponse
 from django.shortcuts import redirect, render
-from django.test import RequestFactory
 from django.utils.translation import gettext as _
-from django.views.generic import FormView
 
-from pretix.base.models import User
-from pretix.base.services.tasks import ProfiledEventTask
 from pretix.celery_app import app
 
 logger = logging.getLogger('pretix.base.tasks')
 
 
-class AsyncMixin:
+class AsyncAction:
+    task = None
     success_url = None
     error_url = None
     known_errortypes = []
 
+    def do(self, *args, **kwargs):
+        if not isinstance(self.task, app.Task):
+            raise TypeError('Method has no task attached')
+
+        try:
+            res = self.task.apply_async(args=args, kwargs=kwargs)
+        except ConnectionError:
+            # Task very likely not yet sent, due to redis restarting etc. Let's try once agan
+            res = self.task.apply_async(args=args, kwargs=kwargs)
+
+        if 'ajax' in self.request.GET or 'ajax' in self.request.POST:
+            data = self._return_ajax_result(res)
+            data['check_url'] = self.get_check_url(res.id, True)
+            return JsonResponse(data)
+        else:
+            if res.ready():
+                if res.successful() and not isinstance(res.info, Exception):
+                    return self.success(res.info)
+                else:
+                    return self.error(res.info)
+            return redirect(self.get_check_url(res.id, False))
+
     def get_success_url(self, value):
         return self.success_url
 
@@ -32,6 +50,11 @@ class AsyncMixin:
     def get_check_url(self, task_id, ajax):
         return self.request.path + '?async_id=%s' % task_id + ('&ajax=1' if ajax else '')
 
+    def get(self, request, *args, **kwargs):
+        if 'async_id' in request.GET and settings.HAS_CELERY:
+            return self.get_result(request)
+        return self.http_method_not_allowed(request)
+
     def _ajax_response_data(self):
         return {}
 
@@ -63,7 +86,7 @@ class AsyncMixin:
                 if smes:
                     messages.success(self.request, smes)
                 # TODO: Do not store message if the ajax client states that it will not redirect
-                # but handle the message itself
+                # but handle the mssage itself
                 data.update({
                     'redirect': self.get_success_url(res.info),
                     'success': True,
@@ -72,7 +95,7 @@ class AsyncMixin:
             else:
                 messages.error(self.request, self.get_error_message(res.info))
                 # TODO: Do not store message if the ajax client states that it will not redirect
-                # but handle the message itself
+                # but handle the mssage itself
                 data.update({
                     'redirect': self.get_error_url(),
                     'success': False,
@@ -136,124 +159,3 @@ class AsyncMixin:
 
     def get_success_message(self, value):
         return _('The task has been completed.')
-
-
-class AsyncAction(AsyncMixin):
-    task = None
-
-    def do(self, *args, **kwargs):
-        if not isinstance(self.task, app.Task):
-            raise TypeError('Method has no task attached')
-
-        try:
-            res = self.task.apply_async(args=args, kwargs=kwargs)
-        except ConnectionError:
-            # Task very likely not yet sent, due to redis restarting etc. Let's try once again
-            res = self.task.apply_async(args=args, kwargs=kwargs)
-
-        if 'ajax' in self.request.GET or 'ajax' in self.request.POST:
-            data = self._return_ajax_result(res)
-            data['check_url'] = self.get_check_url(res.id, True)
-            return JsonResponse(data)
-        else:
-            if res.ready():
-                if res.successful() and not isinstance(res.info, Exception):
-                    return self.success(res.info)
-                else:
-                    return self.error(res.info)
-            return redirect(self.get_check_url(res.id, False))
-
-    def get(self, request, *args, **kwargs):
-        if 'async_id' in request.GET and settings.HAS_CELERY:
-            return self.get_result(request)
-        return self.http_method_not_allowed(request)
-
-
-class AsyncFormView(AsyncMixin, FormView):
-    """
-    FormView variant in which instead of ``form_valid``, an ``async_form_valid``
-    is executed in a celery task. Note that this places some severe limitations
-    on the form and the view, e.g. neither ``get_form*`` nor the form itself
-    may depend on the request object unless specifically supported by this class.
-    Also, all form keyword arguments except ``instance`` need to be serializable.
-    """
-    known_errortypes = ['ValidationError']
-
-    def __init_subclass__(cls):
-        def async_execute(self, request_path, form_kwargs, organizer=None, event=None, user=None):
-            view_instance = cls()
-            view_instance.request = RequestFactory().post(request_path)
-            if organizer:
-                view_instance.request.event = event
-            if organizer:
-                view_instance.request.organizer = organizer
-            if user:
-                view_instance.request.user = User.objects.get(pk=user)
-
-            form_class = view_instance.get_form_class()
-            if form_kwargs.get('instance'):
-                cls.model.objects.get(pk=form_kwargs['instance'])
-
-            form_kwargs = view_instance.get_async_form_kwargs(form_kwargs, organizer, event)
-
-            form = form_class(**form_kwargs)
-            return view_instance.async_form_valid(self, form)
-
-        cls.async_execute = app.task(
-            base=ProfiledEventTask,
-            bind=True,
-            name=cls.__module__ + '.' + cls.__name__ + '.async_execute',
-            throws=(ValidationError,)
-        )(async_execute)
-
-    def async_form_valid(self, task, form):
-        pass
-
-    def get_async_form_kwargs(self, form_kwargs, organizer=None, event=None):
-        return form_kwargs
-
-    def get(self, request, *args, **kwargs):
-        if 'async_id' in request.GET and settings.HAS_CELERY:
-            return self.get_result(request)
-        return super().get(request, *args, **kwargs)
-
-    def form_valid(self, form):
-        if form.files:
-            raise TypeError('File upload currently not supported in AsyncFormView')
-        form_kwargs = {
-            k: v for k, v in self.get_form_kwargs().items()
-        }
-        if form_kwargs.get('instance'):
-            if form_kwargs['instance'].pk:
-                form_kwargs['instance'] = form_kwargs['instance'].pk
-            else:
-                form_kwargs['instance'] = None
-        form_kwargs.setdefault('data', {})
-        kwargs = {
-            'request_path': self.request.path,
-            'form_kwargs': form_kwargs,
-        }
-        if hasattr(self.request, 'organizer'):
-            kwargs['organizer'] = self.request.organizer.pk
-        if self.request.user.is_authenticated:
-            kwargs['user'] = self.request.user.pk
-        if hasattr(self.request, 'event'):
-            kwargs['event'] = self.request.event.pk
-
-        try:
-            res = type(self).async_execute.apply_async(kwargs=kwargs)
-        except ConnectionError:
-            # Task very likely not yet sent, due to redis restarting etc. Let's try once again
-            res = type(self).async_execute.apply_async(kwargs=kwargs)
-
-        if 'ajax' in self.request.GET or 'ajax' in self.request.POST:
-            data = self._return_ajax_result(res)
-            data['check_url'] = self.get_check_url(res.id, True)
-            return JsonResponse(data)
-        else:
-            if res.ready():
-                if res.successful() and not isinstance(res.info, Exception):
-                    return self.success(res.info)
-                else:
-                    return self.error(res.info)
-            return redirect(self.get_check_url(res.id, False))

src/pretix/control/context.py

@@ -66,9 +66,7 @@ def _default_context(request):
                 if complain_testmode_orders is None:
                     complain_testmode_orders = request.event.orders.filter(testmode=True).exists()
                     request.event.cache.set('complain_testmode_orders', complain_testmode_orders, 30)
-            ctx['complain_testmode_orders'] = complain_testmode_orders and request.user.has_event_permission(
-                request.organizer, request.event, 'can_view_orders', request=request
-            )
+            ctx['complain_testmode_orders'] = complain_testmode_orders
         else:
             ctx['complain_testmode_orders'] = False
 

src/pretix/control/forms/checkin.py

@@ -105,11 +105,6 @@ class CheckinListForm(forms.ModelForm):
             'exit_all_at': NextTimeField,
         }
 
-    def clean(self):
-        d = super().clean()
-        CheckinList.validate_rules(d.get('rules'))
-        return d
-
 
 class SimpleCheckinListForm(forms.ModelForm):
     def __init__(self, **kwargs):

src/pretix/control/forms/event.py

@@ -463,7 +463,6 @@ class EventSettingsForm(SettingsForm):
         'redirect_to_checkout_directly',
         'frontpage_subevent_ordering',
         'event_list_type',
-        'event_list_available_only',
         'frontpage_text',
         'event_info_text',
         'attendee_names_asked',
@@ -548,7 +547,6 @@ class EventSettingsForm(SettingsForm):
         if not self.event.has_subevents:
             del self.fields['frontpage_subevent_ordering']
             del self.fields['event_list_type']
-            del self.fields['event_list_available_only']
 
         # create "virtual" fields for better UX when editing <name>_asked and <name>_required fields
         self.virtual_keys = []
@@ -1134,13 +1132,6 @@ class TicketSettingsForm(SettingsForm):
 
 
 class CommentForm(I18nModelForm):
-
-    def __init__(self, *args, **kwargs):
-        self.readonly = kwargs.pop('readonly', None)
-        super().__init__(*args, **kwargs)
-        if self.readonly:
-            self.fields['comment'].widget.attrs['readonly'] = 'readonly'
-
     class Meta:
         model = Event
         fields = ['comment']

src/pretix/control/forms/filter.py

@@ -995,6 +995,7 @@ class EventFilterForm(FilterForm):
         'date_from': 'order_from',
         'date_to': 'order_to',
         'live': 'live',
+        'sum_tickets_paid': 'sum_tickets_paid'
     }
     status = forms.ChoiceField(
         label=_('Status'),
@@ -1438,8 +1439,6 @@ class VoucherFilterForm(FilterForm):
             s = fdata.get('tag').strip()
             if s == '<>':
                 qs = qs.filter(Q(tag__isnull=True) | Q(tag=''))
-            elif s[0] == '"' and s[-1] == '"':
-                qs = qs.filter(tag__iexact=s[1:-1])
             else:
                 qs = qs.filter(tag__icontains=s)
 

src/pretix/control/forms/item.py

@@ -337,7 +337,7 @@ class ItemCreateForm(I18nModelForm):
                 setattr(self.instance, f, getattr(self.cleaned_data['copy_from'], f))
         else:
             # Add to all sales channels by default
-            self.instance.sales_channels = list(get_all_sales_channels().keys())
+            self.instance.sales_channels = [k for k in get_all_sales_channels().keys()]
 
         self.instance.position = (self.event.items.aggregate(p=Max('position'))['p'] or 0) + 1
         instance = super().save(*args, **kwargs)

src/pretix/control/forms/orders.py

@@ -75,7 +75,7 @@ class ExtendForm(I18nModelForm):
         return super().save(commit)
 
 
-class ForceQuotaConfirmationForm(forms.Form):
+class ConfirmPaymentForm(forms.Form):
     force = forms.BooleanField(
         label=_('Overbook quota and ignore late payment'),
         help_text=_('If you check this box, this operation will be performed even if it leads to an overbooked quota '
@@ -101,15 +101,7 @@ class ForceQuotaConfirmationForm(forms.Form):
             del self.fields['force']
 
 
-class ConfirmPaymentForm(ForceQuotaConfirmationForm):
-    pass
-
-
-class ReactivateOrderForm(ForceQuotaConfirmationForm):
-    pass
-
-
-class CancelForm(ForceQuotaConfirmationForm):
+class CancelForm(ConfirmPaymentForm):
     send_email = forms.BooleanField(
         required=False,
         label=_('Notify customer by email'),

src/pretix/control/forms/organizer.py

@@ -71,7 +71,7 @@ class OrganizerUpdateForm(OrganizerForm):
         kwargs.setdefault('initial', {})
         self.instance = kwargs['instance']
         if self.domain and self.instance:
-            initial_domain = self.instance.domains.filter(event__isnull=True).first()
+            initial_domain = self.instance.domains.first()
             if initial_domain:
                 kwargs['initial'].setdefault('domain', initial_domain.domainname)
 
@@ -149,7 +149,7 @@ class TeamForm(forms.ModelForm):
                   'can_change_teams', 'can_change_organizer_settings',
                   'can_manage_gift_cards',
                   'can_change_event_settings', 'can_change_items',
-                  'can_view_orders', 'can_change_orders', 'can_checkin_orders',
+                  'can_view_orders', 'can_change_orders',
                   'can_view_vouchers', 'can_change_vouchers']
         widgets = {
             'limit_events': forms.CheckboxSelectMultiple(attrs={

src/pretix/control/forms/vouchers.py

@@ -5,7 +5,7 @@ from io import StringIO
 from django import forms
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import EmailValidator
-from django.db.models.functions import Upper
+from django.db.models.functions import Lower
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes.forms import SafeModelChoiceField
@@ -346,8 +346,8 @@ class VoucherBulkForm(VoucherForm):
         data = super().clean()
 
         vouchers = self.instance.event.vouchers.annotate(
-            code_upper=Upper('code')
-        ).filter(code_upper__in=[c.upper() for c in data['codes']])
+            code_lower=Lower('code')
+        ).filter(code_lower__in=[c.lower() for c in data['codes']])
         if vouchers.exists():
             raise ValidationError(_('A voucher with one of these codes already exists.'))
 
@@ -377,5 +377,26 @@ class VoucherBulkForm(VoucherForm):
 
         return data
 
-    def post_bulk_save(self, objs):
-        pass
+    def save(self, event, *args, **kwargs):
+        objs = []
+        for code in self.cleaned_data['codes']:
+            obj = modelcopy(self.instance)
+            obj.event = event
+            obj.code = code
+            try:
+                obj.seat = self.cleaned_data['seats'].pop()
+                obj.item = obj.seat.product
+            except IndexError:
+                pass
+            data = dict(self.cleaned_data)
+            data['code'] = code
+            data['bulk'] = True
+            del data['codes']
+            objs.append(obj)
+        Voucher.objects.bulk_create(objs, batch_size=200)
+        objs = []
+        for v in event.vouchers.filter(code__in=self.cleaned_data['codes']):
+            # We need to query them again as bulk_create does not fill in .pk values on databases
+            # other than PostgreSQL
+            objs.append(v)
+        return objs

src/pretix/control/navigation.py

@@ -514,5 +514,5 @@ def merge_in(nav, newnav):
                 if 'children' not in parents[0]:
                     parents[0]['children'] = []
                 parents[0]['children'].append(item)
-                continue
-        nav.append(item)
+        else:
+            nav.append(item)

src/pretix/control/permissions.py

@@ -7,7 +7,7 @@ from django.utils.translation import gettext as _
 
 
 def current_url(request):
-    if request.GET:
+    if len(request.GET):
         return request.path + '?' + request.GET.urlencode()
     else:
         return request.path

src/pretix/control/signals.py

@@ -2,9 +2,7 @@ from django.dispatch import Signal
 
 from pretix.base.signals import DeprecatedSignal, EventPluginSignal
 
-html_page_start = Signal(
-    providing_args=[]
-)
+html_page_start = Signal()
 """
 This signal allows you to put code in the beginning of the main page for every
 page in the backend. You are expected to return HTML.
@@ -12,10 +10,10 @@ page in the backend. You are expected to return HTML.
 The ``sender`` keyword argument will contain the request.
 """
 
-html_head = EventPluginSignal(
-    providing_args=["request"]
-)
+html_head = EventPluginSignal()
 """
+Arguments: ``request``
+
 This signal allows you to put code inside the HTML ``<head>`` tag
 of every page in the backend. You will get the request as the keyword argument
 ``request`` and are expected to return plain HTML.
@@ -23,10 +21,10 @@ of every page in the backend. You will get the request as the keyword argument
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-nav_event = EventPluginSignal(
-    providing_args=["request"]
-)
+nav_event = EventPluginSignal()
 """
+Arguments: ``request``
+
 This signal allows you to add additional views to the admin panel
 navigation. You will get the request as a keyword argument ``request``.
 Receivers are expected to return a list of dictionaries. The dictionaries
@@ -48,10 +46,10 @@ in pretix.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-nav_topbar = Signal(
-    providing_args=["request"]
-)
+nav_topbar = Signal()
 """
+Arguments: ``request``
+
 This signal allows you to add additional views to the top navigation bar.
 You will get the request as a keyword argument ``request``.
 Receivers are expected to return a list of dictionaries. The dictionaries
@@ -67,10 +65,10 @@ This is no ``EventPluginSignal``, so you do not get the event in the ``sender``
 and you may get the signal regardless of whether your plugin is active.
 """
 
-nav_global = Signal(
-    providing_args=["request"]
-)
+nav_global = Signal()
 """
+Arguments: ``request``
+
 This signal allows you to add additional views to the navigation bar when no event is
 selected. You will get the request as a keyword argument ``request``.
 Receivers are expected to return a list of dictionaries. The dictionaries
@@ -92,10 +90,10 @@ This is no ``EventPluginSignal``, so you do not get the event in the ``sender``
 and you may get the signal regardless of whether your plugin is active.
 """
 
-event_dashboard_top = EventPluginSignal(
-    providing_args=['request']
-)
+event_dashboard_top = EventPluginSignal()
 """
+Arguments: 'request'
+
 This signal is sent out to include custom HTML in the top part of the the event dashboard.
 Receivers should return HTML.
 
@@ -103,9 +101,7 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 An additional keyword argument ``subevent`` *can* contain a sub-event.
 """
 
-event_dashboard_widgets = EventPluginSignal(
-    providing_args=[]
-)
+event_dashboard_widgets = EventPluginSignal()
 """
 This signal is sent out to include widgets in the event dashboard. Receivers
 should return a list of dictionaries, where each dictionary can have the keys:
@@ -120,10 +116,10 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 An additional keyword argument ``subevent`` *can* contain a sub-event.
 """
 
-user_dashboard_widgets = Signal(
-    providing_args=['user']
-)
+user_dashboard_widgets = Signal()
 """
+Arguments: 'user'
+
 This signal is sent out to include widgets in the personal user dashboard. Receivers
 should return a list of dictionaries, where each dictionary can have the keys:
 
@@ -136,36 +132,31 @@ should return a list of dictionaries, where each dictionary can have the keys:
 This is a regular django signal (no pretix event signal).
 """
 
-voucher_form_html = EventPluginSignal(
-    providing_args=['form']
-)
+voucher_form_html = EventPluginSignal()
 """
+Arguments: 'form'
+
 This signal allows you to add additional HTML to the form that is used for modifying vouchers.
 You receive the form object in the ``form`` keyword argument.
 
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-voucher_form_class = EventPluginSignal(
-    providing_args=['cls']
-)
+voucher_form_class = EventPluginSignal()
 """
+Arguments: 'cls'
+
 This signal allows you to replace the form class that is used for modifying vouchers.
 You will receive the default form class (or the class set by a previous plugin) in the
 ``cls`` argument so that you can inherit from it.
 
-Note that this is also called for the voucher bulk creation form, which is executed in
-an asynchronous context. For the bulk creation form, ``save()`` is not called. Instead,
-you can implement ``post_bulk_save(saved_vouchers)`` which may be called multiple times
-for every batch persisted to the database.
-
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-voucher_form_validation = EventPluginSignal(
-    providing_args=['form']
-)
+voucher_form_validation = EventPluginSignal()
 """
+Arguments: 'form'
+
 This signal allows you to add additional validation to the form that is used for
 creating and modifying vouchers. You will receive the form instance in the ``form``
 argument and the current data state in the ``data`` argument.
@@ -173,28 +164,28 @@ argument and the current data state in the ``data`` argument.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-quota_detail_html = EventPluginSignal(
-    providing_args=['quota']
-)
+quota_detail_html = EventPluginSignal()
 """
+Arguments: 'quota'
+
 This signal allows you to append HTML to a Quota's detail view. You receive the
 quota as argument in the ``quota`` keyword argument.
 
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-organizer_edit_tabs = DeprecatedSignal(
-    providing_args=['organizer', 'request']
-)
+organizer_edit_tabs = DeprecatedSignal()
 """
+Arguments: 'organizer', 'request'
+
 Deprecated signal, no longer works. We just keep the definition so old plugins don't
 break the installation.
 """
 
-nav_organizer = Signal(
-    providing_args=['organizer', 'request']
-)
+nav_organizer = Signal()
 """
+Arguments: 'organizer', 'request'
+
 This signal is sent out to include tab links on the detail page of an organizer.
 Receivers are expected to return a list of dictionaries. The dictionaries
 should contain at least the keys ``label`` and ``url``. You should also return
@@ -215,30 +206,30 @@ This is a regular django signal (no pretix event signal). Receivers will be pass
 the keyword arguments ``organizer`` and ``request``.
 """
 
-order_info = EventPluginSignal(
-    providing_args=["order", "request"]
-)
+order_info = EventPluginSignal()
 """
+Arguments: ``order``, ``request``
+
 This signal is sent out to display additional information on the order detail page
 
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 Additionally, the argument ``order`` and ``request`` are available.
 """
 
-order_position_buttons = EventPluginSignal(
-    providing_args=["order", "position", "request"]
-)
+order_position_buttons = EventPluginSignal()
 """
+Arguments: ``order``, ``position``, ``request``
+
 This signal is sent out to display additional buttons for a single position of an order.
 
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 Additionally, the argument ``order`` and ``request`` are available.
 """
 
-nav_event_settings = EventPluginSignal(
-    providing_args=['request']
-)
+nav_event_settings = EventPluginSignal()
 """
+Arguments: 'request'
+
 This signal is sent out to include tab links on the settings page of an event.
 Receivers are expected to return a list of dictionaries. The dictionaries
 should contain at least the keys ``label`` and ``url``. You should also return
@@ -253,10 +244,10 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 A second keyword argument ``request`` will contain the request object.
 """
 
-event_settings_widget = EventPluginSignal(
-    providing_args=['request']
-)
+event_settings_widget = EventPluginSignal()
 """
+Arguments: 'request'
+
 This signal is sent out to include template snippets on the settings page of an event
 that allows generating a pretix Widget code.
 
@@ -264,10 +255,10 @@ As with all plugin signals, the ``sender`` keyword argument will contain the eve
 A second keyword argument ``request`` will contain the request object.
 """
 
-item_forms = EventPluginSignal(
-    providing_args=['request', 'item']
-)
+item_forms = EventPluginSignal()
 """
+Arguments: 'request', 'item'
+
 This signal allows you to return additional forms that should be rendered on the product
 modification page. You are passed ``request`` and ``item`` arguments and are expected to return
 an instance of a form class that you bind yourself when appropriate. Your form will be executed
@@ -277,10 +268,10 @@ styles. It is advisable to set a prefix for your form to avoid clashes with othe
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-item_formsets = EventPluginSignal(
-    providing_args=['request', 'item']
-)
+item_formsets = EventPluginSignal()
 """
+Arguments: 'request', 'item'
+
 This signal allows you to return additional formsets that should be rendered on the product
 modification page. You are passed ``request`` and ``item`` arguments and are expected to return
 an instance of a formset class that you bind yourself when appropriate. Your formset will be
@@ -295,10 +286,10 @@ will be passed a ``formset`` variable with your formset.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-subevent_forms = EventPluginSignal(
-    providing_args=['request', 'subevent', 'copy_from']
-)
+subevent_forms = EventPluginSignal()
 """
+Arguments: 'request', 'subevent', 'copy_from'
+
 This signal allows you to return additional forms that should be rendered on the subevent creation
 or modification page. You are passed ``request`` and ``subevent`` arguments and are expected to return
 an instance of a form class that you bind yourself when appropriate. Your form will be executed
@@ -312,17 +303,17 @@ creation, ``copy_from`` can be a subevent that is being copied from.
 As with all plugin signals, the ``sender`` keyword argument will contain the event.
 """
 
-oauth_application_registered = Signal(
-    providing_args=["user", "application"]
-)
+oauth_application_registered = Signal()
 """
+Arguments: ``user``, ``application``
+
 This signal will be called whenever a user registers a new OAuth application.
 """
 
-order_search_filter_q = Signal(
-    providing_args=["query"]
-)
+order_search_filter_q = Signal()
 """
+Arguments: ``query``
+
 This signal will be called whenever a free-text order search is performed. You are expected to return one
 Q object that will be OR-ed with existing search queries. As order search exists on a global level as well,
 this is not an Event signal and will be called even if your plugin is not active. ``sender`` will contain the
@@ -330,10 +321,10 @@ event if the search is performed within an event, and ``None`` otherwise. The se
 ``query``.
 """
 
-order_search_forms = EventPluginSignal(
-    providing_args=['request']
-)
+order_search_forms = EventPluginSignal()
 """
+Arguments: 'request'
+
 This signal allows you to return additional forms that should be rendered in the advanced order search.
 You are passed ``request`` argument and are expected to return an instance of a form class that you bind
 yourself when appropriate. Your form will be executed as part of the standard validation and rendering

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

@@ -283,7 +283,6 @@
                                 {% for nav in nav_items %}
                                     <li>
                                         <a href="{{ nav.url }}" {% if nav.active %}class="active"{% endif %}
-                                                {% if nav.external %}target="_blank"{% endif %}
                                                 {% if nav.children %}class="has-children"{% endif %}>
                                             {% if nav.icon %}
                                                 {% if "<svg" in nav.icon %}
@@ -302,7 +301,6 @@
                                                 {% for item in nav.children %}
                                                     <li>
                                                         <a href="{{ item.url }}"
-                                                                {% if item.external %}target="_blank"{% endif %}
                                                                 {% if item.active %}class="active"{% endif %}>
                                                             {{ item.label }}
                                                         </a>

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

@@ -150,14 +150,12 @@
                 <div class="row">
                     {% bootstrap_field comment_form.comment layout="horizontal" show_help=True show_label=False horizontal_field_class="col-md-12" %}
                 </div>
-                {% if not comment_form.readonly %}
-                    <p class="text-right flip">
-                        <br>
-                        <button class="btn btn-default">
-                            {% trans "Update comment" %}
-                        </button>
-                    </p>
-                {% endif %}
+                <p class="text-right flip">
+                    <br>
+                    <button class="btn btn-default">
+                        {% trans "Update comment" %}
+                    </button>
+                </p>
             </form>
         </div>
     </div>

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

@@ -30,7 +30,6 @@
                 {% bootstrap_field sform.contact_mail layout="control" %}
                 {% bootstrap_field sform.imprint_url layout="control" %}
                 {% bootstrap_field form.is_public layout="control" %}
-                {% bootstrap_field form.sales_channels layout="control" %}
 
                 {% if meta_forms %}
                     <div class="form-group metadata-group">
@@ -237,9 +236,7 @@
                 {% if sform.event_list_type %}
                     {% bootstrap_field sform.event_list_type layout="control" %}
                 {% endif %}
-                {% if sform.event_list_available_only %}
-                    {% bootstrap_field sform.event_list_available_only layout="control" %}
-                {% endif %}
+                {% bootstrap_field form.sales_channels layout="control" %}
             </fieldset>
             <fieldset>
                 <legend>{% trans "Cart" %}</legend>

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

@@ -81,6 +81,8 @@
                 </th>
                 <th>
                     {% trans "Paid tickets per quota" %}
+                    <a href="?{% url_replace request 'ordering' '-sum_tickets_paid' %}"><i class="fa fa-caret-down"></i></a>
+                    <a href="?{% url_replace request 'ordering' 'sum_tickets_paid' %}"><i class="fa fa-caret-up"></i></a>
                 </th>
                 <th>
                     {% trans "Status" %}

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

@@ -1,7 +1,6 @@
 {% load i18n %}
-<a class="quotabox" data-toggle="tooltip_html" data-placement="top"
-        title="{% trans "Quota:" %} {{ q.name }}{% if q.cached_avail.1 is not None %}<br>{% blocktrans with num=q.cached_avail.1 %}Currently available: {{ num }}{% endblocktrans %}{% endif %}"
-    href="{% url "control:event.items.quotas.show" event=q.event.slug organizer=q.event.organizer.slug quota=q.pk %}">
+<div class="quotabox" data-toggle="tooltip_html" data-placement="top"
+        title="{% trans "Quota:" %} {{ q.name }}<br>{% blocktrans with date=q.cached_availability_time|date:"SHORT_DATETIME_FORMAT" %}Numbers as of {{ date }}{% endblocktrans %}{% if q.cached_avail.1 is not None %}<br>{% blocktrans with num=q.cached_avail.1 %}Currently available: {{ num }}{% endblocktrans %}{% endif %}">
     {% if q.size|default_if_none:"NONE" == "NONE" %}
         <div class="progress">
         </div>
@@ -14,4 +13,4 @@
     <div class="numbers">
         {{ q.cached_availability_paid_orders|default_if_none:"?" }} / {{ q.size|default_if_none:"∞" }}
     </div>
-</a>
+</div>

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

@@ -24,7 +24,6 @@
 
     <form method="post" class="form-horizontal" href="">
         {% csrf_token %}
-        {% bootstrap_form form layout='horizontal' horizontal_label_class='sr-only' horizontal_field_class='col-md-12' %}
         <div class="form-group submit-group">
             <a class="btn btn-default btn-lg"
                href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">

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

@@ -35,7 +35,6 @@
             {% bootstrap_field form.can_change_items layout="control" %}
             {% bootstrap_field form.can_view_orders layout="control" %}
             {% bootstrap_field form.can_change_orders layout="control" %}
-            {% bootstrap_field form.can_checkin_orders layout="control" %}
             {% bootstrap_field form.can_view_vouchers layout="control" %}
             {% bootstrap_field form.can_change_vouchers layout="control" %}
         </fieldset>

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

@@ -80,6 +80,8 @@
                         </th>
                         <th>
                             {% trans "Paid tickets per quota" %}
+                            <a href="?{% url_replace request 'filter-ordering' '-sum_tickets_paid' %}"><i class="fa fa-caret-down"></i></a>
+                            <a href="?{% url_replace request 'filter-ordering' 'sum_tickets_paid' %}"><i class="fa fa-caret-up"></i></a>
                         </th>
                         <th>
                             {% trans "Status" %}

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

@@ -5,7 +5,7 @@
 {% block title %}{% trans "Voucher" %}{% endblock %}
 {% block inside %}
     <h1>{% trans "Create multiple vouchers" %}</h1>
-    <form action="" method="post" class="form-horizontal" data-asynctask>
+    <form action="" method="post" class="form-horizontal">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
         <fieldset>

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

@@ -32,7 +32,7 @@
                                 <label class="col-md-3 control-label" for="id_url">{% trans "Voucher link" %}</label>
                                 <div class="col-md-9">
                                     <input type="text" name="url"
-                                            value="{% abseventurl request.event "presale:event.redeem" %}?voucher={{ voucher.code|urlencode }}{% if voucher.subevent_id %}&subevent={{ voucher.subevent_id }}{% endif %}"
+                                            value="{% abseventurl request.event "presale:event.redeem" %}?voucher={{ voucher.code }}{% if voucher.subevent_id %}&subevent={{ voucher.subevent_id }}{% endif %}"
                                             class="form-control"
                                             id="id_url" readonly>
                                 </div>

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

@@ -49,7 +49,7 @@
                         <td>
                             <strong>
                             {% if t.tag %}
-                                <a href="{% url "control:event.vouchers" organizer=request.event.organizer.slug event=request.event.slug %}?tag={{ '"'|add:t.tag|add:'"'|urlencode }}">
+                                <a href="{% url "control:event.vouchers" organizer=request.event.organizer.slug event=request.event.slug %}?tag={{ t.tag|urlencode }}">
                                     {{ t.tag }}
                                 </a>
                             {% else %}

src/pretix/control/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include, url
+from django.conf.urls import include, re_path
 from django.views.generic.base import RedirectView
 
 from pretix.control.views import (
@@ -8,310 +8,327 @@ from pretix.control.views import (
 )
 
 urlpatterns = [
-    url(r'^logout$', auth.logout, name='auth.logout'),
-    url(r'^login$', auth.login, name='auth.login'),
-    url(r'^login/2fa$', auth.Login2FAView.as_view(), name='auth.login.2fa'),
-    url(r'^register$', auth.register, name='auth.register'),
-    url(r'^invite/(?P<token>[a-zA-Z0-9]+)$', auth.invite, name='auth.invite'),
-    url(r'^forgot$', auth.Forgot.as_view(), name='auth.forgot'),
-    url(r'^forgot/recover$', auth.Recover.as_view(), name='auth.forgot.recover'),
-    url(r'^$', dashboards.user_index, name='index'),
-    url(r'^widgets.json$', dashboards.user_index_widgets_lazy, name='index.widgets'),
-    url(r'^global/settings/$', global_settings.GlobalSettingsView.as_view(), name='global.settings'),
-    url(r'^global/update/$', global_settings.UpdateCheckView.as_view(), name='global.update'),
-    url(r'^global/message/$', global_settings.MessageView.as_view(), name='global.message'),
-    url(r'^logdetail/$', global_settings.LogDetailView.as_view(), name='global.logdetail'),
-    url(r'^logdetail/payment/$', global_settings.PaymentDetailView.as_view(), name='global.paymentdetail'),
-    url(r'^logdetail/refund/$', global_settings.RefundDetailView.as_view(), name='global.refunddetail'),
-    url(r'^geocode/$', geo.GeoCodeView.as_view(), name='global.geocode'),
-    url(r'^reauth/$', user.ReauthView.as_view(), name='user.reauth'),
-    url(r'^sudo/$', user.StartStaffSession.as_view(), name='user.sudo'),
-    url(r'^sudo/stop/$', user.StopStaffSession.as_view(), name='user.sudo.stop'),
-    url(r'^sudo/(?P<id>\d+)/$', user.EditStaffSession.as_view(), name='user.sudo.edit'),
-    url(r'^sudo/sessions/$', user.StaffSessionList.as_view(), name='user.sudo.list'),
-    url(r'^users/$', users.UserListView.as_view(), name='users'),
-    url(r'^users/select2$', typeahead.users_select2, name='users.select2'),
-    url(r'^users/add$', users.UserCreateView.as_view(), name='users.add'),
-    url(r'^users/impersonate/stop', users.UserImpersonateStopView.as_view(), name='users.impersonate.stop'),
-    url(r'^users/(?P<id>\d+)/$', users.UserEditView.as_view(), name='users.edit'),
-    url(r'^users/(?P<id>\d+)/reset$', users.UserResetView.as_view(), name='users.reset'),
-    url(r'^users/(?P<id>\d+)/impersonate', users.UserImpersonateView.as_view(), name='users.impersonate'),
-    url(r'^users/(?P<id>\d+)/anonymize', users.UserAnonymizeView.as_view(), name='users.anonymize'),
-    url(r'^pdf/editor/webfonts.css', pdf.FontsCSSView.as_view(), name='pdf.css'),
-    url(r'^settings/?$', user.UserSettings.as_view(), name='user.settings'),
-    url(r'^settings/history/$', user.UserHistoryView.as_view(), name='user.settings.history'),
-    url(r'^settings/notifications/$', user.UserNotificationsEditView.as_view(), name='user.settings.notifications'),
-    url(r'^settings/notifications/off/(?P<id>\d+)/(?P<token>[^/]+)/$', user.UserNotificationsDisableView.as_view(),
-        name='user.settings.notifications.off'),
-    url(r'^settings/oauth/authorized/$', oauth.AuthorizationListView.as_view(),
-        name='user.settings.oauth.list'),
-    url(r'^settings/oauth/authorized/(?P<pk>\d+)/revoke$', oauth.AuthorizationRevokeView.as_view(),
-        name='user.settings.oauth.revoke'),
-    url(r'^settings/oauth/apps/$', oauth.OAuthApplicationListView.as_view(),
-        name='user.settings.oauth.apps'),
-    url(r'^settings/oauth/apps/add$', oauth.OAuthApplicationRegistrationView.as_view(),
-        name='user.settings.oauth.apps.register'),
-    url(r'^settings/oauth/apps/(?P<pk>\d+)/$', oauth.OAuthApplicationUpdateView.as_view(),
-        name='user.settings.oauth.app'),
-    url(r'^settings/oauth/apps/(?P<pk>\d+)/disable$', oauth.OAuthApplicationDeleteView.as_view(),
-        name='user.settings.oauth.app.disable'),
-    url(r'^settings/oauth/apps/(?P<pk>\d+)/roll$', oauth.OAuthApplicationRollView.as_view(),
-        name='user.settings.oauth.app.roll'),
-    url(r'^settings/2fa/$', user.User2FAMainView.as_view(), name='user.settings.2fa'),
-    url(r'^settings/2fa/add$', user.User2FADeviceAddView.as_view(), name='user.settings.2fa.add'),
-    url(r'^settings/2fa/enable', user.User2FAEnableView.as_view(), name='user.settings.2fa.enable'),
-    url(r'^settings/2fa/disable', user.User2FADisableView.as_view(), name='user.settings.2fa.disable'),
-    url(r'^settings/2fa/regenemergency', user.User2FARegenerateEmergencyView.as_view(),
-        name='user.settings.2fa.regenemergency'),
-    url(r'^settings/2fa/totp/(?P<device>[0-9]+)/confirm', user.User2FADeviceConfirmTOTPView.as_view(),
-        name='user.settings.2fa.confirm.totp'),
-    url(r'^settings/2fa/webauthn/(?P<device>[0-9]+)/confirm', user.User2FADeviceConfirmWebAuthnView.as_view(),
-        name='user.settings.2fa.confirm.webauthn'),
-    url(r'^settings/2fa/(?P<devicetype>[^/]+)/(?P<device>[0-9]+)/delete', user.User2FADeviceDeleteView.as_view(),
-        name='user.settings.2fa.delete'),
-    url(r'^organizers/$', organizer.OrganizerList.as_view(), name='organizers'),
-    url(r'^organizers/add$', organizer.OrganizerCreate.as_view(), name='organizers.add'),
-    url(r'^organizers/select2$', typeahead.organizer_select2, name='organizers.select2'),
-    url(r'^organizer/(?P<organizer>[^/]+)/$', organizer.OrganizerDetail.as_view(), name='organizer'),
-    url(r'^organizer/(?P<organizer>[^/]+)/edit$', organizer.OrganizerUpdate.as_view(), name='organizer.edit'),
-    url(r'^organizer/(?P<organizer>[^/]+)/delete$', organizer.OrganizerDelete.as_view(), name='organizer.delete'),
-    url(r'^organizer/(?P<organizer>[^/]+)/settings/display$', organizer.OrganizerDisplaySettings.as_view(),
-        name='organizer.display'),
-    url(r'^organizer/(?P<organizer>[^/]+)/properties$', organizer.EventMetaPropertyListView.as_view(), name='organizer.properties'),
-    url(r'^organizer/(?P<organizer>[^/]+)/property/add$', organizer.EventMetaPropertyCreateView.as_view(),
-        name='organizer.property.add'),
-    url(r'^organizer/(?P<organizer>[^/]+)/property/(?P<property>[^/]+)/edit$', organizer.EventMetaPropertyUpdateView.as_view(),
-        name='organizer.property.edit'),
-    url(r'^organizer/(?P<organizer>[^/]+)/property/(?P<property>[^/]+)/delete$', organizer.EventMetaPropertyDeleteView.as_view(),
-        name='organizer.property.delete'),
-    url(r'^organizer/(?P<organizer>[^/]+)/giftcards$', organizer.GiftCardListView.as_view(), name='organizer.giftcards'),
-    url(r'^organizer/(?P<organizer>[^/]+)/giftcard/add$', organizer.GiftCardCreateView.as_view(), name='organizer.giftcard.add'),
-    url(r'^organizer/(?P<organizer>[^/]+)/giftcard/(?P<giftcard>[^/]+)/$', organizer.GiftCardDetailView.as_view(), name='organizer.giftcard'),
-    url(r'^organizer/(?P<organizer>[^/]+)/giftcard/(?P<giftcard>[^/]+)/edit$', organizer.GiftCardUpdateView.as_view(),
-        name='organizer.giftcard.edit'),
-    url(r'^organizer/(?P<organizer>[^/]+)/webhooks$', organizer.WebHookListView.as_view(), name='organizer.webhooks'),
-    url(r'^organizer/(?P<organizer>[^/]+)/webhook/add$', organizer.WebHookCreateView.as_view(),
-        name='organizer.webhook.add'),
-    url(r'^organizer/(?P<organizer>[^/]+)/webhook/(?P<webhook>[^/]+)/edit$', organizer.WebHookUpdateView.as_view(),
-        name='organizer.webhook.edit'),
-    url(r'^organizer/(?P<organizer>[^/]+)/webhook/(?P<webhook>[^/]+)/logs$', organizer.WebHookLogsView.as_view(),
-        name='organizer.webhook.logs'),
-    url(r'^organizer/(?P<organizer>[^/]+)/devices$', organizer.DeviceListView.as_view(), name='organizer.devices'),
-    url(r'^organizer/(?P<organizer>[^/]+)/device/add$', organizer.DeviceCreateView.as_view(),
-        name='organizer.device.add'),
-    url(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/edit$', organizer.DeviceUpdateView.as_view(),
-        name='organizer.device.edit'),
-    url(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/connect$', organizer.DeviceConnectView.as_view(),
-        name='organizer.device.connect'),
-    url(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/revoke$', organizer.DeviceRevokeView.as_view(),
-        name='organizer.device.revoke'),
-    url(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/logs$', organizer.DeviceLogView.as_view(),
-        name='organizer.device.logs'),
-    url(r'^organizer/(?P<organizer>[^/]+)/gates$', organizer.GateListView.as_view(), name='organizer.gates'),
-    url(r'^organizer/(?P<organizer>[^/]+)/gate/add$', organizer.GateCreateView.as_view(), name='organizer.gate.add'),
-    url(r'^organizer/(?P<organizer>[^/]+)/gate/(?P<gate>[^/]+)/edit$', organizer.GateUpdateView.as_view(),
-        name='organizer.gate.edit'),
-    url(r'^organizer/(?P<organizer>[^/]+)/gate/(?P<gate>[^/]+)/delete$', organizer.GateDeleteView.as_view(),
-        name='organizer.gate.delete'),
-    url(r'^organizer/(?P<organizer>[^/]+)/teams$', organizer.TeamListView.as_view(), name='organizer.teams'),
-    url(r'^organizer/(?P<organizer>[^/]+)/team/add$', organizer.TeamCreateView.as_view(), name='organizer.team.add'),
-    url(r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/$', organizer.TeamMemberView.as_view(),
-        name='organizer.team'),
-    url(r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/edit$', organizer.TeamUpdateView.as_view(),
-        name='organizer.team.edit'),
-    url(r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/delete$', organizer.TeamDeleteView.as_view(),
-        name='organizer.team.delete'),
-    url(r'^organizer/(?P<organizer>[^/]+)/slugrng', main.SlugRNG.as_view(), name='events.add.slugrng'),
-    url(r'^organizer/(?P<organizer>[^/]+)/logs', organizer.LogView.as_view(), name='organizer.log'),
-    url(r'^organizer/(?P<organizer>[^/]+)/export/$', organizer.ExportView.as_view(), name='organizer.export'),
-    url(r'^organizer/(?P<organizer>[^/]+)/export/do$', organizer.ExportDoView.as_view(), name='organizer.export.do'),
-    url(r'^nav/typeahead/$', typeahead.nav_context_list, name='nav.typeahead'),
-    url(r'^events/$', main.EventList.as_view(), name='events'),
-    url(r'^events/add$', main.EventWizard.as_view(), name='events.add'),
-    url(r'^events/typeahead/$', typeahead.event_list, name='events.typeahead'),
-    url(r'^events/typeahead/meta/$', typeahead.meta_values, name='events.meta.typeahead'),
-    url(r'^search/orders/$', search.OrderSearch.as_view(), name='search.orders'),
-    url(r'^event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include([
-        url(r'^$', dashboards.event_index, name='event.index'),
-        url(r'^widgets.json$', dashboards.event_index_widgets_lazy, name='event.index.widgets'),
-        url(r'^live/$', event.EventLive.as_view(), name='event.live'),
-        url(r'^logs/$', event.EventLog.as_view(), name='event.log'),
-        url(r'^delete/$', event.EventDelete.as_view(), name='event.delete'),
-        url(r'^requiredactions/$', event.EventActions.as_view(), name='event.requiredactions'),
-        url(r'^requiredactions/(?P<id>\d+)/discard$', event.EventActionDiscard.as_view(),
-            name='event.requiredaction.discard'),
-        url(r'^comment/$', event.EventComment.as_view(),
-            name='event.comment'),
-        url(r'^quickstart/$', event.QuickSetupView.as_view(), name='event.quick'),
-        url(r'^settings/$', event.EventUpdate.as_view(), name='event.settings'),
-        url(r'^settings/plugins$', event.EventPlugins.as_view(), name='event.settings.plugins'),
-        url(r'^settings/payment/(?P<provider>[^/]+)$', event.PaymentProviderSettings.as_view(),
-            name='event.settings.payment.provider'),
-        url(r'^settings/payment$', event.PaymentSettings.as_view(), name='event.settings.payment'),
-        url(r'^settings/tickets$', event.TicketSettings.as_view(), name='event.settings.tickets'),
-        url(r'^settings/tickets/preview/(?P<output>[^/]+)$', event.TicketSettingsPreview.as_view(),
-            name='event.settings.tickets.preview'),
-        url(r'^settings/email$', event.MailSettings.as_view(), name='event.settings.mail'),
-        url(r'^settings/email/preview$', event.MailSettingsPreview.as_view(), name='event.settings.mail.preview'),
-        url(r'^settings/email/layoutpreview$', event.MailSettingsRendererPreview.as_view(),
-            name='event.settings.mail.preview.layout'),
-        url(r'^settings/cancel', event.CancelSettings.as_view(), name='event.settings.cancel'),
-        url(r'^settings/invoice$', event.InvoiceSettings.as_view(), name='event.settings.invoice'),
-        url(r'^settings/invoice/preview$', event.InvoicePreview.as_view(), name='event.settings.invoice.preview'),
-        url(r'^settings/display', event.DisplaySettings.as_view(), name='event.settings.display'),
-        url(r'^settings/tax/$', event.TaxList.as_view(), name='event.settings.tax'),
-        url(r'^settings/tax/(?P<rule>\d+)/$', event.TaxUpdate.as_view(), name='event.settings.tax.edit'),
-        url(r'^settings/tax/add$', event.TaxCreate.as_view(), name='event.settings.tax.add'),
-        url(r'^settings/tax/(?P<rule>\d+)/delete$', event.TaxDelete.as_view(), name='event.settings.tax.delete'),
-        url(r'^settings/widget$', event.WidgetSettings.as_view(), name='event.settings.widget'),
-        url(r'^pdf/editor/webfonts.css', pdf.FontsCSSView.as_view(), name='pdf.css'),
-        url(r'^pdf/editor/(?P<filename>[^/]+).pdf$', pdf.PdfView.as_view(), name='pdf.background'),
-        url(r'^subevents/$', subevents.SubEventList.as_view(), name='event.subevents'),
-        url(r'^subevents/select2$', typeahead.subevent_select2, name='event.subevents.select2'),
-        url(r'^subevents/(?P<subevent>\d+)/$', subevents.SubEventUpdate.as_view(), name='event.subevent'),
-        url(r'^subevents/(?P<subevent>\d+)/delete$', subevents.SubEventDelete.as_view(),
-            name='event.subevent.delete'),
-        url(r'^subevents/add$', subevents.SubEventCreate.as_view(), name='event.subevents.add'),
-        url(r'^subevents/bulk_add$', subevents.SubEventBulkCreate.as_view(), name='event.subevents.bulk'),
-        url(r'^subevents/bulk_action$', subevents.SubEventBulkAction.as_view(), name='event.subevents.bulkaction'),
-        url(r'^subevents/bulk_edit$', subevents.SubEventBulkEdit.as_view(), name='event.subevents.bulkedit'),
-        url(r'^items/$', item.ItemList.as_view(), name='event.items'),
-        url(r'^items/add$', item.ItemCreate.as_view(), name='event.items.add'),
-        url(r'^items/(?P<item>\d+)/$', item.ItemUpdateGeneral.as_view(), name='event.item'),
-        url(r'^items/(?P<item>\d+)/up$', item.item_move_up, name='event.items.up'),
-        url(r'^items/(?P<item>\d+)/down$', item.item_move_down, name='event.items.down'),
-        url(r'^items/(?P<item>\d+)/delete$', item.ItemDelete.as_view(), name='event.items.delete'),
-        url(r'^items/typeahead/meta/$', typeahead.item_meta_values, name='event.items.meta.typeahead'),
-        url(r'^items/select2$', typeahead.items_select2, name='event.items.select2'),
-        url(r'^items/select2/variation$', typeahead.variations_select2, name='event.items.variations.select2'),
-        url(r'^categories/$', item.CategoryList.as_view(), name='event.items.categories'),
-        url(r'^categories/select2$', typeahead.category_select2, name='event.items.categories.select2'),
-        url(r'^categories/(?P<category>\d+)/delete$', item.CategoryDelete.as_view(),
-            name='event.items.categories.delete'),
-        url(r'^categories/(?P<category>\d+)/up$', item.category_move_up, name='event.items.categories.up'),
-        url(r'^categories/(?P<category>\d+)/down$', item.category_move_down,
-            name='event.items.categories.down'),
-        url(r'^categories/(?P<category>\d+)/$', item.CategoryUpdate.as_view(),
-            name='event.items.categories.edit'),
-        url(r'^categories/add$', item.CategoryCreate.as_view(), name='event.items.categories.add'),
-        url(r'^questions/$', item.QuestionList.as_view(), name='event.items.questions'),
-        url(r'^questions/reorder$', item.reorder_questions, name='event.items.questions.reorder'),
-        url(r'^questions/(?P<question>\d+)/delete$', item.QuestionDelete.as_view(),
-            name='event.items.questions.delete'),
-        url(r'^questions/(?P<question>\d+)/$', item.QuestionView.as_view(),
-            name='event.items.questions.show'),
-        url(r'^questions/(?P<question>\d+)/change$', item.QuestionUpdate.as_view(),
-            name='event.items.questions.edit'),
-        url(r'^questions/add$', item.QuestionCreate.as_view(), name='event.items.questions.add'),
-        url(r'^quotas/$', item.QuotaList.as_view(), name='event.items.quotas'),
-        url(r'^quotas/(?P<quota>\d+)/$', item.QuotaView.as_view(), name='event.items.quotas.show'),
-        url(r'^quotas/select$', typeahead.quotas_select2, name='event.items.quotas.select2'),
-        url(r'^quotas/(?P<quota>\d+)/change$', item.QuotaUpdate.as_view(), name='event.items.quotas.edit'),
-        url(r'^quotas/(?P<quota>\d+)/delete$', item.QuotaDelete.as_view(),
-            name='event.items.quotas.delete'),
-        url(r'^quotas/add$', item.QuotaCreate.as_view(), name='event.items.quotas.add'),
-        url(r'^vouchers/$', vouchers.VoucherList.as_view(), name='event.vouchers'),
-        url(r'^vouchers/tags/$', vouchers.VoucherTags.as_view(), name='event.vouchers.tags'),
-        url(r'^vouchers/rng$', vouchers.VoucherRNG.as_view(), name='event.vouchers.rng'),
-        url(r'^vouchers/item_select$', typeahead.itemvarquota_select2, name='event.vouchers.itemselect2'),
-        url(r'^vouchers/(?P<voucher>\d+)/$', vouchers.VoucherUpdate.as_view(), name='event.voucher'),
-        url(r'^vouchers/(?P<voucher>\d+)/delete$', vouchers.VoucherDelete.as_view(),
-            name='event.voucher.delete'),
-        url(r'^vouchers/add$', vouchers.VoucherCreate.as_view(), name='event.vouchers.add'),
-        url(r'^vouchers/go$', vouchers.VoucherGo.as_view(), name='event.vouchers.go'),
-        url(r'^vouchers/bulk_add$', vouchers.VoucherBulkCreate.as_view(), name='event.vouchers.bulk'),
-        url(r'^vouchers/bulk_action$', vouchers.VoucherBulkAction.as_view(), name='event.vouchers.bulkaction'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/transition$', orders.OrderTransition.as_view(),
-            name='event.order.transition'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/resend$', orders.OrderResendLink.as_view(),
-            name='event.order.resendlink'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/(?P<position>\d+)/resend$', orders.OrderResendLink.as_view(),
-            name='event.order.resendlink'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/invoice$', orders.OrderInvoiceCreate.as_view(),
-            name='event.order.geninvoice'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/invoices/(?P<id>\d+)/regenerate$', orders.OrderInvoiceRegenerate.as_view(),
-            name='event.order.regeninvoice'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/invoices/(?P<id>\d+)/reissue$', orders.OrderInvoiceReissue.as_view(),
-            name='event.order.reissueinvoice'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/download/(?P<position>\d+)/(?P<output>[^/]+)/$',
-            orders.OrderDownload.as_view(),
-            name='event.order.download.ticket'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/answer/(?P<answer>[^/]+)/$',
-            orders.AnswerDownload.as_view(),
-            name='event.order.download.answer'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/checkvatid', orders.OrderCheckVATID.as_view(),
-            name='event.order.checkvatid'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/extend$', orders.OrderExtend.as_view(),
-            name='event.order.extend'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/reactivate$', orders.OrderReactivate.as_view(),
-            name='event.order.reactivate'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/contact$', orders.OrderContactChange.as_view(),
-            name='event.order.contact'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/locale', orders.OrderLocaleChange.as_view(),
-            name='event.order.locale'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/comment$', orders.OrderComment.as_view(),
-            name='event.order.comment'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/change$', orders.OrderChange.as_view(),
-            name='event.order.change'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/approve', orders.OrderApprove.as_view(),
-            name='event.order.approve'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/deny$', orders.OrderDeny.as_view(),
-            name='event.order.deny'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/delete$', orders.OrderDelete.as_view(),
-            name='event.order.delete'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/info', orders.OrderModifyInformation.as_view(),
-            name='event.order.info'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/sendmail$', orders.OrderSendMail.as_view(),
-            name='event.order.sendmail'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/(?P<position>[0-9A-Z]+)/sendmail$', orders.OrderPositionSendMail.as_view(),
-            name='event.order.position.sendmail'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/mail_history$', orders.OrderEmailHistory.as_view(),
-            name='event.order.mail_history'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/payments/(?P<payment>\d+)/cancel$', orders.OrderPaymentCancel.as_view(),
-            name='event.order.payments.cancel'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/payments/(?P<payment>\d+)/confirm$', orders.OrderPaymentConfirm.as_view(),
-            name='event.order.payments.confirm'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/refund$', orders.OrderRefundView.as_view(),
-            name='event.order.refunds.start'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/refunds/(?P<refund>\d+)/cancel$', orders.OrderRefundCancel.as_view(),
-            name='event.order.refunds.cancel'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/refunds/(?P<refund>\d+)/process$', orders.OrderRefundProcess.as_view(),
-            name='event.order.refunds.process'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/refunds/(?P<refund>\d+)/done$', orders.OrderRefundDone.as_view(),
-            name='event.order.refunds.done'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/cancellationrequests/(?P<req>\d+)/delete$',
-            orders.OrderCancellationRequestDelete.as_view(),
-            name='event.order.cancellationrequests.delete'),
-        url(r'^orders/(?P<code>[0-9A-Z]+)/$', orders.OrderDetail.as_view(), name='event.order'),
-        url(r'^invoice/(?P<invoice>[^/]+)$', orders.InvoiceDownload.as_view(),
-            name='event.invoice.download'),
-        url(r'^orders/overview/$', orders.OverView.as_view(), name='event.orders.overview'),
-        url(r'^orders/import/$', orderimport.ImportView.as_view(), name='event.orders.import'),
-        url(r'^orders/import/(?P<file>[^/]+)/$', orderimport.ProcessView.as_view(), name='event.orders.import.process'),
-        url(r'^orders/export/$', orders.ExportView.as_view(), name='event.orders.export'),
-        url(r'^orders/export/do$', orders.ExportDoView.as_view(), name='event.orders.export.do'),
-        url(r'^orders/refunds/$', orders.RefundList.as_view(), name='event.orders.refunds'),
-        url(r'^orders/go$', orders.OrderGo.as_view(), name='event.orders.go'),
-        url(r'^orders/$', orders.OrderList.as_view(), name='event.orders'),
-        url(r'^orders/search$', orders.OrderSearch.as_view(), name='event.orders.search'),
-        url(r'^dangerzone/$', event.DangerZone.as_view(), name='event.dangerzone'),
-        url(r'^cancel/$', orders.EventCancel.as_view(), name='event.cancel'),
-        url(r'^shredder/$', shredder.StartShredView.as_view(), name='event.shredder.start'),
-        url(r'^shredder/export$', shredder.ShredExportView.as_view(), name='event.shredder.export'),
-        url(r'^shredder/download/(?P<file>[^/]+)/$', shredder.ShredDownloadView.as_view(), name='event.shredder.download'),
-        url(r'^shredder/shred', shredder.ShredDoView.as_view(), name='event.shredder.shred'),
-        url(r'^waitinglist/$', waitinglist.WaitingListView.as_view(), name='event.orders.waitinglist'),
-        url(r'^waitinglist/auto_assign$', waitinglist.AutoAssign.as_view(), name='event.orders.waitinglist.auto'),
-        url(r'^waitinglist/(?P<entry>\d+)/delete$', waitinglist.EntryDelete.as_view(),
-            name='event.orders.waitinglist.delete'),
-        url(r'^checkinlists/$', checkin.CheckinListList.as_view(), name='event.orders.checkinlists'),
-        url(r'^checkinlists/add$', checkin.CheckinListCreate.as_view(), name='event.orders.checkinlists.add'),
-        url(r'^checkinlists/select2$', typeahead.checkinlist_select2, name='event.orders.checkinlists.select2'),
-        url(r'^checkinlists/(?P<list>\d+)/$', checkin.CheckInListShow.as_view(), name='event.orders.checkinlists.show'),
-        url(r'^checkinlists/(?P<list>\d+)/change$', checkin.CheckinListUpdate.as_view(),
-            name='event.orders.checkinlists.edit'),
-        url(r'^checkinlists/(?P<list>\d+)/delete$', checkin.CheckinListDelete.as_view(),
-            name='event.orders.checkinlists.delete'),
+    re_path(r'^logout$', auth.logout, name='auth.logout'),
+    re_path(r'^login$', auth.login, name='auth.login'),
+    re_path(r'^login/2fa$', auth.Login2FAView.as_view(), name='auth.login.2fa'),
+    re_path(r'^register$', auth.register, name='auth.register'),
+    re_path(r'^invite/(?P<token>[a-zA-Z0-9]+)$', auth.invite, name='auth.invite'),
+    re_path(r'^forgot$', auth.Forgot.as_view(), name='auth.forgot'),
+    re_path(r'^forgot/recover$', auth.Recover.as_view(), name='auth.forgot.recover'),
+    re_path(r'^$', dashboards.user_index, name='index'),
+    re_path(r'^widgets.json$', dashboards.user_index_widgets_lazy, name='index.widgets'),
+    re_path(r'^global/settings/$', global_settings.GlobalSettingsView.as_view(), name='global.settings'),
+    re_path(r'^global/update/$', global_settings.UpdateCheckView.as_view(), name='global.update'),
+    re_path(r'^global/message/$', global_settings.MessageView.as_view(), name='global.message'),
+    re_path(r'^logdetail/$', global_settings.LogDetailView.as_view(), name='global.logdetail'),
+    re_path(r'^logdetail/payment/$', global_settings.PaymentDetailView.as_view(), name='global.paymentdetail'),
+    re_path(r'^logdetail/refund/$', global_settings.RefundDetailView.as_view(), name='global.refunddetail'),
+    re_path(r'^geocode/$', geo.GeoCodeView.as_view(), name='global.geocode'),
+    re_path(r'^reauth/$', user.ReauthView.as_view(), name='user.reauth'),
+    re_path(r'^sudo/$', user.StartStaffSession.as_view(), name='user.sudo'),
+    re_path(r'^sudo/stop/$', user.StopStaffSession.as_view(), name='user.sudo.stop'),
+    re_path(r'^sudo/(?P<id>\d+)/$', user.EditStaffSession.as_view(), name='user.sudo.edit'),
+    re_path(r'^sudo/sessions/$', user.StaffSessionList.as_view(), name='user.sudo.list'),
+    re_path(r'^users/$', users.UserListView.as_view(), name='users'),
+    re_path(r'^users/select2$', typeahead.users_select2, name='users.select2'),
+    re_path(r'^users/add$', users.UserCreateView.as_view(), name='users.add'),
+    re_path(r'^users/impersonate/stop', users.UserImpersonateStopView.as_view(), name='users.impersonate.stop'),
+    re_path(r'^users/(?P<id>\d+)/$', users.UserEditView.as_view(), name='users.edit'),
+    re_path(r'^users/(?P<id>\d+)/reset$', users.UserResetView.as_view(), name='users.reset'),
+    re_path(r'^users/(?P<id>\d+)/impersonate', users.UserImpersonateView.as_view(), name='users.impersonate'),
+    re_path(r'^users/(?P<id>\d+)/anonymize', users.UserAnonymizeView.as_view(), name='users.anonymize'),
+    re_path(r'^pdf/editor/webfonts.css', pdf.FontsCSSView.as_view(), name='pdf.css'),
+    re_path(r'^settings/?$', user.UserSettings.as_view(), name='user.settings'),
+    re_path(r'^settings/history/$', user.UserHistoryView.as_view(), name='user.settings.history'),
+    re_path(r'^settings/notifications/$', user.UserNotificationsEditView.as_view(), name='user.settings.notifications'),
+    re_path(r'^settings/notifications/off/(?P<id>\d+)/(?P<token>[^/]+)/$', user.UserNotificationsDisableView.as_view(),
+            name='user.settings.notifications.off'),
+    re_path(r'^settings/oauth/authorized/$', oauth.AuthorizationListView.as_view(),
+            name='user.settings.oauth.list'),
+    re_path(r'^settings/oauth/authorized/(?P<pk>\d+)/revoke$', oauth.AuthorizationRevokeView.as_view(),
+            name='user.settings.oauth.revoke'),
+    re_path(r'^settings/oauth/apps/$', oauth.OAuthApplicationListView.as_view(),
+            name='user.settings.oauth.apps'),
+    re_path(r'^settings/oauth/apps/add$', oauth.OAuthApplicationRegistrationView.as_view(),
+            name='user.settings.oauth.apps.register'),
+    re_path(r'^settings/oauth/apps/(?P<pk>\d+)/$', oauth.OAuthApplicationUpdateView.as_view(),
+            name='user.settings.oauth.app'),
+    re_path(r'^settings/oauth/apps/(?P<pk>\d+)/disable$', oauth.OAuthApplicationDeleteView.as_view(),
+            name='user.settings.oauth.app.disable'),
+    re_path(r'^settings/oauth/apps/(?P<pk>\d+)/roll$', oauth.OAuthApplicationRollView.as_view(),
+            name='user.settings.oauth.app.roll'),
+    re_path(r'^settings/2fa/$', user.User2FAMainView.as_view(), name='user.settings.2fa'),
+    re_path(r'^settings/2fa/add$', user.User2FADeviceAddView.as_view(), name='user.settings.2fa.add'),
+    re_path(r'^settings/2fa/enable', user.User2FAEnableView.as_view(), name='user.settings.2fa.enable'),
+    re_path(r'^settings/2fa/disable', user.User2FADisableView.as_view(), name='user.settings.2fa.disable'),
+    re_path(r'^settings/2fa/regenemergency', user.User2FARegenerateEmergencyView.as_view(),
+            name='user.settings.2fa.regenemergency'),
+    re_path(r'^settings/2fa/totp/(?P<device>[0-9]+)/confirm', user.User2FADeviceConfirmTOTPView.as_view(),
+            name='user.settings.2fa.confirm.totp'),
+    re_path(r'^settings/2fa/webauthn/(?P<device>[0-9]+)/confirm', user.User2FADeviceConfirmWebAuthnView.as_view(),
+            name='user.settings.2fa.confirm.webauthn'),
+    re_path(r'^settings/2fa/(?P<devicetype>[^/]+)/(?P<device>[0-9]+)/delete', user.User2FADeviceDeleteView.as_view(),
+            name='user.settings.2fa.delete'),
+    re_path(r'^organizers/$', organizer.OrganizerList.as_view(), name='organizers'),
+    re_path(r'^organizers/add$', organizer.OrganizerCreate.as_view(), name='organizers.add'),
+    re_path(r'^organizers/select2$', typeahead.organizer_select2, name='organizers.select2'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/$', organizer.OrganizerDetail.as_view(), name='organizer'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/edit$', organizer.OrganizerUpdate.as_view(), name='organizer.edit'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/delete$', organizer.OrganizerDelete.as_view(), name='organizer.delete'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/settings/display$', organizer.OrganizerDisplaySettings.as_view(),
+            name='organizer.display'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/properties$', organizer.EventMetaPropertyListView.as_view(),
+            name='organizer.properties'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/property/add$', organizer.EventMetaPropertyCreateView.as_view(),
+            name='organizer.property.add'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/property/(?P<property>[^/]+)/edit$',
+            organizer.EventMetaPropertyUpdateView.as_view(),
+            name='organizer.property.edit'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/property/(?P<property>[^/]+)/delete$',
+            organizer.EventMetaPropertyDeleteView.as_view(),
+            name='organizer.property.delete'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/giftcards$', organizer.GiftCardListView.as_view(),
+            name='organizer.giftcards'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/giftcard/add$', organizer.GiftCardCreateView.as_view(),
+            name='organizer.giftcard.add'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/giftcard/(?P<giftcard>[^/]+)/$', organizer.GiftCardDetailView.as_view(),
+            name='organizer.giftcard'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/giftcard/(?P<giftcard>[^/]+)/edit$',
+            organizer.GiftCardUpdateView.as_view(),
+            name='organizer.giftcard.edit'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/webhooks$', organizer.WebHookListView.as_view(),
+            name='organizer.webhooks'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/webhook/add$', organizer.WebHookCreateView.as_view(),
+            name='organizer.webhook.add'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/webhook/(?P<webhook>[^/]+)/edit$', organizer.WebHookUpdateView.as_view(),
+            name='organizer.webhook.edit'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/webhook/(?P<webhook>[^/]+)/logs$', organizer.WebHookLogsView.as_view(),
+            name='organizer.webhook.logs'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/devices$', organizer.DeviceListView.as_view(), name='organizer.devices'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/device/add$', organizer.DeviceCreateView.as_view(),
+            name='organizer.device.add'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/edit$', organizer.DeviceUpdateView.as_view(),
+            name='organizer.device.edit'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/connect$', organizer.DeviceConnectView.as_view(),
+            name='organizer.device.connect'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/revoke$', organizer.DeviceRevokeView.as_view(),
+            name='organizer.device.revoke'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/device/(?P<device>[^/]+)/logs$', organizer.DeviceLogView.as_view(),
+            name='organizer.device.logs'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/gates$', organizer.GateListView.as_view(), name='organizer.gates'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/gate/add$', organizer.GateCreateView.as_view(),
+            name='organizer.gate.add'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/gate/(?P<gate>[^/]+)/edit$', organizer.GateUpdateView.as_view(),
+            name='organizer.gate.edit'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/gate/(?P<gate>[^/]+)/delete$', organizer.GateDeleteView.as_view(),
+            name='organizer.gate.delete'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/teams$', organizer.TeamListView.as_view(), name='organizer.teams'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/team/add$', organizer.TeamCreateView.as_view(),
+            name='organizer.team.add'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/$', organizer.TeamMemberView.as_view(),
+            name='organizer.team'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/edit$', organizer.TeamUpdateView.as_view(),
+            name='organizer.team.edit'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/delete$', organizer.TeamDeleteView.as_view(),
+            name='organizer.team.delete'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/slugrng', main.SlugRNG.as_view(), name='events.add.slugrng'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/logs', organizer.LogView.as_view(), name='organizer.log'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/export/$', organizer.ExportView.as_view(), name='organizer.export'),
+    re_path(r'^organizer/(?P<organizer>[^/]+)/export/do$', organizer.ExportDoView.as_view(),
+            name='organizer.export.do'),
+    re_path(r'^nav/typeahead/$', typeahead.nav_context_list, name='nav.typeahead'),
+    re_path(r'^events/$', main.EventList.as_view(), name='events'),
+    re_path(r'^events/add$', main.EventWizard.as_view(), name='events.add'),
+    re_path(r'^events/typeahead/$', typeahead.event_list, name='events.typeahead'),
+    re_path(r'^events/typeahead/meta/$', typeahead.meta_values, name='events.meta.typeahead'),
+    re_path(r'^search/orders/$', search.OrderSearch.as_view(), name='search.orders'),
+    re_path(r'^event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include([
+        re_path(r'^$', dashboards.event_index, name='event.index'),
+        re_path(r'^widgets.json$', dashboards.event_index_widgets_lazy, name='event.index.widgets'),
+        re_path(r'^live/$', event.EventLive.as_view(), name='event.live'),
+        re_path(r'^logs/$', event.EventLog.as_view(), name='event.log'),
+        re_path(r'^delete/$', event.EventDelete.as_view(), name='event.delete'),
+        re_path(r'^requiredactions/$', event.EventActions.as_view(), name='event.requiredactions'),
+        re_path(r'^requiredactions/(?P<id>\d+)/discard$', event.EventActionDiscard.as_view(),
+                name='event.requiredaction.discard'),
+        re_path(r'^comment/$', event.EventComment.as_view(),
+                name='event.comment'),
+        re_path(r'^quickstart/$', event.QuickSetupView.as_view(), name='event.quick'),
+        re_path(r'^settings/$', event.EventUpdate.as_view(), name='event.settings'),
+        re_path(r'^settings/plugins$', event.EventPlugins.as_view(), name='event.settings.plugins'),
+        re_path(r'^settings/payment/(?P<provider>[^/]+)$', event.PaymentProviderSettings.as_view(),
+                name='event.settings.payment.provider'),
+        re_path(r'^settings/payment$', event.PaymentSettings.as_view(), name='event.settings.payment'),
+        re_path(r'^settings/tickets$', event.TicketSettings.as_view(), name='event.settings.tickets'),
+        re_path(r'^settings/tickets/preview/(?P<output>[^/]+)$', event.TicketSettingsPreview.as_view(),
+                name='event.settings.tickets.preview'),
+        re_path(r'^settings/email$', event.MailSettings.as_view(), name='event.settings.mail'),
+        re_path(r'^settings/email/preview$', event.MailSettingsPreview.as_view(), name='event.settings.mail.preview'),
+        re_path(r'^settings/email/layoutpreview$', event.MailSettingsRendererPreview.as_view(),
+                name='event.settings.mail.preview.layout'),
+        re_path(r'^settings/cancel', event.CancelSettings.as_view(), name='event.settings.cancel'),
+        re_path(r'^settings/invoice$', event.InvoiceSettings.as_view(), name='event.settings.invoice'),
+        re_path(r'^settings/invoice/preview$', event.InvoicePreview.as_view(), name='event.settings.invoice.preview'),
+        re_path(r'^settings/display', event.DisplaySettings.as_view(), name='event.settings.display'),
+        re_path(r'^settings/tax/$', event.TaxList.as_view(), name='event.settings.tax'),
+        re_path(r'^settings/tax/(?P<rule>\d+)/$', event.TaxUpdate.as_view(), name='event.settings.tax.edit'),
+        re_path(r'^settings/tax/add$', event.TaxCreate.as_view(), name='event.settings.tax.add'),
+        re_path(r'^settings/tax/(?P<rule>\d+)/delete$', event.TaxDelete.as_view(), name='event.settings.tax.delete'),
+        re_path(r'^settings/widget$', event.WidgetSettings.as_view(), name='event.settings.widget'),
+        re_path(r'^pdf/editor/webfonts.css', pdf.FontsCSSView.as_view(), name='pdf.css'),
+        re_path(r'^pdf/editor/(?P<filename>[^/]+).pdf$', pdf.PdfView.as_view(), name='pdf.background'),
+        re_path(r'^subevents/$', subevents.SubEventList.as_view(), name='event.subevents'),
+        re_path(r'^subevents/select2$', typeahead.subevent_select2, name='event.subevents.select2'),
+        re_path(r'^subevents/(?P<subevent>\d+)/$', subevents.SubEventUpdate.as_view(), name='event.subevent'),
+        re_path(r'^subevents/(?P<subevent>\d+)/delete$', subevents.SubEventDelete.as_view(),
+                name='event.subevent.delete'),
+        re_path(r'^subevents/add$', subevents.SubEventCreate.as_view(), name='event.subevents.add'),
+        re_path(r'^subevents/bulk_add$', subevents.SubEventBulkCreate.as_view(), name='event.subevents.bulk'),
+        re_path(r'^subevents/bulk_action$', subevents.SubEventBulkAction.as_view(), name='event.subevents.bulkaction'),
+        re_path(r'^subevents/bulk_edit$', subevents.SubEventBulkEdit.as_view(), name='event.subevents.bulkedit'),
+        re_path(r'^items/$', item.ItemList.as_view(), name='event.items'),
+        re_path(r'^items/add$', item.ItemCreate.as_view(), name='event.items.add'),
+        re_path(r'^items/(?P<item>\d+)/$', item.ItemUpdateGeneral.as_view(), name='event.item'),
+        re_path(r'^items/(?P<item>\d+)/up$', item.item_move_up, name='event.items.up'),
+        re_path(r'^items/(?P<item>\d+)/down$', item.item_move_down, name='event.items.down'),
+        re_path(r'^items/(?P<item>\d+)/delete$', item.ItemDelete.as_view(), name='event.items.delete'),
+        re_path(r'^items/typeahead/meta/$', typeahead.item_meta_values, name='event.items.meta.typeahead'),
+        re_path(r'^items/select2$', typeahead.items_select2, name='event.items.select2'),
+        re_path(r'^items/select2/variation$', typeahead.variations_select2, name='event.items.variations.select2'),
+        re_path(r'^categories/$', item.CategoryList.as_view(), name='event.items.categories'),
+        re_path(r'^categories/select2$', typeahead.category_select2, name='event.items.categories.select2'),
+        re_path(r'^categories/(?P<category>\d+)/delete$', item.CategoryDelete.as_view(),
+                name='event.items.categories.delete'),
+        re_path(r'^categories/(?P<category>\d+)/up$', item.category_move_up, name='event.items.categories.up'),
+        re_path(r'^categories/(?P<category>\d+)/down$', item.category_move_down,
+                name='event.items.categories.down'),
+        re_path(r'^categories/(?P<category>\d+)/$', item.CategoryUpdate.as_view(),
+                name='event.items.categories.edit'),
+        re_path(r'^categories/add$', item.CategoryCreate.as_view(), name='event.items.categories.add'),
+        re_path(r'^questions/$', item.QuestionList.as_view(), name='event.items.questions'),
+        re_path(r'^questions/reorder$', item.reorder_questions, name='event.items.questions.reorder'),
+        re_path(r'^questions/(?P<question>\d+)/delete$', item.QuestionDelete.as_view(),
+                name='event.items.questions.delete'),
+        re_path(r'^questions/(?P<question>\d+)/$', item.QuestionView.as_view(),
+                name='event.items.questions.show'),
+        re_path(r'^questions/(?P<question>\d+)/change$', item.QuestionUpdate.as_view(),
+                name='event.items.questions.edit'),
+        re_path(r'^questions/add$', item.QuestionCreate.as_view(), name='event.items.questions.add'),
+        re_path(r'^quotas/$', item.QuotaList.as_view(), name='event.items.quotas'),
+        re_path(r'^quotas/(?P<quota>\d+)/$', item.QuotaView.as_view(), name='event.items.quotas.show'),
+        re_path(r'^quotas/select$', typeahead.quotas_select2, name='event.items.quotas.select2'),
+        re_path(r'^quotas/(?P<quota>\d+)/change$', item.QuotaUpdate.as_view(), name='event.items.quotas.edit'),
+        re_path(r'^quotas/(?P<quota>\d+)/delete$', item.QuotaDelete.as_view(),
+                name='event.items.quotas.delete'),
+        re_path(r'^quotas/add$', item.QuotaCreate.as_view(), name='event.items.quotas.add'),
+        re_path(r'^vouchers/$', vouchers.VoucherList.as_view(), name='event.vouchers'),
+        re_path(r'^vouchers/tags/$', vouchers.VoucherTags.as_view(), name='event.vouchers.tags'),
+        re_path(r'^vouchers/rng$', vouchers.VoucherRNG.as_view(), name='event.vouchers.rng'),
+        re_path(r'^vouchers/item_select$', typeahead.itemvarquota_select2, name='event.vouchers.itemselect2'),
+        re_path(r'^vouchers/(?P<voucher>\d+)/$', vouchers.VoucherUpdate.as_view(), name='event.voucher'),
+        re_path(r'^vouchers/(?P<voucher>\d+)/delete$', vouchers.VoucherDelete.as_view(),
+                name='event.voucher.delete'),
+        re_path(r'^vouchers/add$', vouchers.VoucherCreate.as_view(), name='event.vouchers.add'),
+        re_path(r'^vouchers/go$', vouchers.VoucherGo.as_view(), name='event.vouchers.go'),
+        re_path(r'^vouchers/bulk_add$', vouchers.VoucherBulkCreate.as_view(), name='event.vouchers.bulk'),
+        re_path(r'^vouchers/bulk_action$', vouchers.VoucherBulkAction.as_view(), name='event.vouchers.bulkaction'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/transition$', orders.OrderTransition.as_view(),
+                name='event.order.transition'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/resend$', orders.OrderResendLink.as_view(),
+                name='event.order.resendlink'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/(?P<position>\d+)/resend$', orders.OrderResendLink.as_view(),
+                name='event.order.resendlink'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/invoice$', orders.OrderInvoiceCreate.as_view(),
+                name='event.order.geninvoice'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/invoices/(?P<id>\d+)/regenerate$',
+                orders.OrderInvoiceRegenerate.as_view(),
+                name='event.order.regeninvoice'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/invoices/(?P<id>\d+)/reissue$', orders.OrderInvoiceReissue.as_view(),
+                name='event.order.reissueinvoice'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/download/(?P<position>\d+)/(?P<output>[^/]+)/$',
+                orders.OrderDownload.as_view(),
+                name='event.order.download.ticket'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/answer/(?P<answer>[^/]+)/$',
+                orders.AnswerDownload.as_view(),
+                name='event.order.download.answer'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/checkvatid', orders.OrderCheckVATID.as_view(),
+                name='event.order.checkvatid'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/extend$', orders.OrderExtend.as_view(),
+                name='event.order.extend'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/reactivate$', orders.OrderReactivate.as_view(),
+                name='event.order.reactivate'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/contact$', orders.OrderContactChange.as_view(),
+                name='event.order.contact'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/locale', orders.OrderLocaleChange.as_view(),
+                name='event.order.locale'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/comment$', orders.OrderComment.as_view(),
+                name='event.order.comment'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/change$', orders.OrderChange.as_view(),
+                name='event.order.change'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/approve', orders.OrderApprove.as_view(),
+                name='event.order.approve'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/deny$', orders.OrderDeny.as_view(),
+                name='event.order.deny'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/delete$', orders.OrderDelete.as_view(),
+                name='event.order.delete'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/info', orders.OrderModifyInformation.as_view(),
+                name='event.order.info'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/sendmail$', orders.OrderSendMail.as_view(),
+                name='event.order.sendmail'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/(?P<position>[0-9A-Z]+)/sendmail$',
+                orders.OrderPositionSendMail.as_view(),
+                name='event.order.position.sendmail'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/mail_history$', orders.OrderEmailHistory.as_view(),
+                name='event.order.mail_history'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/payments/(?P<payment>\d+)/cancel$', orders.OrderPaymentCancel.as_view(),
+                name='event.order.payments.cancel'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/payments/(?P<payment>\d+)/confirm$', orders.OrderPaymentConfirm.as_view(),
+                name='event.order.payments.confirm'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/refund$', orders.OrderRefundView.as_view(),
+                name='event.order.refunds.start'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/refunds/(?P<refund>\d+)/cancel$', orders.OrderRefundCancel.as_view(),
+                name='event.order.refunds.cancel'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/refunds/(?P<refund>\d+)/process$', orders.OrderRefundProcess.as_view(),
+                name='event.order.refunds.process'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/refunds/(?P<refund>\d+)/done$', orders.OrderRefundDone.as_view(),
+                name='event.order.refunds.done'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/cancellationrequests/(?P<req>\d+)/delete$',
+                orders.OrderCancellationRequestDelete.as_view(),
+                name='event.order.cancellationrequests.delete'),
+        re_path(r'^orders/(?P<code>[0-9A-Z]+)/$', orders.OrderDetail.as_view(), name='event.order'),
+        re_path(r'^invoice/(?P<invoice>[^/]+)$', orders.InvoiceDownload.as_view(),
+                name='event.invoice.download'),
+        re_path(r'^orders/overview/$', orders.OverView.as_view(), name='event.orders.overview'),
+        re_path(r'^orders/import/$', orderimport.ImportView.as_view(), name='event.orders.import'),
+        re_path(r'^orders/import/(?P<file>[^/]+)/$', orderimport.ProcessView.as_view(),
+                name='event.orders.import.process'),
+        re_path(r'^orders/export/$', orders.ExportView.as_view(), name='event.orders.export'),
+        re_path(r'^orders/export/do$', orders.ExportDoView.as_view(), name='event.orders.export.do'),
+        re_path(r'^orders/refunds/$', orders.RefundList.as_view(), name='event.orders.refunds'),
+        re_path(r'^orders/go$', orders.OrderGo.as_view(), name='event.orders.go'),
+        re_path(r'^orders/$', orders.OrderList.as_view(), name='event.orders'),
+        re_path(r'^orders/search$', orders.OrderSearch.as_view(), name='event.orders.search'),
+        re_path(r'^dangerzone/$', event.DangerZone.as_view(), name='event.dangerzone'),
+        re_path(r'^cancel/$', orders.EventCancel.as_view(), name='event.cancel'),
+        re_path(r'^shredder/$', shredder.StartShredView.as_view(), name='event.shredder.start'),
+        re_path(r'^shredder/export$', shredder.ShredExportView.as_view(), name='event.shredder.export'),
+        re_path(r'^shredder/download/(?P<file>[^/]+)/$', shredder.ShredDownloadView.as_view(),
+                name='event.shredder.download'),
+        re_path(r'^shredder/shred', shredder.ShredDoView.as_view(), name='event.shredder.shred'),
+        re_path(r'^waitinglist/$', waitinglist.WaitingListView.as_view(), name='event.orders.waitinglist'),
+        re_path(r'^waitinglist/auto_assign$', waitinglist.AutoAssign.as_view(), name='event.orders.waitinglist.auto'),
+        re_path(r'^waitinglist/(?P<entry>\d+)/delete$', waitinglist.EntryDelete.as_view(),
+                name='event.orders.waitinglist.delete'),
+        re_path(r'^checkinlists/$', checkin.CheckinListList.as_view(), name='event.orders.checkinlists'),
+        re_path(r'^checkinlists/add$', checkin.CheckinListCreate.as_view(), name='event.orders.checkinlists.add'),
+        re_path(r'^checkinlists/select2$', typeahead.checkinlist_select2, name='event.orders.checkinlists.select2'),
+        re_path(r'^checkinlists/(?P<list>\d+)/$', checkin.CheckInListShow.as_view(),
+                name='event.orders.checkinlists.show'),
+        re_path(r'^checkinlists/(?P<list>\d+)/change$', checkin.CheckinListUpdate.as_view(),
+                name='event.orders.checkinlists.edit'),
+        re_path(r'^checkinlists/(?P<list>\d+)/delete$', checkin.CheckinListDelete.as_view(),
+                name='event.orders.checkinlists.delete'),
     ])),
-    url(r'^event/(?P<organizer>[^/]+)/$', RedirectView.as_view(pattern_name='control:organizer'), name='event.organizerredirect'),
+    re_path(r'^event/(?P<organizer>[^/]+)/$', RedirectView.as_view(pattern_name='control:organizer'),
+            name='event.organizerredirect'),
 ]

src/pretix/control/views/__init__.py

@@ -1,4 +1,4 @@
-import collections
+import collections.abc
 import warnings
 
 from django.core.paginator import (
@@ -65,7 +65,7 @@ class PaginationMixin:
         return ctx
 
 
-class LargeResultSetPage(collections.Sequence):
+class LargeResultSetPage(collections.abc.Sequence):
 
     def __init__(self, object_list, number, paginator):
         self.object_list = object_list

src/pretix/control/views/dashboards.py

@@ -22,8 +22,8 @@ from django.utils.translation import gettext_lazy as _, pgettext, ungettext
 
 from pretix.base.decimal import round_decimal
 from pretix.base.models import (
-    Item, ItemCategory, ItemVariation, Order, OrderPosition, OrderRefund,
-    Question, Quota, RequiredAction, SubEvent, Voucher, WaitingListEntry,
+    Item, ItemVariation, Order, OrderPosition, OrderRefund, RequiredAction,
+    SubEvent, Voucher, WaitingListEntry,
 )
 from pretix.base.services.quotas import QuotaAvailability
 from pretix.base.timeline import timeline_for_event
@@ -202,10 +202,14 @@ def quota_widgets(sender, subevent=None, lazy=False, **kwargs):
     widgets = []
     quotas = sender.quotas.filter(subevent=subevent)
 
+    quotas_to_compute = [
+        q for q in quotas
+        if not q.cache_is_hot(now() + timedelta(seconds=5))
+    ]
     qa = QuotaAvailability()
-    if quotas:
-        qa.queue(*quotas)
-        qa.compute(allow_cache=True)
+    if quotas_to_compute:
+        qa.queue(*quotas_to_compute)
+        qa.compute()
 
     for q in quotas:
         if not lazy:
@@ -313,40 +317,19 @@ def event_index(request, organizer, event):
         except SubEvent.DoesNotExist:
             pass
 
-    can_view_orders = request.user.has_event_permission(request.organizer, request.event, 'can_view_orders',
-                                                        request=request)
+    widgets = []
+    for r, result in event_dashboard_widgets.send(sender=request.event, subevent=subevent, lazy=True):
+        widgets.extend(result)
+
     can_change_orders = request.user.has_event_permission(request.organizer, request.event, 'can_change_orders',
                                                           request=request)
-    can_change_event_settings = request.user.has_event_permission(request.organizer, request.event,
-                                                                  'can_change_event_settings', request=request)
-    can_view_vouchers = request.user.has_event_permission(request.organizer, request.event, 'can_view_vouchers',
-                                                          request=request)
-
-    widgets = []
-    if can_view_orders:
-        for r, result in event_dashboard_widgets.send(sender=request.event, subevent=subevent, lazy=True):
-            widgets.extend(result)
-
     qs = request.event.logentry_set.all().select_related('user', 'content_type', 'api_token', 'oauth_application',
                                                          'device').order_by('-datetime')
     qs = qs.exclude(action_type__in=OVERVIEW_BANLIST)
-    if not can_view_orders:
+    if not request.user.has_event_permission(request.organizer, request.event, 'can_view_orders', request=request):
         qs = qs.exclude(content_type=ContentType.objects.get_for_model(Order))
-    if not can_view_vouchers:
+    if not request.user.has_event_permission(request.organizer, request.event, 'can_view_vouchers', request=request):
         qs = qs.exclude(content_type=ContentType.objects.get_for_model(Voucher))
-    if not can_change_event_settings:
-        allowed_types = [
-            ContentType.objects.get_for_model(Voucher),
-            ContentType.objects.get_for_model(Order)
-        ]
-        if request.user.has_event_permission(request.organizer, request.event, 'can_change_items', request=request):
-            allowed_types += [
-                ContentType.objects.get_for_model(Item),
-                ContentType.objects.get_for_model(ItemCategory),
-                ContentType.objects.get_for_model(Quota),
-                ContentType.objects.get_for_model(Question),
-            ]
-        qs = qs.filter(content_type__in=allowed_types)
 
     a_qs = request.event.requiredaction_set.filter(done=False)
 
@@ -355,25 +338,25 @@ def event_index(request, organizer, event):
         'logs': qs[:5],
         'subevent': subevent,
         'actions': a_qs[:5] if can_change_orders else [],
-        'comment_form': CommentForm(initial={'comment': request.event.comment}, readonly=not can_change_event_settings),
+        'comment_form': CommentForm(initial={'comment': request.event.comment})
     }
 
-    ctx['has_overpaid_orders'] = can_view_orders and Order.annotate_overpayments(request.event.orders).filter(
+    ctx['has_overpaid_orders'] = Order.annotate_overpayments(request.event.orders).filter(
         Q(~Q(status=Order.STATUS_CANCELED) & Q(pending_sum_t__lt=0))
         | Q(Q(status=Order.STATUS_CANCELED) & Q(pending_sum_rc__lt=0))
     ).exists()
-    ctx['has_pending_orders_with_full_payment'] = can_view_orders and Order.annotate_overpayments(request.event.orders).filter(
+    ctx['has_pending_orders_with_full_payment'] = Order.annotate_overpayments(request.event.orders).filter(
         Q(status__in=(Order.STATUS_EXPIRED, Order.STATUS_PENDING)) & Q(pending_sum_t__lte=0) & Q(require_approval=False)
     ).exists()
-    ctx['has_pending_refunds'] = can_view_orders and OrderRefund.objects.filter(
+    ctx['has_pending_refunds'] = OrderRefund.objects.filter(
         order__event=request.event,
         state__in=(OrderRefund.REFUND_STATE_CREATED, OrderRefund.REFUND_STATE_EXTERNAL)
     ).exists()
-    ctx['has_pending_approvals'] = can_view_orders and request.event.orders.filter(
+    ctx['has_pending_approvals'] = request.event.orders.filter(
         status=Order.STATUS_PENDING,
         require_approval=True
     ).exists()
-    ctx['has_cancellation_requests'] = can_view_orders and CancellationRequest.objects.filter(
+    ctx['has_cancellation_requests'] = CancellationRequest.objects.filter(
         order__event=request.event
     ).exists()
 

src/pretix/control/views/event.py

@@ -55,9 +55,7 @@ from pretix.plugins.stripe.payment import StripeSettingsHolder
 from pretix.presale.style import regenerate_css
 
 from ...base.i18n import language
-from ...base.models.items import (
-    Item, ItemCategory, ItemMetaProperty, Question, Quota,
-)
+from ...base.models.items import ItemMetaProperty
 from ...base.settings import SETTINGS_AFFECTING_CSS, LazyI18nStringList
 from ..logdisplay import OVERVIEW_BANLIST
 from . import CreateView, PaginationMixin, UpdateView
@@ -957,10 +955,11 @@ class EventDelete(RecentAuthenticationRequiredMixin, EventPermissionRequiredMixi
         return reverse('control:index')
 
 
-class EventLog(EventPermissionRequiredMixin, PaginationMixin, ListView):
+class EventLog(EventPermissionRequiredMixin, ListView):
     template_name = 'pretixcontrol/event/logs.html'
     model = LogEntry
     context_object_name = 'logs'
+    paginate_by = 20
 
     def get_queryset(self):
         qs = self.request.event.logentry_set.all().select_related(
@@ -973,21 +972,6 @@ class EventLog(EventPermissionRequiredMixin, PaginationMixin, ListView):
         if not self.request.user.has_event_permission(self.request.organizer, self.request.event, 'can_view_vouchers',
                                                       request=self.request):
             qs = qs.exclude(content_type=ContentType.objects.get_for_model(Voucher))
-        if not self.request.user.has_event_permission(self.request.organizer, self.request.event,
-                                                      'can_change_event_settings', request=self.request):
-            allowed_types = [
-                ContentType.objects.get_for_model(Voucher),
-                ContentType.objects.get_for_model(Order)
-            ]
-            if self.request.user.has_event_permission(self.request.organizer, self.request.event,
-                                                      'can_change_items', request=self.request):
-                allowed_types += [
-                    ContentType.objects.get_for_model(Item),
-                    ContentType.objects.get_for_model(ItemCategory),
-                    ContentType.objects.get_for_model(Quota),
-                    ContentType.objects.get_for_model(Question),
-                ]
-            qs = qs.filter(content_type__in=allowed_types)
 
         if self.request.GET.get('user') == 'yes':
             qs = qs.filter(user__isnull=False)
@@ -1104,7 +1088,6 @@ class TaxCreate(EventSettingsViewMixin, EventPermissionRequiredMixin, CreateView
         }
 
     def post(self, request, *args, **kwargs):
-        self.object = None
         form = self.get_form()
         if form.is_valid() and self.formset.is_valid():
             return self.form_valid(form)
@@ -1380,7 +1363,7 @@ class QuickSetupView(FormView):
                 tax_rule=tax_rule,
                 admission=True,
                 position=i,
-                sales_channels=list(get_all_sales_channels().keys())
+                sales_channels=[k for k in 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']:

src/pretix/control/views/main.py

@@ -1,7 +1,9 @@
 from django.conf import settings
 from django.contrib import messages
 from django.db import transaction
-from django.db.models import F, Max, Min, Prefetch
+from django.db.models import (
+    F, IntegerField, Max, Min, OuterRef, Prefetch, Subquery, Sum,
+)
 from django.db.models.functions import Coalesce, Greatest
 from django.http import JsonResponse
 from django.shortcuts import redirect
@@ -50,7 +52,17 @@ class EventList(PaginationMixin, ListView):
             order_to=Coalesce('max_fromto', 'max_to', 'max_from', 'date_to', 'date_from'),
         )
 
-        qs = qs.prefetch_related(
+        sum_tickets_paid = Quota.objects.filter(
+            event=OuterRef('pk'), subevent__isnull=True
+        ).order_by().values('event').annotate(
+            s=Sum('cached_availability_paid_orders')
+        ).values(
+            's'
+        )
+
+        qs = qs.annotate(
+            sum_tickets_paid=Subquery(sum_tickets_paid, output_field=IntegerField())
+        ).prefetch_related(
             Prefetch('quotas',
                      queryset=Quota.objects.filter(subevent__isnull=True).annotate(s=Coalesce(F('size'), 0)).order_by('-s'),
                      to_attr='first_quotas')
@@ -78,12 +90,15 @@ class EventList(PaginationMixin, ListView):
 
         qa = QuotaAvailability(early_out=False)
         for q in quotas:
-            qa.queue(q)
+            if q.cached_availability_time is None or q.cached_availability_paid_orders is None:
+                qa.queue(q)
         qa.compute()
 
         for q in quotas:
-            q.cached_avail = qa.results[q]
-            q.cached_availability_paid_orders = qa.count_paid_orders.get(q, 0)
+            q.cached_avail = (
+                qa.results[q] if q in qa.results
+                else (q.cached_availability_state, q.cached_availability_number)
+            )
             if q.size is not None:
                 q.percent_paid = min(
                     100,

src/pretix/control/views/orders.py

@@ -83,7 +83,7 @@ from pretix.control.forms.orders import (
     ExtendForm, MarkPaidForm, OrderContactForm, OrderFeeChangeForm,
     OrderLocaleForm, OrderMailForm, OrderPositionAddForm,
     OrderPositionAddFormset, OrderPositionChangeForm, OrderPositionMailForm,
-    OrderRefundForm, OtherOperationsForm, ReactivateOrderForm,
+    OrderRefundForm, OtherOperationsForm,
 )
 from pretix.control.permissions import EventPermissionRequiredMixin
 from pretix.control.signals import order_search_forms
@@ -1424,24 +1424,11 @@ class OrderExtend(OrderView):
 class OrderReactivate(OrderView):
     permission = 'can_change_orders'
 
-    @cached_property
-    def reactivate_form(self):
-        return ReactivateOrderForm(
-            instance=self.order,
-            data=self.request.POST if self.request.method == "POST" else None,
-        )
-
     def post(self, *args, **kwargs):
-        if not self.reactivate_form.is_valid():
-            return render(self.request, 'pretixcontrol/order/reactivate.html', {
-                'form': self.reactivate_form,
-                'order': self.order,
-            })
         try:
             reactivate_order(
                 self.order,
-                user=self.request.user,
-                force=self.reactivate_form.cleaned_data.get('force', False)
+                user=self.request.user
             )
             messages.success(self.request, _('The order has been reactivated.'))
         except OrderError as e:
@@ -1466,7 +1453,6 @@ class OrderReactivate(OrderView):
 
     def get(self, *args, **kwargs):
         return render(self.request, 'pretixcontrol/order/reactivate.html', {
-            'form': self.reactivate_form,
             'order': self.order,
         })
 

src/pretix/control/views/organizer.py

@@ -1438,11 +1438,12 @@ class EventMetaPropertyDeleteView(OrganizerDetailViewMixin, OrganizerPermissionR
         return redirect(success_url)
 
 
-class LogView(OrganizerPermissionRequiredMixin, PaginationMixin, ListView):
+class LogView(OrganizerPermissionRequiredMixin, ListView):
     template_name = 'pretixcontrol/organizers/logs.html'
     permission = 'can_change_organizer_settings'
     model = LogEntry
     context_object_name = 'logs'
+    paginate_by = 20
 
     def get_queryset(self):
         qs = self.request.organizer.all_logentries().select_related(