Merge branch 'master' into questions-vue3

# Conflicts:
#	src/pretix/base/forms/questions.py
#	src/pretix/base/middleware.py
#	src/pretix/base/templates/pretixbase/redirect.html

package-lock.json

@@ -9,7 +9,8 @@
       "version": "1.0.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "vue": "^3.5.30"
+        "vue": "^3.5.30",
+        "vue-slicksort": "^2.0.5"
       },
       "devDependencies": {
         "@eslint/js": "^10.0.1",
@@ -4635,6 +4636,15 @@
         "vue-eslint-parser": "^10.0.0"
       }
     },
+    "node_modules/vue-slicksort": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/vue-slicksort/-/vue-slicksort-2.0.5.tgz",
+      "integrity": "sha512-fXz1YrNjhUbJK7o0tMk27mIr4pMAZYLSYvtmLazCtfpvz+zafPCn34ILDL8B7hT7WLVZKreYs6JVe5VWymqmzA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "vue": ">=3.0.0"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",

package.json

@@ -27,7 +27,8 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "vue": "^3.5.30"
+    "vue": "^3.5.30",
+    "vue-slicksort": "^2.0.5"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",

src/pretix/api/auth/devicesecurity.py

@@ -115,7 +115,7 @@ class PretixScanSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:event.settings'),
         ('POST', 'api-v1:upload'),
         ('POST', 'api-v1:checkinrpc.redeem'),
-        ('POST', 'api-v1:checkinrpc.annul'),
+        ('POST', 'api-v1:checkinrpc.annull'),
         ('GET', 'api-v1:checkinrpc.search'),
         ('GET', 'api-v1:reusablemedium-list'),
         ('POST', 'api-v1:reusablemedium-lookup'),
@@ -154,7 +154,7 @@ class PretixScanNoSyncNoSearchSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:event.settings'),
         ('POST', 'api-v1:upload'),
         ('POST', 'api-v1:checkinrpc.redeem'),
-        ('POST', 'api-v1:checkinrpc.annul'),
+        ('POST', 'api-v1:checkinrpc.annull'),
         ('GET', 'api-v1:checkinrpc.search'),
     )
 
@@ -191,7 +191,7 @@ class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:event.settings'),
         ('POST', 'api-v1:upload'),
         ('POST', 'api-v1:checkinrpc.redeem'),
-        ('POST', 'api-v1:checkinrpc.annul'),
+        ('POST', 'api-v1:checkinrpc.annull'),
         ('GET', 'api-v1:checkinrpc.search'),
     )
 

src/pretix/api/serializers/event.py

@@ -702,7 +702,7 @@ class TaxRuleSerializer(CountryFieldMixin, I18nAwareModelSerializer):
         return super().save(**kwargs)
 
     def validate_default(self, value):
-        if not value and self.instance.default:
+        if not value and (not self.instance or self.instance.default):
             raise ValidationError("You can't remove the default property, instead set it on another tax rule.")
         return value
 

src/pretix/api/serializers/item.py

@@ -53,6 +53,7 @@ from pretix.base.models import (
     ItemVariation, ItemVariationMetaValue, Question, QuestionOption, Quota,
     SalesChannel,
 )
+from pretix.base.models.items import Questionnaire, QuestionnaireChild
 
 
 class InlineItemVariationSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
@@ -542,6 +543,7 @@ class LegacyDependencyValueField(serializers.CharField):
 class QuestionSerializer(I18nAwareModelSerializer):
     options = InlineQuestionOptionSerializer(many=True, required=False)
     identifier = serializers.CharField(allow_null=True)
+    internal_name = serializers.CharField(allow_null=True, source='question', read_only=True)
     dependency_value = LegacyDependencyValueField(source='dependency_values', required=False, allow_null=True)
 
     class Meta:
@@ -550,7 +552,7 @@ class QuestionSerializer(I18nAwareModelSerializer):
                   'ask_during_checkin', 'show_during_checkin', 'identifier', 'dependency_question', 'dependency_values',
                   'hidden', 'dependency_value', 'print_on_invoice', 'help_text', 'valid_number_min',
                   'valid_number_max', 'valid_date_min', 'valid_date_max', 'valid_datetime_min', 'valid_datetime_max',
-                  'valid_string_length_max', 'valid_file_portrait')
+                  'valid_string_length_max', 'valid_file_portrait', 'internal_name',)
 
     def validate_identifier(self, value):
         Question._clean_identifier(self.context['event'], value, self.instance)
@@ -619,13 +621,167 @@ class QuestionSerializer(I18nAwareModelSerializer):
         options_data = validated_data.pop('options') if 'options' in validated_data else []
         items = validated_data.pop('items', [])
 
-        question = Question.objects.create(**validated_data, container_type=Question.ContainerType.ORDERPOSITION)
+        question = Question.objects.create(**validated_data)
         question.items.set(items)
         for opt_data in options_data:
             QuestionOption.objects.create(question=question, **opt_data)
         return question
 
 
+class QuestionRefField(serializers.PrimaryKeyRelatedField):
+    def to_representation(self, qc):
+        if not qc:
+            return None
+        elif qc.system_question:
+            return qc.system_question
+        elif qc.user_question_id:
+            return qc.user_question_id
+        else:
+            return None
+
+    def to_internal_value(self, data):
+        if type(data) == int:
+            return {'user_question': super().to_internal_value(data), 'system_question': None}
+        elif type(data) == str or data is None:
+            return {'user_question': None, 'system_question': data}
+        else:
+            self.fail('incorrect_type', data_type=type(data).__name__)
+
+    def use_pk_only_optimization(self):
+        return self.source == '*'
+
+
+class InlineQuestionnaireChildSerializer(I18nAwareModelSerializer):
+    question = QuestionRefField(source='*', queryset=Question.objects.none())
+    dependency_question = QuestionRefField(allow_null=True, required=False, queryset=Question.objects.none())
+
+    class Meta:
+        model = QuestionnaireChild
+        fields = ('question', 'required', 'label', 'help_text', 'dependency_question', 'dependency_values')
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["question"].queryset = self.context["event"].questions.all()
+        self.fields["dependency_question"].queryset = self.context["event"].questions.all()
+
+    def validate(self, data):
+        data = super().validate(data)
+        event = self.context['event']
+
+        full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
+        full_data.update(data)
+
+        if full_data.get('ask_during_checkin') and full_data.get('dependency_question'):
+            raise ValidationError('Dependencies are not supported during check-in.')
+
+        dep = full_data.get('dependency_question')
+        if dep:
+            if dep.ask_during_checkin:
+                raise ValidationError(_('Question cannot depend on a question asked during check-in.'))
+
+            seen_ids = {self.instance.pk} if self.instance else set()
+            while dep:
+                if dep.pk in seen_ids:
+                    raise ValidationError(_('Circular dependency between questions detected.'))
+                seen_ids.add(dep.pk)
+                dep = dep.dependency_question
+
+        return data
+
+    def validate_dependency_question(self, value):
+        if value:
+            if value.type not in (Question.TYPE_CHOICE, Question.TYPE_BOOLEAN, Question.TYPE_CHOICE_MULTIPLE):
+                raise ValidationError('Question dependencies can only be set to boolean or choice questions.')
+            if value == self.instance:
+                raise ValidationError('A question cannot depend on itself.')
+        return value
+
+
+class QuestionnaireSerializer(I18nAwareModelSerializer):
+    limit_sales_channels = serializers.SlugRelatedField(
+        slug_field="identifier",
+        queryset=SalesChannel.objects.none(),
+        required=False,
+        allow_empty=True,
+        many=True,
+    )
+
+    class Meta:
+        model = Questionnaire
+        fields = ('id', 'type', 'internal_name', 'items', 'position', 'all_sales_channels', 'limit_sales_channels', 'children')
+
+    def __init__(self, *args, **kwargs):
+        self.fields['children'] = InlineQuestionnaireChildSerializer(many=True, required=True, context=kwargs['context'], partial=False)
+        super().__init__(*args, **kwargs)
+
+    def validate(self, data):
+        data = super().validate(data)
+        event = self.context['event']
+
+        #full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
+        #full_data.update(data)
+
+        #if full_data.get('ask_during_checkin') and full_data.get('dependency_question'):
+        #    raise ValidationError('Dependencies are not supported during check-in.')
+
+        #if full_data.get('ask_during_checkin') and full_data.get('type') in Question.ASK_DURING_CHECKIN_UNSUPPORTED:
+        #    raise ValidationError(_('This type of question cannot be asked during check-in.'))
+
+        #if full_data.get('show_during_checkin') and full_data.get('type') in Question.SHOW_DURING_CHECKIN_UNSUPPORTED:
+        #    raise ValidationError(_('This type of question cannot be shown during check-in.'))
+
+        #Question.clean_items(event, full_data.get('items') or [])
+        return data
+
+    def validate_children(self, value):
+        prev_questions = {}
+        for child in value:
+            if child.get('dependency_question'):
+                if (child['dependency_question']['user_question'] or child['dependency_question']['system_question']) not in prev_questions:
+                    raise ValidationError('A question can only depend on a previous question from the same questionnaire.')
+
+            if child['user_question']:
+                prev_questions[child['user_question']] = child
+            if child['system_question']:
+                prev_questions[child['system_question']] = child
+        return value
+
+    @transaction.atomic
+    def create(self, validated_data):
+        children_data = validated_data.pop('children') if 'children' in validated_data else []
+        questionnaire = super().create(validated_data)
+        self.set_children(questionnaire, children_data)
+        return questionnaire
+
+    @transaction.atomic
+    def update(self, instance, validated_data):
+        children_data = validated_data.pop('children', None)
+        questionnaire = super().update(instance, validated_data)
+        if children_data is not None:
+            self.set_children(questionnaire, children_data)
+        return questionnaire
+
+    def set_children(self, questionnaire, new_data):
+        result = []
+        child_serializer = self.fields['children'].child
+        existing = questionnaire.children.all()
+        for i, d in enumerate(new_data):
+            d['questionnaire'] = questionnaire
+            d['position'] = i + 1
+            d.setdefault('required', False)
+            d.setdefault('help_text', None)
+            d.setdefault('dependency_question', None)
+            d.setdefault('dependency_values', None)
+        updatable = min(len(existing), len(new_data))
+        for i in range(0, updatable):
+            result.append(child_serializer.update(existing[i], new_data[i]))
+        for i in range(updatable, len(new_data)):
+            result.append(child_serializer.create(new_data[i]))
+        for i in range(updatable, len(existing)):
+            existing[i].delete()
+        return result
+
+
 class QuotaSerializer(I18nAwareModelSerializer):
     available = serializers.BooleanField(read_only=True)
     available_number = serializers.IntegerField(read_only=True)

src/pretix/api/urls.py

@@ -79,7 +79,8 @@ event_router.register(r'subevents', event.SubEventViewSet)
 event_router.register(r'clone', event.CloneEventViewSet)
 event_router.register(r'items', item.ItemViewSet)
 event_router.register(r'categories', item.ItemCategoryViewSet)
-event_router.register(r'questions', item.QuestionViewSet)
+event_router.register(r'datafields', item.QuestionViewSet)
+event_router.register(r'questionnaires', item.QuestionnaireViewSet)
 event_router.register(r'discounts', discount.DiscountViewSet)
 event_router.register(r'quotas', item.QuotaViewSet)
 event_router.register(r'vouchers', voucher.VoucherViewSet)

src/pretix/api/views/item.py

@@ -48,13 +48,14 @@ from pretix.api.pagination import TotalOrderingFilter
 from pretix.api.serializers.item import (
     ItemAddOnSerializer, ItemBundleSerializer, ItemCategorySerializer,
     ItemProgramTimeSerializer, ItemSerializer, ItemVariationSerializer,
-    QuestionOptionSerializer, QuestionSerializer, QuotaSerializer,
+    QuestionOptionSerializer, QuestionSerializer, QuestionnaireSerializer, QuotaSerializer,
 )
 from pretix.api.views import ConditionalListView
 from pretix.base.models import (
     CartPosition, Item, ItemAddOn, ItemBundle, ItemCategory, ItemProgramTime,
     ItemVariation, Question, QuestionOption, Quota,
 )
+from pretix.base.models.items import Questionnaire
 from pretix.base.services.quotas import QuotaAvailability
 from pretix.helpers.dicts import merge_dicts
 from pretix.helpers.i18n import i18ncomp
@@ -475,10 +476,7 @@ class QuestionViewSet(ConditionalListView, viewsets.ModelViewSet):
     write_permission = 'event.items:write'
 
     def get_queryset(self):
-        return self.request.event.questions.filter(
-            # the container_type parameter is undocumented, this API is going to change in a later release
-            container_type=self.request.GET.get('container_type', Question.ContainerType.ORDERPOSITION),
-        ).prefetch_related('options').all()
+        return self.request.event.questions.prefetch_related('options').all()
 
     @transaction.atomic()
     def perform_create(self, serializer):
@@ -566,6 +564,51 @@ class QuestionOptionViewSet(viewsets.ModelViewSet):
         super().perform_destroy(instance)
 
 
+class QuestionnaireViewSet(ConditionalListView, viewsets.ModelViewSet):
+    serializer_class = QuestionnaireSerializer
+    queryset = Questionnaire.objects.none()
+    #filter_backends = (DjangoFilterBackend, TotalOrderingFilter)
+    #filterset_class = QuestionFilter
+    ordering_fields = ('id', 'position')
+    ordering = ('position', 'id')
+    permission = None
+    write_permission = 'event.items:write'
+
+    def get_queryset(self):
+        return self.request.event.questionnaires.prefetch_related('children').all()
+
+    def perform_create(self, serializer):
+        serializer.save(event=self.request.event)
+        serializer.instance.log_action(
+            'pretix.event.questionnaire.added',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=self.request.data
+        )
+
+    def get_serializer_context(self):
+        ctx = super().get_serializer_context()
+        ctx['event'] = self.request.event
+        return ctx
+
+    def perform_update(self, serializer):
+        serializer.save(event=self.request.event)
+        serializer.instance.log_action(
+            'pretix.event.questionnaire.changed',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=self.request.data
+        )
+
+    def perform_destroy(self, instance):
+        instance.log_action(
+            'pretix.event.questionnaire.deleted',
+            user=self.request.user,
+            auth=self.request.auth,
+        )
+        super().perform_destroy(instance)
+
+
 class NumberInFilter(django_filters.BaseInFilter, django_filters.NumberFilter):
     pass
 

src/pretix/base/forms/questions.py

@@ -36,7 +36,6 @@ import copy
 import json
 import logging
 import re
-from collections import namedtuple
 from datetime import timedelta
 from decimal import Decimal
 from io import BytesIO
@@ -637,352 +636,13 @@ class PortraitImageField(SizeValidationMixin, ExtValidationMixin, forms.FileFiel
         super().__init__(*args, **kwargs)
 
 
-FakeQuestion = namedtuple(
-    'FakeQuestion', 'id question position required help_text container_type', defaults=('', Question.ContainerType.ORDERPOSITION)
-)
-
-
-def get_fake_attendee_questions(settings):
-    fq = []
-    sqo = settings.system_question_order
-
-    if settings.attendee_names_asked:
-        fq.append(FakeQuestion('attendee_name_parts', _('Attendee name'), sqo.get('attendee_name_parts', 0), settings.attendee_names_required))
-
-    if settings.attendee_emails_asked:
-        fq.append(FakeQuestion('attendee_email', _('Attendee email'), sqo.get('attendee_email', 0), settings.attendee_emails_required))
-
-    if settings.attendee_company_asked:
-        fq.append(FakeQuestion('company', _('Company'), sqo.get('company', 0), settings.attendee_company_required))
-
-    if settings.attendee_addresses_asked:
-        fq.append(FakeQuestion('street', _('Street'), sqo.get('street', 0), settings.attendee_addresses_required))
-        fq.append(FakeQuestion('zipcode', _('ZIP code'), sqo.get('zipcode', 0), settings.attendee_addresses_required))
-        fq.append(FakeQuestion('city', _('City'), sqo.get('city', 0), settings.attendee_addresses_required))
-        fq.append(FakeQuestion('state', _('State'), sqo.get('country', 0), settings.attendee_addresses_required))
-        fq.append(FakeQuestion('country', _('Country'), sqo.get('country', 0), settings.attendee_addresses_required))
-    return fq
-
-
 class BaseQuestionsForm(forms.Form):
     """
-    This is the base form class responsible for asking order- or ticket-related questions.
-    """
-    address_validation = False
-
-    def build_user_question_field(self, request, event, answerlist, q):
-        # Do we already have an answer? Provide it as the initial value
-        answers = [a for a in answerlist if a.question_id == q.id]
-        if answers:
-            initial = answers[0]
-        else:
-            initial = None
-        tz = ZoneInfo(event.settings.timezone)
-        required = q.required and not self.all_optional
-        if q.type == Question.TYPE_BOOLEAN:
-            if required:
-                # For some reason, django-bootstrap3 does not set the required attribute
-                # itself.
-                widget = forms.CheckboxInput(attrs={'required': 'required'})
-            else:
-                widget = forms.CheckboxInput()
-
-            if initial:
-                initialbool = (initial.answer == "True")
-            else:
-                initialbool = False
-
-            field = forms.BooleanField(
-                label=escape(q.question), required=required,
-                help_text=rich_text(q.help_text),
-                initial=initialbool, widget=widget,
-            )
-        elif q.type == Question.TYPE_NUMBER:
-            field = forms.DecimalField(
-                label=escape(q.question), required=required,
-                min_value=q.valid_number_min or Decimal('0.00'),
-                max_value=q.valid_number_max,
-                help_text=rich_text(q.help_text),
-                initial=initial.answer if initial else None,
-            )
-        elif q.type == Question.TYPE_STRING:
-            field = forms.CharField(
-                label=escape(q.question), required=required,
-                max_length=q.valid_string_length_max,
-                help_text=rich_text(q.help_text),
-                initial=initial.answer if initial else None,
-            )
-        elif q.type == Question.TYPE_TEXT:
-            field = forms.CharField(
-                label=escape(q.question), required=required,
-                max_length=q.valid_string_length_max,
-                help_text=rich_text(q.help_text),
-                widget=forms.Textarea,
-                initial=initial.answer if initial else None,
-            )
-        elif q.type == Question.TYPE_COUNTRYCODE:
-            field = CountryField(
-                countries=CachedCountries,
-                blank=True, null=True, blank_label=' ',
-            ).formfield(
-                label=escape(q.question), required=required,
-                help_text=rich_text(q.help_text),
-                widget=forms.Select,
-                empty_label=' ',
-                initial=initial.answer if initial else (
-                    guess_country_from_request(request, event) if required else None),
-            )
-        elif q.type == Question.TYPE_CHOICE:
-            field = forms.ModelChoiceField(
-                queryset=q.options,
-                label=escape(q.question), required=required,
-                help_text=rich_text(q.help_text),
-                widget=forms.Select,
-                to_field_name='identifier',
-                empty_label='',
-                initial=initial.options.first() if initial else None,
-            )
-        elif q.type == Question.TYPE_CHOICE_MULTIPLE:
-            field = forms.ModelMultipleChoiceField(
-                queryset=q.options,
-                label=escape(q.question), required=required,
-                help_text=rich_text(q.help_text),
-                to_field_name='identifier',
-                widget=QuestionCheckboxSelectMultiple,
-                initial=initial.options.all() if initial else None,
-            )
-        elif q.type == Question.TYPE_FILE:
-            if q.valid_file_portrait:
-                field = PortraitImageField(
-                    label=escape(q.question), required=required,
-                    help_text=rich_text(q.help_text),
-                    initial=initial.file if initial else None,
-                    widget=PortraitImageWidget(answer=initial, request=request,
-                                               attrs={'data-portrait-photo': 'true'}),
-                )
-            else:
-                field = ExtFileField(
-                    label=escape(q.question), required=required,
-                    help_text=rich_text(q.help_text),
-                    initial=initial.file if initial else None,
-                    widget=UploadedFileWidget(answer=initial, request=request),
-                    ext_whitelist=settings.FILE_UPLOAD_EXTENSIONS_OTHER,
-                    max_size=settings.FILE_UPLOAD_MAX_SIZE_OTHER,
-                )
-        elif q.type == Question.TYPE_DATE:
-            attrs = {}
-            if q.valid_date_min:
-                attrs['data-min'] = q.valid_date_min.isoformat()
-            if q.valid_date_max:
-                attrs['data-max'] = q.valid_date_max.isoformat()
-            help_text = q.help_text
-            if not help_text:
-                if q.valid_date_min and q.valid_date_max:
-                    help_text = format_lazy(
-                        _('Please enter a date between {min} and {max}.'),
-                        min=date_format(q.valid_date_min, "SHORT_DATE_FORMAT"),
-                        max=date_format(q.valid_date_max, "SHORT_DATE_FORMAT"),
-                    )
-                elif q.valid_date_min:
-                    help_text = format_lazy(
-                        _('Please enter a date no earlier than {min}.'),
-                        min=date_format(q.valid_date_min, "SHORT_DATE_FORMAT"),
-                    )
-                elif q.valid_date_max:
-                    help_text = format_lazy(
-                        _('Please enter a date no later than {max}.'),
-                        max=date_format(q.valid_date_max, "SHORT_DATE_FORMAT"),
-                    )
-            if initial and initial.answer:
-                try:
-                    _initial = dateutil.parser.parse(initial.answer).date()
-                except dateutil.parser.ParserError:
-                    _initial = None
-            else:
-                _initial = None
-            field = forms.DateField(
-                label=escape(q.question), required=required,
-                help_text=rich_text(help_text),
-                initial=_initial,
-                widget=DatePickerWidget(attrs),
-            )
-            if q.valid_date_min:
-                field.validators.append(MinDateValidator(q.valid_date_min))
-            if q.valid_date_max:
-                field.validators.append(MaxDateValidator(q.valid_date_max))
-        elif q.type == Question.TYPE_TIME:
-            if initial and initial.answer:
-                try:
-                    _initial = dateutil.parser.parse(initial.answer).time()
-                except dateutil.parser.ParserError:
-                    _initial = None
-            else:
-                _initial = None
-            field = forms.TimeField(
-                label=escape(q.question), required=required,
-                help_text=rich_text(q.help_text),
-                initial=_initial,
-                widget=TimePickerWidget(without_seconds=True),
-            )
-        elif q.type == Question.TYPE_DATETIME:
-            help_text = q.help_text
-            if not help_text:
-                if q.valid_datetime_min and q.valid_datetime_max:
-                    help_text = format_lazy(
-                        _('Please enter a date and time between {min} and {max}.'),
-                        min=date_format(q.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
-                        max=date_format(q.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
-                    )
-                elif q.valid_datetime_min:
-                    help_text = format_lazy(
-                        _('Please enter a date and time no earlier than {min}.'),
-                        min=date_format(q.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
-                    )
-                elif q.valid_datetime_max:
-                    help_text = format_lazy(
-                        _('Please enter a date and time no later than {max}.'),
-                        max=date_format(q.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
-                    )
-
-            if initial and initial.answer:
-                try:
-                    _initial = dateutil.parser.parse(initial.answer).astimezone(tz)
-                except dateutil.parser.ParserError:
-                    _initial = None
-            else:
-                _initial = None
-
-            field = SplitDateTimeField(
-                label=escape(q.question), required=required,
-                help_text=rich_text(help_text),
-                initial=_initial,
-                widget=SplitDateTimePickerWidget(
-                    time_format=get_format_without_seconds('TIME_INPUT_FORMATS'),
-                    min_date=q.valid_datetime_min,
-                    max_date=q.valid_datetime_max
-                ),
-            )
-            if q.valid_datetime_min:
-                field.validators.append(MinDateTimeValidator(q.valid_datetime_min))
-            if q.valid_datetime_max:
-                field.validators.append(MaxDateTimeValidator(q.valid_datetime_max))
-        elif q.type == Question.TYPE_PHONENUMBER:
-            if initial:
-                try:
-                    initial = PhoneNumber().from_string(initial.answer)
-                except NumberParseException:
-                    initial = None
-
-            if not initial:
-                phone_prefix = guess_phone_prefix_from_request(request, event)
-                if phone_prefix:
-                    initial = "+{}.".format(phone_prefix)
-
-            field = PhoneNumberField(
-                label=escape(q.question), required=required,
-                help_text=rich_text(q.help_text),
-                # We now exploit an implementation detail in PhoneNumberPrefixWidget to allow us to pass just
-                # a country code but no number as an initial value. It's a bit hacky, but should be stable for
-                # the future.
-                initial=initial,
-                widget=WrappedPhoneNumberPrefixWidget()
-            )
-        field.question = q
-        if answers:
-            # Cache the answer object for later use
-            field.answer = answers[0]
-
-        if q.dependency_question_id:
-            field.widget.attrs['data-question-dependency'] = q.dependency_question_id
-            field.widget.attrs['data-question-dependency-values'] = escapejson_attr(json.dumps(q.dependency_values))
-            if q.type != 'M':
-                field.widget.attrs['required'] = q.required and not self.all_optional
-                field._required = q.required and not self.all_optional
-            field.required = False
-        return field
-
-    def check_user_questions(self, d):
-        question_cache = {f.question.pk: f.question for f in self.fields.values() if getattr(f, 'question', None)}
-
-        def question_is_visible(parentid, qvals):
-            if parentid not in question_cache:
-                return False
-            parentq = question_cache[parentid]
-            if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
-                return False
-            if 'question_%d' % parentid not in d:
-                return False
-            dval = d.get('question_%d' % parentid)
-            return (
-                ('True' in qvals and dval)
-                or ('False' in qvals and not dval)
-                or (isinstance(dval, QuestionOption) and dval.identifier in qvals)
-                or (isinstance(dval, (list, QuerySet)) and any(qval in [o.identifier for o in dval] for qval in qvals))
-            )
-
-        def question_is_required(q):
-            return (
-                q.required and
-                (not q.dependency_question_id or question_is_visible(q.dependency_question_id, q.dependency_values))
-            )
-
-        if not self.all_optional:
-            for q in question_cache.values():
-                answer = d.get('question_%d' % q.pk)
-                field = self['question_%d' % q.pk]
-                if question_is_required(q) and not answer and answer != 0 and not field.errors:
-                    raise ValidationError({'question_%d' % q.pk: [_('This field is required.')]})
-
-        # Strip invisible question from cleaned_data so they don't end up in the database
-        for q in question_cache.values():
-            answer = d.get('question_%d' % q.pk)
-            if q.dependency_question_id and not question_is_visible(q.dependency_question_id, q.dependency_values) and answer is not None:
-                d['question_%d' % q.pk] = None
-
-        # Strip False answers to required yes/no questions even if all_optional is set, as our data model assumes that
-        # required yes/no questions can only be answered with yes
-        for q in question_cache.values():
-            if q.required and q.type == Question.TYPE_BOOLEAN:
-                if 'question_%d' % q.pk in d and d['question_%d' % q.pk] is False:
-                    d['question_%d' % q.pk] = None
-
-
-class OrderLevelQuestionsForm(BaseQuestionsForm):
-    def __init__(self, container, *args, **kwargs):
-        """
-        Takes two additional keyword arguments:
-
-        :param checkoutsession: The checkout session the form should be for
-        :param order: The order the form should be for
-        :param event: The event this belongs to
-        """
-        request = kwargs.pop('request', None)
-        event = kwargs.pop('event')
-        self.all_optional = kwargs.pop('all_optional', False)
-
-        super().__init__(*args, **kwargs)
-
-        questions = Question.objects.filter(
-            event=event, container_type=Question.ContainerType.ORDER,
-            ask_during_checkin=False, hidden=False,
-        ).order_by('position')
-        answerlist = container.answers.prefetch_related('options')
-
-        for q in questions:
-            self.fields['question_%s' % q.id] = self.build_user_question_field(request, event, answerlist, q)
-
-    def clean(self):
-        d = super().clean()
-        self.check_user_questions(d)
-        return d
-
-
-class TicketLevelQuestionsForm(BaseQuestionsForm):
-    """
-    This form class is responsible for asking ticket-related questions. This includes
+    This form class is responsible for asking order-related questions. This includes
     the attendee name for admission tickets, if the corresponding setting is enabled,
     as well as additional questions defined by the organizer.
     """
+    address_validation = False
 
     def __init__(self, *args, **kwargs):
         """
@@ -996,6 +656,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
         orderpos = self.orderpos = kwargs.pop('orderpos', None)
         pos = cartpos or orderpos
         item = pos.item
+        questionnaires = pos.item.relevant_questionnaires
         event = kwargs.pop('event')
         self.all_optional = kwargs.pop('all_optional', False)
         self.attendee_addresses_required = event.settings.attendee_addresses_required and not self.all_optional
@@ -1005,18 +666,13 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
         if cartpos and item.validity_mode == Item.VALIDITY_MODE_DYNAMIC and item.validity_dynamic_start_choice:
             self.fields['requested_valid_from'] = self.build_requested_valid_from_field(event, pos, item)
 
-        questions = []
-        if item.ask_attendee_data:
-            questions += get_fake_attendee_questions(event.settings)
-        questions += pos.item.questions_to_ask
-
-        questions.sort(key=lambda q: q.position)
-
-        for q in questions:
-            if isinstance(q, FakeQuestion):
-                self.fields[q.id] = self.build_system_question_field(request, event, pos, q)
-            else:
-                self.fields['question_%s' % q.id] = self.build_user_question_field(request, event, pos.answerlist, q)
+        for questionnaire in questionnaires:
+            for child in getattr(questionnaire, 'childlist', questionnaire.children.all()):
+                if child.user_question:
+                    q = child.user_question
+                    self.fields['question_%s' % q.id] = self.build_user_question_field(request, event, pos, q)
+                elif child.system_question:
+                    self.fields[child.system_question] = self.build_system_question_field(request, event, pos, child)
 
         responses = question_form_fields.send(sender=event, position=pos)
         data = pos.meta_info_data
@@ -1081,22 +737,22 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
             )
 
     def build_system_question_field(self, request, event, pos, qc):
-        field_name = qc.id
+        field_name = qc.system_question
         if field_name == 'attendee_name_parts':
             return NamePartsFormField(
                 max_length=255,
                 required=qc.required and not self.all_optional,
                 scheme=event.settings.name_scheme,
                 titles=event.settings.name_scheme_titles,
-                label=escape(qc.question),
-                help_text=rich_text(qc.help_text),
+                label=qc.label,
+                help_text=qc.help_text,
                 initial=pos.attendee_name_parts,
             )
         if field_name == 'attendee_email':
             return forms.EmailField(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.question),
-                help_text=rich_text(qc.help_text),
+                label=qc.label,
+                help_text=qc.help_text,
                 initial=pos.attendee_email,
                 widget=forms.EmailInput(
                     attrs={
@@ -1107,8 +763,8 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
         if field_name == 'company':
             return forms.CharField(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.question),
-                help_text=rich_text(qc.help_text),
+                label=qc.label,
+                help_text=qc.help_text,
                 max_length=255,
                 initial=pos.company,
             )
@@ -1116,8 +772,8 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
         if field_name == 'street':
             return forms.CharField(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.question),
-                help_text=rich_text(qc.help_text),
+                label=qc.label,
+                help_text=qc.help_text,
                 widget=forms.Textarea(attrs={
                     'rows': 2,
                     'placeholder': _('Street and Number'),
@@ -1129,8 +785,8 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
             return forms.CharField(
                 required=False,
                 max_length=30,
-                label=escape(qc.question),
-                help_text=rich_text(qc.help_text),
+                label=qc.label,
+                help_text=qc.help_text,
                 initial=pos.zipcode,
                 widget=forms.TextInput(attrs={
                     'autocomplete': 'postal-code',
@@ -1139,8 +795,8 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
         if field_name == 'city':
             return forms.CharField(
                 required=False,
-                label=escape(qc.question),
-                help_text=rich_text(qc.help_text),
+                label=qc.label,
+                help_text=qc.help_text,
                 max_length=255,
                 initial=pos.city,
                 widget=forms.TextInput(attrs={
@@ -1153,8 +809,8 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
                 countries=CachedCountries
             ).formfield(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.question),
-                help_text=rich_text(qc.help_text),
+                label=qc.label,
+                help_text=qc.help_text,
                 initial=country,
                 widget=forms.Select(attrs={
                     'autocomplete': 'country',
@@ -1181,8 +837,8 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
                 del self.data[fprefix + 'state']
 
             field = forms.ChoiceField(
-                label=escape(qc.question),
-                help_text=rich_text(qc.help_text),
+                label=qc.label,
+                help_text=qc.help_text,
                 required=False,
                 choices=c,
                 initial=state,
@@ -1193,6 +849,236 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
             field.widget.is_required = True
             return field
 
+    def build_user_question_field(self, request, event, pos, q):
+        # Do we already have an answer? Provide it as the initial value
+        answers = [a for a in pos.answerlist if a.question_id == q.id]
+        if answers:
+            initial = answers[0]
+        else:
+            initial = None
+        tz = ZoneInfo(event.settings.timezone)
+        help_text = rich_text(q.help_text)
+        label = escape(q.question)  # django-bootstrap3 calls mark_safe
+        required = q.required and not self.all_optional
+        if q.type == Question.TYPE_BOOLEAN:
+            if required:
+                # For some reason, django-bootstrap3 does not set the required attribute
+                # itself.
+                widget = forms.CheckboxInput(attrs={'required': 'required'})
+            else:
+                widget = forms.CheckboxInput()
+
+            if initial:
+                initialbool = (initial.answer == "True")
+            else:
+                initialbool = False
+
+            field = forms.BooleanField(
+                label=label, required=required,
+                help_text=help_text,
+                initial=initialbool, widget=widget,
+            )
+        elif q.type == Question.TYPE_NUMBER:
+            field = forms.DecimalField(
+                label=label, required=required,
+                min_value=q.valid_number_min or Decimal('0.00'),
+                max_value=q.valid_number_max,
+                help_text=help_text,
+                initial=initial.answer if initial else None,
+            )
+        elif q.type == Question.TYPE_STRING:
+            field = forms.CharField(
+                label=label, required=required,
+                max_length=q.valid_string_length_max,
+                help_text=help_text,
+                initial=initial.answer if initial else None,
+            )
+        elif q.type == Question.TYPE_TEXT:
+            field = forms.CharField(
+                label=label, required=required,
+                max_length=q.valid_string_length_max,
+                help_text=help_text,
+                widget=forms.Textarea,
+                initial=initial.answer if initial else None,
+            )
+        elif q.type == Question.TYPE_COUNTRYCODE:
+            field = CountryField(
+                countries=CachedCountries,
+                blank=True, null=True, blank_label=' ',
+            ).formfield(
+                label=label, required=required,
+                help_text=help_text,
+                widget=forms.Select,
+                empty_label=' ',
+                initial=initial.answer if initial else (guess_country_from_request(request, event) if required else None),
+            )
+        elif q.type == Question.TYPE_CHOICE:
+            field = forms.ModelChoiceField(
+                queryset=q.options,
+                label=label, required=required,
+                help_text=help_text,
+                widget=forms.Select,
+                to_field_name='identifier',
+                empty_label='',
+                initial=initial.options.first() if initial else None,
+            )
+        elif q.type == Question.TYPE_CHOICE_MULTIPLE:
+            field = forms.ModelMultipleChoiceField(
+                queryset=q.options,
+                label=label, required=required,
+                help_text=help_text,
+                to_field_name='identifier',
+                widget=QuestionCheckboxSelectMultiple,
+                initial=initial.options.all() if initial else None,
+            )
+        elif q.type == Question.TYPE_FILE:
+            if q.valid_file_portrait:
+                field = PortraitImageField(
+                    label=label, required=required,
+                    help_text=help_text,
+                    initial=initial.file if initial else None,
+                    widget=PortraitImageWidget(position=pos, event=event, answer=initial, attrs={'data-portrait-photo': 'true'}),
+                )
+            else:
+                field = ExtFileField(
+                    label=label, required=required,
+                    help_text=help_text,
+                    initial=initial.file if initial else None,
+                    widget=UploadedFileWidget(position=pos, event=event, answer=initial),
+                    ext_whitelist=settings.FILE_UPLOAD_EXTENSIONS_OTHER,
+                    max_size=settings.FILE_UPLOAD_MAX_SIZE_OTHER,
+                )
+        elif q.type == Question.TYPE_DATE:
+            attrs = {}
+            if q.valid_date_min:
+                attrs['data-min'] = q.valid_date_min.isoformat()
+            if q.valid_date_max:
+                attrs['data-max'] = q.valid_date_max.isoformat()
+            if not help_text:
+                if q.valid_date_min and q.valid_date_max:
+                    help_text = format_lazy(
+                        _('Please enter a date between {min} and {max}.'),
+                        min=date_format(q.valid_date_min, "SHORT_DATE_FORMAT"),
+                        max=date_format(q.valid_date_max, "SHORT_DATE_FORMAT"),
+                    )
+                elif q.valid_date_min:
+                    help_text = format_lazy(
+                        _('Please enter a date no earlier than {min}.'),
+                        min=date_format(q.valid_date_min, "SHORT_DATE_FORMAT"),
+                    )
+                elif q.valid_date_max:
+                    help_text = format_lazy(
+                        _('Please enter a date no later than {max}.'),
+                        max=date_format(q.valid_date_max, "SHORT_DATE_FORMAT"),
+                    )
+            if initial and initial.answer:
+                try:
+                    _initial = dateutil.parser.parse(initial.answer).date()
+                except dateutil.parser.ParserError:
+                    _initial = None
+            else:
+                _initial = None
+            field = forms.DateField(
+                label=label, required=required,
+                help_text=help_text,
+                initial=_initial,
+                widget=DatePickerWidget(attrs),
+            )
+            if q.valid_date_min:
+                field.validators.append(MinDateValidator(q.valid_date_min))
+            if q.valid_date_max:
+                field.validators.append(MaxDateValidator(q.valid_date_max))
+        elif q.type == Question.TYPE_TIME:
+            if initial and initial.answer:
+                try:
+                    _initial = dateutil.parser.parse(initial.answer).time()
+                except dateutil.parser.ParserError:
+                    _initial = None
+            else:
+                _initial = None
+            field = forms.TimeField(
+                label=label, required=required,
+                help_text=help_text,
+                initial=_initial,
+                widget=TimePickerWidget(without_seconds=True),
+            )
+        elif q.type == Question.TYPE_DATETIME:
+            if not help_text:
+                if q.valid_datetime_min and q.valid_datetime_max:
+                    help_text = format_lazy(
+                        _('Please enter a date and time between {min} and {max}.'),
+                        min=date_format(q.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
+                        max=date_format(q.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
+                    )
+                elif q.valid_datetime_min:
+                    help_text = format_lazy(
+                        _('Please enter a date and time no earlier than {min}.'),
+                        min=date_format(q.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
+                    )
+                elif q.valid_datetime_max:
+                    help_text = format_lazy(
+                        _('Please enter a date and time no later than {max}.'),
+                        max=date_format(q.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
+                    )
+
+            if initial and initial.answer:
+                try:
+                    _initial = dateutil.parser.parse(initial.answer).astimezone(tz)
+                except dateutil.parser.ParserError:
+                    _initial = None
+            else:
+                _initial = None
+
+            field = SplitDateTimeField(
+                label=label, required=required,
+                help_text=help_text,
+                initial=_initial,
+                widget=SplitDateTimePickerWidget(
+                    time_format=get_format_without_seconds('TIME_INPUT_FORMATS'),
+                    min_date=q.valid_datetime_min,
+                    max_date=q.valid_datetime_max
+                ),
+            )
+            if q.valid_datetime_min:
+                field.validators.append(MinDateTimeValidator(q.valid_datetime_min))
+            if q.valid_datetime_max:
+                field.validators.append(MaxDateTimeValidator(q.valid_datetime_max))
+        elif q.type == Question.TYPE_PHONENUMBER:
+            if initial:
+                try:
+                    initial = PhoneNumber().from_string(initial.answer)
+                except NumberParseException:
+                    initial = None
+
+            if not initial:
+                phone_prefix = guess_phone_prefix_from_request(request, event)
+                if phone_prefix:
+                    initial = "+{}.".format(phone_prefix)
+
+            field = PhoneNumberField(
+                label=label, required=required,
+                help_text=help_text,
+                # We now exploit an implementation detail in PhoneNumberPrefixWidget to allow us to pass just
+                # a country code but no number as an initial value. It's a bit hacky, but should be stable for
+                # the future.
+                initial=initial,
+                widget=WrappedPhoneNumberPrefixWidget()
+            )
+        field.question = q
+        if answers:
+            # Cache the answer object for later use
+            field.answer = answers[0]
+
+        if q.dependency_question_id:
+            field.widget.attrs['data-question-dependency'] = q.dependency_question_id
+            field.widget.attrs['data-question-dependency-values'] = escapejson_attr(json.dumps(q.dependency_values))
+            if q.type != 'M':
+                field.widget.attrs['required'] = q.required and not self.all_optional
+                field._required = q.required and not self.all_optional
+            field.required = False
+
+        return field
+
     def clean(self):
         from pretix.base.addressvalidation import \
             validate_address  # local import to prevent impact on startup time
@@ -1206,7 +1092,49 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
             if not d.get('state'):
                 self.add_error('state', _('This field is required.'))
 
-        self.check_user_questions(d)
+        question_cache = {f.question.pk: f.question for f in self.fields.values() if getattr(f, 'question', None)}
+
+        def question_is_visible(parentid, qvals):
+            if parentid not in question_cache:
+                return False
+            parentq = question_cache[parentid]
+            if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
+                return False
+            if 'question_%d' % parentid not in d:
+                return False
+            dval = d.get('question_%d' % parentid)
+            return (
+                ('True' in qvals and dval)
+                or ('False' in qvals and not dval)
+                or (isinstance(dval, QuestionOption) and dval.identifier in qvals)
+                or (isinstance(dval, (list, QuerySet)) and any(qval in [o.identifier for o in dval] for qval in qvals))
+            )
+
+        def question_is_required(q):
+            return (
+                q.required and
+                (not q.dependency_question_id or question_is_visible(q.dependency_question_id, q.dependency_values))
+            )
+
+        if not self.all_optional:
+            for q in question_cache.values():
+                answer = d.get('question_%d' % q.pk)
+                field = self['question_%d' % q.pk]
+                if question_is_required(q) and not answer and answer != 0 and not field.errors:
+                    raise ValidationError({'question_%d' % q.pk: [_('This field is required.')]})
+
+        # Strip invisible question from cleaned_data so they don't end up in the database
+        for q in question_cache.values():
+            answer = d.get('question_%d' % q.pk)
+            if q.dependency_question_id and not question_is_visible(q.dependency_question_id, q.dependency_values) and answer is not None:
+                d['question_%d' % q.pk] = None
+
+        # Strip False answers to required yes/no questions even if all_optional is set, as our data model assumes that
+        # required yes/no questions can only be answered with yes
+        for q in question_cache.values():
+            if q.required and q.type == Question.TYPE_BOOLEAN:
+                if 'question_%d' % q.pk in d and d['question_%d' % q.pk] is False:
+                    d['question_%d' % q.pk] = None
 
         return d
 
@@ -1286,15 +1214,15 @@ class BaseInvoiceAddressForm(forms.ModelForm):
         if not self.ask_vat_id:
             del self.fields['vat_id']
         elif self.validate_vat_id:
-            self.fields['vat_id'].help_text = _(
-                'Optional, but depending on the country you reside in we might need to charge you '
-                'additional taxes if you do not enter it.'
-            )
+            self.fields['vat_id'].help_text = '<br/>'.join([
+                str(_('Optional, but depending on the country you reside in we might need to charge you '
+                      'additional taxes if you do not enter it.')),
+            ])
         else:
-            self.fields['vat_id'].help_text = _(
-                'Optional, but it might be required for you to claim tax benefits on your invoice '
-                'depending on your and the seller’s country of residence.'
-            )
+            self.fields['vat_id'].help_text = '<br/>'.join([
+                str(_('Optional, but it might be required for you to claim tax benefits on your invoice '
+                      'depending on your and the seller’s country of residence.')),
+            ])
 
         transmission_type_choices = [
             (t.identifier, t.public_name) for t in get_transmission_types()
@@ -1380,8 +1308,8 @@ class BaseInvoiceAddressForm(forms.ModelForm):
             del self.fields['beneficiary']
 
         if event.settings.invoice_address_custom_field:
-            self.fields['custom_field'].label = escape(event.settings.invoice_address_custom_field)
-            self.fields['custom_field'].help_text = rich_text(event.settings.invoice_address_custom_field_helptext)
+            self.fields['custom_field'].label = event.settings.invoice_address_custom_field
+            self.fields['custom_field'].help_text = event.settings.invoice_address_custom_field_helptext
         else:
             del self.fields['custom_field']
 

src/pretix/base/forms/widgets.py

@@ -47,7 +47,6 @@ from pretix.helpers.i18n import (
     get_format_without_seconds, get_javascript_format,
     get_javascript_format_without_seconds,
 )
-from pretix.helpers.safedownload import get_token
 
 
 def replace_arabic_numbers(inp):
@@ -158,26 +157,36 @@ class TimePickerWidget(forms.TimeInput):
 
 class UploadedFileWidget(forms.ClearableFileInput):
     def __init__(self, *args, **kwargs):
+        self.position = kwargs.pop('position')
+        self.event = kwargs.pop('event')
         self.answer = kwargs.pop('answer')
-        self.request = kwargs.pop('request')
         super().__init__(*args, **kwargs)
 
     class FakeFile:
-        def __init__(self, file, answer, request):
+        def __init__(self, file, position, event, answer):
             self.file = file
+            self.position = position
+            self.event = event
             self.answer = answer
-            self.request = request
 
         def __str__(self):
             return os.path.basename(self.file.name).split('.', 1)[-1]
 
         @property
         def url(self):
-            token = get_token(self.request, self.answer)
-            if self.request.resolver_match.namespace == 'control':
-                return self.answer.backend_file_url + '?token=' + token
+            from pretix.base.models import OrderPosition
+            from pretix.multidomain.urlreverse import eventreverse
+
+            if isinstance(self.position, OrderPosition):
+                return eventreverse(self.event, 'presale:event.order.download.answer', kwargs={
+                    'order': self.position.order.code,
+                    'secret': self.position.order.secret,
+                    'answer': self.answer.pk,
+                })
             else:
-                return self.answer.frontend_file_url + '?token=' + token
+                return eventreverse(self.event, 'presale:event.cart.download.answer', kwargs={
+                    'answer': self.answer.pk,
+                })
 
     def get_context(self, name, value, attrs):
         # Browsers can't recognize that the server already has a file uploaded
@@ -190,7 +199,7 @@ class UploadedFileWidget(forms.ClearableFileInput):
 
     def format_value(self, value):
         if self.is_initial(value):
-            return self.FakeFile(value, self.answer, self.request)
+            return self.FakeFile(value, self.position, self.event, self.answer)
 
 
 class SplitDateTimePickerWidget(forms.SplitDateTimeWidget):
@@ -305,18 +314,3 @@ class BusinessBooleanRadio(forms.RadioSelect):
             'False': False,
             False: False,
         }.get(value)
-
-
-class OptionAttrsSelect(forms.Select):
-    def __init__(self, *args, option_attrs=None, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.option_attrs = option_attrs or {}
-
-    def create_option(self, name, value, label, selected, index, subindex=None, attrs=None):
-        option = super().create_option(
-            name, value, label, selected, index, subindex=subindex, attrs=attrs
-        )
-        extra = self.option_attrs.get(str(value))
-        if extra:
-            option["attrs"].update(extra)
-        return option

src/pretix/base/migrations/0308_checkoutsession_invoiceaddress_checkout_session.py

@@ -1,63 +0,0 @@
-# Generated by Django 4.2.17 on 2025-01-01 20:25
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("pretixbase", "0307_devicelastseen"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="CheckoutSession",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True, primary_key=True, serialize=False
-                    ),
-                ),
-                ("cart_id", models.CharField(max_length=255, unique=True)),
-                ("created", models.DateTimeField(auto_now_add=True)),
-                ("testmode", models.BooleanField(default=False)),
-                ("session_data", models.JSONField(default=dict)),
-                (
-                    "customer",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="checkout_sessions",
-                        to="pretixbase.customer",
-                    ),
-                ),
-                (
-                    "event",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="checkout_sessions",
-                        to="pretixbase.event",
-                    ),
-                ),
-                (
-                    "sales_channel",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to="pretixbase.saleschannel",
-                    ),
-                ),
-            ],
-        ),
-        migrations.AddField(
-            model_name="invoiceaddress",
-            name="checkout_session",
-            field=models.OneToOneField(
-                null=True,
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="invoice_address",
-                to="pretixbase.checkoutsession",
-            ),
-        ),
-    ]

src/pretix/base/migrations/0308_questionnaire_questionnairechild.py

@@ -0,0 +1,175 @@
+# Generated by Django 4.2.29 on 2026-03-19 14:24
+import json
+from collections import namedtuple
+from itertools import chain, groupby
+
+from django.db import migrations, models
+import django.db.models.deletion
+import i18nfield.fields
+from i18nfield.strings import LazyI18nString
+
+import pretix.base.models.base
+import pretix.base.models.fields
+
+
+FakeQuestion = namedtuple(
+    'FakeQuestion', 'id question position required'
+)
+
+
+def get_fake_questions(settings):
+    def b(s):
+        return s == 'True'
+    fq = []
+    sqo = json.loads(settings.get('system_question_order', '{}'))
+    _ = LazyI18nString.from_gettext
+
+    if b(settings.get('attendee_names_asked', 'True')):
+        fq.append(FakeQuestion('attendee_name_parts', _('Attendee name'), sqo.get('attendee_name_parts', 0), b(settings.get('attendee_names_required'))))
+
+    if b(settings.get('attendee_emails_asked')):
+        fq.append(FakeQuestion('attendee_email', _('Attendee email'), sqo.get('attendee_email', 0), b(settings.get('attendee_emails_required'))))
+
+    if b(settings.get('attendee_company_asked')):
+        fq.append(FakeQuestion('company', _('Company'), sqo.get('company', 0), b(settings.get('attendee_company_required'))))
+
+    if b(settings.get('attendee_addresses_asked')):
+        fq.append(FakeQuestion('street', _('Street'), sqo.get('street', 0), b(settings.get('attendee_addresses_required'))))
+        fq.append(FakeQuestion('zipcode', _('ZIP code'), sqo.get('zipcode', 0), b(settings.get('attendee_addresses_required'))))
+        fq.append(FakeQuestion('city', _('City'), sqo.get('city', 0), b(settings.get('attendee_addresses_required'))))
+        fq.append(FakeQuestion('country', _('Country'), sqo.get('country', 0), b(settings.get('attendee_addresses_required'))))
+    return fq
+
+
+def migrate_questions_forward(apps, schema_editor):
+    Event = apps.get_model("pretixbase", "Event")
+    Item = apps.get_model("pretixbase", "Item")
+    Question = apps.get_model("pretixbase", "Question")
+    Questionnaire = apps.get_model("pretixbase", "Questionnaire")
+    QuestionnaireChild = apps.get_model("pretixbase", "QuestionnaireChild")
+    EventSettingsStore = apps.get_model('pretixbase', 'Event_SettingsStore')
+
+    def create_grouped_item_questionnaires(event, children, label_prefix, questionnaire_type):
+        # group by item, creating a unique questionnaire per item
+        item_questionnaires = (([t[3] for t in children], item_id) for item_id, children in
+                               groupby(children, key=lambda t: t[0]))
+
+        # group again, merging all questionnaires with identical children
+        merged_questionnaires = groupby(sorted(item_questionnaires, key=lambda t: [q.id for q in t[0]]),
+                                        key=lambda t: t[0])
+        for children, iterator in merged_questionnaires:
+            items = [item for _c, item in iterator]
+
+            # create questionnaires and children
+            questionnaire = Questionnaire.objects.create(
+                event=event, type=questionnaire_type, position=0, all_sales_channels=True,
+                internal_name=label_prefix + ', '.join(str(iname or name) for (id, iname, name) in items)
+            )
+            questionnaire.items.set([id for (id, iname, name) in items])
+            deps = {}
+            for position, child in enumerate(children):
+                if isinstance(child, FakeQuestion):
+                    QuestionnaireChild.objects.create(
+                        questionnaire=questionnaire,
+                        position=position + 1,
+                        system_question=child.id,
+                        required=child.required,
+                        label=child.question,
+                    )
+                else:
+                    deps[child.id] = QuestionnaireChild.objects.create(
+                        questionnaire=questionnaire,
+                        position=position + 1,
+                        user_question=child,
+                        required=child.required,
+                        label=child.question,
+                        help_text=child.help_text,
+                        dependency_question=deps[child.dependency_question.id] if child.dependency_question else None,
+                        dependency_values=child.dependency_values,
+                    )
+
+    for event in Event.objects.iterator():
+        # get relevant settings
+        settings = {
+            setting.key: setting.value for setting in EventSettingsStore.objects.filter(object_id=event.id, key__in=(
+                'system_question_order', 'attendee_names_asked', 'attendee_names_required', 'attendee_emails_asked', 'attendee_emails_required',
+                'attendee_company_asked', 'attendee_company_required', 'attendee_addresses_asked', 'attendee_addresses_required',
+            ))
+        }
+
+        # get all questions (user-defined and system provided), along with the products for which they're asked
+        questions = event.questions.all()
+        children = sorted(chain((
+            (item, q.position, q.id, q)
+            for q in questions.filter(hidden=False)
+            for item in q.items.values_list('id', 'internal_name', 'name')
+        ), (
+            (item, q.position, 0, q)
+            for q in get_fake_questions(settings)
+            for item in event.items.filter(personalized=True).values_list('id', 'internal_name', 'name')
+        )), key=lambda t: (t[0], t[1], t[2]))
+
+        create_grouped_item_questionnaires(event, children, '', 'PS')
+
+        children = sorted(chain((
+            (item, q.position, q.id, q)
+            for q in questions.filter(hidden=True)
+            for item in q.items.values_list('id', 'internal_name', 'name')
+        )), key=lambda t: (t[0], t[1], t[2]))
+
+        create_grouped_item_questionnaires(event, children, 'Hidden questions for ', 'PH')
+
+
+def migrate_questions_backward(apps, schema_editor):
+    pass  # as long as we don't delete the old columns, this is a no op. after that, it gets complicated...
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0307_devicelastseen'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Questionnaire',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('internal_name', models.CharField(max_length=255)),
+                ('type', models.CharField(max_length=5)),
+                ('position', models.PositiveIntegerField(default=0)),
+                ('all_sales_channels', models.BooleanField(default=True)),
+                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='questionnaires', to='pretixbase.event')),
+                ('items', models.ManyToManyField(related_name='questionnaires', to='pretixbase.item')),
+                ('limit_sales_channels', models.ManyToManyField(to='pretixbase.saleschannel')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=(models.Model, pretix.base.models.base.LoggingMixin),
+        ),
+        migrations.CreateModel(
+            name='QuestionnaireChild',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('position', models.PositiveIntegerField(default=0)),
+                ('system_question', models.CharField(max_length=25, null=True)),
+                ('required', models.BooleanField(default=False)),
+                ('label', i18nfield.fields.I18nTextField()),
+                ('help_text', i18nfield.fields.I18nTextField(null=True)),
+                ('dependency_values', pretix.base.models.fields.MultiStringField(default=[])),
+                ('dependency_question', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='dependent_questions', to='pretixbase.questionnairechild')),
+                ('questionnaire', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='children', to='pretixbase.questionnaire')),
+                ('user_question', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='references', to='pretixbase.question')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=(models.Model, pretix.base.models.base.LoggingMixin),
+        ),
+        migrations.RunPython(
+            migrate_questions_forward,
+            migrate_questions_backward,
+        ),
+        # TODO remove old columns from Question model
+    ]

src/pretix/base/migrations/0309_alter_questionanswer_unique_together_and_more.py

@@ -1,33 +0,0 @@
-# Generated by Django 5.2.15 on 2026-08-07 20:01
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0308_checkoutsession_invoiceaddress_checkout_session'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='question',
-            name='container_type',
-            field=models.CharField(default='P', max_length=5),
-        ),
-        migrations.AddField(
-            model_name='questionanswer',
-            name='checkoutsession',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='pretixbase.checkoutsession'),
-        ),
-        migrations.AddField(
-            model_name='questionanswer',
-            name='order',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='pretixbase.order'),
-        ),
-        migrations.AlterUniqueTogether(
-            name='questionanswer',
-            unique_together={('cartposition', 'question'), ('checkoutsession', 'question'), ('order', 'question'), ('orderposition', 'question')},
-        ),
-    ]

src/pretix/base/models/__init__.py

@@ -37,7 +37,7 @@ from .invoices import Invoice, InvoiceLine, invoice_filename
 from .items import (
     Item, ItemAddOn, ItemBundle, ItemCategory, ItemMetaProperty, ItemMetaValue,
     ItemProgramTime, ItemVariation, ItemVariationMetaValue, Question,
-    QuestionOption, Quota, SubEventItem, SubEventItemVariation,
+    QuestionOption, Questionnaire, QuestionnaireChild, Quota, SubEventItem, SubEventItemVariation,
     itempicture_upload_to,
 )
 from .log import LogEntry

src/pretix/base/models/customers.py

@@ -33,7 +33,6 @@ from django.db.models.aggregates import Sum
 from django.db.models.expressions import OuterRef, Subquery
 from django.db.models.functions.comparison import Coalesce
 from django.utils.crypto import get_random_string, salted_hmac
-from django.utils.functional import cached_property
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager, scopes_disabled
@@ -410,17 +409,6 @@ class AttendeeProfile(models.Model):
 
         return '\n'.join([str(p).strip() for p in parts if p and str(p).strip()])
 
-    @cached_property
-    def answers_key_to_index(self):
-        return {a.get('field_name'): i for i, a in enumerate(self.answers)}
-
-    def store_answer(self, answer_dict):
-        k = answer_dict['field_name']
-        if k in self.answers_key_to_index:
-            self.answers[self.answers_key_to_index[k]] = answer_dict
-        else:
-            self.answers.append(answer_dict)
-
 
 def generate_client_id():
     return get_random_string(40)

src/pretix/base/models/event.py

@@ -736,7 +736,7 @@ class Event(EventMixin, LoggedModel):
         self.settings.mail_send_order_paid_attendee = True
         self.settings.mail_send_order_approved_attendee = True
         self.settings.mail_send_order_approved_free_attendee = True
-        self.settings.mail_send_download_reminder_attendee = True
+        self.settings.mail_text_download_reminder_attendee = True
 
     @property
     def social_image(self):

src/pretix/base/models/items.py

@@ -1569,10 +1569,12 @@ class ItemBundle(models.Model):
 
 class Question(LoggedModel):
     """
-    A question is an input field that can be used to extend a ticket by custom information,
-    e.g. "Attendee age". The answers are found next to the position. The answers may be found
-    in QuestionAnswers, attached to OrderPositions/CartPositions. A question can allow one of
-    several input types, currently:
+    A question is a data field that can be used to extend an order or a ticket by custom
+    information, e.g. "Attendee age". To be actually useful, questions need to be added to
+    one or multiple Questionnaires. The answers may be found in QuestionAnswers, attached
+    to Orders, OrderPositions or CartPositions.
+
+    A question can allow one of several input types, currently:
 
     * a number (``TYPE_NUMBER``)
     * a one-line string (``TYPE_STRING``)
@@ -1606,9 +1608,6 @@ class Question(LoggedModel):
     :param dependency_values: The values that `dependency_question` needs to be set to for this question to be applicable.
     :type dependency_values: list[str]
     """
-    class ContainerType(models.TextChoices):
-        ORDER = "O", _("Order")
-        ORDERPOSITION = "P", _("Order position")
     TYPE_NUMBER = "N"
     TYPE_STRING = "S"
     TYPE_TEXT = "T"
@@ -1644,13 +1643,7 @@ class Question(LoggedModel):
         related_name="questions",
         on_delete=models.CASCADE
     )
-    container_type = models.CharField(
-        max_length=5,
-        choices=ContainerType.choices,
-        verbose_name=_("Asked on"),
-        default=ContainerType.ORDERPOSITION,
-    )
-    question = I18nTextField(
+    question = I18nTextField(  # to be renamed to 'internal_name'
         verbose_name=_("Question")
     )
     identifier = models.CharField(
@@ -1665,7 +1658,7 @@ class Question(LoggedModel):
             ),
         ],
     )
-    help_text = I18nTextField(
+    help_text = I18nTextField(  # to be removed
         verbose_name=_("Help text"),
         help_text=_("If the question needs to be explained or clarified, do it here!"),
         null=True, blank=True,
@@ -1675,22 +1668,22 @@ class Question(LoggedModel):
         choices=TYPE_CHOICES,
         verbose_name=_("Question type")
     )
-    required = models.BooleanField(
+    required = models.BooleanField(  # to be removed, -> QuestionnaireChild
         default=False,
         verbose_name=_("Required question")
     )
-    items = models.ManyToManyField(
+    items = models.ManyToManyField(  # to be removed, -> Questionnaire
         Item,
         related_name='questions',
         verbose_name=_("Products"),
         blank=True,
         help_text=_('This question will be asked to buyers of the selected products')
     )
-    position = models.PositiveIntegerField(
+    position = models.PositiveIntegerField(  # to be removed, -> Questionnaire + QuestionnaireChild
         default=0,
         verbose_name=_("Position")
     )
-    ask_during_checkin = models.BooleanField(
+    ask_during_checkin = models.BooleanField(  # to be removed
         verbose_name=_('Ask during check-in instead of in the ticket buying process'),
         help_text=_('Not supported by all check-in apps for all question types.'),
         default=False
@@ -1700,7 +1693,7 @@ class Question(LoggedModel):
         help_text=_('Not supported by all check-in apps for all question types.'),
         default=False
     )
-    hidden = models.BooleanField(
+    hidden = models.BooleanField(  # to be removed
         verbose_name=_('Hidden question'),
         help_text=_('This question will only show up in the backend.'),
         default=False
@@ -1709,10 +1702,10 @@ class Question(LoggedModel):
         verbose_name=_('Print answer on invoices'),
         default=False
     )
-    dependency_question = models.ForeignKey(
+    dependency_question = models.ForeignKey(  # to be removed, -> QuestionnaireChild
         'Question', null=True, blank=True, on_delete=models.SET_NULL, related_name='dependent_questions'
     )
-    dependency_values = MultiStringField(default=[])
+    dependency_values = MultiStringField(default=[])  # to be removed, -> QuestionnaireChild
     valid_number_min = models.DecimalField(decimal_places=6, max_digits=30, null=True, blank=True,
                                            verbose_name=_('Minimum value'),
                                            help_text=_('Currently not supported in our apps and during check-in'))
@@ -1746,9 +1739,9 @@ class Question(LoggedModel):
     objects = ScopedManager(organizer='event__organizer')
 
     class Meta:
-        verbose_name = _("Question")
-        verbose_name_plural = _("Questions")
-        ordering = ('position', 'id')
+        verbose_name = _("Data field")
+        verbose_name_plural = _("Data fields")
+        ordering = ('question', 'id')
         unique_together = (('event', 'identifier'),)
 
     def __str__(self):
@@ -1973,6 +1966,105 @@ class QuestionOption(models.Model):
         ordering = ('position', 'id')
 
 
+class Questionnaire(LoggedModel):
+    TYPE_ORDER_SALE = "OS"
+    TYPE_ORDER_POSITION_SALE = "PS"
+    TYPE_ORDER_POSITION_ATTENDEE_ONLY = "PA"
+    TYPE_ORDER_POSITION_CHECKIN = "PC"
+    TYPE_ORDER_POSITION_HIDDEN = "PH"
+    TYPE_CHOICES = (
+        (TYPE_ORDER_SALE, _("Order-wide, before purchase")),
+        (TYPE_ORDER_POSITION_SALE, _("Per product, before purchase")),
+        (TYPE_ORDER_POSITION_ATTENDEE_ONLY, _("Per product, via attendee link")),
+        (TYPE_ORDER_POSITION_CHECKIN, _("Per product, at check-in")),
+        (TYPE_ORDER_POSITION_HIDDEN, _("Per product, hidden")),
+    )
+    event = models.ForeignKey(
+        Event,
+        related_name="questionnaires",
+        on_delete=models.CASCADE
+    )
+    internal_name = models.CharField(
+        verbose_name=_("Internal name"),
+        max_length=255,
+    )
+    type = models.CharField(
+        max_length=5,
+        choices=TYPE_CHOICES,
+        verbose_name=_("Questionnaire type")
+    )
+    items = models.ManyToManyField(
+        Item,
+        related_name='questionnaires',
+        verbose_name=_("Products"),
+        blank=True,
+        help_text=_('This questionnaire will be asked to buyers of the selected products')
+    )
+    position = models.PositiveIntegerField(
+        default=0,
+        verbose_name=_("Position")
+    )
+    all_sales_channels = models.BooleanField(
+        verbose_name=_("Sell on all sales channels the product is sold on"),
+        default=True,
+    )
+    limit_sales_channels = models.ManyToManyField(
+        "SalesChannel",
+        verbose_name=_("Restrict to specific sales channels"),
+        help_text=_('The sales channel selection for the product as a whole takes precedence, so if a sales channel is '
+                    'selected here but not on product level, the variation will not be available.'),
+        blank=True,
+    )
+
+
+class QuestionnaireChild(LoggedModel):
+    SYSTEM_QUESTION_CHOICES = (
+        ('attendee_name_parts', _('Attendee name')),
+        ('attendee_email', _('Attendee email')),
+        ('company', _('Company')),
+        ('street', _('Street')),
+        ('zipcode', _('ZIP code')),
+        ('city', _('City')),
+        ('country', _('Country')),
+    )
+    questionnaire = models.ForeignKey(
+        Questionnaire,
+        related_name="children",
+        on_delete=models.CASCADE
+    )
+    position = models.PositiveIntegerField(
+        default=0,
+        verbose_name=_("Position")
+    )
+    user_question = models.ForeignKey(
+        Question,
+        related_name="references",
+        on_delete=models.CASCADE,
+        null=True, blank=True,
+    )
+    system_question = models.CharField(
+        max_length=25,
+        choices=SYSTEM_QUESTION_CHOICES,
+        null=True, blank=True,
+    )
+    required = models.BooleanField(
+        default=False,
+        verbose_name=_("Required question")
+    )
+    label = I18nTextField(
+        verbose_name=_("Question")
+    )
+    help_text = I18nTextField(
+        verbose_name=_("Help text"),
+        help_text=_("If the question needs to be explained or clarified, do it here!"),
+        null=True, blank=True,
+    )
+    dependency_question = models.ForeignKey(
+        'QuestionnaireChild', null=True, blank=True, on_delete=models.SET_NULL, related_name='dependent_questions'
+    )
+    dependency_values = MultiStringField(default=[])
+
+
 class Quota(LoggedModel):
     """
     A quota is a "pool of tickets". It is there to limit the number of items

src/pretix/base/models/orders.py

@@ -1304,9 +1304,10 @@ class Order(LockModel, LoggedModel):
 
 def answerfile_name(instance, filename: str) -> str:
     secret = get_random_string(length=32, allowed_chars=string.ascii_letters + string.digits)
+    event = (instance.cartposition if instance.cartposition else instance.orderposition.order).event
     return 'cachedfiles/answers/{org}/{ev}/{secret}.{filename}'.format(
-        org=instance.event.organizer.slug,
-        ev=instance.event.slug,
+        org=event.organizer.slug,
+        ev=event.slug,
         secret=secret,
         filename=escape_uri_path(filename),
     )
@@ -1335,14 +1336,6 @@ class QuestionAnswer(models.Model):
         'CartPosition', null=True, blank=True,
         related_name='answers', on_delete=models.CASCADE
     )
-    order = models.ForeignKey(
-        'Order', null=True, blank=True,
-        related_name='answers', on_delete=models.CASCADE
-    )
-    checkoutsession = models.ForeignKey(
-        'CheckoutSession', null=True, blank=True,
-        related_name='answers', on_delete=models.CASCADE
-    )
     question = models.ForeignKey(
         Question, related_name='answers', on_delete=models.CASCADE
     )
@@ -1358,21 +1351,16 @@ class QuestionAnswer(models.Model):
     objects = ScopedManager(organizer='question__event__organizer')
 
     class Meta:
-        unique_together = [
-            ['orderposition', 'question'],
-            ['cartposition', 'question'],
-            ['order', 'question'],
-            ['checkoutsession', 'question'],
-        ]
+        unique_together = [['orderposition', 'question'], ['cartposition', 'question']]
 
     @property
     def backend_file_url(self):
         if self.file:
-            if self.associated_order:
+            if self.orderposition:
                 return reverse('control:event.order.download.answer', kwargs={
-                    'code': self.associated_order.code,
-                    'event': self.associated_order.event.slug,
-                    'organizer': self.associated_order.event.organizer.slug,
+                    'code': self.orderposition.order.code,
+                    'event': self.orderposition.order.event.slug,
+                    'organizer': self.orderposition.order.event.organizer.slug,
                     'answer': self.pk,
                 })
         return ""
@@ -1382,14 +1370,14 @@ class QuestionAnswer(models.Model):
         from pretix.multidomain.urlreverse import eventreverse
 
         if self.file:
-            if self.associated_order:
-                url = eventreverse(self.associated_order.event, 'presale:event.order.download.answer', kwargs={
-                    'order': self.associated_order.code,
-                    'secret': self.associated_order.secret,
+            if self.orderposition:
+                url = eventreverse(self.orderposition.order.event, 'presale:event.order.download.answer', kwargs={
+                    'order': self.orderposition.order.code,
+                    'secret': self.orderposition.order.secret,
                     'answer': self.pk,
                 })
             else:
-                url = eventreverse(self.event, 'presale:event.cart.download.answer', kwargs={
+                url = eventreverse(self.cartposition.event, 'presale:event.cart.download.answer', kwargs={
                     'answer': self.pk,
                 })
 
@@ -1404,24 +1392,6 @@ class QuestionAnswer(models.Model):
     def file_name(self):
         return self.file.name.split('.', 1)[-1]
 
-    @property
-    def associated_order(self):
-        if self.orderposition:
-            return self.orderposition.order
-        elif self.order:
-            return self.order
-
-    @property
-    def event(self):
-        if self.orderposition:
-            return self.orderposition.order.event
-        elif self.cartposition:
-            return self.cartposition.event
-        elif self.order:
-            return self.order.event
-        elif self.checkoutsession:
-            return self.checkoutsession.event
-
     def __str__(self):
         return self.to_string(use_cached=True)
 
@@ -1477,6 +1447,12 @@ class QuestionAnswer(models.Model):
         else:
             return self.answer
 
+    def to_dependency_values(self):
+        if self.question.type in (Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE):
+            return [o.identifier for o in self.options.all()]
+        elif self.question.type in (Question.TYPE_BOOLEAN, Question.TYPE_COUNTRYCODE):
+            return self.answer
+
     def save(self, *args, **kwargs):
         if self.orderposition and self.cartposition:
             raise ValueError('QuestionAnswer cannot be linked to an order and a cart position at the same time.')
@@ -1621,53 +1597,80 @@ class AbstractPosition(RoundingCorrectionMixin, models.Model):
 
     def cache_answers(self, all=True):
         """
-        Creates two properties on the object.
-        (1) answ: a dictionary of question.id → answer string
-        (2) questions: a list of Question objects, extended by an 'answer' property
+        Creates a new property on the object:
+        questions: a list of Question objects, extended by an 'answer' property
         """
-        self.answ = {}
-        for a in getattr(self, 'answerlist', self.answers.all()):  # use prefetch_related cache from get_cart
-            self.answ[a.question_id] = a
-
         # We need to clone our question objects, otherwise we will override the cached
         # answers of other items in the same cart if the question objects have been
         # selected via prefetch_related
         if not all:
-            if hasattr(self.item, 'questions_to_ask'):
-                questions = list(copy.copy(q) for q in self.item.questions_to_ask)
+            if hasattr(self.item, 'relevant_questionnaires'):
+                children = list(copy.copy(qc) for qq in self.item.relevant_questionnaires for qc in qq.childlist)
             else:
-                questions = list(copy.copy(q) for q in self.item.questions.filter(ask_during_checkin=False,
-                                                                                  hidden=False))
+                children = list(copy.copy(qc) for qq in self.item.questionnaires.filter(type='PS') for qc in qq.children.all())
         else:
-            questions = list(copy.copy(q) for q in self.item.questions.all())
+            children = list(copy.copy(qc) for qq in self.item.questionnaires.filter(type__startswith='P') for qc in qq.children.all())
 
-        question_cache = {
-            q.pk: q for q in questions
+        qc_cache = {
+            q.pk: q for q in children
         }
 
-        def question_is_visible(parentid, qvals):
-            if parentid not in question_cache:
+        def qc_is_visible(parentid, qvals):
+            if parentid not in qc_cache:
                 return False
-            parentq = question_cache[parentid]
-            if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
+            parentqc = qc_cache[parentid]
+            if parentqc.dependency_question_id and not qc_is_visible(parentqc.dependency_question_id, parentqc.dependency_values):
                 return False
-            if parentid not in self.answ:
-                return False
-            return (
-                ('True' in qvals and self.answ[parentid].answer == 'True')
-                or ('False' in qvals and self.answ[parentid].answer == 'False')
-                or (any(qval in [o.identifier for o in self.answ[parentid].options.all()] for qval in qvals))
-            )
+            answer_values = self.get_dependency_answer_values(parentqc)
+            return any(qval in answer_values for qval in qvals)
 
         self.questions = []
-        for q in questions:
-            if q.id in self.answ:
-                q.answer = self.answ[q.id]
-                q.answer.question = q  # cache object
+        for qc in children:
+            if qc.user_question_id and qc.user_question_id in self.answer_cache:
+                qc.answer = self.answer_cache[qc.user_question_id]
+                #qc.answer.question = qc  # cache object
+            elif qc.system_question:
+                qc.answer = self.get_system_answer(qc.system_question)
+                #qc.answer.question = qc  # cache object
             else:
-                q.answer = ""
-            if not q.dependency_question_id or question_is_visible(q.dependency_question_id, q.dependency_values):
-                self.questions.append(q)
+                qc.answer = ""
+            if not qc.dependency_question_id or qc_is_visible(qc.dependency_question_id, qc.dependency_values):
+                self.questions.append(qc)
+
+    @cached_property
+    def answer_cache(self):
+        return {
+            aw.question_id: aw for aw in getattr(self, 'answerlist', self.answers.all())
+        }
+
+    def get_dependency_answer_values(self, qc):
+        if qc.user_question_id:
+            if qc.user_question_id not in self.answer_cache:
+                return None
+            answer = self.answer_cache[qc.user_question_id]
+            return answer.to_dependency_values()
+        elif qc.system_question:
+            return [self.get_system_answer(qc.system_question)]
+        else:
+            raise ValueError('Questionnaire child without question has no answer')
+
+    def get_system_answer(self, system_question_name):
+        if system_question_name == 'attendee_name_parts':
+            return self.attendee_name_parts
+        elif system_question_name == 'attendee_email':
+            return self.attendee_email
+        elif system_question_name == 'street':
+            return self.street
+        elif system_question_name == 'zipcode':
+            return self.zipcode
+        elif system_question_name == 'city':
+            return self.city
+        elif system_question_name == 'state':
+            return self.state
+        elif system_question_name == 'country':
+            return self.country
+        else:
+            raise ValueError('Unknown system question name')
 
     @property
     def net_price(self):
@@ -3207,39 +3210,6 @@ class Transaction(models.Model):
         return self.tax_value_includes_rounding_correction * self.count
 
 
-class CheckoutSession(models.Model):
-    """
-    A checkout session optionally bundles cart positions with additional information. This is historically
-    not required in pretix and currently only used in the Storefront API.
-    """
-    event = models.ForeignKey(
-        Event,
-        verbose_name=_("Event"),
-        related_name="checkout_sessions",
-        on_delete=models.CASCADE,
-    )
-    cart_id = models.CharField(
-        max_length=255, unique=True,
-        verbose_name=_("Cart ID (e.g. session key)"),
-    )
-    created = models.DateTimeField(
-        verbose_name=_("Date"),
-        auto_now_add=True,
-    )
-    customer = models.ForeignKey(
-        Customer,
-        related_name='checkout_sessions',
-        null=True, blank=True,
-        on_delete=models.SET_NULL,
-    )
-    sales_channel = models.ForeignKey(
-        "SalesChannel",
-        on_delete=models.CASCADE,
-    )
-    testmode = models.BooleanField(default=False)
-    session_data = models.JSONField(default=dict)
-
-
 class CartPosition(AbstractPosition):
     """
     A cart position is similar to an order line, except that it is not
@@ -3444,13 +3414,6 @@ class CartPosition(AbstractPosition):
 
 class InvoiceAddress(models.Model):
     last_modified = models.DateTimeField(auto_now=True)
-    checkout_session = models.OneToOneField(
-        CheckoutSession,
-        null=True,
-        blank=True,
-        related_name='invoice_address',
-        on_delete=models.CASCADE
-    )
     order = models.OneToOneField(Order, null=True, blank=True, related_name='invoice_address', on_delete=models.CASCADE)
     customer = models.ForeignKey(
         Customer,

src/pretix/base/payment.py

@@ -72,7 +72,7 @@ from pretix.helpers.countries import CachedCountries
 from pretix.helpers.format import format_map
 from pretix.helpers.money import DecimalTextInput
 from pretix.multidomain.urlreverse import eventreverse_absolute
-from pretix.presale.views import get_cart
+from pretix.presale.views import get_cart_positions
 from pretix.presale.views.cart import cart_session, get_or_create_cart_id
 
 logger = logging.getLogger(__name__)
@@ -330,24 +330,9 @@ class BasePaymentProvider:
         payment method. This returns ``False`` by default which is no guarantee that
         aborting a pending payment can never happen, it just hides the frontend button
         to avoid users accidentally committing double payments.
-        If the decision doesn't depend on the specific payment, then only implementing
-        ``abort_pending_allowed`` is enough, ``payment_abort_pending_allowed(payment: OrderPayment)``
-        is expected to take this into account.
-        As a consumer only evaluate ``payment_abort_pending_allowed(payment: OrderPayment)``
-        to check if aborting this pending payment is possible.
         """
         return False
 
-    def _payment_abort_pending_allowed(self, payment: OrderPayment) -> bool:
-        """
-        Experimental: This might change during upcomming releases.
-        Whether or not a user can abort a payment in pending state to switch to another
-        payment method. This returns ``self.abort_pending_allowed`` by default which is
-        no guarantee that aborting a pending payment can never happen, it just hides the
-        frontend button to avoid users accidentally committing double payments.
-        """
-        return self.abort_pending_allowed
-
     @property
     def requires_invoice_immediately(self):
         """
@@ -1034,12 +1019,10 @@ class BasePaymentProvider:
         On success, you should set ``payment.state = OrderPayment.PAYMENT_STATE_CANCELED`` (or call the super method).
         On failure, you should raise a PaymentException.
         """
-
-        if payment.state == OrderPayment.PAYMENT_STATE_PENDING:
-            if not self._payment_abort_pending_allowed(payment):
-                raise PaymentException(_(
-                    "This payment is already being processed and cannot be canceled any more."
-                ))
+        if payment.state == OrderPayment.PAYMENT_STATE_PENDING and not self.abort_pending_allowed:
+            raise PaymentException(_(
+                "This payment is already being processed and can not be canceled any more."
+            ))
 
         payment.state = OrderPayment.PAYMENT_STATE_CANCELED
         payment.save(update_fields=['state'])
@@ -1165,7 +1148,7 @@ class FreeOrderProvider(BasePaymentProvider):
     def is_allowed(self, request: HttpRequest, total: Decimal=None) -> bool:
         from .services.cart import get_fees
 
-        cart = get_cart(request)
+        cart = get_cart_positions(request)
 
         try:
             fees = get_fees(event=request.event, request=request,
@@ -1433,7 +1416,7 @@ class GiftCardPayment(BasePaymentProvider):
                 for p in cs.get('payments', [])
                 if p.get('info_data', {}).get('gift_card')
             ]
-            positions = get_cart(request)
+            positions = get_cart_positions(request)
             testmode = self.event.testmode
         else:
             used_cards = []

src/pretix/base/reldate.py

@@ -19,245 +19,30 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-import copy
 import datetime
-import os
-import warnings
 from collections import namedtuple
-from dataclasses import dataclass
-from typing import (
-    TYPE_CHECKING, Iterable, List, Literal, Optional, Tuple, Union, cast,
-)
+from typing import Union
 from zoneinfo import ZoneInfo
 
 from dateutil import parser
 from django import forms
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.forms.widgets import Widget
 from django.utils.formats import get_format
-from django.utils.functional import Promise, lazy
+from django.utils.functional import lazy
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
-from pretix.base.forms.widgets import OptionAttrsSelect
+BASE_CHOICES = (
+    ('date_from', _('Event start')),
+    ('date_to', _('Event end')),
+    ('date_admission', _('Event admission')),
+    ('presale_start', _('Presale start')),
+    ('presale_end', _('Presale end')),
+)
 
-if TYPE_CHECKING:
-    from .models import Event, Order, SubEvent
-
-
-@dataclass(frozen=True)
-class BaseChoice:
-    base: Literal["event", "order"]
-    attribute: str
-    text: Promise
-    supports_before: bool
-    supports_after: bool
-
-    @property
-    def key(self) -> str:
-        key = f"{self.base}__{self.attribute}"
-        return key
-
-    @staticmethod
-    def find(objects: Iterable["BaseChoice"], key: str) -> "BaseChoice":
-        if "__" in key:
-            choice = next((obj for obj in objects if obj.key == key), None)
-        else:
-            # fallback for RelativeDateFields stored, before support for bases other than event was added
-            choice = next((obj for obj in objects if obj.attribute == key and obj.base == "event"), None)
-
-        if choice is None:
-            raise TypeError(f"key {key} must be a valid key in BASE_CHOICES")
-
-        return choice
-
-
-BASE_CHOICES: List[BaseChoice] = [
-    BaseChoice('event', 'date_from', _('Event start'), True, True),
-    BaseChoice('event', 'date_to', _('Event end'), True, True),
-    BaseChoice('event', 'date_admission', _('Event admission'), True, True),
-    BaseChoice('event', 'presale_start', _('Presale start'), True, True),
-    BaseChoice('event', 'presale_end', _('Presale end'), True, True),
-    BaseChoice('order', 'datetime', _('Order creation'), False, True),
-    BaseChoice('order', 'expires', _('Order expiry'), True, True),
-]
-
-EVENT_BASE_CHOICES = [
-    x for x in BASE_CHOICES if x.base == 'event'
-]
-
-ORDER_BASE_CHOICES = [
-    x for x in BASE_CHOICES if x.base == 'order'
-]
-
-
-@dataclass(frozen=True)
-class RelativeDate:
-    """
-    This contains information on a date that is defined in relation to a fixed base point.
-    This means that the underlying data is a fixed date as the base point and a number of days or a time interval
-    to calculate the date.
-
-    The list of valid base date choices is defined in BASE_CHOICES.
-    If the base_date_name is not set, the date_from attribute of Event is used.
-    """
-
-    days: int = 0
-    minutes: Optional[int] = None
-    time: Optional[datetime.time] = None
-    is_after: bool = False
-    base_date_name: str = 'event__date_from__'
-
-    def __post_init__(self) -> None:
-        if self.is_after and not self._choice.supports_after:
-            raise ValueError(
-                "The selected base date and attribute combination does not support relative dates placed after the base date"
-            )
-        if not self.is_after and not self._choice.supports_before:
-            raise ValueError(
-                "The selected base date and attribute combination does not support relative dates placed before the base date")
-
-    @property
-    def _choice(self):
-        return BaseChoice.find(BASE_CHOICES, self.base_date_name)
-
-    @property
-    def key(self):
-        return self._choice.key
-
-    def __eq__(self, o: object) -> bool:
-        if not isinstance(o, RelativeDate):
-            return False
-        return self.to_string() == o.to_string()
-
-    def _resolve_date(self, base: "Event | Order | SubEvent") -> Tuple[datetime.datetime, ZoneInfo]:
-        """
-        Resolves the datetime and timezone information of this RelativeDate object in relation to the provided reference.
-
-        :param base: the reference which should be used to resolve the relative date
-        :return:
-        """
-        from .models import Event, Order, SubEvent
-
-        choice = self._choice
-
-        if choice.base == "order" and isinstance(base, Order):
-            event = base.event
-            base_date = getattr(base, choice.attribute)
-        elif choice.base == "event" and isinstance(base, SubEvent):
-            event = base.event
-            base_date = (getattr(base, choice.attribute) or
-                         getattr(base.event, choice.attribute) or
-                         base.date_from)
-        elif choice.base == "event" and isinstance(base, Event):
-            event = base
-            base_date = getattr(base, choice.attribute) or event.date_from
-        else:
-            raise TypeError("The base defined by data does not match the passed in base")
-
-        tz = ZoneInfo(event.settings.timezone)
-        return base_date, tz
-
-    def date(self, base: "Event | Order | SubEvent") -> datetime.date:
-        """
-        Resolves the effective date of this RelativeDate object in relation to the provided reference.
-
-        :param base: the reference which should be used to resolve the date
-        :return: datetime.date
-        """
-        if self.minutes is not None:
-            raise ValueError('A minute-based relative datetime can not be used as a date')
-
-        base_date, tz = self._resolve_date(base)
-
-        if self.is_after:
-            new_date = base_date.astimezone(tz) + datetime.timedelta(days=self.days)
-        else:
-            new_date = base_date.astimezone(tz) - datetime.timedelta(days=self.days)
-        return new_date.date()
-
-    def datetime(self, base: "Event | Order | SubEvent") -> datetime.datetime:
-        """
-        Resolves the effective datetime of this RelativeDate object in relation to the provided reference.
-
-        :param base: the reference which should be used to resolve the datetime
-        :return: datetime.datetime
-        """
-        base_date, tz = self._resolve_date(base)
-
-        if self.minutes is not None:
-            if self.is_after:
-                return base_date.astimezone(tz) + datetime.timedelta(minutes=self.minutes)
-            else:
-                return base_date.astimezone(tz) - datetime.timedelta(minutes=self.minutes)
-        else:
-            if self.is_after:
-                new_date = (base_date.astimezone(tz) + datetime.timedelta(days=self.days)).astimezone(tz)
-            else:
-                new_date = (base_date.astimezone(tz) - datetime.timedelta(days=self.days)).astimezone(tz)
-            if self.time:
-                new_date = new_date.replace(
-                    hour=self.time.hour,
-                    minute=self.time.minute,
-                    second=self.time.second
-                )
-            new_date = new_date.astimezone(tz)
-            return new_date
-
-    def to_string(self) -> str:
-        if self.minutes is not None:
-            return 'RELDATE/minutes/{}/{}/{}'.format(  #
-                self.minutes,
-                self._choice.key,
-                'after' if self.is_after else '',
-            )
-        return 'RELDATE/{}/{}/{}/{}'.format(  #
-            self.days,
-            self.time.strftime('%H:%M:%S') if self.time else '-',
-            self._choice.key,
-            'after' if self.is_after else '',
-        )
-
-    @classmethod
-    def from_string(cls, input: str):
-        if not input.startswith('RELDATE/'):
-            raise TypeError("Invalid input for RelativeDate.from_string()")
-
-        parts = input.split('/')
-        if parts[1] == 'minutes':
-            data = RelativeDate(
-                days=0,
-                minutes=int(parts[2]),
-                base_date_name=parts[3],
-                time=None,
-                is_after=len(parts) > 4 and parts[4] == "after",
-            )
-        else:
-            if parts[2] == '-':
-                time = None
-            else:
-                timeparts = parts[2].split(':')
-                time = datetime.time(hour=int(timeparts[0]), minute=int(timeparts[1]), second=int(timeparts[2]))
-            try:
-                data = RelativeDate(
-                    days=int(parts[1] or 0),
-                    base_date_name=parts[3],
-                    time=time,
-                    minutes=None,
-                    is_after=len(parts) > 4 and parts[4] == "after",
-                )
-            except ValueError:
-                data = RelativeDate(
-                    days=0,
-                    base_date_name=parts[3],
-                    time=time,
-                    minutes=None,
-                    is_after=len(parts) > 4 and parts[4] == "after",
-                )
-
-        return data
+RelativeDate = namedtuple('RelativeDate', ['days', 'minutes', 'time', 'is_after', 'base_date_name'], defaults=(0, None, None, False, 'date_from'))
 
 
 class RelativeDateWrapper:
@@ -265,53 +50,130 @@ class RelativeDateWrapper:
     This contains information on a date that might be relative to an event. This means
     that the underlying data is either a fixed date or a number of days and a wall clock
     time to calculate the date based on a base point.
+
+    The base point can be the date_from, date_to, date_admission, presale_start or presale_end
+    attribute of an event or subevent. If the respective attribute is not set, ``date_from``
+    will be used.
     """
 
     def __init__(self, data: Union[datetime.datetime, RelativeDate]):
         self.data = data
 
-    def date(self, base: "Event | Order | SubEvent") -> datetime.date:
-        """
-        If the RelativeDateWrapper wraps a RelativeDate object:
-            Resolves the effective date of this object in relation to the provided reference.
-        If the RelativeDateWrapper wraps an absolute date or datetime:
-            Returns the wrapped absolute date.
+    def date(self, event) -> datetime.date:
+        from .models import SubEvent
 
-        :param base: the reference which should be used to resolve the date in case it is a relative date.
-        :return: datetime.date
-        """
         if isinstance(self.data, datetime.datetime):
             return self.data.date()
         elif isinstance(self.data, datetime.date):
             return self.data
         else:
-            return self.data.date(base)
+            if self.data.minutes is not None:
+                raise ValueError('A minute-based relative datetime can not be used as a date')
 
-    def datetime(self, base: "Event | Order | SubEvent") -> datetime.datetime:
-        """
-        If the RelativeDateWrapper wraps a RelativeDate object:
-            Resolves the effective datetime of this object in relation to the provided reference.
-        If the RelativeDateWrapper wraps an absolute date or datetime:
-            Returns the wrapped absolute datetime.
+            tz = ZoneInfo(event.settings.timezone)
+            if isinstance(event, SubEvent):
+                base_date = (
+                    getattr(event, self.data.base_date_name)
+                    or getattr(event.event, self.data.base_date_name)
+                    or event.date_from
+                )
+            else:
+                base_date = getattr(event, self.data.base_date_name) or event.date_from
+
+            if self.data.is_after:
+                new_date = base_date.astimezone(tz) + datetime.timedelta(days=self.data.days)
+            else:
+                new_date = base_date.astimezone(tz) - datetime.timedelta(days=self.data.days)
+            return new_date.date()
+
+    def datetime(self, event) -> datetime.datetime:
+        from .models import SubEvent
 
-        :param base: the reference which should be used to resolve the datetime in case it is a relative datetime.
-        :return: datetime.datetime
-        """
         if isinstance(self.data, (datetime.datetime, datetime.date)):
             return self.data
         else:
-            return self.data.datetime(base)
+            tz = ZoneInfo(event.settings.timezone)
+            if isinstance(event, SubEvent):
+                base_date = (
+                    getattr(event, self.data.base_date_name)
+                    or getattr(event.event, self.data.base_date_name)
+                    or event.date_from
+                )
+            else:
+                base_date = getattr(event, self.data.base_date_name) or event.date_from
+
+            if self.data.minutes is not None:
+                if self.data.is_after:
+                    return base_date.astimezone(tz) + datetime.timedelta(minutes=self.data.minutes)
+                else:
+                    return base_date.astimezone(tz) - datetime.timedelta(minutes=self.data.minutes)
+            else:
+                if self.data.is_after:
+                    new_date = (base_date.astimezone(tz) + datetime.timedelta(days=self.data.days)).astimezone(tz)
+                else:
+                    new_date = (base_date.astimezone(tz) - datetime.timedelta(days=self.data.days)).astimezone(tz)
+                if self.data.time:
+                    new_date = new_date.replace(
+                        hour=self.data.time.hour,
+                        minute=self.data.time.minute,
+                        second=self.data.time.second
+                    )
+                new_date = new_date.astimezone(tz)
+                return new_date
 
     def to_string(self) -> str:
         if isinstance(self.data, (datetime.datetime, datetime.date)):
             return self.data.isoformat()
         else:
-            return self.data.to_string()
+            if self.data.minutes is not None:
+                return 'RELDATE/minutes/{}/{}/{}'.format(  #
+                    self.data.minutes,
+                    self.data.base_date_name,
+                    'after' if self.data.is_after else '',
+                )
+            return 'RELDATE/{}/{}/{}/{}'.format(  #
+                self.data.days,
+                self.data.time.strftime('%H:%M:%S') if self.data.time else '-',
+                self.data.base_date_name,
+                'after' if self.data.is_after else '',
+            )
 
     @classmethod
     def from_string(cls, input: str):
         if input.startswith('RELDATE/'):
-            data = RelativeDate.from_string(input)
+            parts = input.split('/')
+            if parts[1] == 'minutes':
+                data = RelativeDate(
+                    days=0,
+                    minutes=int(parts[2]),
+                    base_date_name=parts[3],
+                    time=None,
+                    is_after=len(parts) > 4 and parts[4] == "after",
+                )
+            else:
+                if parts[2] == '-':
+                    time = None
+                else:
+                    timeparts = parts[2].split(':')
+                    time = datetime.time(hour=int(timeparts[0]), minute=int(timeparts[1]), second=int(timeparts[2]))
+                try:
+                    data = RelativeDate(
+                        days=int(parts[1] or 0),
+                        base_date_name=parts[3],
+                        time=time,
+                        minutes=None,
+                        is_after=len(parts) > 4 and parts[4] == "after",
+                    )
+                except ValueError:
+                    data = RelativeDate(
+                        days=0,
+                        base_date_name=parts[3],
+                        time=time,
+                        minutes=None,
+                        is_after=len(parts) > 4 and parts[4] == "after",
+                    )
+            if data.base_date_name not in [k[0] for k in BASE_CHOICES]:
+                raise ValueError('{} is not a valid base date'.format(data.base_date_name))
         else:
             data = parser.parse(input)
         return RelativeDateWrapper(data)
@@ -325,6 +187,7 @@ BEFORE_AFTER_CHOICE = (
     ('after', _('after')),
 )
 
+
 reldatetimeparts = namedtuple('reldatetimeparts', (
     "status",  # 0
     "absolute",  # 1
@@ -339,14 +202,6 @@ reldatetimeparts = namedtuple('reldatetimeparts', (
 reldatetimeparts.indizes = reldatetimeparts(*range(9))
 
 
-def _get_choices(base_choices: List[BaseChoice]) -> List[Tuple[str, Promise]]:
-    return [(c.key, c.text) for c in base_choices]
-
-
-def _get_choice_validation_obj(choices: List[BaseChoice]):
-    return {c.key: {"data-supports-before": c.supports_before, "data-supports-after": c.supports_after} for c in choices}
-
-
 class RelativeDateTimeWidget(forms.MultiWidget):
     template_name = 'pretixbase/forms/widgets/reldatetime.html'
     parts = reldatetimeparts
@@ -354,7 +209,6 @@ class RelativeDateTimeWidget(forms.MultiWidget):
     def __init__(self, *args, **kwargs):
         self.status_choices = kwargs.pop('status_choices')
         base_choices = kwargs.pop('base_choices')
-        choices = _get_choices(base_choices)
 
         def placeholder_datetime_format():
             df = get_format('DATETIME_INPUT_FORMATS')[0]
@@ -366,29 +220,21 @@ class RelativeDateTimeWidget(forms.MultiWidget):
             tf = get_format('TIME_INPUT_FORMATS')[0]
             return datetime.time(8, 30, 0).strftime(tf)
 
-        widgets = cast(dict[str, Widget | type[Widget]], cast(object, reldatetimeparts(
+        widgets = reldatetimeparts(
             status=forms.RadioSelect(choices=self.status_choices),
             absolute=forms.DateTimeInput(
                 attrs={'placeholder': lazy(placeholder_datetime_format, str), 'class': 'datetimepicker'}
             ),
             rel_days_number=forms.NumberInput(),
-            rel_mins_relationto=OptionAttrsSelect(
-                attrs={'data-relative-choice': True},
-                choices=choices,
-                option_attrs=_get_choice_validation_obj(base_choices)
-            ),
+            rel_mins_relationto=forms.Select(choices=base_choices),
             rel_days_timeofday=forms.TimeInput(
                 attrs={'placeholder': lazy(placeholder_time_format, str), 'class': 'timepickerfield'}
             ),
             rel_mins_number=forms.NumberInput(),
-            rel_days_relationto=OptionAttrsSelect(
-                attrs={'data-relative-choice': True},
-                choices=choices,
-                option_attrs=_get_choice_validation_obj(base_choices)
-            ),
-            rel_mins_relation=forms.Select(attrs={'data-relation-choice': True}, choices=BEFORE_AFTER_CHOICE),
-            rel_days_relation=forms.Select(attrs={'data-relation-choice': True}, choices=BEFORE_AFTER_CHOICE),
-        )))
+            rel_days_relationto=forms.Select(choices=base_choices),
+            rel_mins_relation=forms.Select(choices=BEFORE_AFTER_CHOICE),
+            rel_days_relation=forms.Select(choices=BEFORE_AFTER_CHOICE),
+        )
         super().__init__(widgets=widgets, *args, **kwargs)
 
     def decompress(self, value):
@@ -401,10 +247,10 @@ class RelativeDateTimeWidget(forms.MultiWidget):
                 status="unset",
                 absolute=None,
                 rel_days_number=1,
-                rel_mins_relationto="event__date_from",
+                rel_mins_relationto="date_from",
                 rel_days_timeofday=None,
                 rel_mins_number=0,
-                rel_days_relationto="event__date_from",
+                rel_days_relationto="date_from",
                 rel_mins_relation="before",
                 rel_days_relation="before"
             )
@@ -413,10 +259,10 @@ class RelativeDateTimeWidget(forms.MultiWidget):
                 status="absolute",
                 absolute=value.data,
                 rel_days_number=1,
-                rel_mins_relationto="event__date_from",
+                rel_mins_relationto="date_from",
                 rel_days_timeofday=None,
                 rel_mins_number=0,
-                rel_days_relationto="event__date_from",
+                rel_days_relationto="date_from",
                 rel_mins_relation="before",
                 rel_days_relation="before"
             )
@@ -425,10 +271,10 @@ class RelativeDateTimeWidget(forms.MultiWidget):
                 status="relative_minutes",
                 absolute=None,
                 rel_days_number=None,
-                rel_mins_relationto=value.data.key,
+                rel_mins_relationto=value.data.base_date_name,
                 rel_days_timeofday=None,
                 rel_mins_number=value.data.minutes,
-                rel_days_relationto=value.data.key,
+                rel_days_relationto=value.data.base_date_name,
                 rel_mins_relation="after" if value.data.is_after else "before",
                 rel_days_relation="after" if value.data.is_after else "before"
             )
@@ -436,10 +282,10 @@ class RelativeDateTimeWidget(forms.MultiWidget):
             status="relative",
             absolute=None,
             rel_days_number=value.data.days,
-            rel_mins_relationto=value.data.key,
+            rel_mins_relationto=value.data.base_date_name,
             rel_days_timeofday=value.data.time,
             rel_mins_number=0,
-            rel_days_relationto=value.data.key,
+            rel_days_relationto=value.data.base_date_name,
             rel_mins_relation="after" if value.data.is_after else "before",
             rel_days_relation="after" if value.data.is_after else "before"
         )
@@ -463,41 +309,17 @@ class RelativeDateTimeField(forms.MultiValueField):
             ('relative', _('Relative date:')),
             ('relative_minutes', _('Relative time:')),
         ]
-        self.relative_to_order = kwargs.pop('relative_to_order', False)
-
-        possible_choices = copy.deepcopy(EVENT_BASE_CHOICES)
-        if self.relative_to_order:
-            possible_choices.extend(ORDER_BASE_CHOICES)
-
         if kwargs.get('limit_choices'):
             limit = kwargs.pop('limit_choices')
-            if any(["__" not in l for l in limit]):
-                _warn_skips = (str(os.path.dirname(__file__)),)
-
-                warnings.warn(
-                    message="Please prefix limit_choices with the base the attributes refer to, for example event__date_from",
-                    category=DeprecationWarning,
-                    skip_file_prefixes=_warn_skips
-                )
-
-            possible_choices = [
-                c for c in possible_choices if
-                # new base case as we want limit_choices to be expressed as base__attribute
-                (c.key in limit) or
-                # fallback for old event based entries
-                # if the base is an event, then using only attribute is fine
-                (c.base == "event" and c.attribute in limit)
-            ]
-
+            choices = [(k, v) for k, v in BASE_CHOICES if k in limit]
+        else:
+            choices = BASE_CHOICES
         if not kwargs.get('required', True):
             status_choices.insert(0, ('unset', _('Not set')))
-
-        choices = _get_choices(possible_choices)
-
         fields = reldatetimeparts(
             status=forms.ChoiceField(
                 choices=status_choices,
-                required=True,
+                required=True
             ),
             absolute=forms.DateTimeField(
                 required=False
@@ -507,7 +329,7 @@ class RelativeDateTimeField(forms.MultiValueField):
             ),
             rel_mins_relationto=forms.ChoiceField(
                 choices=choices,
-                required=False,
+                required=False
             ),
             rel_days_timeofday=forms.TimeField(
                 required=False,
@@ -517,7 +339,7 @@ class RelativeDateTimeField(forms.MultiValueField):
             ),
             rel_days_relationto=forms.ChoiceField(
                 choices=choices,
-                required=False,
+                required=False
             ),
             rel_mins_relation=forms.ChoiceField(
                 choices=BEFORE_AFTER_CHOICE,
@@ -528,9 +350,8 @@ class RelativeDateTimeField(forms.MultiValueField):
                 required=False
             ),
         )
-
         if 'widget' not in kwargs:
-            kwargs['widget'] = RelativeDateTimeWidget(status_choices=status_choices, base_choices=possible_choices)
+            kwargs['widget'] = RelativeDateTimeWidget(status_choices=status_choices, base_choices=choices)
         kwargs.pop('max_length', 0)
         kwargs.pop('empty_value', 0)
         super().__init__(
@@ -538,24 +359,21 @@ class RelativeDateTimeField(forms.MultiValueField):
         )
 
     def set_event(self, event):
-        possible_choices = copy.deepcopy(EVENT_BASE_CHOICES)
-        if self.relative_to_order:
-            possible_choices.extend(ORDER_BASE_CHOICES)
-
-        possible_choices = possible_choices
-        choices = _get_choices(possible_choices)
-
-        self.widget.widgets[reldatetimeparts.indizes.rel_days_relationto].choices = choices
-        self.widget.widgets[reldatetimeparts.indizes.rel_mins_relationto].choices = choices
+        self.widget.widgets[reldatetimeparts.indizes.rel_days_relationto].choices = [
+            (k, v) for k, v in BASE_CHOICES if getattr(event, k, None)
+        ]
+        self.widget.widgets[reldatetimeparts.indizes.rel_mins_relationto].choices = [
+            (k, v) for k, v in BASE_CHOICES if getattr(event, k, None)
+        ]
 
     def compress(self, data_list):
         if not data_list:
             return None
         data = reldatetimeparts(*data_list)
-        if data.status == 'unset':
-            return None
-        elif data.status == 'absolute':
+        if data.status == 'absolute':
             return RelativeDateWrapper(data.absolute)
+        elif data.status == 'unset':
+            return None
         elif data.status == 'relative_minutes':
             return RelativeDateWrapper(RelativeDate(
                 days=0,
@@ -586,18 +404,6 @@ class RelativeDateTimeField(forms.MultiValueField):
             raise ValidationError(self.error_messages['incomplete'])
         elif data.status == 'relative_minutes' and (data.rel_mins_number is None or not data.rel_mins_relationto):
             raise ValidationError(self.error_messages['incomplete'])
-        elif data.status == 'relative':
-            choice = BaseChoice.find(BASE_CHOICES, data.rel_days_relationto)
-            if data.rel_days_relation == "before" and not choice.supports_before:
-                raise ValidationError(_('A relative date cannot be expressed as "before" for "{}"'.format(choice.text)))
-            elif data.status == 'relative' and data.rel_days_relation == "after" and not choice.supports_after:
-                raise ValidationError(_('A relative date cannot be expressed as "after" for "{}"'.format(choice.text)))
-        elif data.status == 'relative_minutes':
-            choice = BaseChoice.find(BASE_CHOICES, data.rel_days_relationto)
-            if data.rel_days_relation == "before" and not choice.supports_before:
-                raise ValidationError(_('A relative time cannot be expressed as "before" for "{}"'.format(choice.text)))
-            elif data.rel_days_relation == "after" and not choice.supports_after:
-                raise ValidationError(_('A relative time cannot be expressed as "after" for "{}"'.format(choice.text)))
 
         return super().clean(value)
 
@@ -618,20 +424,15 @@ class RelativeDateWidget(RelativeDateTimeWidget):
 
     def __init__(self, *args, **kwargs):
         self.status_choices = kwargs.pop('status_choices')
-        self.base_choices = kwargs.pop('base_choices')
-        widgets = cast(dict[str, Widget | type[Widget]], cast(object, reldateparts(
+        widgets = reldateparts(
             status=forms.RadioSelect(choices=self.status_choices),
             absolute=forms.DateInput(
                 attrs={'class': 'datepickerfield'}
             ),
             rel_days_number=forms.NumberInput(),
-            rel_days_relationto=OptionAttrsSelect(
-                choices=self.base_choices,
-                option_attrs=_get_choice_validation_obj(self.base_choices),
-                attrs={'data-relative-choice': True},
-            ),
-            rel_days_relation=forms.Select(choices=BEFORE_AFTER_CHOICE, attrs={'data-relation-choice': True},),
-        )))
+            rel_days_relationto=forms.Select(choices=kwargs.pop('base_choices')),
+            rel_days_relation=forms.Select(choices=BEFORE_AFTER_CHOICE),
+        )
         forms.MultiWidget.__init__(self, widgets=widgets, *args, **kwargs)
 
     def decompress(self, value):
@@ -659,7 +460,7 @@ class RelativeDateWidget(RelativeDateTimeWidget):
             status="relative",
             absolute=None,
             rel_days_number=value.data.days,
-            rel_days_relationto=value.data.key,
+            rel_days_relationto=value.data.base_date_name,
             rel_days_relation="after" if value.data.is_after else "before"
         )
 
@@ -673,15 +474,6 @@ class RelativeDateField(RelativeDateTimeField):
         ]
         if not kwargs.get('required', True):
             status_choices.insert(0, ('unset', _('Not set')))
-
-        self.relative_to_order = kwargs.pop('relative_to_order', False)
-
-        possible_choices = copy.deepcopy(EVENT_BASE_CHOICES)
-        if self.relative_to_order:
-            possible_choices.extend(ORDER_BASE_CHOICES)
-
-        choices = _get_choices(possible_choices)
-
         fields = reldateparts(
             status=forms.ChoiceField(
                 choices=status_choices,
@@ -694,37 +486,33 @@ class RelativeDateField(RelativeDateTimeField):
                 required=False
             ),
             rel_days_relationto=forms.ChoiceField(
-                choices=choices,
-                required=False,
+                choices=BASE_CHOICES,
+                required=False
             ),
             rel_days_relation=forms.ChoiceField(
                 choices=BEFORE_AFTER_CHOICE,
                 required=False
             ),
         )
-
         if 'widget' not in kwargs:
-            kwargs['widget'] = RelativeDateWidget(status_choices=status_choices, base_choices=possible_choices)
+            kwargs['widget'] = RelativeDateWidget(status_choices=status_choices, base_choices=BASE_CHOICES)
         forms.MultiValueField.__init__(
             self, fields=fields, require_all_fields=False, *args, **kwargs
         )
 
     def set_event(self, event):
-        choices = [
-            (c.key, c.text) for c in EVENT_BASE_CHOICES if getattr(event, c.attribute, None)
+        self.widget.widgets[reldateparts.indizes.rel_days_relationto].choices = [
+            (k, v) for k, v in BASE_CHOICES if getattr(event, k, None)
         ]
-        if self.relative_to_order:
-            choices += [(c.key, c.text) for c in ORDER_BASE_CHOICES]
-        self.widget.widgets[reldateparts.indizes.rel_days_relationto].choices = choices
 
     def compress(self, data_list):
         if not data_list:
             return None
         data = reldateparts(*data_list)
-        if data.status == 'unset':
-            return None
-        elif data.status == 'absolute':
+        if data.status == 'absolute':
             return RelativeDateWrapper(data.absolute)
+        elif data.status == 'unset':
+            return None
         else:
             return RelativeDateWrapper(RelativeDate(
                 days=data.rel_days_number,
@@ -737,14 +525,8 @@ class RelativeDateField(RelativeDateTimeField):
         data = reldateparts(*value)
         if data.status == 'absolute' and not data.absolute:
             raise ValidationError(self.error_messages['incomplete'])
-        if data.status == 'relative':
-            choice = BaseChoice.find(BASE_CHOICES, data.rel_days_relationto)
-            if data.rel_days_number is None or not data.rel_days_relationto:
-                raise ValidationError(self.error_messages['incomplete'])
-            elif data.rel_days_relation == "before" and not choice.supports_before:
-                raise ValidationError(_("A relative date cannot be expressed as 'before' for '{}'".format(choice.text)))
-            elif data.rel_days_relation == "after" and not choice.supports_after:
-                raise ValidationError(_("A relative date cannot be expressed as 'after' for '{}'".format(choice.text)))
+        elif data.status == 'relative' and (data.rel_days_number is None or not data.rel_days_relationto):
+            raise ValidationError(self.error_messages['incomplete'])
 
         return forms.MultiValueField.clean(self, value)
 

src/pretix/base/services/cart.py

@@ -61,7 +61,7 @@ from pretix.base.models import (
     Seat, SeatCategoryMapping, Voucher,
 )
 from pretix.base.models.event import SubEvent
-from pretix.base.models.orders import CheckoutSession, OrderFee
+from pretix.base.models.orders import OrderFee
 from pretix.base.models.tax import TaxRule
 from pretix.base.reldate import RelativeDateWrapper
 from pretix.base.services.checkin import _save_answers
@@ -472,16 +472,6 @@ class CartManager:
                 if term_last < time_machine_now(self.real_now_dt):
                     raise CartError(error_messages['payment_ended'])
 
-    def _ensure_checkout_session(self):
-        CheckoutSession.objects.get_or_create(
-            event=self.event,
-            cart_id=self.cart_id,
-            defaults={
-                "sales_channel": self._sales_channel,
-                "testmode": self.event.testmode,
-            },
-        )
-
     def _extend_expiry_of_valid_existing_positions(self):
         # real_now_dt is initialized at CartManager instantiation, so it's slightly in the past. Add a small
         # delta to reduce risk of extending already expired CartPositions.
@@ -1569,7 +1559,6 @@ class CartManager:
 
     def commit(self):
         self._check_presale_dates()
-        self._ensure_checkout_session()
         self._check_max_cart_size()
 
         err = self._delete_out_of_timeframe()

src/pretix/base/services/checkin.py

@@ -892,7 +892,6 @@ def _save_answers(op, answers, given_answers):
             qa.answer = answer
             qa.save(update_fields=['answer'])
             qa.options.clear()
-            return qa
 
     written = False
     for q, a in given_answers.items():

src/pretix/base/services/cleanup.py

@@ -33,7 +33,6 @@ from pretix.base.models.customers import CustomerSSOGrant
 
 from ..models import CachedFile, CartPosition, InvoiceAddress
 from ..models.auth import UserKnownLoginSource
-from ..models.orders import CheckoutSession
 from ..signals import periodic_task
 
 
@@ -44,10 +43,6 @@ def clean_cart_positions(sender, **kwargs):
         cp.delete()
     for cp in CartPosition.objects.filter(expires__lt=now() - timedelta(days=14), addon_to__isnull=True):
         cp.delete()
-    for cs in CheckoutSession.objects.filter(created__lt=now() - timedelta(days=14)).exclude(
-        Exists(CartPosition.objects.filter(cart_id=OuterRef("cart_id")))
-    ):
-        cs.delete()
     for ia in InvoiceAddress.objects.filter(order__isnull=True, customer__isnull=True, last_modified__lt=now() - timedelta(days=14)):
         ia.delete()
 

src/pretix/base/services/orders.py

@@ -48,12 +48,12 @@ from celery.exceptions import MaxRetriesExceededError
 from django.conf import settings
 from django.core.cache import cache
 from django.core.exceptions import ValidationError
-from django.db import models, transaction
+from django.db import transaction
 from django.db.models import (
-    Count, Exists, F, IntegerField, Max, Min, OuterRef, Q, QuerySet, Subquery,
-    Sum, Value,
+    Count, Exists, F, IntegerField, Max, Min, OuterRef, Q, QuerySet, Sum,
+    Value,
 )
-from django.db.models.functions import Cast, Greatest
+from django.db.models.functions import Coalesce, Greatest
 from django.db.transaction import get_connection
 from django.dispatch import receiver
 from django.utils.functional import cached_property
@@ -71,10 +71,10 @@ from pretix.base.models import (
     Membership, Order, OrderPayment, OrderPosition, Quota, Seat,
     SeatCategoryMapping, User, Voucher,
 )
-from pretix.base.models.event import Event_SettingsStore, SubEvent
+from pretix.base.models.event import SubEvent
 from pretix.base.models.orders import (
-    BlockedTicketSecret, CheckoutSession, InvoiceAddress, OrderFee,
-    OrderRefund, generate_secret,
+    BlockedTicketSecret, InvoiceAddress, OrderFee, OrderRefund,
+    generate_secret,
 )
 from pretix.base.models.organizer import SalesChannel, TeamAPIToken
 from pretix.base.models.tax import TAXED_ZERO, TaxedPrice, TaxRule
@@ -1030,8 +1030,7 @@ def _apply_rounding_and_fees(positions: List[CartPosition], payment_requests: Li
 def _create_order(event: Event, *, email: str, positions: List[CartPosition], now_dt: datetime,
                   payment_requests: List[dict], sales_channel: SalesChannel, locale: str=None,
                   address: InvoiceAddress=None, meta_info: dict=None, shown_total=None,
-                  customer=None, valid_if_pending=False, api_meta: dict=None, tax_rounding_mode=None,
-                  cart_id: str=None):
+                  customer=None, valid_if_pending=False, api_meta: dict=None, tax_rounding_mode=None):
     payments = []
 
     try:
@@ -1114,14 +1113,6 @@ def _create_order(event: Event, *, email: str, positions: List[CartPosition], no
     if meta_info:
         for msg in meta_info.get('confirm_messages', []):
             order.log_action('pretix.event.order.consent', data={'msg': msg})
-    if cart_id:
-        try:
-            session = CheckoutSession.objects.get(event=event, cart_id=cart_id)
-        except CheckoutSession.DoesNotExist:
-            pass
-        else:
-            session.answers.update(order=order, checkoutsession=None)
-            session.delete()
 
     order_placed.send(event, order=order, bulk=False)
     return order, payments
@@ -1169,7 +1160,7 @@ def _order_placed_email_attendee(event: Event, order: Order, position: OrderPosi
 
 def _perform_order(event: Event, payment_requests: List[dict], position_ids: List[str],
                    email: str, locale: str, address: int, meta_info: dict=None, sales_channel: str='web',
-                   shown_total=None, customer=None, api_meta: dict=None, tax_rounding_mode=None, cart_id: str=None):
+                   shown_total=None, customer=None, api_meta: dict=None, tax_rounding_mode=None):
     for p in payment_requests:
         p['pprov'] = event.get_payment_providers(cached=True)[p['provider']]
         if not p['pprov']:
@@ -1276,7 +1267,6 @@ def _perform_order(event: Event, payment_requests: List[dict], position_ids: Lis
                 valid_if_pending=valid_if_pending,
                 api_meta=api_meta,
                 tax_rounding_mode=tax_rounding_mode,
-                cart_id=cart_id,
             )
 
             try:
@@ -1504,104 +1494,83 @@ def send_expiry_warnings(sender, **kwargs):
 @scopes_disabled()
 def send_download_reminders(sender, **kwargs):
     today = now().replace(hour=0, minute=0, second=0, microsecond=0)
-
-    events = Event.objects.filter(
-        Q(has_subevents=False, date_from__gte=now()) |
-        (Q(has_subevents=True) & Q(Exists(
-            SubEvent.objects.filter(event_id=OuterRef('id'), date_from__gte=now())
-        )))
-    ).annotate(
-        reminder_days=Subquery(
-            Event_SettingsStore.objects.filter(
-                object=OuterRef('id'),
-                key='mail_days_download_reminder'
-            ).exclude(
-                value="None"
-            ).annotate(
-                val=Cast(F("value"), output_field=models.IntegerField()),
-            ).values("val")
+    qs = Order.objects.annotate(
+        first_date=Coalesce(
+            Min('all_positions__subevent__date_from'),
+            F('event__date_from')
         )
     ).filter(
-        reminder_days__isnull=False,
-    ).order_by()
+        download_reminder_sent=False,
+        datetime__lte=now() - timedelta(hours=2),
+        first_date__gte=today,
+    ).only(
+        'pk', 'event_id', 'sales_channel', 'datetime',
+    ).order_by('event_id')
+    event_id = None
+    days = None
+    event = None
 
-    for event in events.iterator(chunk_size=10_000):
-        qs = event.orders.filter(
-            download_reminder_sent=False,
-            datetime__lte=now() - timedelta(hours=2),
-        )
+    for o in qs:
+        if o.event_id != event_id:
+            days = o.event.settings.get('mail_days_download_reminder', as_type=int)
+            event = o.event
+            event_id = o.event_id
 
-        if event.has_subevents:
-            qs = qs.annotate(
-                first_date=Min('all_positions__subevent__date_from')
-            ).filter(
-                Q(first_date__gte=today)
-            )
-        else:
-            event_reminder_date = (event.date_from - timedelta(days=event.reminder_days)).replace(hour=0, minute=0, second=0, microsecond=0)
-            if now() < event_reminder_date:
+        if days is None:
+            continue
+
+        if o.sales_channel.identifier not in event.settings.mail_sales_channel_download_reminder:
+            continue
+
+        reminder_date = (o.first_date - timedelta(days=days)).replace(hour=0, minute=0, second=0, microsecond=0)
+        if now() < reminder_date or o.datetime > reminder_date:
+            continue
+
+        with transaction.atomic():
+            o = Order.objects.select_for_update(of=OF_SELF).get(pk=o.pk)
+            if o.download_reminder_sent:
+                # Race condition
+                continue
+            positions = list(o.positions_with_tickets)
+            if not positions:
                 continue
 
-        qs = qs.only(
-            'pk', 'event_id', 'sales_channel', 'datetime',
-        ).order_by()
-
-        for o in qs:
-            if o.sales_channel.identifier not in event.settings.mail_sales_channel_download_reminder:
+            if not o.ticket_download_available:
                 continue
 
-            if event.has_subevents:
-                reminder_date = ((o.first_date or event.date_from) - timedelta(days=event.reminder_days)).replace(hour=0, minute=0, second=0, microsecond=0)
-            else:
-                reminder_date = event_reminder_date
-            if now() < reminder_date or o.datetime > reminder_date:
-                continue
-
-            with transaction.atomic():
-                o = Order.objects.select_for_update(of=OF_SELF).get(pk=o.pk)
-                if o.download_reminder_sent:
-                    # Race condition
-                    continue
-                positions = list(o.positions_with_tickets)
-                if not positions:
+            if o.status != Order.STATUS_PAID:
+                if o.status != Order.STATUS_PENDING or o.require_approval or (not o.valid_if_pending and not o.event.settings.ticket_download_pending):
                     continue
 
-                if not o.ticket_download_available:
-                    continue
+            with language(o.locale, o.event.settings.region):
+                o.download_reminder_sent = True
+                o.save(update_fields=['download_reminder_sent'])
+                email_template = event.settings.mail_text_download_reminder
+                email_subject = event.settings.mail_subject_download_reminder
+                email_context = get_email_context(event=event, order=o)
+                o.send_mail(
+                    email_subject, email_template, email_context,
+                    'pretix.event.order.email.download_reminder_sent',
+                    attach_tickets=True
+                )
 
-                if o.status != Order.STATUS_PAID:
-                    if o.status != Order.STATUS_PENDING or o.require_approval or (not o.valid_if_pending and not o.event.settings.ticket_download_pending):
-                        continue
-
-                with language(o.locale, o.event.settings.region):
-                    o.download_reminder_sent = True
-                    o.save(update_fields=['download_reminder_sent'])
-                    email_template = event.settings.mail_text_download_reminder
-                    email_subject = event.settings.mail_subject_download_reminder
-                    email_context = get_email_context(event=event, order=o)
-                    o.send_mail(
-                        email_subject, email_template, email_context,
-                        'pretix.event.order.email.download_reminder_sent',
-                        attach_tickets=True
-                    )
-
-                    if event.settings.mail_send_download_reminder_attendee:
-                        for p in positions:
-                            if p.subevent_id:
-                                reminder_date = (p.subevent.date_from - timedelta(days=event.reminder_days)).replace(
-                                    hour=0, minute=0, second=0, microsecond=0
-                                )
-                                if now() < reminder_date:
-                                    continue
-                            if p.addon_to_id is None and p.attendee_email and p.attendee_email != o.email:
-                                email_template = event.settings.mail_text_download_reminder_attendee
-                                email_subject = event.settings.mail_subject_download_reminder_attendee
-                                email_context = get_email_context(event=event, order=o, position=p)
-                                o.send_mail(
-                                    email_subject, email_template, email_context,
-                                    'pretix.event.order.email.download_reminder_sent',
-                                    attach_tickets=True, position=p
-                                )
+                if event.settings.mail_send_download_reminder_attendee:
+                    for p in positions:
+                        if p.subevent_id:
+                            reminder_date = (p.subevent.date_from - timedelta(days=days)).replace(
+                                hour=0, minute=0, second=0, microsecond=0
+                            )
+                            if now() < reminder_date:
+                                continue
+                        if p.addon_to_id is None and p.attendee_email and p.attendee_email != o.email:
+                            email_template = event.settings.mail_text_download_reminder_attendee
+                            email_subject = event.settings.mail_subject_download_reminder_attendee
+                            email_context = get_email_context(event=event, order=o, position=p)
+                            o.send_mail(
+                                email_subject, email_template, email_context,
+                                'pretix.event.order.email.download_reminder_sent',
+                                attach_tickets=True, position=p
+                            )
 
 
 def notify_user_changed_order(order, user=None, auth=None, invoices=[]):
@@ -3200,12 +3169,12 @@ class OrderChangeManager:
 def perform_order(self, event: Event, payments: List[dict], positions: List[str],
                   email: str=None, locale: str=None, address: int=None, meta_info: dict=None,
                   sales_channel: str='web', shown_total=None, customer=None, override_now_dt: datetime=None,
-                  api_meta: dict=None, cart_id: str=None):
+                  api_meta: dict=None):
     with language(locale), time_machine_now_assigned(override_now_dt):
         try:
             try:
                 return _perform_order(event, payments, positions, email, locale, address, meta_info,
-                                      sales_channel, shown_total, customer, api_meta, cart_id=cart_id)
+                                      sales_channel, shown_total, customer, api_meta)
             except LockTimeoutException:
                 self.retry()
         except (MaxRetriesExceededError, LockTimeoutException):

src/pretix/base/services/quotas.py

@@ -193,7 +193,7 @@ class QuotaAvailability:
         lock_name = '_'.join([str(p) for p in sorted([q.pk for q in quotas])])
         if rc.exists(f'quotas:availabilitycachewrite:{lock_name}{self._cache_key_suffix}'):
             return
-        rc.set(f'quotas:availabilitycachewrite:{lock_name}{self._cache_key_suffix}', '1', ex=10)
+        rc.setex(f'quotas:availabilitycachewrite:{lock_name}{self._cache_key_suffix}', '1', 10)
 
         update = defaultdict(list)
         for q in quotas:

src/pretix/base/settings.py

@@ -2930,7 +2930,7 @@ Your {event} team"""))  # noqa: W291
     },
     'mail_days_download_reminder': {
         'type': int,
-        'default': None  # when this default is changed, send_download_reminders needs to change
+        'default': None
     },
     'mail_send_download_reminder_attendee': {
         'type': bool,

src/pretix/base/views/mixins.py

@@ -27,26 +27,23 @@ 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.db.models import Prefetch, Q, QuerySet
 from django.utils.functional import cached_property
 from django.utils.timezone import make_aware
 
 from pretix.base.forms.questions import (
-    BaseInvoiceAddressForm, BaseInvoiceNameForm, OrderLevelQuestionsForm,
-    TicketLevelQuestionsForm,
+    BaseInvoiceAddressForm, BaseInvoiceNameForm, BaseQuestionsForm,
 )
 from pretix.base.models import (
     CartPosition, InvoiceAddress, OrderPosition, Question, QuestionAnswer,
-    QuestionOption,
+    QuestionOption, QuestionnaireChild,
 )
 from pretix.base.models.customers import AttendeeProfile
-from pretix.base.models.orders import CheckoutSession, Order
 from pretix.presale.signals import contact_form_fields_overrides
 
 
 class BaseQuestionsViewMixin:
-    order_form_class = OrderLevelQuestionsForm
-    orderposition_form_class = TicketLevelQuestionsForm
+    form_class = BaseQuestionsForm
     all_optional = False
 
     @cached_property
@@ -59,26 +56,18 @@ class BaseQuestionsViewMixin:
     def question_form_kwargs(self, cr):
         return {}
 
-    @property
-    def order_question_container(self):
-        raise NotImplementedError()
-
     @cached_property
     def order_questions_form(self):
-        container = self.order_question_container
-        if container is None:
-            return None
         kwargs = {}  # self.question_form_kwargs(cr)
-        form = self.order_form_class(
-            event=self.request.event,
-            prefix='order',
-            request=self.request,
-            container=container,
-            all_optional=self.all_optional,
-            data=(self.request.POST if self.request.method == 'POST' else None),
-            files=(self.request.FILES if self.request.method == 'POST' else None),
-            **kwargs
-        )
+        form = self.form_class(event=self.request.event,
+                               prefix='order',
+                               request=self.request,
+                               cartpos=None,
+                               orderpos=None,
+                               all_optional=self.all_optional,
+                               data=(self.request.POST if self.request.method == 'POST' else None),
+                               files=(self.request.FILES if self.request.method == 'POST' else None),
+                               **kwargs)
         return form
 
     @cached_property
@@ -94,17 +83,15 @@ class BaseQuestionsViewMixin:
             orderpos = cr if isinstance(cr, OrderPosition) else None
 
             kwargs = self.question_form_kwargs(cr)
-            form = self.orderposition_form_class(
-                event=self.request.event,
-                prefix=cr.id,
-                request=self.request,
-                cartpos=cartpos,
-                orderpos=orderpos,
-                all_optional=self.all_optional,
-                data=(self.request.POST if self.request.method == 'POST' else None),
-                files=(self.request.FILES if self.request.method == 'POST' else None),
-                **kwargs
-            )
+            form = self.form_class(event=self.request.event,
+                                   prefix=cr.id,
+                                   request=self.request,
+                                   cartpos=cartpos,
+                                   orderpos=orderpos,
+                                   all_optional=self.all_optional,
+                                   data=(self.request.POST if self.request.method == 'POST' else None),
+                                   files=(self.request.FILES if self.request.method == 'POST' else None),
+                                   **kwargs)
             form.pos = cartpos or orderpos
             form.show_copy_answers_to_addon_button = form.pos.addon_to and (
                 set(form.pos.addon_to.item.questions.all()) & set(form.pos.item.questions.all()) or
@@ -157,38 +144,8 @@ class BaseQuestionsViewMixin:
 
     def save(self):
         failed = False
-        if self.order_questions_form:
-            if not self.order_questions_form.is_valid():
-                failed = True
-            else:
-                checkoutsession = self.order_question_container if isinstance(self.order_question_container, CheckoutSession) else None
-                order = self.order_question_container if isinstance(self.order_question_container, Order) else None
-                for k, v in self.order_questions_form.cleaned_data.items():
-                    if k.startswith('question_'):
-                        field = self.order_questions_form.fields[k]
-                        if hasattr(field, 'answer'):
-                            # We already have a cached answer object, so we don't
-                            # have to create a new one
-                            if v == '' or v is None or (isinstance(field, forms.FileField) and v is False) \
-                                    or (isinstance(v, QuerySet) and not v.exists()):
-                                if field.answer.file:
-                                    field.answer.file.delete()
-                                field.answer.delete()
-                            else:
-                                self._save_to_answer(field, field.answer, v)
-                                field.answer.save()
-                        elif v != '' and v is not None:
-                            self._upsert_answer(
-                                field, v,
-                                checkoutsession=checkoutsession,
-                                order=order,
-                                question=field.question,
-                            )
-
         for form in self.forms:
             meta_info = form.pos.meta_info_data
-            cartposition = form.pos if isinstance(form.pos, CartPosition) else None
-            orderposition = form.pos if isinstance(form.pos, OrderPosition) else None
             # Every form represents a CartPosition or OrderPosition with questions attached
             if not form.is_valid():
                 failed = True
@@ -197,8 +154,10 @@ class BaseQuestionsViewMixin:
                     prof = AttendeeProfile.objects.filter(
                         customer=self.cart_customer, pk=form.cleaned_data.get('saved_id')
                     ).first() or AttendeeProfile(customer=getattr(self, 'cart_customer', None))
+                    answers_key_to_index = {a.get('field_name'): i for i, a in enumerate(prof.answers)}
                 else:
                     prof = AttendeeProfile(customer=getattr(self, 'cart_customer', None))
+                    answers_key_to_index = {}
 
                 # This form was correctly filled, so we store the data as
                 # answers to the questions / in the CartPosition object
@@ -236,19 +195,64 @@ class BaseQuestionsViewMixin:
                             else:
                                 self._save_to_answer(field, field.answer, v)
                                 field.answer.save()
-
-                                answer_dict = self._build_answer_dict(field, field.answer, k)
-                                prof.store_answer(answer_dict)
+                                if isinstance(field, forms.ModelMultipleChoiceField) or isinstance(field, forms.ModelChoiceField):
+                                    answer_value = {o.identifier: str(o) for o in field.answer.options.all()}
+                                elif isinstance(field, forms.BooleanField):
+                                    answer_value = bool(field.answer.answer)
+                                else:
+                                    answer_value = str(field.answer.answer)
+                                answer_dict = {
+                                    'field_name': k,
+                                    'field_label': str(field.label),
+                                    'value': answer_value,
+                                    'question_type': field.question.type,
+                                    'question_identifier': field.question.identifier,
+                                }
+                                if k in answers_key_to_index:
+                                    prof.answers[answers_key_to_index[k]] = answer_dict
+                                else:
+                                    prof.answers.append(answer_dict)
                         elif v != '' and v is not None:
-                            answer = self._upsert_answer(
-                                field, v,
-                                cartposition=cartposition,
-                                orderposition=orderposition,
+                            answer = QuestionAnswer(
+                                cartposition=(form.pos if isinstance(form.pos, CartPosition) else None),
+                                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()
 
-                            answer_dict = self._build_answer_dict(field, answer, k)
-                            prof.store_answer(answer_dict)
+                            if isinstance(field, forms.ModelMultipleChoiceField) or isinstance(field, forms.ModelChoiceField):
+                                answer_value = {o.identifier: str(o) for o in answer.options.all()}
+                            elif isinstance(field, forms.BooleanField):
+                                answer_value = bool(answer.answer)
+                            else:
+                                answer_value = str(answer.answer)
+                            answer_dict = {
+                                'field_name': k,
+                                'field_label': str(field.label),
+                                'value': answer_value,
+                                'question_type': field.question.type,
+                                'question_identifier': field.question.identifier,
+                            }
+                            if k in answers_key_to_index:
+                                prof.answers[answers_key_to_index[k]] = answer_dict
+                            else:
+                                prof.answers.append(answer_dict)
 
                     else:
                         field = form.fields[k]
@@ -267,7 +271,10 @@ class BaseQuestionsViewMixin:
                             'question_type': None,
                             'question_identifier': None,
                         }
-                        prof.store_answer(answer_dict)
+                        if k in answers_key_to_index:
+                            prof.answers[answers_key_to_index[k]] = answer_dict
+                        else:
+                            prof.answers.append(answer_dict)
 
             form.pos.meta_info = json.dumps(meta_info)
             form.pos.save()
@@ -278,23 +285,6 @@ class BaseQuestionsViewMixin:
 
         return not failed
 
-    def _upsert_answer(self, field, v, **answer_kwargs):
-        answer = QuestionAnswer(**answer_kwargs)
-        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(**answer_kwargs)
-            self._save_to_answer(field, answer, v)
-            answer.save()
-        return answer
-
     def _save_to_answer(self, field, answer, value):
         if isinstance(field, forms.ModelMultipleChoiceField):
             answstr = ", ".join([str(o) for o in value])
@@ -318,21 +308,6 @@ class BaseQuestionsViewMixin:
         else:
             answer.answer = value
 
-    def _build_answer_dict(self, field, answer, k):
-        if isinstance(field, forms.ModelMultipleChoiceField) or isinstance(field, forms.ModelChoiceField):
-            answer_value = {o.identifier: str(o) for o in answer.options.all()}
-        elif isinstance(field, forms.BooleanField):
-            answer_value = bool(answer.answer)
-        else:
-            answer_value = str(answer.answer)
-        return {
-            'field_name': k,
-            'field_label': str(field.label),
-            'value': answer_value,
-            'question_type': field.question.type,
-            'question_identifier': field.question.identifier,
-        }
-
 
 class OrderQuestionsViewMixin(BaseQuestionsViewMixin):
     invoice_form_class = BaseInvoiceAddressForm
@@ -346,27 +321,37 @@ class OrderQuestionsViewMixin(BaseQuestionsViewMixin):
 
     @cached_property
     def positions(self):
-        qqs = self.request.event.questions.all()
+        qqs = self.request.event.questionnaires.all()
         if self.only_user_visible:
-            qqs = qqs.filter(ask_during_checkin=False, hidden=False, container_type=Question.ContainerType.ORDERPOSITION)
+            qqs = qqs.filter(type='PS')
+        else:
+            qqs = qqs.filter(type__startswith='P')
+        qqs = qqs.filter(
+            Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=self.order.sales_channel.identifier)
+        )
         return list(self.order.positions.select_related(
             'item', 'variation'
         ).prefetch_related(
             Prefetch('answers',
                      QuestionAnswer.objects.prefetch_related('options'),
                      to_attr='answerlist'),
-            Prefetch('item__questions',
+            Prefetch('item__questionnaires',
                      qqs.prefetch_related(
-                         Prefetch('options', QuestionOption.objects.prefetch_related(Prefetch(
-                             # This prefetch statement is utter bullshit, but it actually prevents Django from doing
-                             # a lot of queries since ModelChoiceIterator stops trying to be clever once we have
-                             # a prefetch lookup on this query...
-                             'question',
-                             Question.objects.none(),
-                             to_attr='dummy'
-                         )))
-                     ).select_related('dependency_question'),
-                     to_attr='questions_to_ask')
+                         Prefetch('children', QuestionnaireChild.objects.prefetch_related(
+                             Prefetch('user_question', Question.objects.prefetch_related(
+                                 Prefetch('options', QuestionOption.objects.prefetch_related(Prefetch(
+                                     # This prefetch statement is utter bullshit, but it actually prevents Django from doing
+                                     # a lot of queries since ModelChoiceIterator stops trying to be clever once we have
+                                     # a prefetch lookup on this query...
+                                     'question',
+                                     Question.objects.none(),
+                                     to_attr='dummy'
+                                 )))
+                             ))
+                         ),
+                         to_attr='childlist')
+                     ),
+                     to_attr='relevant_questionnaires')
         ))
 
     @cached_property
@@ -436,7 +421,6 @@ class OrderQuestionsViewMixin(BaseQuestionsViewMixin):
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
         ctx['order'] = self.order
-        ctx['order_questions_form'] = self.order_questions_form
         ctx['formgroups'] = self.formdict.items()
         ctx['invoice_form'] = self.invoice_form
         ctx['invoice_address_asked'] = self.address_asked

src/pretix/base/views/redirect.py

@@ -26,6 +26,7 @@ from django.core import signing
 from django.http import HttpResponseBadRequest, HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import reverse
+from django.utils.html import format_html
 
 logger = logging.getLogger(__name__)
 
@@ -60,6 +61,7 @@ def redir_view(request):
         u = urllib.parse.urlparse(url)
         return render(request, 'pretixbase/redirect.html', {
             'hostname': u.hostname,
+            'bold_hostname': format_html("<strong>{}</strong>", u.hostname),
             'url': url,
         })
 

src/pretix/control/forms/item.py

@@ -153,19 +153,11 @@ class QuestionForm(I18nModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if self.instance.container_type == Question.ContainerType.ORDERPOSITION:
-            self.fields['items'].queryset = self.instance.event.items.all()
-            self.fields['items'].required = True
-        else:
-            del self.fields['items']
-            del self.fields['ask_during_checkin']
-            del self.fields['show_during_checkin']
-            del self.fields['print_on_invoice']
-        self.fields['dependency_question'].widget.attrs['data-container-type'] = self.instance.container_type
+        self.fields['items'].queryset = self.instance.event.items.all()
+        self.fields['items'].required = True
         self.fields['dependency_question'].queryset = self.instance.event.questions.filter(
             type__in=(Question.TYPE_BOOLEAN, Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE),
-            ask_during_checkin=False,
-            container_type=self.instance.container_type,
+            ask_during_checkin=False
         )
         if self.instance.pk:
             self.fields['dependency_question'].queryset = self.fields['dependency_question'].queryset.exclude(

src/pretix/control/forms/subevents.py

@@ -94,14 +94,14 @@ class SubEventBulkForm(SubEventForm):
         label=_('Start of presale'),
         help_text=_('Optional. No products will be sold before this date.'),
         required=False,
-        limit_choices=('event__date_from', 'event__date_to'),
+        limit_choices=('date_from', 'date_to'),
     )
     rel_presale_end = RelativeDateTimeField(
         label=_('End of presale'),
         help_text=_('Optional. No products will be sold after this date. If you do not set this value, the presale '
                     'will end after the end date of your event.'),
         required=False,
-        limit_choices=('event__date_from', 'event__date_to'),
+        limit_choices=('date_from', 'date_to'),
     )
     skip_if_overlap = forms.BooleanField(
         label=pgettext_lazy('subevent', 'Skip dates that overlap with any existing date'),
@@ -333,12 +333,12 @@ class BulkSubEventItemForm(SubEventItemForm):
     rel_available_from = RelativeDateTimeField(
         label=_('Available from'),
         required=False,
-        limit_choices=('event__date_from', 'event__date_to'),
+        limit_choices=('date_from', 'date_to'),
     )
     rel_available_until = RelativeDateTimeField(
         label=_('Available until'),
         required=False,
-        limit_choices=('event__date_from', 'event__date_to'),
+        limit_choices=('date_from', 'date_to'),
     )
 
     def __init__(self, *args, **kwargs):
@@ -355,12 +355,12 @@ class BulkSubEventItemVariationForm(SubEventItemVariationForm):
     rel_available_from = RelativeDateTimeField(
         label=_('Available from'),
         required=False,
-        limit_choices=('event__date_from', 'event__date_to'),
+        limit_choices=('date_from', 'date_to'),
     )
     rel_available_until = RelativeDateTimeField(
         label=_('Available_until'),
         required=False,
-        limit_choices=('event__date_from', 'event__date_to'),
+        limit_choices=('date_from', 'date_to'),
     )
 
     def __init__(self, *args, **kwargs):

src/pretix/control/logdisplay.py

@@ -861,6 +861,9 @@ class OrganizerPluginStateLogEntryType(LogEntryType):
     'pretix.event.question.option.added': _('An answer option has been added to the question.'),
     'pretix.event.question.option.deleted': _('An answer option has been removed from the question.'),
     'pretix.event.question.option.changed': _('An answer option has been changed.'),
+    'pretix.event.questionnaire.added': _('A questionnaire has been created.'),
+    'pretix.event.questionnaire.deleted': _('A questionnaire has been deleted.'),
+    'pretix.event.questionnaire.changed': _('A questionnaire has been changed.'),
     'pretix.event.permissions.added': _('A user has been added to the event team.'),
     'pretix.event.permissions.invited': _('A user has been invited to the event team.'),
     'pretix.event.permissions.changed': _('A user\'s permissions have been changed.'),

src/pretix/control/navigation.py

@@ -182,12 +182,12 @@ def get_event_navigation(request: HttpRequest):
                 'active': 'event.items.categories' in url.url_name,
             },
             {
-                'label': _('Questions'),
-                'url': reverse('control:event.items.questions', kwargs={
+                'label': _('Questionnaires'),
+                'url': reverse('control:event.items.questionnaires', kwargs={
                     'event': request.event.slug,
                     'organizer': request.event.organizer.slug,
                 }),
-                'active': 'event.items.questions' in url.url_name,
+                'active': 'event.items.questionnaires' in url.url_name or 'event.items.questions' in url.url_name,
             },
             {
                 'label': _('Discounts'),

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

@@ -58,7 +58,6 @@
             <script type="text/javascript" src="{% static "leaflet/leaflet.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixcontrol/js/ui/geo.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixbase/js/details.js" %}"></script>
-            <script type="text/javascript" src="{% static "pretixbase/js/reldate.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixbase/js/asynctask.js" %}"></script>
             <script type="text/javascript" src="{% static "sortable/Sortable.js" %}"></script>
             <script type="text/javascript" src="{% static "colorpicker/bootstrap-colorpicker.js" %}"></script>

src/pretix/control/templates/pretixcontrol/items/question_delete.html

@@ -13,11 +13,9 @@
 					{% blocktrans with url=edit_url|add:"#tab-0-1-open" %}If you want to keep the answers, <a href="{{url}}">edit the question</a> and set it to hidden.{% endblocktrans %}
 				</p>
 			</div>
-            <ul>
-                {% for item in dependent %}
-                    <li><a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.pk %}">{{ item }}</a></li>
-                {% endfor %}
-            </ul>
+			{% for item in dependent %}
+				<li><a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.pk %}">{{ item }}</a></li>
+			{% endfor %}
 		{% endif %}
 		<div class="form-group submit-group">
             <a href="{% url "control:event.items.questions" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">

src/pretix/control/templates/pretixcontrol/items/question_edit.html

@@ -12,150 +12,113 @@
 {% endblock %}
 {% block inside %}
     {% if question %}
-        <h1>{% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}</h1>
+        <h1>{% blocktrans with name=question.question %}Data field: {{ name }}{% endblocktrans %}</h1>
     {% else %}
-        <h1>{% trans "Question" %}</h1>
+        <h1>{% trans "Data field" %}</h1>
     {% endif %}
     <form action="" method="post" class="form-horizontal">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
-        <div class="tabbed-form">
-            <fieldset>
-                <legend>{% trans "General" %}</legend>
-                {% bootstrap_field form.question layout="control" %}
-                {% bootstrap_field form.type layout="control" %}
-                {% if form.items %}
-                    {% bootstrap_field form.items layout="control" %}
-                {% endif %}
-                {% bootstrap_field form.required layout="control" %}
-                <div class="alert alert-info alert-required-boolean">
-                    {% blocktrans trimmed %}
-                        If you mark a Yes/No question as required, it means that the user has to select Yes and No is not
-                        accepted. If you want to allow both options, do not make this field required.
-                    {% endblocktrans %}
-                </div>
-                <div id="valid-number">
-                    {% bootstrap_field form.valid_number_min layout="control" %}
-                    {% bootstrap_field form.valid_number_max layout="control" %}
-                </div>
-                <div id="valid-date">
-                    {% bootstrap_field form.valid_date_min layout="control" %}
-                    {% bootstrap_field form.valid_date_max layout="control" %}
-                </div>
-                <div id="valid-datetime">
-                    {% bootstrap_field form.valid_datetime_min layout="control" %}
-                    {% bootstrap_field form.valid_datetime_max layout="control" %}
-                </div>
-                <div id="valid-string">
-                    {% bootstrap_field form.valid_string_length_max layout="control" %}
-                </div>
-                <div id="valid-file">
-                    {% bootstrap_field form.valid_file_portrait layout="control" %}
-                </div>
-                <div id="answer-options">
-                    <h3>{% trans "Answer options" %}</h3>
-                    <noscript>
-                        <p>{% trans "Only applicable if you choose 'Choose one/multiple from a list' above." %}</p>
-                    </noscript>
-                    <div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}" data-formset-delete-confirm-text="{% trans "If you delete an answer option, you will no longer be able to see statistical data on customers who previously selected this option, and when such customers edit their answers, they need to select a different option." %}">
-                        {{ formset.management_form }}
-                        {% bootstrap_formset_errors formset %}
-                        <div data-formset-body>
-                            {% for form in formset %}
-                                <div data-formset-form>
-                                    <div class="sr-only">
-                                        {{ form.id }}
-                                        {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
-                                        {% bootstrap_field form.ORDER form_group_class="" layout="inline" %}
-                                    </div>
-                                    <div class="row question-option-row">
-                                        <div class="col-xs-10">
-                                    <span class="text-muted">
-                                        {% blocktrans trimmed with id=form.instance.identifier %}
-                                            Answer option {{ id }}
-                                        {% endblocktrans %}
-                                    </span>
-                                            {% bootstrap_form_errors form %}
-                                            {% bootstrap_field form.answer layout='inline' form_group_class="" %}
-                                        </div>
-                                        <div class="col-xs-2 text-right flip">
-                                            <span>&nbsp;</span><br>
-                                            <button type="button" class="btn btn-default" data-formset-move-up-button>
-                                                <i class="fa fa-arrow-up"></i></button>
-                                            <button type="button" class="btn btn-default" data-formset-move-down-button>
-                                                <i class="fa fa-arrow-down"></i></button>
-                                            <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                                <i class="fa fa-trash"></i></button>
-                                        </div>
-                                    </div>
-                                </div>
-                            {% endfor %}
-                        </div>
-                        <script type="form-template" data-formset-empty-form>
-                            {% escapescript %}
-                                <div data-formset-form>
-                                    <div class="sr-only">
-                                        {{ formset.empty_form.id }}
-                                        {% bootstrap_field formset.empty_form.DELETE form_group_class="" layout="inline" %}
-                                        {% bootstrap_field formset.empty_form.ORDER form_group_class="" layout="inline" %}
-                                    </div>
-                                    <div class="row question-option-row">
-                                        <div class="col-xs-10">
-                                    <span class="text-muted">
-                                        {% trans "New answer option" %}
-                                    </span>
-                                            {% bootstrap_field formset.empty_form.answer layout='inline' form_group_class="" %}
-                                        </div>
-                                        <div class="col-xs-2 text-right flip">
-                                            <span>&nbsp;</span><br>
-                                            <button type="button" class="btn btn-default" data-formset-move-up-button>
-                                                <i class="fa fa-arrow-up"></i></button>
-                                            <button type="button" class="btn btn-default" data-formset-move-down-button>
-                                                <i class="fa fa-arrow-down"></i></button>
-                                            <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                                <i class="fa fa-trash"></i></button>
-                                        </div>
-                                    </div>
-                                </div>
-                            {% endescapescript %}
-                        </script>
-                        <p>
-                            <button type="button" class="btn btn-default" data-formset-add>
-                                <i class="fa fa-plus"></i> {% trans "Add a new option" %}</button>
-                        </p>
-                    </div>
-                </div>
-            </fieldset>
-            <fieldset>
-                <legend>{% trans "Advanced" %}</legend>
-                {% bootstrap_field form.help_text layout="control" %}
-                {% bootstrap_field form.identifier layout="control" %}
-                {% if form.ask_during_checkin %}
-                    {% bootstrap_field form.ask_during_checkin layout="control" %}
-                {% endif %}
-                {% if form.show_during_checkin %}
-                    {% bootstrap_field form.show_during_checkin layout="control" %}
-                {% endif %}
-                {% bootstrap_field form.hidden layout="control" %}
-                {% if form.print_on_invoice %}
-                    {% bootstrap_field form.print_on_invoice layout="control" %}
-                {% endif %}
-
-                <div class="form-group">
-                    <label class="col-md-3 control-label" for="id_dependency_question">
-                        {% trans "Question dependency" %}
-                        <br><span class="optional">{% trans "Optional" context "form" %}</span>
-                    </label>
-                    <div class="col-md-4">
-                        {% bootstrap_field form.dependency_question layout="inline" form_group_class="inner" %}
-                    </div>
-                    <div class="col-md-5">
-                        <script type="text/plain" id="dependency_value_val">{{ form.instance.dependency_values|escapejson_dumps }}</script>
-                        {% bootstrap_field form.dependency_values layout="inline" form_group_class="inner" %}
-                    </div>
-                </div>
-            </fieldset>
+        {% bootstrap_field form.question layout="control" %}
+        {% bootstrap_field form.type layout="control" %}
+        <div id="valid-number">
+            {% bootstrap_field form.valid_number_min layout="control" %}
+            {% bootstrap_field form.valid_number_max layout="control" %}
         </div>
+        <div id="valid-date">
+            {% bootstrap_field form.valid_date_min layout="control" %}
+            {% bootstrap_field form.valid_date_max layout="control" %}
+        </div>
+        <div id="valid-datetime">
+            {% bootstrap_field form.valid_datetime_min layout="control" %}
+            {% bootstrap_field form.valid_datetime_max layout="control" %}
+        </div>
+        <div id="valid-string">
+            {% bootstrap_field form.valid_string_length_max layout="control" %}
+        </div>
+        <div id="valid-file">
+            {% bootstrap_field form.valid_file_portrait layout="control" %}
+        </div>
+        <div id="answer-options">
+            <h3>{% trans "Answer options" %}</h3>
+            <noscript>
+                <p>{% trans "Only applicable if you choose 'Choose one/multiple from a list' above." %}</p>
+            </noscript>
+            <div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}" data-formset-delete-confirm-text="{% trans "If you delete an answer option, you will no longer be able to see statistical data on customers who previously selected this option, and when such customers edit their answers, they need to select a different option." %}">
+                {{ formset.management_form }}
+                {% bootstrap_formset_errors formset %}
+                <div data-formset-body>
+                    {% for form in formset %}
+                        <div data-formset-form>
+                            <div class="sr-only">
+                                {{ form.id }}
+                                {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
+                                {% bootstrap_field form.ORDER form_group_class="" layout="inline" %}
+                            </div>
+                            <div class="row question-option-row">
+                                <div class="col-xs-10">
+                            <span class="text-muted">
+                                {% blocktrans trimmed with id=form.instance.identifier %}
+                                    Answer option {{ id }}
+                                {% endblocktrans %}
+                            </span>
+                                    {% bootstrap_form_errors form %}
+                                    {% bootstrap_field form.answer layout='inline' form_group_class="" %}
+                                </div>
+                                <div class="col-xs-2 text-right flip">
+                                    <span>&nbsp;</span><br>
+                                    <button type="button" class="btn btn-default" data-formset-move-up-button>
+                                        <i class="fa fa-arrow-up"></i></button>
+                                    <button type="button" class="btn btn-default" data-formset-move-down-button>
+                                        <i class="fa fa-arrow-down"></i></button>
+                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
+                                        <i class="fa fa-trash"></i></button>
+                                </div>
+                            </div>
+                        </div>
+                    {% endfor %}
+                </div>
+                <script type="form-template" data-formset-empty-form>
+                    {% escapescript %}
+                        <div data-formset-form>
+                            <div class="sr-only">
+                                {{ formset.empty_form.id }}
+                                {% bootstrap_field formset.empty_form.DELETE form_group_class="" layout="inline" %}
+                                {% bootstrap_field formset.empty_form.ORDER form_group_class="" layout="inline" %}
+                            </div>
+                            <div class="row question-option-row">
+                                <div class="col-xs-10">
+                            <span class="text-muted">
+                                {% trans "New answer option" %}
+                            </span>
+                                    {% bootstrap_field formset.empty_form.answer layout='inline' form_group_class="" %}
+                                </div>
+                                <div class="col-xs-2 text-right flip">
+                                    <span>&nbsp;</span><br>
+                                    <button type="button" class="btn btn-default" data-formset-move-up-button>
+                                        <i class="fa fa-arrow-up"></i></button>
+                                    <button type="button" class="btn btn-default" data-formset-move-down-button>
+                                        <i class="fa fa-arrow-down"></i></button>
+                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
+                                        <i class="fa fa-trash"></i></button>
+                                </div>
+                            </div>
+                        </div>
+                    {% endescapescript %}
+                </script>
+                <p>
+                    <button type="button" class="btn btn-default" data-formset-add>
+                        <i class="fa fa-plus"></i> {% trans "Add a new option" %}</button>
+                </p>
+            </div>
+        </div>
+        {% bootstrap_field form.identifier layout="control" %}
+        {% bootstrap_field form.ask_during_checkin layout="control" %}
+        {% bootstrap_field form.show_during_checkin layout="control" %}
+        {% bootstrap_field form.hidden layout="control" %}
+        {% bootstrap_field form.print_on_invoice layout="control" %}
+
+
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}

src/pretix/control/templates/pretixcontrol/items/questionnaires.html

@@ -0,0 +1,41 @@
+{% extends "pretixcontrol/items/base.html" %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% load static %}
+{% load icon %}
+{% load compress %}
+{% load vite %}
+
+{% block title %}
+    {% trans "Questionnaires" %}
+{% endblock %}
+{% block inside %}
+    <h1>
+        {% trans "Questionnaires" %}
+        <a href="{% url "control:event.items.questions" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default pull-right">
+            {% icon "wrench" %} {% trans "Manage data fields" %}
+        </a>
+    </h1>
+    <p>
+        {% blocktrans trimmed %}
+            Questionaires allow your attendees to fill in additional data about their ticket. If you provide food, one
+            example might be to ask your users about dietary requirements.
+        {% endblocktrans %}
+    </p>
+    <p>
+        TODO: add more specific explanation of the questionnaire concept.
+    </p>
+
+    {{ request.event.settings.locales|json_script:"event_locales" }}
+    {{ questionnaire_type_choices|json_script:"questionnaire_type_choices" }}
+
+    {% url "control:event.items.questions.edit" organizer=request.event.organizer.slug event=request.event.slug question=0 as datafield_edit_url %}
+    {{ datafield_edit_url|json_script:"datafield_edit_url" }}
+
+    <div id="questionnaires-editor">
+        <!-- Vue app mount point -->
+    </div>
+
+    {% vite_hmr %}
+    {% vite_asset "src/pretix/static/pretixcontrol/js/ui/questionnaires/index.ts" %}
+{% endblock %}

src/pretix/control/templates/pretixcontrol/items/questions.html

@@ -1,8 +1,8 @@
 {% extends "pretixcontrol/items/base.html" %}
 {% load i18n %}
-{% block title %}{% trans "Questions" %}{% endblock %}
+{% block title %}{% trans "Data fields" %}{% endblock %}
 {% block inside %}
-    <h1>{% trans "Questions" %}</h1>
+    <h1>{% trans "Data fields" %}</h1>
     <p>
         {% blocktrans trimmed %}
             Questions allow your attendees to fill in additional data about their ticket. If you provide food, one
@@ -10,64 +10,37 @@
         {% endblocktrans %}
     </p>
     {% csrf_token %}
-
-    {% if request.event.settings.feature_flag_order_level_questions %}
-        {% if 'event.items:write' in request.eventpermset %}
-            <p>
-                <a href="{% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug %}?container_type=P" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new per-ticket question" %}
-                </a>
-                <a href="{% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug %}?container_type=O" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new order-level question" %}
-                </a>
-            </p>
-        {% endif %}
-
-        <h2>{% trans "Per-ticket questions" %}</h2>
-        <p>{% trans "These questions are asked for every ticket, so possibly multiple times in the same order." %}</p>
-    {% else %}
-        {% if 'event.items:write' in request.eventpermset %}
-            <p>
-                <a href="{% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug %}?container_type=P" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new question" %}
-                </a>
-            </p>
-        {% endif %}
+    {% if 'event.items:write' in request.eventpermset %}
+        <p>
+            <a href="{% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new data field" %}
+            </a>
+        </p>
     {% endif %}
     <div class="table-responsive">
         <table class="table table-hover table-quotas">
             <thead>
             <tr>
-                <th>{% trans "Question" %}</th>
+                <th>{% trans "Internal name" %}</th>
                 <th>{% trans "Type" %}</th>
                 <th class="iconcol"></th>
                 <th class="iconcol"></th>
                 <th class="iconcol"></th>
-                <th>{% trans "Products" %}</th>
-                {% if 'event.items:write' in request.eventpermset %}
-                    <th class="action-col-2"></th>
-                {% endif %}
                 <th class="action-col-2"></th>
             </tr>
             </thead>
-            <tbody data-dnd-url="{% url "control:event.items.questions.reorder" organizer=request.event.organizer.slug event=request.event.slug %}?container_type=P">
-            {% for q in questions %}{% if q.container_type == "P" %}
-                <tr data-dnd-id="{{ q.id }}">
+            <tbody>
+            {% for q in questions %}
+                <tr>
                     <td>
                         <strong>
-                            {% if q.pk %}
-                                <a href="{% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}">
-                            {% endif %}
-                            {{ q.question }}
-                            {% if q.pk %}
-                                </a>
-                            {% endif %}
+                            <a href="{% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}">
+                                {{ q.question }}
+                            </a>
                         </strong><br>
                         <small class="text-muted">{{ q.identifier }}</small>
                     </td>
                     <td>
-                        {% if q.pk %}
-                            {{ q.get_type_display }}
-                        {% else %}
-                            {% trans "System question" %}
-                        {% endif %}
+                        {{ q.get_type_display }}
                     </td>
                     <td>
                         {% if q.required %}
@@ -84,122 +57,16 @@
                             <span class="fa fa-eye-slash text-muted" data-toggle="tooltip" title="{% trans "Hidden question" %}"></span>
                         {% endif %}
                     </td>
-                    <td>
-                        {% if q.pk %}
-                            <ul>
-                                {% for item in q.items.all %}
-                                    <li>
-                                        <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.id %}">{{ item }}</a>
-                                    </li>
-                                {% endfor %}
-                            </ul>
-                        {% else %}
-                            <small>{% trans "All personalized products" %}</small>
-                        {% endif %}
-                    </td>
-                    {% if 'event.items:write' in request.eventpermset %}
-                        <td class="dnd-container">
-                        </td>
-                    {% endif %}
                     <td class="text-right flip">
-                        {% if q.pk %}
-                            <a href="{% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm"><i class="fa fa-bar-chart"></i></a>
-                            {% if 'event.items:write' in request.eventpermset %}
-                                <a href="{% url "control:event.items.questions.edit" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
-                                <a href="{% url "control:event.items.questions.delete" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
-                            {% endif %}
-                        {% else %}
-                            {% if 'event.settings.general:write' in request.eventpermset %}
-                                <a href="{% url "control:event.settings" organizer=request.event.organizer.slug event=request.event.slug %}#tab-0-2-open"
-                                        class="btn btn-default btn-sm"><i class="fa fa-wrench"></i></a>
-                            {% endif %}
+                        <a href="{% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm"><i class="fa fa-bar-chart"></i></a>
+                        {% if 'event.items:write' in request.eventpermset %}
+                            <a href="{% url "control:event.items.questions.edit" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
+                            <a href="{% url "control:event.items.questions.delete" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
                         {% endif %}
                     </td>
                 </tr>
-            {% endif %}{% endfor %}
+            {% endfor %}
             </tbody>
         </table>
     </div>
-
-    {% if request.event.settings.feature_flag_order_level_questions %}
-        <h2>
-            {% trans "Per-order questions" %}
-            <small><span class="label label-info" title="
-                {% trans "This functionality is in active development and expected to change significantly over the coming months." %}
-                {% trans "Per-order questions are currently not supported and will not be displayed in pretixPOS." %}
-            " data-toggle="tooltip">
-                <span class="fa fa-flask" aria-hidden="true"></span>
-                {% trans "Experimental feature" %}
-            </span></small>
-        </h2>
-        <p>{% trans "These questions are asked once per order." %}</p>
-        <div class="table-responsive">
-            <table class="table table-hover table-quotas">
-                <thead>
-                <tr>
-                    <th>{% trans "Question" %}</th>
-                    <th>{% trans "Type" %}</th>
-                    <th class="iconcol"></th>
-                    <th class="iconcol"></th>
-                    <th class="iconcol"></th>
-                    {% if 'event.items:write' in request.eventpermset %}
-                        <th class="action-col-2"></th>
-                    {% endif %}
-                    <th class="action-col-2"></th>
-                </tr>
-                </thead>
-                <tbody data-dnd-url="{% url "control:event.items.questions.reorder" organizer=request.event.organizer.slug event=request.event.slug %}?container_type=O">
-                {% for q in questions %}{% if q.container_type == "O" %}
-                    <tr data-dnd-id="{{ q.id }}">
-                        <td>
-                            <strong>
-                                {{ q.question }}
-                            </strong><br>
-                            <small class="text-muted">{{ q.identifier }}</small>
-                        </td>
-                        <td>
-                            {% if q.pk %}
-                                {{ q.get_type_display }}
-                            {% else %}
-                                {% trans "System question" %}
-                            {% endif %}
-                        </td>
-                        <td>
-                            {% if q.required %}
-                                <span class="fa fa-exclamation-circle text-muted" data-toggle="tooltip" title="{% trans "Required question" %}"></span>
-                            {% endif %}
-                        </td>
-                        <td>
-                            {% if q.pk and q.ask_during_checkin %}
-                                <span class="fa fa-check-square text-muted" data-toggle="tooltip" title="{% trans "Ask during check-in" %}"></span>
-                            {% endif %}
-                        </td>
-                        <td>
-                            {% if q.pk and q.hidden %}
-                                <span class="fa fa-eye-slash text-muted" data-toggle="tooltip" title="{% trans "Hidden question" %}"></span>
-                            {% endif %}
-                        </td>
-                        {% if 'event.items:write' in request.eventpermset %}
-                            <td class="dnd-container">
-                            </td>
-                        {% endif %}
-                        <td class="text-right flip">
-                            {% if q.pk %}
-                                {% if 'event.items:write' in request.eventpermset %}
-                                    <a href="{% url "control:event.items.questions.edit" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
-                                    <a href="{% url "control:event.items.questions.delete" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
-                                {% endif %}
-                            {% else %}
-                                {% if 'event.settings.general:write' in request.eventpermset %}
-                                    <a href="{% url "control:event.settings" organizer=request.event.organizer.slug event=request.event.slug %}#tab-0-2-open"
-                                            class="btn btn-default btn-sm"><i class="fa fa-wrench"></i></a>
-                                {% endif %}
-                            {% endif %}
-                        </td>
-                    </tr>
-                {% endif %}{% endfor %}
-                </tbody>
-            </table>
-        </div>
-    {% endif %}
 {% endblock %}

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

@@ -35,18 +35,6 @@
                     </div>
                 </details>
             {% endif %}
-            {% if order_questions_form.fields %}
-                <details class="panel panel-default" open>
-                    <summary class="panel-heading">
-                        <h4 class="panel-title">
-                            <strong>{% trans "Additional order information" %}</strong>
-                        </h4>
-                    </summary>
-                    <div class="panel-body">
-                        {% bootstrap_form order_questions_form layout="horizontal" %}
-                    </div>
-                </details>
-            {% endif %}
             {% for pos, forms in formgroups %}
                 <details class="panel panel-default" open>
                     <summary class="panel-heading">

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

@@ -1,28 +0,0 @@
-{% load safelink %}
-{% load i18n %}
-{% load rich_text %}
-{% if answer %}
-    {% if answer.file %}
-        <span class="fa fa-file"></span>
-        <a href="{{ answer.backend_file_url }}?token={% answer_token request answer %}">
-            {{ answer.file_name }}
-        </a>
-        <span class="label label-danger" data-toggle="tooltip"
-                title="{% trans "This file has been uploaded by a user and could contain viruses or other malicious content." %}">
-            {% trans "UNSAFE" %}
-        </span>
-        {% if answer.is_image %}
-            <br>
-            <a href="{{ answer.backend_file_url }}?token={% answer_token request answer %}" data-lightbox="order"
-                class="answer-thumb">
-                <img src="{{ answer.backend_file_url }}?token={% answer_token request answer %}">
-            </a>
-        {% endif %}
-    {% elif question.type == "M" %}
-        {{ answer.to_string_i18n|rich_text_snippet }}
-    {% else %}
-        {{ answer.to_string_i18n|linebreaksbr }}
-    {% endif %}
-{% else %}
-    <em>{% trans "not answered" %}</em>
-{% endif %}

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

@@ -427,14 +427,6 @@
                                 </form>
                             </dd>
                         {% endif %}
-
-                        {% if order.answers.all %}
-                            <hr>
-                        {% endif %}
-                        {% for ans in order.answers.all %}
-                            <dt>{{ ans.question.internal_name|default:ans.question.question }}</dt>
-                            <dd>{% include "pretixcontrol/order/fragment_question_answer.html" with request=request question=ans.question answer=ans %}</dd>
-                        {% endfor %}
                     </dl>
                 </div>
             </div>
@@ -610,60 +602,9 @@
                                 {% endif %}
                                 {% if line.has_questions %}
                                     <dl>
-                                        {% if line.item.ask_attendee_data and event.settings.attendee_names_asked %}
-                                            <dt>{% trans "Attendee name" %}</dt>
-                                            <dd>{% if line.attendee_name %}{{ line.attendee_name_all_components }}{% else %}
-                                                <em>{% trans "not answered" %}</em>{% endif %}</dd>
-                                        {% endif %}
-                                        {% if line.item.ask_attendee_data and event.settings.attendee_emails_asked %}
-                                            <dt>{% trans "Attendee email" %}</dt>
-                                            <dd>
-                                                {% if line.attendee_email %}
-                                                    {{ line.attendee_email }}
-                                                    {% if not line.addon_to %}
-                                                        <form class="form-inline helper-display-inline" method="post"
-                                                              action="{% url "control:event.order.resendlink" event=request.event.slug organizer=request.event.organizer.slug code=order.code position=line.pk %}">
-                                                            {% csrf_token %}
-                                                            <a href="{% url "control:event.order.position.sendmail" event=request.event.slug organizer=request.event.organizer.slug code=order.code position=line.pk %}"
-                                                               class="btn btn-default btn-xs">
-                                                                <span class="fa fa-envelope-o"></span>
-                                                            </a>
-                                                            <button class="btn btn-default btn-xs">
-                                                                {% trans "Resend link" %}
-                                                            </button>
-                                                        </form>
-                                                    {% endif %}
-                                                {% else %}
-                                                    <em>{% trans "not answered" %}</em>
-                                                {% endif %}
-                                            </dd>
-                                        {% endif %}
-                                        {% if line.item.ask_attendee_data and event.settings.attendee_company_asked %}
-                                            <dt>
-                                                {% trans "Attendee company" %}
-                                            </dt>
-                                            <dd>
-                                                {% if line.company %}{{ line.company }}{% else %}<em>{% trans "not answered" %}</em>{% endif %}
-                                            </dd>
-                                        {% endif %}
-                                        {% if line.item.ask_attendee_data and event.settings.attendee_addresses_asked %}
-                                            <dt>
-                                                {% trans "Attendee address" %}
-                                            </dt>
-                                            <dd>
-                                                {% if line.street or line.zipcode or line.city or line.country %}
-                                                    {{ line.street|default_if_none:""|linebreaksbr }}<br>
-                                                    {{ line.zipcode|default_if_none:"" }} {{ line.city|default_if_none:"" }}<br>
-                                                    {% if line.state %}{{ line.state_for_address }}<br>{% endif %}
-                                                    {{ line.country.name|default_if_none:"" }}
-                                                {% else %}
-                                                    <em>{% trans "not answered" %}</em>
-                                                {% endif %}
-                                            </dd>
-                                        {% endif %}
                                         {% for q in line.questions %}
                                             <dt>
-                                                {{ q.question }}
+                                                {{ q.label }}
                                                 {% if q.ask_during_checkin %}
                                                     <span class="fa fa-qrcode text-muted"
                                                             data-toggle="tooltip"
@@ -672,7 +613,46 @@
                                                 {% endif %}
                                             </dt>
                                             <dd>
-                                                {% include "pretixcontrol/order/fragment_question_answer.html" with request=request question=q answer=q.answer %}
+                                                {% if q.answer %}
+                                                    {% if q.answer.file %}
+                                                        <span class="fa fa-file"></span>
+                                                        <a href="{{ q.answer.backend_file_url }}?token={% answer_token request q.answer %}">
+                                                            {{ q.answer.file_name }}
+                                                        </a>
+                                                        <span class="label label-danger" data-toggle="tooltip"
+                                                                title="{% trans "This file has been uploaded by a user and could contain viruses or other malicious content." %}">
+                                                            {% trans "UNSAFE" %}
+                                                        </span>
+                                                        {% if q.answer.is_image %}
+                                                            <br>
+                                                            <a href="{{ q.answer.backend_file_url }}?token={% answer_token request q.answer %}" data-lightbox="order"
+                                                                class="answer-thumb">
+                                                                <img src="{{ q.answer.backend_file_url }}?token={% answer_token request q.answer %}">
+                                                            </a>
+                                                        {% endif %}
+                                                    {% elif q.type == "M" %}
+                                                        {{ q.answer.to_string_i18n|rich_text_snippet }}
+                                                    {% elif q.type %}
+                                                        {{ q.answer.to_string_i18n|linebreaksbr }}
+                                                    {% else %}{#  TODO: proper separation of QuestionAnswer objects and system answers......   #}
+                                                        {{ q.answer|linebreaksbr }}
+                                                    {% endif %}
+                                                {% else %}
+                                                    <em>{% trans "not answered" %}</em>
+                                                {% endif %}
+                                                {% if q.system_question == "attendee_email" and not line.addon_to %}
+                                                    <form class="form-inline helper-display-inline" method="post"
+                                                          action="{% url "control:event.order.resendlink" event=request.event.slug organizer=request.event.organizer.slug code=order.code position=line.pk %}">
+                                                        {% csrf_token %}
+                                                        <a href="{% url "control:event.order.position.sendmail" event=request.event.slug organizer=request.event.organizer.slug code=order.code position=line.pk %}"
+                                                           class="btn btn-default btn-xs">
+                                                            <span class="fa fa-envelope-o"></span>
+                                                        </a>
+                                                        <button class="btn btn-default btn-xs">
+                                                            {% trans "Resend link" %}
+                                                        </button>
+                                                    </form>
+                                                {% endif %}
                                             </dd>
                                         {% endfor %}
                                         {% for q in line.additional_fields %}

src/pretix/control/urls.py

@@ -350,6 +350,7 @@ urlpatterns = [
         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'^questionnaires/$', item.QuestionnairesEditor.as_view(), name='event.items.questionnaires'),
         re_path(r'^quotas/$', item.QuotaList.as_view(), name='event.items.quotas'),
         re_path(r'^quotas/bulk_action$', item.QuotaBulkAction.as_view(), name='event.items.quotas.bulkaction'),
         re_path(r'^quotas/bulk_edit$', item.QuotaBulkUpdateView.as_view(), name='event.items.quotas.bulkedit'),

src/pretix/control/views/item.py

@@ -56,7 +56,7 @@ from django.utils.functional import cached_property
 from django.utils.timezone import now
 from django.utils.translation import gettext, gettext_lazy as _
 from django.views.decorators.http import require_http_methods
-from django.views.generic import FormView, ListView, View
+from django.views.generic import FormView, ListView, TemplateView, View
 from django.views.generic.detail import DetailView, SingleObjectMixin
 from django_countries.fields import Country
 
@@ -65,7 +65,6 @@ from pretix.api.serializers.item import (
     ItemVariationSerializer,
 )
 from pretix.base.forms import I18nFormSet
-from pretix.base.forms.questions import get_fake_attendee_questions
 from pretix.base.models import (
     CartPosition, Item, ItemCategory, ItemProgramTime, ItemVariation, LogEntry,
     OrderPosition, Question, QuestionAnswer, QuestionOption, Quota,
@@ -427,7 +426,7 @@ def reorder_categories(request, organizer, event):
 
 
 FakeQuestion = namedtuple(
-    'FakeQuestion', 'id question position required container_type'
+    'FakeQuestion', 'id question position required'
 )
 
 
@@ -441,10 +440,7 @@ class QuestionList(ListView):
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
-
-        questions = get_fake_attendee_questions(self.request.event.settings)
-
-        questions += list(ctx['questions'])
+        questions = list(ctx['questions'])
         questions.sort(key=lambda q: q.position)
         ctx['questions'] = questions
         return ctx
@@ -459,16 +455,14 @@ def reorder_questions(request, organizer, event):
     except (JSONDecodeError, KeyError, ValueError):
         return HttpResponseBadRequest("expected JSON: {ids:[]}")
 
-    qs = request.event.questions.filter(container_type=request.GET['container_type'])
-
     # filter system_questions - normal questions are int/digit, system_questions strings
     custom_question_ids = [i for i in ids if i.isdigit()]
-    input_questions = list(qs.filter(id__in=custom_question_ids))
+    input_questions = list(request.event.questions.filter(id__in=custom_question_ids))
 
     if len(input_questions) != len(custom_question_ids):
         raise Http404(_("Some of the provided object ids are invalid."))
 
-    if len(input_questions) != qs.count():
+    if len(input_questions) != request.event.questions.count():
         raise Http404(_("Not all objects have been selected."))
 
     for q in input_questions:
@@ -482,19 +476,18 @@ def reorder_questions(request, organizer, event):
                 }
             )
 
-    if request.GET['container_type'] == Question.ContainerType.ORDERPOSITION:
-        system_question_order = {}
-        for s in ('attendee_name_parts', 'attendee_email', 'company', 'street', 'zipcode', 'city', 'country'):
-            if s in ids:
-                system_question_order[s] = ids.index(s)
-            else:
-                system_question_order[s] = -1
-        request.event.settings.system_question_order = system_question_order
-        request.event.log_action(
-            'pretix.event.settings', user=request.user, data={
-                'system_question_order': system_question_order,
-            }
-        )
+    system_question_order = {}
+    for s in ('attendee_name_parts', 'attendee_email', 'company', 'street', 'zipcode', 'city', 'country'):
+        if s in ids:
+            system_question_order[s] = ids.index(s)
+        else:
+            system_question_order[s] = -1
+    request.event.settings.system_question_order = system_question_order
+    request.event.log_action(
+        'pretix.event.settings', user=request.user, data={
+            'system_question_order': system_question_order,
+        }
+    )
 
     return HttpResponse()
 
@@ -732,9 +725,6 @@ class QuestionCreate(EventPermissionRequiredMixin, QuestionMixin, CreateView):
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
         kwargs['instance'] = Question(event=self.request.event)
-        kwargs['instance'].container_type = self.request.GET.get('container_type', Question.ContainerType.ORDERPOSITION)
-        if kwargs['instance'].container_type not in Question.ContainerType.values:
-            raise PermissionDenied
         return kwargs
 
     def get_success_url(self) -> str:
@@ -766,6 +756,11 @@ class QuestionCreate(EventPermissionRequiredMixin, QuestionMixin, CreateView):
         return ret
 
 
+class QuestionnairesEditor(EventPermissionRequiredMixin, TemplateView):
+    permission = 'can_change_items'
+    template_name = 'pretixcontrol/items/questionnaires.html'
+
+
 class QuotaQueryMixin:
 
     @cached_property
@@ -791,7 +786,7 @@ class QuotaQueryMixin:
         return QuotaFilterForm(data=self.request_data, prefix='filter', event=self.request.event)
 
 
-class QuotaList(PaginationMixin, QuotaQueryMixin, ListView):
+class QuotaList(PaginationMixin, ListView):
     model = Quota
     context_object_name = 'quotas'
     template_name = 'pretixcontrol/items/quotas.html'

src/pretix/control/views/orders.py

@@ -2226,10 +2226,6 @@ class OrderModifyInformation(OrderQuestionsViewMixin, OrderView):
     only_user_visible = False
     all_optional = True
 
-    @property
-    def order_question_container(self):
-        return self.order
-
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
         ctx['other_form'] = self.other_form
@@ -2591,11 +2587,7 @@ class AnswerDownload(EventPermissionRequiredMixin, OrderViewMixin, ListView):
         answid = kwargs.get('answer')
         token = request.GET.get('token', '')
 
-        answer = get_object_or_404(
-            QuestionAnswer,
-            Q(orderposition__order=self.order) | Q(order=self.order),
-            id=answid
-        )
+        answer = get_object_or_404(QuestionAnswer, orderposition__order=self.order, id=answid)
         if not answer.file:
             raise Http404()
         if not check_token(request, answer, token):
@@ -2605,7 +2597,7 @@ class AnswerDownload(EventPermissionRequiredMixin, OrderViewMixin, ListView):
         resp = FileResponse(answer.file, content_type=ftype or 'application/binary')
         resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}-{}"'.format(
             self.request.event.slug.upper(), self.order.code,
-            answer.orderposition.positionid if answer.orderposition else '',
+            answer.orderposition.positionid,
             os.path.basename(answer.file.name).split('.', 1)[1]
         )
         return resp

src/pretix/control/views/subevents.py

@@ -431,7 +431,7 @@ class SubEventEditorMixin(MetaDataEditorMixin):
         days = (self.copy_from.date_from.astimezone(tz).date() - value.astimezone(tz).date()).days
         return RelativeDateWrapper(RelativeDate(
             days=abs(days),
-            base_date_name='event__date_from',
+            base_date_name='date_from',
             time=value.astimezone(tz).time(),
             minutes=None,
             is_after=days < 0,

src/pretix/helpers/safedownload.py

@@ -24,21 +24,17 @@ import hashlib
 from django.core.signing import BadSignature, TimestampSigner
 
 
-class SafeDownloadSigner(TimestampSigner):
-    pass
-
-
 def get_token(request, answer):
     if not request.session.session_key:
         request.session.create()
     payload = '{}:{}'.format(request.session.session_key, answer.pk)
-    signer = SafeDownloadSigner()
+    signer = TimestampSigner()
     return signer.sign(hashlib.sha1(payload.encode()).hexdigest())
 
 
 def check_token(request, answer, token):
     payload = hashlib.sha1('{}:{}'.format(request.session.session_key, answer.pk).encode()).hexdigest()
-    signer = SafeDownloadSigner()
+    signer = TimestampSigner()
     try:
         return payload == signer.unsign(token, max_age=3600 * 24)
     except BadSignature:

src/pretix/plugins/paypal2/payment.py

@@ -23,7 +23,7 @@ import json
 import logging
 import urllib.parse
 from collections import OrderedDict
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 from decimal import Decimal
 
 from django import forms
@@ -193,31 +193,6 @@ class PaypalSettingsHolder(BasePaymentProvider):
                      }
                  )
              )),
-            ('allow_retries_during_compliance_hold',
-             forms.BooleanField(
-                 label=_('Allow further payments during compliance hold'),
-                 help_text=_(
-                     'PayPals fraud prevention might block processing of individual payments for a considerable amount '
-                     'of time. The payment is marked as "pending" during this time window. You can allow your customers to '
-                     'start another payment attempts during that window. This might result in them being charged twice if the'
-                     'original payment is approved.'
-                 ),
-                 required=False
-             )),
-            ('timeout_payment_during_compliance_hold',
-             forms.IntegerField(
-                 label=_('Timeout further payment attempts'),
-                 help_text=_(
-                     'Time duration in minutes after which another payment attempt is possible, while the last payment is '
-                     'still under investigation.'
-                 ),
-                 required=False,
-                 widget=forms.NumberInput(
-                     attrs={
-                         'data-checkbox-dependency': '#id_payment_paypal_allow_retries_during_compliance_hold',
-                     }
-                 )
-             )),
 
         ]
 
@@ -540,16 +515,8 @@ class PaypalMethod(BasePaymentProvider):
             'XPF': 0,
         }))
 
-    def _payment_abort_pending_allowed(self, payment) -> bool:
-        if not self.settings.get('allow_retries_during_compliance_hold', as_type=bool, default=True):
-            return False
-
-        if payment.info_data.get('create_time', False):
-            create_time = datetime.fromisoformat(payment.info_data['create_time'])
-            duration = self.settings.get('timeout_payment_during_compliance_hold', as_type=int, default=10)
-            if datetime.now(tz=timezone.utc) - create_time > timedelta(minutes=duration):
-                return True
-
+    @property
+    def abort_pending_allowed(self):
         return False
 
     def _create_paypal_order(self, request, payment=None, cart_total=None):
@@ -711,8 +678,6 @@ class PaypalMethod(BasePaymentProvider):
             else:
                 pp_captured_order = response.result
                 payment.info = json.dumps(pp_captured_order.dict())
-                if pp_captured_order.status == 'APPROVED':
-                    payment.state = OrderPayment.PAYMENT_STATE_PENDING
                 payment.save()
 
             try:
@@ -892,20 +857,14 @@ class PaypalMethod(BasePaymentProvider):
             logger.info('{}: {} - paypal payment processing time'.format(str(payment.global_id), str(duration)))
 
     def payment_pending_render(self, request, payment) -> str:
-        stuck_in_compliance = False
-        retry = self._payment_abort_pending_allowed(payment)
+        retry = True
         try:
-            for purchase_unit in payment.info_data['purchase_units']:
-                for capture in purchase_unit['payments']['captures']:
-                    if capture['status'] == "PENDING":
-                        stuck_in_compliance = True
-        except KeyError:
-            pass
-
-        try:
-            if payment.info_data.get('status') == "APPROVED":
-                stuck_in_compliance = True
-        except (KeyError):
+            if (
+                    payment.info
+                    and payment.info_data['purchase_units'][0]['payments']['captures'][0]['status'] == 'PENDING'
+            ):
+                retry = False
+        except (KeyError, IndexError):
             pass
 
         error = payment.info_data.get("error", {})
@@ -913,8 +872,7 @@ class PaypalMethod(BasePaymentProvider):
 
         template = get_template('pretixplugins/paypal2/pending.html')
         ctx = {'request': request, 'event': self.event, 'settings': self.settings,
-               'stuck_in_compliance': stuck_in_compliance, 'retry': retry, 'order': payment.order,
-               'is_known_issue': is_known_issue}
+               'retry': retry, 'order': payment.order, 'is_known_issue': is_known_issue}
         return template.render(ctx)
 
     def matching_id(self, payment: OrderPayment):

src/pretix/plugins/paypal2/signals.py

@@ -166,8 +166,6 @@ def signal_process_response(sender, request: HttpRequest, response: HttpResponse
 
 settings_hierarkey.add_default('payment_paypal_debug_buyer_country', '', str)
 settings_hierarkey.add_default('payment_paypal_method_wallet', True, bool)
-settings_hierarkey.add_default('payment_paypal_allow_retries_during_compliance_hold', True, bool)
-settings_hierarkey.add_default('payment_paypal_timeout_payment_during_compliance_hold', 10, int)
 
 
 def _nonce(request):

src/pretix/plugins/paypal2/templates/pretixplugins/paypal2/pending.html

@@ -6,12 +6,9 @@
             Your payment has failed due to a known issue within PayPal. Please try again, there is a high chance of the
             payment succeeding on a second or third attempt. You can also try other payment methods, if available.
         {% endblocktrans %}</div>
-{% elif stuck_in_compliance %}
+    {% else %}
         <p>{% blocktrans trimmed %}
-            Your payment is being processed by PayPal. This takes longer than usual. You can wait until PayPal
-            acknowledges the payment or you can try paying again with this or another payment method.
-            This might result in you being charged twice in case PayPal allows your initial payment attempt.
-            Please contact us to resolve this case.
+            Our attempt to execute your payment via PayPal has failed. Please try again or contact us.
         {% endblocktrans %}</p>
     {% endif %}
 {% else %}

src/pretix/plugins/paypal2/views.py

@@ -471,8 +471,8 @@ def webhook(request, *args, **kwargs):
     elif payment.state in (OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED,
                            OrderPayment.PAYMENT_STATE_CANCELED, OrderPayment.PAYMENT_STATE_FAILED):
         if sale['status'] == 'COMPLETED':
+            any_captures = False
             all_captures_completed = True
-            any_pending_review = False
             for purchaseunit in sale['purchase_units']:
                 for capture in purchaseunit['payments']['captures']:
                     try:
@@ -483,9 +483,9 @@ def webhook(request, *args, **kwargs):
 
                     if capture['status'] not in ('COMPLETED', 'REFUNDED', 'PARTIALLY_REFUNDED'):
                         all_captures_completed = False
-                        if capture['status_details']['reason'] == "PENDING_REVIEW":
-                            any_pending_review = True
-            if all_captures_completed:
+                    else:
+                        any_captures = True
+            if any_captures and all_captures_completed:
                 try:
                     payment.info = json.dumps(sale.dict())
                     payment.save(update_fields=['info'])
@@ -493,9 +493,6 @@ def webhook(request, *args, **kwargs):
                     prov.log_payment_duration(payment)
                 except Quota.QuotaExceededException:
                     pass
-            if any_pending_review and payment.state != OrderPayment.PAYMENT_STATE_PENDING:
-                payment.state = OrderPayment.PAYMENT_STATE_PENDING
-                payment.save(update_fields=['state'])
         elif sale['status'] == 'APPROVED':
             try:
                 request.session['payment_paypal_oid'] = payment.info_data['id']

src/pretix/plugins/sendmail/forms.py

@@ -384,8 +384,8 @@ class RuleForm(FormPlaceholderMixin, I18nModelForm):
             ]
         )
 
-        self._set_field_placeholders('subject', ['event', 'order', 'event_or_subevent', 'position_or_address'])
-        self._set_field_placeholders('template', ['event', 'order', 'event_or_subevent', 'position_or_address'], rich=True)
+        self._set_field_placeholders('subject', ['event', 'order', 'event_or_subevent'])
+        self._set_field_placeholders('template', ['event', 'order', 'event_or_subevent'], rich=True)
 
         choices = [
             (Order.STATUS_PAID, _('Paid (or canceled with paid fee)')),

src/pretix/plugins/sendmail/views.py

@@ -657,7 +657,7 @@ class UpdateRule(EventPermissionRequiredMixin, UpdateView):
 
         for lang in self.request.event.settings.locales:
             with language(lang, self.request.event.settings.region):
-                placeholders = get_sample_context(self.request.event, ['event', 'order', 'event_or_subevent', 'position_or_address'])
+                placeholders = get_sample_context(self.request.event, ['event', 'order', 'position_or_address'])
                 subject = bleach.clean(self.object.subject.localize(lang), tags=set())
                 preview_subject = prefix_subject(self.request.event, format_map(subject, placeholders), highlight=True)
                 template = self.object.template.localize(lang)

src/pretix/presale/checkoutflow.py

@@ -95,7 +95,7 @@ from pretix.presale.signals import (
     question_form_fields_overrides,
 )
 from pretix.presale.utils import customer_login
-from pretix.presale.views import CartMixin, get_cart, get_cart_is_free
+from pretix.presale.views import CartMixin, get_cart_positions, get_cart_is_free
 from pretix.presale.views.cart import (
     _items_from_post_data, cart_session, create_empty_cart_id,
     get_or_create_cart_id,
@@ -494,7 +494,7 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
         self.request = request
 
         # check whether addons are applicable
-        if get_cart(request).filter(item__addons__isnull=False).exists():
+        if get_cart_positions(request).filter(item__addons__isnull=False).exists():
             return True
 
         # don't re-check whether cross-selling is applicable if we're already past the AddOnsStep
@@ -1061,26 +1061,18 @@ class QuestionsStep(CartQuestionsViewMixin, CartMixin, TemplateFlowStep):
                 return False
 
         for cp in self._positions_for_questions:
-            answ = {
-                aw.question_id: aw for aw in cp.answerlist
-            }
-            question_cache = {
-                q.pk: q for q in cp.item.questions_to_ask
+            qc_cache = {
+                qc.pk: qc for qq in cp.item.relevant_questionnaires for qc in qq.childlist
             }
 
             def question_is_visible(parentid, qvals):
-                if parentid not in question_cache:
+                if parentid not in qc_cache:
                     return False
-                parentq = question_cache[parentid]
-                if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
+                parentqc = qc_cache[parentid]
+                if parentqc.dependency_question_id and not question_is_visible(parentqc.dependency_question_id, parentqc.dependency_values):
                     return False
-                if parentid not in answ:
-                    return False
-                return (
-                    ('True' in qvals and answ[parentid].answer == 'True')
-                    or ('False' in qvals and answ[parentid].answer == 'False')
-                    or (any(qval in [o.identifier for o in answ[parentid].options.all()] for qval in qvals))
-                )
+                answer_values = cp.get_dependency_answer_values(parentqc)
+                return any(qval in answer_values for qval in qvals)
 
             def question_is_required(q):
                 return (
@@ -1089,31 +1081,16 @@ class QuestionsStep(CartQuestionsViewMixin, CartMixin, TemplateFlowStep):
                 )
 
             if not self.all_optional:
-                for q in cp.item.questions_to_ask:
-                    if question_is_required(q) and q.id not in answ:
-                        if warn:
-                            messages.warning(request, _('Please fill in answers to all required questions.'))
-                        return False
-                if cp.item.ask_attendee_data and self.request.event.settings.get('attendee_names_required', as_type=bool) \
-                        and not cp.attendee_name_parts:
-                    if warn:
-                        messages.warning(request, _('Please fill in answers to all required questions.'))
-                    return False
-                if cp.item.ask_attendee_data and self.request.event.settings.get('attendee_emails_required', as_type=bool) \
-                        and cp.attendee_email is None:
-                    if warn:
-                        messages.warning(request, _('Please fill in answers to all required questions.'))
-                    return False
-                if cp.item.ask_attendee_data and self.request.event.settings.get('attendee_company_required', as_type=bool) \
-                        and cp.company is None:
-                    if warn:
-                        messages.warning(request, _('Please fill in answers to all required questions.'))
-                    return False
-                if cp.item.ask_attendee_data and self.request.event.settings.get('attendee_addresses_required', as_type=bool) \
-                        and (cp.street is None and cp.city is None and cp.country is None):
-                    if warn:
-                        messages.warning(request, _('Please fill in answers to all required questions.'))
-                    return False
+                for qq in cp.item.relevant_questionnaires:
+                    for qc in qq.childlist:
+                        if qc.user_question_id and question_is_required(qc) and qc.user_question_id not in cp.answer_cache:
+                            if warn:
+                                messages.warning(request, _('Please fill in answers to all required questions.'))
+                            return False
+                        if qc.system_question and question_is_required(qc) and not cp.get_system_answer(qc.system_question):
+                            if warn:
+                                messages.warning(request, _('Please fill in answers to all required questions.'))
+                            return False
 
             responses = question_form_fields.send(sender=self.request.event, position=cp)
             form_data = cp.meta_info_data.get('question_form_data', {})
@@ -1125,7 +1102,6 @@ class QuestionsStep(CartQuestionsViewMixin, CartMixin, TemplateFlowStep):
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
-        ctx['order_questions_form'] = self.order_questions_form
         ctx['formgroups'] = self.formdict.items()
         ctx['contact_form'] = self.contact_form
         ctx['invoice_form'] = self.invoice_form
@@ -1564,7 +1540,6 @@ class ConfirmStep(CartMixin, AsyncAction, TemplateFlowStep):
         ctx['addr'] = self.invoice_address
         ctx['confirm_messages'] = self.confirm_messages
         ctx['cart_session'] = self.cart_session
-        ctx['checkout_session'] = self.checkout_session
         ctx['invoice_address_asked'] = self.address_asked
         ctx['customer'] = self.cart_customer
 
@@ -1662,7 +1637,6 @@ class ConfirmStep(CartMixin, AsyncAction, TemplateFlowStep):
             customer=self.cart_session.get('customer'),
             override_now_dt=time_machine_now(default=None),
             api_meta=api_meta,
-            cart_id=get_or_create_cart_id(request),
         )
 
     def get_success_message(self, value):

src/pretix/presale/forms/checkout.py

@@ -41,8 +41,8 @@ from django.utils.translation import gettext_lazy as _
 from phonenumber_field.formfields import PhoneNumberField
 
 from pretix.base.forms.questions import (
-    BaseInvoiceAddressForm, TicketLevelQuestionsForm,
-    WrappedPhoneNumberPrefixWidget, guess_phone_prefix_from_request,
+    BaseInvoiceAddressForm, BaseQuestionsForm, WrappedPhoneNumberPrefixWidget,
+    guess_phone_prefix_from_request,
 )
 from pretix.base.templatetags.rich_text import rich_text
 from pretix.base.validators import EmailBanlistValidator
@@ -139,7 +139,7 @@ class InvoiceNameForm(InvoiceAddressForm):
                 del self.fields[f]
 
 
-class CustomerAwareQuestionsForm(TicketLevelQuestionsForm):
+class CustomerAwareQuestionsForm(BaseQuestionsForm):
     """
     The base class is responsible for asking order-related questions. This includes
     the attendee name for admission tickets, if the corresponding setting is enabled,

src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html

@@ -162,26 +162,6 @@
                         {% endfor %}
                     </div>
                 </div>
-                {% if checkout_session.answers.all %}
-                    <div class="panel panel-default panel-contact">
-                        <div class="panel-heading">
-                            <h3 class="panel-title">
-                                {% trans "Additional order information" %}
-                                <a href="{% eventurl request.event "presale:event.checkout" step="questions" cart_namespace=cart_namespace|default_if_none:"" %}" aria-label="{% trans "Modify contact information" %}" class="h6">
-                                    <span class="fa fa-edit" aria-hidden="true"></span>{% trans "Modify" %}
-                                </a>
-                            </h3>
-                        </div>
-                        <div class="panel-body">
-                            <dl class="dl-horizontal">
-                                {% for ans in checkout_session.answers.all %}
-                                    <dt>{{ ans.question.question }}</dt>
-                                    <dd>{% include "pretixpresale/event/fragment_question_answer.html" with request=request question=ans.question answer=ans %}</dd>
-                                {% endfor %}
-                            </dl>
-                        </div>
-                    </div>
-                {% endif %}
             </div>
         </div>
         {% if confirm_messages %}

src/pretix/presale/templates/pretixpresale/event/checkout_questions.html

@@ -68,11 +68,11 @@
                     </div>
                 </details>
             {% endif %}
-            {% if order_questions_form.fields %}
-                <details class="panel panel-default" open>
+            {% if order_questions_form %}
+                <details class="panel panel-default" open id="invoice-details">
                     <summary class="panel-heading">
                         <h3 class="panel-title">
-                            <strong>{% trans "Additional order information" %}</strong>
+                            <strong>{% trans "Additional order questions" %}</strong>
                         </h3>
                     </summary>
                     <div class="panel-body">

src/pretix/presale/templates/pretixpresale/event/fragment_cart.html

@@ -204,9 +204,29 @@
                             {% endif %}
                         {% endif %}
                         {% for q in line.questions %}
-                            <dt>{{ q.question }}</dt>
+                            <dt>{{ q.label }}</dt>
                             <dd>
-                                {% include "pretixpresale/event/fragment_question_answer.html" with request=request question=q answer=q.answer %}
+                                {% if q.answer %}
+                                    {% if q.answer.file %}
+                                        <span class="fa fa-file" aria-hidden="true"></span>
+                                        <a href="{{ q.answer.frontend_file_url }}?token={% answer_token request q.answer %}">
+                                            {{ q.answer.file_name }}
+                                        </a>
+                                        {% if q.answer.is_image %}
+                                            <br>
+                                            <a href="{{ q.answer.frontend_file_url }}?token={% answer_token request q.answer %}" data-lightbox="order"
+                                                    class="answer-thumb">
+                                                <img src="{{ q.answer.frontend_file_url }}?token={% answer_token request q.answer %}" alt="{% trans "The image you previously uploaded" %}">
+                                            </a>
+                                        {% endif %}
+                                    {% elif q.type == "M" %}
+                                        {{ q.answer|rich_text_snippet }}
+                                    {% else %}
+                                        {{ q.answer|linebreaksbr }}
+                                    {% endif %}
+                                {% else %}
+                                    <em class="text-muted">{% trans "not answered" %}</em>
+                                {% endif %}
                             </dd>
                         {% endfor %}
                         {% for q in line.additional_answers %}

src/pretix/presale/templates/pretixpresale/event/fragment_question_answer.html

@@ -1,24 +0,0 @@
-{% load safelink %}
-{% load i18n %}
-{% load rich_text %}
-{% if answer %}
-    {% if answer.file %}
-        <span class="fa fa-file" aria-hidden="true"></span>
-        <a href="{{ answer.frontend_file_url }}?token={% answer_token request answer %}">
-            {{ answer.file_name }}
-        </a>
-        {% if answer.is_image %}
-            <br>
-            <a href="{{ answer.frontend_file_url }}?token={% answer_token request answer %}" data-lightbox="order"
-                    class="answer-thumb">
-                <img src="{{ answer.frontend_file_url }}?token={% answer_token request answer %}" alt="{% trans "The image you previously uploaded" %}">
-            </a>
-        {% endif %}
-    {% elif question.type == "M" %}
-        {{ answer|rich_text_snippet }}
-    {% else %}
-        {{ answer|linebreaksbr }}
-    {% endif %}
-{% else %}
-    <em class="text-muted">{% trans "not answered" %}</em>
-{% endif %}

src/pretix/presale/templates/pretixpresale/event/order.html

@@ -346,16 +346,6 @@
                             {% endfor %}
                         {% endif %}
                     </dl>
-
-                    {% if order.answers.all %}
-                        <hr>
-                        <dl class="dl-horizontal">
-                            {% for ans in order.answers.all %}
-                                <dt>{{ ans.question.question }}</dt>
-                                <dd>{% include "pretixpresale/event/fragment_question_answer.html" with request=request question=ans.question answer=ans %}</dd>
-                            {% endfor %}
-                        </dl>
-                    {% endif %}
                 </div>
             </div>
         </div>

src/pretix/presale/templates/pretixpresale/event/order_modify.html

@@ -48,18 +48,6 @@
                     </div>
                 </details>
             {% endif %}
-            {% if order_questions_form.fields %}
-                <details class="panel panel-default" open>
-                    <summary class="panel-heading">
-                        <h3 class="panel-title">
-                            <strong>{% trans "Additional order information" %}</strong>
-                        </h3>
-                    </summary>
-                    <div class="panel-body">
-                        {% bootstrap_form order_questions_form layout="checkout" %}
-                    </div>
-                </details>
-            {% endif %}
             {% for pos, forms in formgroups %}
                 <details class="panel panel-default" open>
                     <summary class="panel-heading">

src/pretix/presale/views/__init__.py

@@ -41,7 +41,7 @@ from itertools import groupby
 
 from django.conf import settings
 from django.contrib import messages
-from django.db.models import Exists, OuterRef, Prefetch, Sum
+from django.db.models import Exists, OuterRef, Prefetch, Q, Sum
 from django.utils import translation
 from django.utils.functional import cached_property
 from django.utils.timezone import now
@@ -54,7 +54,7 @@ from pretix.base.models import (
     CartPosition, Customer, InvoiceAddress, ItemAddOn, OrderFee, Question,
     QuestionAnswer, QuestionOption, TaxRule,
 )
-from pretix.base.models.orders import CheckoutSession
+from pretix.base.models.items import QuestionnaireChild
 from pretix.base.services.cart import get_fees
 from pretix.base.services.pricing import apply_rounding
 from pretix.base.templatetags.money import money_filter
@@ -95,22 +95,13 @@ class CartMixin:
         """
         A list of this users cart position
         """
-        return list(get_cart(self.request))
+        return list(get_cart_positions(self.request))
 
     @cached_property
     def cart_session(self):
         from pretix.presale.views.cart import cart_session
         return cart_session(self.request)
 
-    @cached_property
-    def checkout_session(self):
-        from pretix.presale.views.cart import get_or_create_cart_id
-
-        return CheckoutSession.objects.filter(
-            event=self.request.event,
-            cart_id=get_or_create_cart_id(self.request, create=False),
-        ).first()
-
     @cached_property
     def cart_customer(self):
         if self.cart_session.get('customer_mode', 'guest') == 'login':
@@ -399,7 +390,7 @@ def cart_exists(request):
     return bool(request._cart_cache)
 
 
-def get_cart(request):
+def get_cart_positions(request):
     from pretix.presale.views.cart import get_or_create_cart_id
 
     if not hasattr(request, '_cart_cache'):
@@ -407,8 +398,11 @@ def get_cart(request):
         if not cart_id:
             request._cart_cache = CartPosition.objects.none()
         else:
-            qqs = request.event.questions.all()
-            qqs = qqs.filter(ask_during_checkin=False, hidden=False, container_type=Question.ContainerType.ORDERPOSITION)
+            qqs = request.event.questionnaires.all()
+            qqs = qqs.filter(
+                Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=request.sales_channel.identifier),
+                type='PS'
+            )
             request._cart_cache = CartPosition.objects.filter(
                 cart_id=cart_id, event=request.event
             ).annotate(
@@ -429,18 +423,23 @@ def get_cart(request):
                 Prefetch('answers',
                          QuestionAnswer.objects.prefetch_related('options'),
                          to_attr='answerlist'),
-                Prefetch('item__questions',
+                Prefetch('item__questionnaires',
                          qqs.prefetch_related(
-                             Prefetch('options', QuestionOption.objects.prefetch_related(Prefetch(
-                                 # This prefetch statement is utter bullshit, but it actually prevents Django from doing
-                                 # a lot of queries since ModelChoiceIterator stops trying to be clever once we have
-                                 # a prefetch lookup on this query...
-                                 'question',
-                                 Question.objects.none(),
-                                 to_attr='dummy'
-                             )))
-                         ).select_related('dependency_question'),
-                         to_attr='questions_to_ask')
+                             Prefetch('children', QuestionnaireChild.objects.prefetch_related(
+                                 Prefetch('user_question', Question.objects.prefetch_related(
+                                     Prefetch('options', QuestionOption.objects.prefetch_related(Prefetch(
+                                         # This prefetch statement is utter bullshit, but it actually prevents Django from doing
+                                         # a lot of queries since ModelChoiceIterator stops trying to be clever once we have
+                                         # a prefetch lookup on this query...
+                                         'question',
+                                         Question.objects.none(),
+                                         to_attr='dummy'
+                                     )))
+                                 ))
+                             ),
+                             to_attr='childlist')
+                         ),
+                         to_attr='relevant_questionnaires')
             )
             by_id = {cp.pk: cp for cp in request._cart_cache}
             for cp in request._cart_cache:
@@ -450,6 +449,8 @@ def get_cart(request):
                     cp.addon_to = by_id[cp.addon_to_id]
     return request._cart_cache
 
+get_cart = get_cart_positions  # legacy compatibility
+
 
 def get_cart_total(request):
     """
@@ -501,7 +502,7 @@ def get_cart_is_free(request):
 
     if not hasattr(request, '_cart_free_cache'):
         cs = cart_session(request)
-        pos = get_cart(request)
+        pos = get_cart_positions(request)
         ia = get_cart_invoice_address(request)
         try:
             fees = get_fees(event=request.event, request=request, invoice_address=ia,

src/pretix/presale/views/cart.py

@@ -67,7 +67,6 @@ from pretix.base.services.cart import (
 from pretix.base.timemachine import time_machine_now
 from pretix.base.views.tasks import AsyncAction
 from pretix.helpers.http import redirect_to_url
-from pretix.helpers.safedownload import check_token
 from pretix.multidomain.urlreverse import eventreverse
 from pretix.presale.productlist import (
     item_group_by_category, prepare_item_list_for_shop,
@@ -389,7 +388,6 @@ def get_or_create_cart_id(request, create=True):
             if 'carts' in request.session:
                 request.session['carts'][current_id] = {}
         else:
-            # We found a valid, existing cart.
             return current_id
 
     cart_data = {}
@@ -400,7 +398,6 @@ def get_or_create_cart_id(request, create=True):
             cart_data['widget_data'] = cached_widget_data
     else:
         if not create:
-            # There is no existing cart for this request and we're not supposed to create a new one.
             return None
         new_id = generate_cart_id(request, prefix=prefix)
 
@@ -849,19 +846,15 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, CartMixin, TemplateView
 class AnswerDownload(EventViewMixin, View):
     def get(self, request, *args, **kwargs):
         answid = kwargs.get('answer')
-        token = request.GET.get('token', '')
-        cart_id = get_or_create_cart_id(self.request)
         answer = get_object_or_404(
             QuestionAnswer,
-            Q(cartposition__cart_id=cart_id) | Q(checkoutsession__cart_id=cart_id),
+            cartposition__cart_id=get_or_create_cart_id(self.request),
             id=answid
         )
         if not answer.file:
             return Http404()
-        if not check_token(request, answer, token):
-            raise Http404(_("This link is no longer valid. Please go back, refresh the page, and try again."))
 
-        ftype, _1 = mimetypes.guess_type(answer.file.name)
+        ftype, _ = mimetypes.guess_type(answer.file.name)
         filename = '{}-cart-{}'.format(
             self.request.event.slug.upper(),
             os.path.basename(answer.file.name).split('.', 1)[1]
@@ -869,7 +862,6 @@ class AnswerDownload(EventViewMixin, View):
         resp = FileResponse(
             answer.file,
             filename=filename,
-            as_attachment=True,
             content_type=ftype or 'application/binary'
         )
         return resp

src/pretix/presale/views/order.py

@@ -90,9 +90,7 @@ from pretix.base.views.tasks import AsyncAction
 from pretix.helpers.http import redirect_to_url
 from pretix.helpers.safedownload import check_token
 from pretix.multidomain.urlreverse import eventreverse, eventreverse_absolute
-from pretix.presale.forms.checkout import (
-    CustomerAwareQuestionsForm, InvoiceAddressForm,
-)
+from pretix.presale.forms.checkout import InvoiceAddressForm, CustomerAwareQuestionsForm
 from pretix.presale.forms.order import OrderPositionChangeForm
 from pretix.presale.productlist import prepare_item_list_for_shop
 from pretix.presale.signals import question_form_fields_overrides
@@ -351,7 +349,7 @@ class OrderDetails(EventViewMixin, OrderDetailMixin, CartMixin, TicketPageMixin,
                 pp = lp.payment_provider
                 ctx['last_payment_info'] = pp.payment_pending_render(self.request, ctx['last_payment'])
 
-                if lp.state == OrderPayment.PAYMENT_STATE_PENDING and not pp._payment_abort_pending_allowed(lp):
+                if lp.state == OrderPayment.PAYMENT_STATE_PENDING and not pp.abort_pending_allowed:
                     ctx['can_pay'] = False
 
             ctx['can_pay'] = ctx['can_pay'] and self.order._can_be_paid() is True
@@ -613,8 +611,7 @@ class OrderPayChangeMethod(EventViewMixin, OrderDetailMixin, TemplateView):
 
         if self.open_payment:
             pp = self.open_payment.payment_provider
-            if self.open_payment.state == OrderPayment.PAYMENT_STATE_PENDING and not pp._payment_abort_pending_allowed(
-                    self.open_payment):
+            if self.open_payment.state == OrderPayment.PAYMENT_STATE_PENDING and not pp.abort_pending_allowed:
                 messages.error(request, _('A payment is currently pending for this order.'))
                 return redirect(self.get_order_url())
 
@@ -809,14 +806,10 @@ class OrderInvoiceCreate(EventViewMixin, OrderDetailMixin, View):
 
 @method_decorator(xframe_options_exempt, 'dispatch')
 class OrderModify(EventViewMixin, OrderDetailMixin, OrderQuestionsViewMixin, TemplateView):
-    orderposition_form_class = CustomerAwareQuestionsForm
+    form_class = CustomerAwareQuestionsForm
     invoice_form_class = InvoiceAddressForm
     template_name = "pretixpresale/event/order_modify.html"
 
-    @property
-    def order_question_container(self):
-        return self.order
-
     @cached_property
     def positions(self):
         if self.request.GET.get('generate_invoice') == 'true':
@@ -947,7 +940,7 @@ class OrderModify(EventViewMixin, OrderDetailMixin, OrderQuestionsViewMixin, Tem
 
 @method_decorator(xframe_options_exempt, 'dispatch')
 class OrderPositionModify(EventViewMixin, OrderPositionDetailMixin, OrderQuestionsViewMixin, TemplateView):
-    orderposition_form_class = CustomerAwareQuestionsForm
+    form_class = CustomerAwareQuestionsForm
     invoice_form_class = None
     template_name = "pretixpresale/event/position_modify.html"
 
@@ -955,10 +948,6 @@ class OrderPositionModify(EventViewMixin, OrderPositionDetailMixin, OrderQuestio
     def invoice_form(self):
         return None
 
-    @property
-    def order_question_container(self):
-        return None
-
     @cached_property
     def positions(self):
         return [p for p in super().positions if p.pk == self.position.pk or p.addon_to_id == self.position.pk]
@@ -1155,11 +1144,7 @@ class AnswerDownload(EventViewMixin, OrderDetailMixin, View):
         answid = kwargs.get('answer')
         token = request.GET.get('token', '')
 
-        answer = get_object_or_404(
-            QuestionAnswer,
-            Q(orderposition__order=self.order) | Q(order=self.order),
-            id=answid,
-        )
+        answer = get_object_or_404(QuestionAnswer, orderposition__order=self.order, id=answid)
         if not answer.file:
             raise Http404()
         if not check_token(request, answer, token):
@@ -1169,7 +1154,7 @@ class AnswerDownload(EventViewMixin, OrderDetailMixin, View):
         resp = FileResponse(answer.file, content_type=ftype or 'application/binary')
         resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}-{}"'.format(
             self.request.event.slug.upper(), self.order.code,
-            answer.orderposition.positionid if answer.orderposition else '',
+            answer.orderposition.positionid,
             os.path.basename(answer.file.name).split('.', 1)[1]
         )
         return resp
@@ -1733,7 +1718,7 @@ class OrderChangeMixin:
 
         if totaldiff > Decimal('0.00') and self.order.status == Order.STATUS_PENDING:
             for p in self.order.payments.filter(state=OrderPayment.PAYMENT_STATE_PENDING):
-                if not p.payment_provider._payment_abort_pending_allowed(p):
+                if not p.payment_provider.abort_pending_allowed:
                     raise OrderError(_('You may not change your order in a way that requires additional payment while '
                                        'we are processing your current payment. Please check back after your current '
                                        'payment has been accepted.'))

src/pretix/presale/views/questions.py

@@ -40,13 +40,9 @@ from pretix.presale.views import get_cart
 
 
 class CartQuestionsViewMixin(BaseQuestionsViewMixin):
-    orderposition_form_class = CustomerAwareQuestionsForm
+    form_class = CustomerAwareQuestionsForm
     only_user_visible = True
 
-    @property
-    def order_question_container(self):
-        return self.checkout_session
-
     @cached_property
     def _positions_for_questions(self):
         cart = get_cart(self.request)

src/pretix/static/pretixbase/js/reldate.js

@@ -1,42 +0,0 @@
-$(document).on('pretix:bind-forms', () => {
-	document.querySelectorAll('.reldatetime, .reldate').forEach(container => {
-		const groups = container.querySelectorAll('.radio')
-
-		groups.forEach(group => {
-			const referenceSelect = group.querySelector('select[data-relative-choice]')
-			const beforeAfterSelect = group.querySelector('select[data-relation-choice]')
-			if (!referenceSelect || !beforeAfterSelect) return
-
-			const beforeOption = beforeAfterSelect.querySelector('option[value="before"]')
-			const afterOption = beforeAfterSelect.querySelector('option[value="after"]')
-
-			const updateBeforeOption = () => {
-				let supportsBefore = referenceSelect.selectedOptions[0].hasAttribute('data-supports-before')
-				if (beforeOption) {
-					beforeOption.disabled = !beforeOption.disabled && !supportsBefore
-				}
-
-				let supportsAfter = referenceSelect.selectedOptions[0].hasAttribute('data-supports-after')
-				if (afterOption) {
-					afterOption.disabled = !afterOption.disabled && !supportsAfter
-				}
-
-				let dirty = false
-				if (beforeOption.disabled && beforeAfterSelect.value === 'before') {
-					beforeAfterSelect.value = 'after'
-					dirty = true
-				}
-				if (afterOption.disabled && beforeAfterSelect.value === 'after') {
-					beforeAfterSelect.value = 'before'
-					dirty = true
-				}
-
-				if (dirty) {
-					beforeAfterSelect.dispatchEvent(new Event('change', {bubbles: true}))
-				}
-			}
-			referenceSelect.addEventListener('change', updateBeforeOption)
-			updateBeforeOption()
-		})
-	})
-})

src/pretix/static/pretixcontrol/js/ui/question.js

@@ -131,8 +131,7 @@ $(function () {
         $val.parent().append("<div class=\"help-block loading-indicator\"><span class=\"fa" +
             " fa-cog fa-spin\"></span></div>");
 
-				// the container_type parameter is undocumented. this API is going to change in a later release.
-        apiGET('/api/v1/organizers/' + $("body").attr("data-organizer") + '/events/' + $("body").attr("data-event") + '/questions/' + val + '/?container_type=' + encodeURIComponent($dq.data('container-type')), function (data) {
+        apiGET('/api/v1/organizers/' + $("body").attr("data-organizer") + '/events/' + $("body").attr("data-event") + '/questions/' + val + '/', function (data) {
             if (data.type === "B") {
                 $val.append($("<option>").attr("value", "True").text(gettext("Yes")));
                 $val.append($("<option>").attr("value", "False").text(gettext("No")));

src/pretix/static/pretixcontrol/js/ui/questionnaires/App.vue

@@ -0,0 +1,146 @@
+<script lang="ts">
+import QuestionnaireElement from './QuestionnaireElement.vue';
+import * as api from './api';
+import { Questionnaire } from './model';
+import { i18n_any, QUESTION_TYPE, sort, localeComp, numericComp, groupBy, _ } from './helper';
+import {Ref, ref} from 'vue';
+import { SlickList, SlickItem } from 'vue-slicksort';
+
+const items_list = await api.getItems();
+const categories_list = await api.getCategories();
+const categories = Object.fromEntries(categories_list.map(cat => [cat.id, cat]));
+categories['null'] = { position: -1, internal_name: _('Uncategorized') };
+sort(items_list, numericComp(item => categories[item.category]?.position), numericComp(item => item.position));
+console.log("items_list", items_list);
+const grouped_items = [...groupBy(items_list, item => categories[item.category])];
+console.log("grouped_items", grouped_items);
+
+const all_questionnaires: (Omit<Questionnaire, 'id'> & { _new_id?: number, id?: number })[] = await api.getQuestionnaires();
+const order_questionnaires = ref(all_questionnaires.filter(q => q.type.startsWith('O')));
+const position_questionnaires = ref(all_questionnaires.filter(q => q.type.startsWith('P')));
+const datafields = ref(await api.getDatafields());
+
+function saveQuestionnaire(questionnaire) {
+	if (questionnaire.id) {
+		api.updateQuestionnaire(questionnaire.id, questionnaire);
+	} else {
+		api.createQuestionnaire(questionnaire);
+	}
+}
+
+export default {
+  components: {
+    QuestionnaireElement, SlickList, SlickItem,
+  },
+  methods: {
+    i18n_any,
+    addPositionQuestionnaire() {
+      position_questionnaires.value.push({
+	      all_sales_channels: false, children: [], limit_sales_channels: [], position: 0,
+				items: [], internal_name: "Unnamed questionnaire", type: "PS",
+				_new_id: Date.now(),
+			});
+    },
+    addOrderQuestionnaire() {
+      order_questionnaires.value.push({
+	      all_sales_channels: false, children: [], limit_sales_channels: [], position: 0,
+				items: [], internal_name: "Unnamed questionnaire", type: "OS",
+				_new_id: Date.now(),
+			});
+    },
+		saveData() {
+			for (const questionnaire of order_questionnaires.value) {
+				saveQuestionnaire(questionnaire);
+			}
+			for (const questionnaire of position_questionnaires.value) {
+				saveQuestionnaire(questionnaire);
+			}
+		},
+  },
+  data() {
+    return {
+    	order_questionnaires,
+      position_questionnaires,
+      datafields,
+      items: items_list,
+      selected_product: ref(""),
+      grouped_items,
+      categories,
+    }
+  }
+}
+</script>
+
+<style>
+.hidden-questionnaire { opacity: 0.3; }
+
+.questionnaires-list { margin-right: 180px; }
+.question-edit-buttons { float:right; }
+.question-edit-buttons div { position: absolute; margin-left: 10px; min-width: 100px; }
+.question-edit-buttons button {  }
+.form-group { margin-bottom: 30px }
+
+.questionnaires-editor.product-selected .panel .panel-heading {}
+
+.questionnaires-editor.product-selected .panel { margin-bottom: 0; border: 0 none; border-bottom: 1px solid #ddd; box-shadow: none; border-radius: 0; }
+.questionnaires-editor.product-selected .panel .panel-heading { font-style: italic; background: white; border: 0 none; }
+
+.filter-row { background: #f8e6ff; border: 1px solid #e3cbed; padding: 10px; }
+
+.debuginfo { font-size: 70%; background: rgba(200, 200, 200, 0.5); }
+.dependency-info { position: absolute;  }
+.dependency-info > span {  }
+
+.category-header { margin: 8px 0 -5px 0; font-weight: bold; color: #737373; }
+</style>
+<template>
+	<div class="questionnaires-editor">
+		<p class="filter-row">
+			Order questionnaires
+		</p>
+		<div class="questionnaires-list">
+			<SlickList axis="y" v-model:list="order_questionnaires" useDragHandle appendTo="#orderQuestionnaireListParent" id="orderQuestionnaireListParent">
+				<SlickItem v-for="(questionnaire, index) in order_questionnaires" :key="questionnaire.id || questionnaire._new_id" :index="index">
+					<QuestionnaireElement
+						:questionnaire="questionnaire"
+						:datafields="datafields"
+						:grouped_items="null"
+						:selected_product="null" />
+				</SlickItem>
+			</SlickList>
+		</div>
+		<p>
+			<button class="btn btn-default" @click="addOrderQuestionnaire()"><i class="fa fa-plus"></i> Neuen Fragebogen erstellen</button>
+			<button class="btn btn-default" @click="saveData()"><i class="fa fa-save"></i> Speichern</button>
+		</p>
+	</div>
+
+	<div :class="`questionnaires-editor ${selected_product ? 'product-selected':''}`">
+		<p class="filter-row">
+			Questionnaires for product:
+			<select v-model="selected_product">
+				<option value="">(all)</option>
+				<optgroup v-for="[category, items] in grouped_items" :label="category.internal_name || i18n_any(category.name)">
+					<option v-for="item in items" :value="item.id">
+						{{ item.internal_name || i18n_any(item.name) }}
+					</option>
+				</optgroup>
+			</select>
+		</p>
+		<div class="questionnaires-list">
+			<SlickList axis="y" v-model:list="position_questionnaires" useDragHandle appendTo="#questionnaireListParent" id="questionnaireListParent">
+				<SlickItem v-for="(questionnaire, index) in position_questionnaires" :key="questionnaire.id || questionnaire._new_id" :index="index">
+					<QuestionnaireElement
+						:questionnaire="questionnaire"
+						:datafields="datafields"
+						:grouped_items="grouped_items"
+						:selected_product="selected_product" />
+				</SlickItem>
+			</SlickList>
+		</div>
+		<p>
+			<button class="btn btn-default" @click="addPositionQuestionnaire()"><i class="fa fa-plus"></i> Neuen Fragebogen erstellen</button>
+			<button class="btn btn-default" @click="saveData()"><i class="fa fa-save"></i> Speichern</button>
+		</p>
+	</div>
+</template>

src/pretix/static/pretixcontrol/js/ui/questionnaires/I18nTextField.vue

@@ -0,0 +1,16 @@
+<script setup lang="ts">
+import { ref, useId, defineProps } from 'vue';
+import {getEventLocales} from "./api";
+
+const locales = getEventLocales();
+
+const props = defineProps(['value', 'id']);
+
+if (!props.value) props.value = {};
+</script>
+
+<template>
+<div class="i18n-form-group" :id="id">
+	<textarea v-for="locale in locales" cols="40" rows="2" :lang="locale" dir="ltr" class="form-control" title="Englisch" :id="`${id}_${locale}`" :placeholder="locale" v-model="value[locale]"></textarea>
+</div>
+</template>

src/pretix/static/pretixcontrol/js/ui/questionnaires/NativeDialog.vue

@@ -0,0 +1,49 @@
+<script setup lang="ts">
+import { ref, useId } from 'vue';
+
+const dialog = ref<HTMLDialogElement>();
+
+const props = defineProps({
+  classes: {
+    type: String,
+    default: "",
+  },
+  title: '',
+});
+
+const visible = ref(false);
+
+const showModal = () => {
+  dialog.value?.showModal();
+  visible.value = true;
+};
+
+defineExpose({
+  show: showModal,
+  close: (returnVal?: string): void => dialog.value?.close(returnVal),
+  visible,
+});
+const id = useId();
+</script>
+
+<template>
+  <dialog
+    ref="dialog" class="modal-card"
+    @close="visible = false"
+    closedby="any"
+    :aria-labelledby="`${id}-title`"
+  >
+    <form
+      v-if="visible"
+      method="dialog" class="modal-card-inner form-horizontal"
+      :class="{
+        [props.classes]: props.classes,
+      }"
+    >
+      <div class="modal-card-content">
+          <h2 :id="`${id}-title`" class="modal-card-title h3">{{ title }}</h2>
+          <slot />
+      </div>
+    </form>
+  </dialog>
+</template>

src/pretix/static/pretixcontrol/js/ui/questionnaires/QuestionElement.vue

@@ -0,0 +1,154 @@
+<script setup lang="ts">
+import { i18n_any, QUESTION_TYPE, QUESTION_TYPE_LABEL, SYSTEM_DATAFIELDS } from './helper';
+import NativeDialog from './NativeDialog.vue';
+import I18nTextField from './I18nTextField.vue';
+import {useId, ref, computed} from 'vue'
+import { DragHandle } from 'vue-slicksort';
+import {getDatafieldEditUrl} from "./api";
+
+const id = useId();
+const props = defineProps(['question', 'datafields', 'editable', 'possible_dependencies'])
+const emit = defineEmits(['removeSelf']);
+const gettext = (window as any).gettext;
+const question = ref(props.question);
+
+const df = typeof question.value.question === 'number' ?
+		props.datafields.find(el => el.id === question.value.question) :
+	typeof question.value.question === 'string' ?
+		SYSTEM_DATAFIELDS[question.value.question] :
+		null;
+
+const dependency_values_options = computed(() => props.datafields.find(el => el.id === question.value.dependency_question)?.options);
+const dependency_values_resolved = computed(() => question.value.dependency_values.map(ident => i18n_any(dependency_values_options.value.find(opt => opt.identifier === ident)?.answer) ?? ident));
+
+if (!question.value.label) question.value.label = {};
+if (!question.value.help_text) question.value.help_text = {};
+
+const editor = ref();
+</script>
+
+<template>
+  <div class="form-group">
+    <div class="question-edit-buttons" v-if="editable"><div class="btn-group">
+			<DragHandle tag="button" class="btn btn-default"><i class="fa fa-arrows"></i></DragHandle>
+      <button class="btn btn-default" @click="editor.show()"><i class="fa fa-edit"></i></button>
+    </div></div>
+
+		<template v-if="df">
+			<div v-if="question.dependency_question" class="dependency-info debuginfo">
+				<span><span class="fa fa-link"></span> {{ question.dependency_question }} = {{ dependency_values_resolved }}</span>
+			</div>
+			<div class="col-md-3 control-label label-empty" v-if="df.type === QUESTION_TYPE.BOOLEAN"></div>
+			<label class="col-md-3 control-label" :for="id" v-else>
+				{{ i18n_any(question.label) }}
+			</label>
+			<div class="col-md-9">
+				<input :id="id" type="text" v-if="df.type === QUESTION_TYPE.STRING || df.type === QUESTION_TYPE.PHONENUMBER" class="form-control">
+				<textarea :id="id" v-if="df.type === QUESTION_TYPE.TEXT" class="form-control"></textarea>
+				<div class="checkbox" v-if="df.type === QUESTION_TYPE.BOOLEAN">
+					<label :for="id">
+						<input :id="id" type="checkbox"> {{ i18n_any(question.label) }}
+					</label>
+				</div>
+				<input :id="id" type="number" v-if="df.type === QUESTION_TYPE.NUMBER" class="form-control">
+				<input :id="id" type="file" v-if="df.type === QUESTION_TYPE.FILE" class="form-control">
+				<select :id="id" class="form-control"
+					v-if="df.type === QUESTION_TYPE.CHOICE || df.type === QUESTION_TYPE.COUNTRYCODE">
+					<option></option>
+					<option v-for="opt in df.options">{{ i18n_any(opt.answer) }}</option>
+				</select>
+				<div class="checkbox" v-if="df.type === QUESTION_TYPE.CHOICE_MULTIPLE" v-for="(opt, index) in df.options">
+					<label :for="`${id}-${index}`">
+						<input :id="`${id}-${index}`" type="checkbox"> {{ i18n_any(opt.answer) }}
+					</label>
+				</div>
+				<div class="help-block">{{ i18n_any(question.help_text) }}</div>
+			</div>
+		</template>
+		<div v-else class="col-md-12">
+			<h3>{{ i18n_any(question.label) }}</h3>
+			<p>{{ i18n_any(question.help_text) }}</p>
+		</div>
+  </div>
+
+  <Teleport to="body">
+    <NativeDialog ref="editor" class="modal-card"
+                  title="Edit question">
+        <div class="form-group">
+          <label class="col-md-3 control-label">
+            {{ gettext('Question') }}
+          </label>
+          <div class="col-md-9">
+            <I18nTextField :value="question.label"/>
+          </div>
+        </div>
+        <div class="form-group">
+          <label class="col-md-3 control-label">
+            {{ gettext('Help text') }}
+          </label>
+          <div class="col-md-9">
+            <I18nTextField :value="question.help_text"/>
+            <div class="help-block">Wenn diese Frage noch weitere Erklärung braucht, können Sie sie hier eintragen.</div>
+          </div>
+        </div>
+        <div class="form-group">
+          <label class="col-md-3 control-label">
+            Data field
+          </label>
+          <div class="col-md-9">
+            <p class="form-control-static">
+							<template v-if="typeof question.question === 'number'">
+								{{ df.internal_name }}
+								<a :href="getDatafieldEditUrl(df.id)" target="_blank">Manage data field details</a>
+							</template>
+							<template v-else>
+								{{ question.question }}
+							</template>
+						</p>
+          </div>
+        </div>
+        <div class="form-group">
+          <label class="col-md-3 control-label">
+            Data field type
+          </label>
+          <div class="col-md-9">
+            <select v-model="df.type" class="form-control" disabled>
+              <option v-for="(label, type) in QUESTION_TYPE_LABEL" :value="QUESTION_TYPE[type]">{{ label }}</option>
+            </select>
+          </div>
+        </div>
+        <div class="form-group">
+        	<label class="col-md-3 control-label label-empty">&nbsp;</label>
+          <div class="col-md-9">
+          	<div class="checkbox">
+							<label>
+								<input type="checkbox" v-model="question.required">
+								{{ gettext('Required question') }}
+							</label>
+						</div>
+          </div>
+        </div>
+
+        <div class="form-group">
+          <label class="col-md-3 control-label">
+            {{ gettext('Only visible if...') }}
+          </label>
+          <div class="col-md-9">
+            <select v-model="question.dependency_question" class="form-control">
+              <option :value="null">{{ gettext('(none)') }}</option>
+              <option v-for="(qc, index) in possible_dependencies" :value="qc.question">{{ i18n_any(qc.label) }}</option>
+            </select>
+            <select v-model="question.dependency_values" class="form-control" multiple>
+              <option v-for="(qc, index) in dependency_values_options" :value="qc.identifier">{{ i18n_any(qc.answer) }}</option>
+            </select>
+						<div v-if="question.dependency_question">
+							<p><span class="debuginfo">depends on {{ question.dependency_question }} = {{ dependency_values_resolved }}</span></p>
+						</div>
+          </div>
+        </div>
+
+        <button @click="editor.close()" class="btn btn-primary pull-right"><span class="fa fa-check"></span> Save and close</button>
+        <button @click="emit('removeSelf')" class="btn btn-default">Remove from questionnaire</button>
+    </NativeDialog>
+  </Teleport>
+</template>

src/pretix/static/pretixcontrol/js/ui/questionnaires/QuestionnaireElement.vue

@@ -0,0 +1,163 @@
+<script setup lang="ts">
+import {useId, ref, computed} from 'vue'
+import QuestionElement from "./QuestionElement.vue";
+import {i18n_any, QUESTION_TYPE, QUESTION_TYPE_LABEL} from "./helper";
+import I18nTextField from "./I18nTextField.vue";
+import NativeDialog from "./NativeDialog.vue";
+import { SlickList, SlickItem, DragHandle } from 'vue-slicksort';
+
+const dlgEditor = ref();
+const dlgAddExisting = ref();
+const dlgAddTextblock = ref();
+
+const newTextblockTitle = ref();
+const newTextblockText = ref();
+
+const id = useId();
+const props = defineProps(['questionnaire', 'datafields', 'selected_product', 'grouped_items'])
+const gettext = (window as any).gettext
+
+function toggleItem() {
+  const i = props.questionnaire.items.indexOf(props.selected_product);
+  if (i === -1) {
+    props.questionnaire.items.push(props.selected_product);
+  } else {
+    props.questionnaire.items.splice(i, 1);
+  }
+}
+
+function addExistingDatafield(field) {
+	props.questionnaire.children.push({
+		question: field.id,
+		required: false,
+		label: {},
+		help_text: {},
+		dependency_question: null,
+		dependency_values: [],
+	});
+	dlgAddExisting.value.close();
+}
+
+function showAddTextblockDialog() {
+	newTextblockTitle.value = {};
+	newTextblockText.value = {};
+	dlgAddTextblock.value.show();
+}
+
+function addTextblock() {
+	props.questionnaire.children.push({
+		question: null,
+		required: false,
+		label: newTextblockTitle.value,
+		help_text: newTextblockText.value,
+		dependency_question: null,
+		dependency_values: [],
+	});
+	dlgAddTextblock.value.close();
+}
+
+const isHidden = computed(() => props.selected_product && props.questionnaire.items.indexOf(props.selected_product) === -1);
+const isEditable = computed(() => props.selected_product && props.questionnaire.items.indexOf(props.selected_product) !== -1);
+
+</script>
+
+
+<template>
+	<div class="question-edit-buttons"><div class="btn-group">
+		<DragHandle tag="button" class="btn btn-default"><i class="fa fa-arrows"></i></DragHandle>
+		<button class="btn btn-default" @click="dlgEditor.show()"><i class="fa fa-edit"></i></button>
+	</div></div>
+
+  <details class="panel panel-default " :open="!!isEditable"
+    :class="{ 'hidden-questionnaire': isHidden }">
+    <summary class="panel-heading">
+			<input type="checkbox" @click="toggleItem()" v-if="selected_product" :checked="!isHidden">
+			{{ props.questionnaire.internal_name }}
+    </summary>
+    <div class="panel-body" v-if="!isHidden">
+      <div class="form-horizontal" :id="`questionListParent${props.questionnaire.id}`">
+				<SlickList axis="y" v-model:list="props.questionnaire.children" useDragHandle :appendTo="`#questionListParent${props.questionnaire.id}`">
+					<SlickItem v-for="(child, index) in props.questionnaire.children" :key="child.id" :index="index">
+						<QuestionElement
+										:datafields="props.datafields"
+										:question="child"
+										:editable="true"
+										:possible_dependencies="props.questionnaire.children.slice(0, index)"
+										@remove-self="questionnaire.children.splice(index, 1)" />
+					</SlickItem>
+				</SlickList>
+      </div>
+			<p v-if="true" class="btn-group" role="group">
+					<button class="btn btn-default" @click="dlgAddExisting.show()"><i class="fa fa-plus"></i> {{ gettext('Existing data field') }}</button>
+					<button class="btn btn-default" @click="newDatafield()"><i class="fa fa-plus"></i> {{ gettext('New data field') }}</button>
+					<button class="btn btn-default" @click="showAddTextblockDialog()"><i class="fa fa-plus"></i> {{ gettext('Text') }}</button>
+			</p>
+    </div>
+  </details>
+
+  <Teleport to="body">
+    <NativeDialog ref="dlgEditor" class="modal-card"
+                  :title="gettext('Edit questionnaire')">
+        <div class="form-group">
+          <label class="col-md-3 control-label">
+            {{ gettext('Internal name') }}
+          </label>
+          <div class="col-md-9">
+            <input type="text" class="form-control" v-model="questionnaire.internal_name"/>
+          </div>
+        </div>
+        <div class="form-group" v-if="grouped_items">
+          <label class="col-md-3 control-label">
+            {{ gettext('Visible on products') }}
+          </label>
+          <div class="col-md-9">
+						<div v-for="[category, items] in grouped_items">
+							<div class="category-header">{{ category.internal_name || i18n_any(category.name) }}</div>
+							<div class="checkbox" v-for="item in items">
+								<label :for="id + '_' + item.id">
+									<input :id="id + '_' + item.id" type="checkbox" :checked="questionnaire.items.indexOf(item.id) !== -1"> {{ item.internal_name || i18n_any(item.name) }}
+								</label>
+							</div>
+						</div>
+          </div>
+        </div>
+        <button @click="dlgEditor.close()" class="btn btn-primary pull-right"><span class="fa fa-check"></span> {{ gettext('Save and close') }}</button>
+        <button class="btn btn-default">{{ gettext('Delete') }}</button>
+    </NativeDialog>
+
+    <NativeDialog ref="dlgAddExisting" class="modal-card"
+                  :title="gettext('Add existing data field')">
+
+				<div class="list-group">
+					<a href="javascript:" @click="addExistingDatafield(field)" v-for="field in datafields" class="list-group-item">{{ field.internal_name }}</a>
+				</div>
+
+        <button @click="dlgAddExisting.close()" class="btn btn-default pull-right">{{ gettext('Cancel') }}</button>
+    </NativeDialog>
+
+    <NativeDialog ref="dlgAddTextblock" class="modal-card"
+                  :title="gettext('Add sub heading')">
+
+        <div class="form-group">
+          <label class="col-md-3 control-label">
+            {{ gettext('Title') }}
+          </label>
+          <div class="col-md-9">
+            <I18nTextField :value="newTextblockTitle"/>
+          </div>
+        </div>
+        <div class="form-group">
+          <label class="col-md-3 control-label">
+            {{ gettext('Text') }}
+          </label>
+          <div class="col-md-9">
+            <I18nTextField :value="newTextblockText"/>
+          </div>
+        </div>
+
+        <button @click="addTextblock()" class="btn btn-default pull-right">{{ gettext('OK') }}</button>
+        <button @click="dlgAddTextblock.close()" class="btn btn-default pull-right">{{ gettext('Cancel') }}</button>
+
+    </NativeDialog>
+  </Teleport>
+</template>

src/pretix/static/pretixcontrol/js/ui/questionnaires/api.ts

@@ -0,0 +1,67 @@
+import {ApiListResponse, Datafield, Questionnaire, Item} from "./model";
+
+const organizer_slug = document.body.getAttribute('data-organizer'),
+	event_slug = document.body.getAttribute('data-event');
+
+async function api_get(resource) {
+	return await $.getJSON(`/api/v1/${resource}?_nocache=${+new Date()}`);
+}
+
+async function api_get_all<T>(resource): Promise<T[]> {
+	let next = `/api/v1/${resource}?_nocache=${+new Date()}`;
+	const result: T[] = [];
+	while (next) {
+		const response: ApiListResponse<T> = await $.getJSON(next);
+		result.push(...response.results);
+		next = response.next;
+		console.log('api_get_all: '+ resource, next, response, result)
+	}
+	return result;
+}
+
+async function api_json_request(resource, method, json_body) {
+	return await (await fetch(`/api/v1/${resource}`, {
+		body: JSON.stringify(json_body),
+		method: method,
+		headers: {
+				"Content-Type": "application/json",
+				"X-CSRFToken": $('[name=csrfmiddlewaretoken]').val() as string,
+		},
+	})).json();
+}
+
+export async function getDatafields() {
+	return await api_get_all<Datafield>(`organizers/${organizer_slug}/events/${event_slug}/datafields/`);
+}
+
+export async function getQuestionnaires() {
+	return await api_get_all<Questionnaire>(`organizers/${organizer_slug}/events/${event_slug}/questionnaires/`);
+}
+
+export async function updateQuestionnaire(id, data) {
+	return await api_json_request(`organizers/${organizer_slug}/events/${event_slug}/questionnaires/${id}/`, 'PATCH', data);
+}
+
+export async function createQuestionnaire(data) {
+	return await api_json_request(`organizers/${organizer_slug}/events/${event_slug}/questionnaires/`, 'POST', data);
+}
+
+export async function getItems() {
+	return await api_get_all<Item>(`organizers/${organizer_slug}/events/${event_slug}/items/`);
+}
+
+export async function getCategories() {
+	return await api_get_all<Item>(`organizers/${organizer_slug}/events/${event_slug}/categories/`);
+}
+
+function get_json_script_value(id) {
+	return JSON.parse(document.getElementById(id).innerText);
+}
+
+export function getEventLocales() {
+	return get_json_script_value('event_locales');
+}
+
+export function getDatafieldEditUrl(datafield_id) {
+	return get_json_script_value('datafield_edit_url').replace('/0/', `/${datafield_id}/`);
+}

src/pretix/static/pretixcontrol/js/ui/questionnaires/helper.js

@@ -0,0 +1,97 @@
+
+export function i18n_any(data) {
+	if (!data) return null;
+	const preferred = document.body.getAttribute("data-pretixlocale");
+	if (data[preferred]) return data[preferred];
+  return Object.values(data)[0];
+}
+
+function freezeRec(o) {
+	return Object.freeze(Object.fromEntries(Object.entries(o).map(([k, v]) => [k, v && Object.getPrototypeOf(v) === Object.prototype ? freezeRec(v) : v])))
+}
+
+export function localeComp(fn) {
+	return function(a, b) {
+		return fn(a).localeCompare(fn(b));
+	}
+}
+export function numericComp(fn) {
+	return function(a, b) {
+		return fn(a) - fn(b);
+	}
+}
+export function pick(key) {
+	return function(obj) {
+		return obj[key];
+	}
+}
+export function sort(array, ...orderBy) {
+	array.sort(function(a, b) {
+		for(let comp of orderBy) {
+			const result = comp(a, b);
+			if (result !== 0) {
+				return result;
+			}
+		}
+		return 0;
+	});
+}
+export function *groupBy(array, key) {
+	let lastKey, lastArray;
+	for(const x of array){
+		const k = key(x);
+		if (lastKey !== k || !lastArray) {
+			if (lastArray) {
+				yield [lastKey, lastArray];
+			}
+			lastKey = k; lastArray = [x];
+		} else {
+			lastArray.push(x);
+		}
+	}
+	if (lastArray) {
+		yield [lastKey, lastArray];
+	}
+}
+
+export const QUESTION_TYPE = {
+  NUMBER: "N",
+  STRING: "S",
+  TEXT: "T",
+  BOOLEAN: "B",
+  CHOICE: "C",
+  CHOICE_MULTIPLE: "M",
+  FILE: "F",
+  DATE: "D",
+  TIME: "H",
+  DATETIME: "W",
+  COUNTRYCODE: "CC",
+  PHONENUMBER: "TEL",
+};
+
+export const _ = x => x;
+
+export const QUESTION_TYPE_LABEL = {
+    NUMBER: _("Number"),
+    STRING: _("Text (one line)"),
+    TEXT: _("Multiline text"),
+    BOOLEAN: _("Yes/No"),
+    CHOICE: _("Choose one from a list"),
+    CHOICE_MULTIPLE: _("Choose multiple from a list"),
+    FILE: _("File upload"),
+    DATE: _("Date"),
+    TIME: _("Time"),
+    DATETIME: _("Date and time"),
+    COUNTRYCODE: _("Country code (ISO 3166-1 alpha-2)"),
+    PHONENUMBER: _("Phone number"),
+};
+
+export const SYSTEM_DATAFIELDS = freezeRec({
+		'attendee_name_parts': { label: _('Attendee name'), type: QUESTION_TYPE.STRING },
+		'attendee_email': { label: _('Attendee email'), type: QUESTION_TYPE.STRING },
+		'company': { label: _('Company'), type: QUESTION_TYPE.STRING },
+		'street': { label: _('Street'), type: QUESTION_TYPE.STRING },
+		'zipcode': { label: _('ZIP code'), type: QUESTION_TYPE.STRING },
+		'city': { label: _('City'), type: QUESTION_TYPE.STRING },
+		'country': { label: _('Country'), type: QUESTION_TYPE.COUNTRYCODE },
+});

src/pretix/static/pretixcontrol/js/ui/questionnaires/index.ts

@@ -0,0 +1,4 @@
+import { createApp } from 'vue'
+import App from './App.vue'
+
+createApp(App).mount('#questionnaires-editor')

src/pretix/static/pretixcontrol/js/ui/questionnaires/model.ts

@@ -0,0 +1,65 @@
+
+export type ApiListResponse<T> = {
+	count: number,
+	next: string | null,
+	previous: string | null,
+	results: T[],
+};
+
+// from webcheckin/i18n.ts
+export type I18nString = string | Record<string, string> | null | undefined;
+
+export type Datafield = {
+	id: number,
+	// question: I18nString,
+	type: string,
+	required: boolean,
+	//items: number[],
+	options: any[],
+	// position: number,
+	//ask_during_checkin: boolean,
+	show_during_checkin: boolean,
+	identifier: string,
+	// dependency_question: string | null,
+	// dependency_values	[]
+	// hidden: boolean,
+	// dependency_value	null
+	print_on_invoice: boolean,
+	// help_text: I18nString,
+	valid_number_min: null | number,
+	valid_number_max: null | number,
+	valid_date_min: null | string,
+	valid_date_max: null | string,
+	valid_datetime_min: null | string,
+	valid_datetime_max: null | string,
+	valid_string_length_max: null | number,
+	valid_file_portrait: boolean,
+	internal_name: string,
+};
+
+export type Questionnaire = {
+	id: number,
+	internal_name: string,
+	type: string,
+	items: number[],
+	position: number,
+	all_sales_channels: boolean,
+	limit_sales_channels: string[],
+	children: QuestionnaireChild[],
+};
+
+export type QuestionnaireChild = {
+	question: string | number,
+	required: boolean,
+	label: I18nString,
+	help_text: I18nString,
+	dependency_question: number | null,
+	dependency_values: null | string[],
+};
+
+export type Item = {
+	id: number,
+	category: number,
+	name: I18nString,
+	internal_name: string | null,
+};

src/pretix/static/pretixcontrol/scss/_forms.scss

@@ -780,6 +780,8 @@ fieldset.accordion-panel > legend {
   }
 }
 
+
+/* These classes are not only used for tax rules, but also for event meta properties  */
 .tax-rules-formset {
   margin-left: -15px;
   margin-right: -15px;
@@ -802,6 +804,7 @@ fieldset.accordion-panel > legend {
   padding-bottom: 5px;
 }
 
+
 .batch-select-label {
   display: block;
   width: 100%;

src/pretix/static/pretixpresale/js/widget/widget.js

@@ -262,7 +262,7 @@ Vue.component('availbox', {
     },
     mounted: function() {
         if (!this.$root.cart_exists && this.$root.itemnum === 1 && (!this.$root.categories[0].items[0].has_variations || this.$root.categories[0].items[0].variations.length < 2) && !this.$root.has_seating_plan ? 1 : 0) {
-            this.$refs.quantity.value = 1;
+            this.$refs.quantity.value = 1;    
             if (this.order_max === 1) {
                 this.$refs.quantity.checked = true;
             }
@@ -310,7 +310,7 @@ Vue.component('availbox', {
             return this.avail[0] < 100 && this.$root.waiting_list_enabled && this.item.allow_waitinglist;
         },
         waiting_list_url: function () {
-            var u = this.$root.target_url + 'w/' + widget_id + '/waitinglist/?locale=' + lang + '&item=' + this.item.id
+            var u = this.$root.target_url + 'w/' + widget_id + '/waitinglist/?locale=' + lang + '&item=' + this.item.id 
             if (this.item.has_variations) {
                 u += '&var=' + this.variation.id
             }
@@ -345,7 +345,7 @@ Vue.component('pricebox', {
         + '       :min="display_price_nonlocalized" :value="suggested_price_nonlocalized" :name="field_name"'
         + '       step="any" v-bind:aria-labelledby="aria_labelledby" v-bind:aria-describedby="price_desc_id">'
         + '</div>'
-        + '<small class="pretix-widget-pricebox-tax" :id="price_desc_id" v-if="price.rate != \'0\' && price.gross != \'0.00\'">'
+        + '<small class="pretix-widget-pricebox-tax" :id="price_desc_id" v-if="price.rate != \'0.00\' && price.gross != \'0.00\'">'
         + '{{ taxline }}'
         + '</small>'
         + '</div>'),
@@ -863,7 +863,7 @@ var shared_alert_fragment = (
     '<dialog :class="alertClasses" role="alertdialog" v-bind:aria-labelledby="$root.parent.html_id + \'-error-message\'" @close="errorClose">'
     + '<form class="pretix-widget-alert-box" method="dialog">'
     + '<p :id="$root.parent.html_id + \'-error-message\'">{{ $root.error_message }}</p>'
-    + '<p><button v-if="$root.error_url_after" @click="errorContinue" autofocus v-bind:aria-describedby="$root.parent.html_id + \'-error-message\'">' + strings.continue + '</button>'
+    + '<p><button v-if="$root.error_url_after" value="continue" autofocus v-bind:aria-describedby="$root.parent.html_id + \'-error-message\'">' + strings.continue + '</button>'
     + '<button v-else autofocus v-bind:aria-describedby="$root.parent.html_id + \'-error-message\'">' + strings.close + '</button></p>'
     + '</form>'
     + '<transition name="bounce">'
@@ -952,7 +952,7 @@ Vue.component('pretix-overlay', {
         cancelBlockedClasses: function () {
             return {
                 'pretix-widget-visibility-hidden': !this.cancelBlocked,
-            }
+            }  
         },
     },
     mounted () {
@@ -974,18 +974,19 @@ Vue.component('pretix-overlay', {
             this.$root.lightbox.loading = false;
         },
         errorClose: function (e) {
+            var dialog = e.target;
+            if (dialog.returnValue == "continue" && this.$root.error_url_after) {
+                if (this.$root.error_url_after_new_tab) {
+                    window.open(this.$root.error_url_after);
+                } else if (this.$root.overlay) {
+                    this.$root.overlay.frame_src = this.$root.error_url_after;
+                    this.$root.frame_loading = true;
+                }
+            }
             this.$root.error_message = null;
             this.$root.error_url_after = null;
             this.$root.error_url_after_new_tab = false;
         },
-        errorContinue: function () {
-            if (this.$root.error_url_after_new_tab) {
-                window.open(this.$root.error_url_after);
-            } else if (this.$root.overlay) {
-                this.$root.overlay.frame_src = this.$root.error_url_after;
-                this.$root.frame_loading = true;
-            }
-        },
         close: function (e) {
             if (this.$root.frame_loading) {
                 // Chrome does not allow blocking dialog.cancel event more than once

src/pretix/static/pretixpresale/widget/TODOS.md

@@ -0,0 +1,2 @@
+- modernize the sometimes native form submitting?
+- destructure props?

src/pretix/static/pretixpresale/widget/src/components/Overlay.vue

@@ -54,16 +54,16 @@ function lightboxLoaded () {
 	}
 }
 
-function errorContinue () {
-	if (store.overlay.errorUrlAfterNewTab) {
-		window.open(store.overlay.errorUrlAfter)
-	} else {
-		store.overlay.frameSrc = store.overlay.errorUrlAfter
-		store.overlay.frameLoading = true
+function errorClose (e: Event) {
+	const dialog = e.target as HTMLDialogElement
+	if (dialog.returnValue === 'continue' && store.overlay.errorUrlAfter) {
+		if (store.overlay.errorUrlAfterNewTab) {
+			window.open(store.overlay.errorUrlAfter)
+		} else {
+			store.overlay.frameSrc = store.overlay.errorUrlAfter
+			store.overlay.frameLoading = true
+		}
 	}
-}
-
-function errorClose () {
 	store.overlay.errorMessage = null
 	store.overlay.errorUrlAfter = null
 	store.overlay.errorUrlAfterNewTab = false
@@ -168,10 +168,6 @@ onMounted(() => {
 onUnmounted(() => {
 	window.removeEventListener('message', onMessage, false)
 })
-
-const vAutofocus = {
-	mounted: (el) => el.focus()
-}
 </script>
 
 <template lang="pug">
@@ -185,7 +181,7 @@ Teleport(to="body")
 					strong {{ STRINGS.cancel_blocked }}
 			.pretix-widget-frame-inner(v-show="store.overlay.frameShown")
 				form.pretix-widget-frame-close(method="dialog")
-					button(ref="closeButton", v-autofocus, :aria-label="STRINGS.close_checkout")
+					button(ref="closeButton", :aria-label="STRINGS.close_checkout", autofocus)
 						svg(:alt="STRINGS.close", height="16", viewBox="0 0 512 512", width="16", xmlns="http://www.w3.org/2000/svg")
 							path(fill="#fff", d="M437.5,386.6L306.9,256l130.6-130.6c14.1-14.1,14.1-36.8,0-50.9c-14.1-14.1-36.8-14.1-50.9,0L256,205.1L125.4,74.5 c-14.1-14.1-36.8-14.1-50.9,0c-14.1,14.1-14.1,36.8,0,50.9L205.1,256L74.5,386.6c-14.1,14.1-14.1,36.8,0,50.9 c14.1,14.1,36.8,14.1,50.9,0L256,306.9l130.6,130.6c14.1,14.1,36.8,14.1,50.9,0C451.5,423.4,451.5,400.6,437.5,386.6z")
 				iframe(
@@ -204,9 +200,9 @@ Teleport(to="body")
 			form.pretix-widget-alert-box(method="dialog")
 				p(:id="errorMessageId") {{ store.overlay.errorMessage }}
 				p
-					button(v-if="store.overlay.errorUrlAfter", v-autofocus, :aria-describedby="errorMessageId", @click="errorContinue")
+					button(v-if="store.overlay.errorUrlAfter", value="continue", autofocus, :aria-describedby="errorMessageId")
 						| {{ STRINGS.continue }}
-					button(v-else, v-autofocus, :aria-describedby="errorMessageId") {{ STRINGS.close }}
+					button(v-else, autofocus, :aria-describedby="errorMessageId") {{ STRINGS.close }}
 			transition(name="bounce")
 				svg.pretix-widget-alert-icon(v-if="store.overlay.errorMessage", width="64", height="64", viewBox="0 0 1792 1792", xmlns="http://www.w3.org/2000/svg")
 					path(style="fill:#ffffff;", d="M 599.86438,303.72882 H 1203.5254 V 1503.4576 H 599.86438 Z")
@@ -218,7 +214,7 @@ Teleport(to="body")
 					path.pretix-widget-primary-color(d="M1152 896q0-106-75-181t-181-75-181 75-75 181 75 181 181 75 181-75 75-181zm512-109v222q0 12-8 23t-20 13l-185 28q-19 54-39 91 35 50 107 138 10 12 10 25t-9 23q-27 37-99 108t-94 71q-12 0-26-9l-138-108q-44 23-91 38-16 136-29 186-7 28-36 28h-222q-14 0-24.5-8.5t-11.5-21.5l-28-184q-49-16-90-37l-141 107q-10 9-25 9-14 0-25-11-126-114-165-168-7-10-7-23 0-12 8-23 15-21 51-66.5t54-70.5q-27-50-41-99l-183-27q-13-2-21-12.5t-8-23.5v-222q0-12 8-23t19-13l186-28q14-46 39-92-40-57-107-138-10-12-10-24 0-10 9-23 26-36 98.5-107.5t94.5-71.5q13 0 26 10l138 107q44-23 91-38 16-136 29-186 7-28 36-28h222q14 0 24.5 8.5t11.5 21.5l28 184q49 16 90 37l142-107q9-9 24-9 13 0 25 10 129 119 165 170 7 8 7 22 0 12-8 23-15 21-51 66.5t-54 70.5q26 50 41 98l183 28q13 2 21 12.5t8 23.5z")
 			.pretix-widget-lightbox-inner(v-if="store.overlay.lightbox")
 				form.pretix-widget-lightbox-close(method="dialog")
-					button(v-autofocus, :aria-label="STRINGS.close")
+					button(:aria-label="STRINGS.close", autofocus)
 						svg(:alt="STRINGS.close", height="16", viewBox="0 0 512 512", width="16", xmlns="http://www.w3.org/2000/svg")
 							path(fill="#fff", d="M437.5,386.6L306.9,256l130.6-130.6c14.1-14.1,14.1-36.8,0-50.9c-14.1-14.1-36.8-14.1-50.9,0L256,205.1L125.4,74.5 c-14.1-14.1-36.8-14.1-50.9,0c-14.1,14.1-14.1,36.8,0,50.9L205.1,256L74.5,386.6c-14.1,14.1-14.1,36.8,0,50.9 c14.1,14.1,36.8,14.1,50.9,0L256,306.9l130.6,130.6c14.1,14.1,36.8,14.1,50.9,0C451.5,423.4,451.5,400.6,437.5,386.6z")
 				figure.pretix-widget-lightbox-image

src/pretix/static/pretixpresale/widget/src/components/PriceBox.vue

@@ -86,7 +86,7 @@ const taxline = computed(() => {
 	}
 })
 
-const showTaxline = computed(() => props.price.rate !== '0' && props.price.gross !== '0.00')
+const showTaxline = computed(() => props.price.rate !== '0.00' && props.price.gross !== '0.00')
 </script>
 <template lang="pug">
 .pretix-widget-pricebox

src/tests/base/test_models.py

@@ -473,7 +473,7 @@ class QuotaTestCase(BaseQuotaTestCase):
     @classscope(attr='o')
     def test_waitinglist_auto_disable(self):
         self.event.settings.waiting_list_auto_disable = RelativeDateWrapper(
-            RelativeDate(days=0, time=None, base_date_name='event__date_from', minutes=20, is_after=True)
+            RelativeDate(days=0, time=None, base_date_name='date_from', minutes=20, is_after=True)
         )
         self.quota.items.add(self.item1)
         self.quota.size = 1
@@ -484,7 +484,7 @@ class QuotaTestCase(BaseQuotaTestCase):
         self.assertEqual(self.item1.check_quotas(), (Quota.AVAILABILITY_ORDERED, 0))
         self.assertEqual(self.item1.check_quotas(count_waitinglist=False), (Quota.AVAILABILITY_OK, 1))
         self.event.settings.waiting_list_auto_disable = RelativeDateWrapper(
-            RelativeDate(days=0, time=None, base_date_name='event__date_from', minutes=20, is_after=False)
+            RelativeDate(days=0, time=None, base_date_name='date_from', minutes=20, is_after=False)
         )
         self.assertEqual(self.item1.check_quotas(), (Quota.AVAILABILITY_OK, 1))
         self.assertEqual(self.item1.check_quotas(count_waitinglist=False), (Quota.AVAILABILITY_OK, 1))
@@ -1192,7 +1192,7 @@ class OrderTestCase(BaseQuotaTestCase):
         self.op2.subevent = se2
         self.op2.save()
         self.event.settings.set('payment_term_last', RelativeDateWrapper(
-            RelativeDate(days=2, time=None, base_date_name='event__date_from', minutes=None)
+            RelativeDate(days=2, time=None, base_date_name='date_from', minutes=None)
         ))
 
         self.order.status = Order.STATUS_EXPIRED
@@ -1347,7 +1347,7 @@ class OrderTestCase(BaseQuotaTestCase):
         self.op2.subevent = se2
         self.op2.save()
         self.event.settings.set('last_order_modification_date', RelativeDateWrapper(
-            RelativeDate(days=2, time=None, base_date_name='event__date_from', minutes=None)
+            RelativeDate(days=2, time=None, base_date_name='date_from', minutes=None)
         ))
         assert self.order.can_modify_answers
         self.op2.subevent = se3
@@ -1363,7 +1363,7 @@ class OrderTestCase(BaseQuotaTestCase):
         self.event.date_from = datetime.datetime(2017, 5, 3, 12, 0, 0, tzinfo=datetime.timezone.utc)
         self.event.save()
         self.event.settings.set('payment_term_last', RelativeDateWrapper(
-            RelativeDate(days=2, time=None, base_date_name='event__date_from', minutes=None)
+            RelativeDate(days=2, time=None, base_date_name='date_from', minutes=None)
         ))
         assert self.order.payment_term_last == datetime.datetime(2017, 5, 1, 23, 59, 59, tzinfo=datetime.timezone.utc)
 
@@ -1379,7 +1379,7 @@ class OrderTestCase(BaseQuotaTestCase):
         self.op2.subevent = se2
         self.op2.save()
         self.event.settings.set('payment_term_last', RelativeDateWrapper(
-            RelativeDate(days=2, time=None, base_date_name='event__date_from', minutes=None)
+            RelativeDate(days=2, time=None, base_date_name='date_from', minutes=None)
         ))
         assert self.order.payment_term_last > now()
         self.op2.subevent = se3
@@ -1395,7 +1395,7 @@ class OrderTestCase(BaseQuotaTestCase):
         self.event.date_from = datetime.datetime(2017, 5, 3, 12, 0, 0, tzinfo=datetime.timezone.utc)
         self.event.save()
         self.event.settings.set('ticket_download_date', RelativeDateWrapper(
-            RelativeDate(days=2, time=None, base_date_name='event__date_from', minutes=None)
+            RelativeDate(days=2, time=None, base_date_name='date_from', minutes=None)
         ))
         assert self.order.ticket_download_date == datetime.datetime(2017, 5, 1, 12, 0, 0, tzinfo=datetime.timezone.utc)
 
@@ -1411,7 +1411,7 @@ class OrderTestCase(BaseQuotaTestCase):
         self.op2.subevent = se2
         self.op2.save()
         self.event.settings.set('ticket_download_date', RelativeDateWrapper(
-            RelativeDate(days=2, time=None, base_date_name='event__date_from', minutes=None)
+            RelativeDate(days=2, time=None, base_date_name='date_from', minutes=None)
         ))
         assert self.order.ticket_download_date > now()
         self.op2.subevent = se3
@@ -1582,13 +1582,13 @@ class OrderTestCase(BaseQuotaTestCase):
 
         assert self.order.user_cancel_deadline is None
         self.event.settings.set('cancel_allow_user_until', RelativeDateWrapper(
-            RelativeDate(days=2, time=datetime.time(14, 0, 0), base_date_name='event__date_from', minutes=None)
+            RelativeDate(days=2, time=datetime.time(14, 0, 0), base_date_name='date_from', minutes=None)
         ))
         self.order = Order.objects.get(pk=self.order.pk)
         assert self.order.user_cancel_deadline > now()
         assert self.order.user_cancel_allowed
         self.event.settings.set('cancel_allow_user_until', RelativeDateWrapper(
-            RelativeDate(days=4, time=datetime.time(14, 0, 0), base_date_name='event__date_from', minutes=None)
+            RelativeDate(days=4, time=datetime.time(14, 0, 0), base_date_name='date_from', minutes=None)
         ))
         self.order = Order.objects.get(pk=self.order.pk)
         assert self.order.user_cancel_deadline < now()
@@ -1607,7 +1607,7 @@ class OrderTestCase(BaseQuotaTestCase):
         self.op2.save()
 
         self.event.settings.set('cancel_allow_user_until', RelativeDateWrapper(
-            RelativeDate(days=2, time=datetime.time(14, 0, 0), base_date_name='event__date_from', minutes=None)
+            RelativeDate(days=2, time=datetime.time(14, 0, 0), base_date_name='date_from', minutes=None)
         ))
         self.order = Order.objects.get(pk=self.order.pk)
         assert self.order.user_cancel_deadline < now()
@@ -2018,13 +2018,13 @@ class OrderTestCase(BaseQuotaTestCase):
 
         assert self.order.user_change_deadline is None
         self.event.settings.set('change_allow_user_until', RelativeDateWrapper(
-            RelativeDate(days=2, time=datetime.time(14, 0, 0), base_date_name='event__date_from', minutes=None)
+            RelativeDate(days=2, time=datetime.time(14, 0, 0), base_date_name='date_from', minutes=None)
         ))
         self.order = Order.objects.get(pk=self.order.pk)
         assert self.order.user_change_deadline > now()
         assert self.order.user_change_allowed
         self.event.settings.set('change_allow_user_until', RelativeDateWrapper(
-            RelativeDate(days=4, time=datetime.time(14, 0, 0), base_date_name='event__date_from', minutes=None)
+            RelativeDate(days=4, time=datetime.time(14, 0, 0), base_date_name='date_from', minutes=None)
         ))
         self.order = Order.objects.get(pk=self.order.pk)
         assert self.order.user_change_deadline < now()
@@ -2046,7 +2046,7 @@ class OrderTestCase(BaseQuotaTestCase):
         self.op2.save()
 
         self.event.settings.set('change_allow_user_until', RelativeDateWrapper(
-            RelativeDate(days=2, time=datetime.time(14, 0, 0), base_date_name='event__date_from', minutes=None)
+            RelativeDate(days=2, time=datetime.time(14, 0, 0), base_date_name='date_from', minutes=None)
         ))
         self.order = Order.objects.get(pk=self.order.pk)
         assert self.order.user_change_deadline < now()

src/tests/base/test_orders.py

@@ -204,7 +204,7 @@ def test_expiry_last_relative(event):
     event.date_from = now() + timedelta(days=5)
     event.save()
     event.settings.set('payment_term_last', RelativeDateWrapper(
-        RelativeDate(days=2, time=None, base_date_name='event__date_from', minutes=None)
+        RelativeDate(days=2, time=None, base_date_name='date_from', minutes=None)
     ))
     order = _create_order(event, email='dummy@example.org', positions=[],
                           now_dt=today,
@@ -245,7 +245,7 @@ def test_expiry_last_relative_subevents(event):
     )
 
     event.settings.set('payment_term_last', RelativeDateWrapper(
-        RelativeDate(days=2, time=None, base_date_name='event__date_from', minutes=None)
+        RelativeDate(days=2, time=None, base_date_name='date_from', minutes=None)
     ))
     order = _create_order(event, email='dummy@example.org', positions=[cp1, cp2],
                           now_dt=today,

src/tests/base/test_payment.py

@@ -133,7 +133,7 @@ def test_availability_date_relative(event):
     event.save()
     prov = DummyPaymentProvider(event)
     prov.settings.set('_availability_date', RelativeDateWrapper(
-        RelativeDate(days=2, time=None, base_date_name='event__date_from', minutes=None)
+        RelativeDate(days=2, time=None, base_date_name='date_from', minutes=None)
     ))
 
     utc = datetime.timezone.utc
@@ -150,7 +150,7 @@ def test_availability_start_relative(event):
     event.save()
     prov = DummyPaymentProvider(event)
     prov.settings.set('_availability_start', RelativeDateWrapper(
-        RelativeDate(days=2, time=datetime.time(12, 0), base_date_name='event__date_from', minutes=None)
+        RelativeDate(days=2, time=datetime.time(12, 0), base_date_name='date_from', minutes=None)
     ))
 
     utc = datetime.timezone.utc
@@ -193,12 +193,12 @@ def test_availability_date_cart_relative_subevents(event):
 
     prov = DummyPaymentProvider(event)
     prov.settings.set('_availability_date', RelativeDateWrapper(
-        RelativeDate(days=3, time=None, base_date_name='event__date_from', minutes=None)
+        RelativeDate(days=3, time=None, base_date_name='date_from', minutes=None)
     ))
     assert prov._is_available_by_time(cart_id="123")
 
     prov.settings.set('_availability_date', RelativeDateWrapper(
-        RelativeDate(days=4, time=None, base_date_name='event__date_from', minutes=None)
+        RelativeDate(days=4, time=None, base_date_name='date_from', minutes=None)
     ))
     assert not prov._is_available_by_time(cart_id="123")
 
@@ -233,11 +233,11 @@ def test_availability_date_order_relative_subevents(event):
 
     prov = DummyPaymentProvider(event)
     prov.settings.set('_availability_date', RelativeDateWrapper(
-        RelativeDate(days=3, time=None, base_date_name='event__date_from', minutes=None)
+        RelativeDate(days=3, time=None, base_date_name='date_from', minutes=None)
     ))
     assert prov._is_available_by_time(order=order)
 
     prov.settings.set('_availability_date', RelativeDateWrapper(
-        RelativeDate(days=4, time=None, base_date_name='event__date_from', minutes=None)
+        RelativeDate(days=4, time=None, base_date_name='date_from', minutes=None)
     ))
     assert not prov._is_available_by_time(order=order)

src/tests/base/test_reldate.py

@@ -19,13 +19,13 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from datetime import datetime, time, timedelta
+from datetime import datetime, time
 from zoneinfo import ZoneInfo
 
 import pytest
 from django_scopes import scope
 
-from pretix.base.models import Event, Order, Organizer
+from pretix.base.models import Event, Organizer
 from pretix.base.reldate import RelativeDate, RelativeDateWrapper
 
 TOKYO = ZoneInfo('Asia/Tokyo')
@@ -40,6 +40,7 @@ def event():
         date_from=datetime(2017, 12, 27, 5, 0, 0, tzinfo=TOKYO),
         presale_start=datetime(2017, 12, 1, 5, 0, 0, tzinfo=TOKYO),
         plugins='pretix.plugins.banktransfer'
+
     )
     event.settings.timezone = "Asia/Tokyo"
     return event
@@ -55,57 +56,57 @@ def test_absolute_date(event):
 
 @pytest.mark.django_db
 def test_relative_date_without_time(event):
-    rdw = RelativeDateWrapper(RelativeDate(days=1, time=None, base_date_name='event__date_from', minutes=None))
+    rdw = RelativeDateWrapper(RelativeDate(days=1, time=None, base_date_name='date_from', minutes=None))
     assert rdw.datetime(event).astimezone(TOKYO) == datetime(2017, 12, 26, 5, 0, 0, tzinfo=TOKYO)
-    assert rdw.to_string() == 'RELDATE/1/-/event__date_from/'
-    rdw = RelativeDateWrapper(RelativeDate(days=1, time=None, base_date_name='event__date_from', minutes=None, is_after=True))
+    assert rdw.to_string() == 'RELDATE/1/-/date_from/'
+    rdw = RelativeDateWrapper(RelativeDate(days=1, time=None, base_date_name='date_from', minutes=None, is_after=True))
     assert rdw.datetime(event).astimezone(TOKYO) == datetime(2017, 12, 28, 5, 0, 0, tzinfo=TOKYO)
-    assert rdw.to_string() == 'RELDATE/1/-/event__date_from/after'
+    assert rdw.to_string() == 'RELDATE/1/-/date_from/after'
 
 
 @pytest.mark.django_db
 def test_relative_date_other_base_point(event):
     with scope(organizer=event.organizer):
-        rdw = RelativeDateWrapper(RelativeDate(days=1, time=None, base_date_name='event__presale_start', minutes=None))
+        rdw = RelativeDateWrapper(RelativeDate(days=1, time=None, base_date_name='presale_start', minutes=None))
         assert rdw.datetime(event) == datetime(2017, 11, 30, 5, 0, 0, tzinfo=TOKYO)
-        assert rdw.to_string() == 'RELDATE/1/-/event__presale_start/'
+        assert rdw.to_string() == 'RELDATE/1/-/presale_start/'
 
         # presale_end is unset, defaults to date_from
-        rdw = RelativeDateWrapper(RelativeDate(days=1, time=None, base_date_name='event__presale_end', minutes=None))
+        rdw = RelativeDateWrapper(RelativeDate(days=1, time=None, base_date_name='presale_end', minutes=None))
         assert rdw.datetime(event) == datetime(2017, 12, 26, 5, 0, 0, tzinfo=TOKYO)
-        assert rdw.to_string() == 'RELDATE/1/-/event__presale_end/'
+        assert rdw.to_string() == 'RELDATE/1/-/presale_end/'
 
         # subevent base
         se = event.subevents.create(name="SE1", date_from=datetime(2017, 11, 27, 5, 0, 0, tzinfo=TOKYO))
-        rdw = RelativeDateWrapper(RelativeDate(days=1, time=None, base_date_name='event__date_from', minutes=None))
+        rdw = RelativeDateWrapper(RelativeDate(days=1, time=None, base_date_name='date_from', minutes=None))
         assert rdw.datetime(se) == datetime(2017, 11, 26, 5, 0, 0, tzinfo=TOKYO)
 
         # presale_start is unset on subevent, default to event
-        rdw = RelativeDateWrapper(RelativeDate(days=1, time=None, base_date_name='event__presale_start', minutes=None))
+        rdw = RelativeDateWrapper(RelativeDate(days=1, time=None, base_date_name='presale_start', minutes=None))
         assert rdw.datetime(se) == datetime(2017, 11, 30, 5, 0, 0, tzinfo=TOKYO)
 
         # presale_end is unset on all, default to date_from of subevent
-        rdw = RelativeDateWrapper(RelativeDate(days=1, time=None, base_date_name='event__presale_end', minutes=None))
+        rdw = RelativeDateWrapper(RelativeDate(days=1, time=None, base_date_name='presale_end', minutes=None))
         assert rdw.datetime(se) == datetime(2017, 11, 26, 5, 0, 0, tzinfo=TOKYO)
 
 
 @pytest.mark.django_db
 def test_relative_date_in_minutes(event):
-    rdw = RelativeDateWrapper(RelativeDate(days=0, time=None, base_date_name='event__date_from', minutes=60))
-    assert rdw.to_string() == 'RELDATE/minutes/60/event__date_from/'
+    rdw = RelativeDateWrapper(RelativeDate(days=0, time=None, base_date_name='date_from', minutes=60))
+    assert rdw.to_string() == 'RELDATE/minutes/60/date_from/'
     assert rdw.datetime(event) == datetime(2017, 12, 27, 4, 0, 0, tzinfo=TOKYO)
-    rdw = RelativeDateWrapper(RelativeDate(days=0, time=None, base_date_name='event__date_from', minutes=60, is_after=True))
-    assert rdw.to_string() == 'RELDATE/minutes/60/event__date_from/after'
+    rdw = RelativeDateWrapper(RelativeDate(days=0, time=None, base_date_name='date_from', minutes=60, is_after=True))
+    assert rdw.to_string() == 'RELDATE/minutes/60/date_from/after'
     assert rdw.datetime(event) == datetime(2017, 12, 27, 6, 0, 0, tzinfo=TOKYO)
 
 
 @pytest.mark.django_db
 def test_relative_date_with_time(event):
-    rdw = RelativeDateWrapper(RelativeDate(days=1, time=time(8, 5, 13), base_date_name='event__date_from', minutes=None))
-    assert rdw.to_string() == 'RELDATE/1/08:05:13/event__date_from/'
+    rdw = RelativeDateWrapper(RelativeDate(days=1, time=time(8, 5, 13), base_date_name='date_from', minutes=None))
+    assert rdw.to_string() == 'RELDATE/1/08:05:13/date_from/'
     assert rdw.datetime(event) == datetime(2017, 12, 26, 8, 5, 13, tzinfo=TOKYO)
-    rdw = RelativeDateWrapper(RelativeDate(days=1, time=time(8, 5, 13), base_date_name='event__date_from', minutes=None, is_after=True))
-    assert rdw.to_string() == 'RELDATE/1/08:05:13/event__date_from/after'
+    rdw = RelativeDateWrapper(RelativeDate(days=1, time=time(8, 5, 13), base_date_name='date_from', minutes=None, is_after=True))
+    assert rdw.to_string() == 'RELDATE/1/08:05:13/date_from/after'
     assert rdw.datetime(event) == datetime(2017, 12, 28, 8, 5, 13, tzinfo=TOKYO)
 
 
@@ -114,94 +115,35 @@ def test_relative_date_with_time_around_dst(event):
     event.settings.timezone = "Europe/Berlin"
     event.date_from = datetime(2020, 3, 29, 18, 0, 0, tzinfo=BERLIN)
 
-    rdw = RelativeDateWrapper(RelativeDate(days=1, time=time(18, 0, 0), base_date_name='event__date_from', minutes=None))
-    assert rdw.to_string() == 'RELDATE/1/18:00:00/event__date_from/'
+    rdw = RelativeDateWrapper(RelativeDate(days=1, time=time(18, 0, 0), base_date_name='date_from', minutes=None))
+    assert rdw.to_string() == 'RELDATE/1/18:00:00/date_from/'
     assert rdw.datetime(event) == datetime(2020, 3, 28, 18, 0, 0, tzinfo=BERLIN)
 
-    rdw = RelativeDateWrapper(RelativeDate(days=0, time=time(2, 30, 0), base_date_name='event__date_from', minutes=None))
-    assert rdw.to_string() == 'RELDATE/0/02:30:00/event__date_from/'
+    rdw = RelativeDateWrapper(RelativeDate(days=0, time=time(2, 30, 0), base_date_name='date_from', minutes=None))
+    assert rdw.to_string() == 'RELDATE/0/02:30:00/date_from/'
     assert rdw.datetime(event) == datetime(2020, 3, 29, 2, 30, 0, tzinfo=BERLIN)
 
     event.date_from = datetime(2020, 10, 25, 18, 0, 0, tzinfo=BERLIN)
 
-    rdw = RelativeDateWrapper(RelativeDate(days=1, time=time(18, 0, 0), base_date_name='event__date_from', minutes=None))
-    assert rdw.to_string() == 'RELDATE/1/18:00:00/event__date_from/'
+    rdw = RelativeDateWrapper(RelativeDate(days=1, time=time(18, 0, 0), base_date_name='date_from', minutes=None))
+    assert rdw.to_string() == 'RELDATE/1/18:00:00/date_from/'
     assert rdw.datetime(event) == datetime(2020, 10, 24, 18, 0, 0, tzinfo=BERLIN)
 
-    rdw = RelativeDateWrapper(RelativeDate(days=0, time=time(2, 30, 0), base_date_name='event__date_from', minutes=None))
-    assert rdw.to_string() == 'RELDATE/0/02:30:00/event__date_from/'
+    rdw = RelativeDateWrapper(RelativeDate(days=0, time=time(2, 30, 0), base_date_name='date_from', minutes=None))
+    assert rdw.to_string() == 'RELDATE/0/02:30:00/date_from/'
     assert rdw.datetime(event) == datetime(2020, 10, 25, 2, 30, 0, tzinfo=BERLIN)
 
 
-def test_unserialize_backwards_compatibility():
+def test_unserialize():
     d = datetime(2017, 12, 25, 10, 0, 0, tzinfo=TOKYO)
     rdw = RelativeDateWrapper.from_string(d.isoformat())
     assert rdw.data == d
 
-    # keeping the test for the old from_string_format to ensure that we don't break anything
     rdw = RelativeDateWrapper.from_string('RELDATE/1/-/date_from/')
     assert rdw.data == RelativeDate(days=1, time=None, base_date_name='date_from', minutes=None)
 
-    # keeping the test for the old from_string_format to ensure that we don't break anything
     rdw = RelativeDateWrapper.from_string('RELDATE/1/18:05:13/date_from/')
     assert rdw.data == RelativeDate(days=1, time=time(18, 5, 13), base_date_name='date_from', minutes=None)
 
-    # keeping the test for the old from_string_format to ensure that we don't break anything
     rdw = RelativeDateWrapper.from_string('RELDATE/minutes/60/date_from/')
     assert rdw.data == RelativeDate(days=0, time=None, base_date_name='date_from', minutes=60)
-
-
-def test_backwards_compatibility():
-    # the data model of RelativeDate had to be extended to support other models as relation target
-    # previously only:
-    # - date_from
-    # - date_to
-    # - date_admission
-    # - presale_start
-    # - presale_end
-    # where valid values for the fourth slot (base_date_names) of the serialized form.
-    # the relationship in this case always pointed at event
-    # so any preexisting base_date_names without __ should continue to work and upgrade to event__{old_base_date_name}
-    d = datetime(2017, 12, 25, 10, 0, 0, tzinfo=TOKYO)
-    rdw = RelativeDateWrapper.from_string(d.isoformat())
-    assert rdw.data == d
-
-    rdw = RelativeDateWrapper.from_string('RELDATE/1/-/date_from/')
-    assert rdw.to_string() == 'RELDATE/1/-/event__date_from/'
-
-    rdw = RelativeDateWrapper.from_string('RELDATE/1/-/date_to/')
-    assert rdw.to_string() == 'RELDATE/1/-/event__date_to/'
-
-    rdw = RelativeDateWrapper.from_string('RELDATE/1/-/date_admission/')
-    assert rdw.to_string() == 'RELDATE/1/-/event__date_admission/'
-
-    rdw = RelativeDateWrapper.from_string('RELDATE/1/-/presale_start/')
-    assert rdw.to_string() == 'RELDATE/1/-/event__presale_start/'
-
-    rdw = RelativeDateWrapper.from_string('RELDATE/1/-/presale_end/')
-    assert rdw.to_string() == 'RELDATE/1/-/event__presale_end/'
-
-    # new order base_date_names should not work without __
-    with pytest.raises(TypeError):
-        RelativeDateWrapper.from_string('RELDATE/1/-/datetime/')
-    with pytest.raises(TypeError):
-        RelativeDateWrapper.from_string('RELDATE/1/-/expires/')
-
-
-@pytest.mark.django_db
-def test_relative_to_order(event):
-    with scope(organizer=event.organizer):
-        order_moment = datetime(2020, 3, 29, 18, 0, 0, tzinfo=TOKYO)
-
-        order = Order.objects.create(
-            code='FOO', event=event, email='dummy@dummy.test',
-            status=Order.STATUS_PENDING, secret="k24fiuwvu8kxz3y1",
-            datetime=order_moment,
-            expires=order_moment + timedelta(days=10),
-            sales_channel=event.organizer.sales_channels.get(identifier="web"),
-            total=23, locale='en'
-        )
-
-        rdw = RelativeDateWrapper(RelativeDate(days=1, time=None, base_date_name='order__datetime', minutes=None, is_after=True))
-        assert rdw.datetime(order).astimezone(TOKYO) == datetime(2020, 3, 30, 18, 0, 0, tzinfo=TOKYO)
-        assert rdw.to_string() == 'RELDATE/1/-/order__datetime/after'

src/tests/base/test_waitinglist.py

@@ -235,7 +235,7 @@ class WaitingListTestCase(TestCase):
         self.event.settings.set('waiting_list_enabled', True)
         self.event.settings.set('waiting_list_auto', True)
         self.event.settings.waiting_list_auto_disable = RelativeDateWrapper(
-            RelativeDate(days=0, time=None, base_date_name='event__date_from', minutes=20, is_after=False)
+            RelativeDate(days=0, time=None, base_date_name='date_from', minutes=20, is_after=False)
         )
         self.event.save()
         with scope(organizer=self.o):

src/tests/control/test_events.py

@@ -481,7 +481,7 @@ class EventsTest(SoupTest):
             'payment_term_last_0': 'absolute',
             'payment_term_last_1': (self.event1.presale_end - datetime.timedelta(1)).strftime('%Y-%m-%d'),
             'payment_term_last_2': '0',
-            'payment_term_last_3': 'event__date_from',
+            'payment_term_last_3': 'date_from',
             'tax_rule_payment': 'default',
         })
         assert doc.select('.alert-danger')
@@ -496,7 +496,7 @@ class EventsTest(SoupTest):
             'payment_term_last_0': 'relative',
             'payment_term_last_1': '',
             'payment_term_last_2': '10',
-            'payment_term_last_3': 'event__date_from',
+            'payment_term_last_3': 'date_from',
             'tax_rule_payment': 'default',
         })
         assert doc.select('.alert-danger')

src/tests/control/test_subevents.py

@@ -230,19 +230,19 @@ class SubEventsTest(SoupTest):
             'rel_presale_start_0': 'unset',
             'rel_presale_start_1': '',
             'rel_presale_start_2': '1',
-            'rel_presale_start_3': 'event__date_from',
+            'rel_presale_start_3': 'date_from',
             'rel_presale_start_4': '',
             'rel_presale_start_5': '',
-            'rel_presale_start_6': 'event__date_from',
+            'rel_presale_start_6': 'date_from',
             'rel_presale_start_7': 'before',
             'rel_presale_start_8': 'before',
             'rel_presale_end_1': '',
             'rel_presale_end_0': 'relative',
             'rel_presale_end_2': '1',
-            'rel_presale_end_3': 'event__date_from',
+            'rel_presale_end_3': 'date_from',
             'rel_presale_end_4': '13:29:31',
             'rel_presale_end_5': '',
-            'rel_presale_end_6': 'event__date_from',
+            'rel_presale_end_6': 'date_from',
             'rel_presale_end_7': 'before',
             'rel_presale_end_8': 'before',
             'quotas-TOTAL_FORMS': '1',
@@ -328,19 +328,19 @@ class SubEventsTest(SoupTest):
             'rel_presale_start_0': 'unset',
             'rel_presale_start_1': '',
             'rel_presale_start_2': '1',
-            'rel_presale_start_3': 'event__date_from',
+            'rel_presale_start_3': 'date_from',
             'rel_presale_start_4': '',
             'rel_presale_start_5': '',
-            'rel_presale_start_6': 'event__date_from',
+            'rel_presale_start_6': 'date_from',
             'rel_presale_start_7': 'before',
             'rel_presale_start_8': 'before',
             'rel_presale_end_1': '',
             'rel_presale_end_0': 'relative',
             'rel_presale_end_2': '1',
-            'rel_presale_end_3': 'event__date_from',
+            'rel_presale_end_3': 'date_from',
             'rel_presale_end_4': '13:29:31',
             'rel_presale_end_5': '',
-            'rel_presale_end_6': 'event__date_from',
+            'rel_presale_end_6': 'date_from',
             'rel_presale_end_7': 'before',
             'rel_presale_end_8': 'before',
             'quotas-TOTAL_FORMS': '1',
@@ -403,19 +403,19 @@ class SubEventsTest(SoupTest):
             'rel_presale_start_0': 'unset',
             'rel_presale_start_1': '',
             'rel_presale_start_2': '1',
-            'rel_presale_start_3': 'event__date_from',
+            'rel_presale_start_3': 'date_from',
             'rel_presale_start_4': '',
             'rel_presale_start_5': '',
-            'rel_presale_start_6': 'event__date_from',
+            'rel_presale_start_6': 'date_from',
             'rel_presale_start_7': 'before',
             'rel_presale_start_8': 'before',
             'rel_presale_end_1': '',
             'rel_presale_end_0': 'relative',
             'rel_presale_end_2': '1',
-            'rel_presale_end_3': 'event__date_from',
+            'rel_presale_end_3': 'date_from',
             'rel_presale_end_4': '13:29:31',
             'rel_presale_end_5': '',
-            'rel_presale_end_6': 'event__date_from',
+            'rel_presale_end_6': 'date_from',
             'rel_presale_end_7': 'before',
             'rel_presale_end_8': 'before',
             'quotas-TOTAL_FORMS': '1',
@@ -479,19 +479,19 @@ class SubEventsTest(SoupTest):
             'rel_presale_start_0': 'unset',
             'rel_presale_start_1': '',
             'rel_presale_start_2': '1',
-            'rel_presale_start_3': 'event__date_from',
+            'rel_presale_start_3': 'date_from',
             'rel_presale_start_4': '',
             'rel_presale_start_5': '',
-            'rel_presale_start_6': 'event__date_from',
+            'rel_presale_start_6': 'date_from',
             'rel_presale_start_7': 'before',
             'rel_presale_start_8': 'before',
             'rel_presale_end_1': '',
             'rel_presale_end_0': 'relative',
             'rel_presale_end_2': '1',
-            'rel_presale_end_3': 'event__date_from',
+            'rel_presale_end_3': 'date_from',
             'rel_presale_end_4': '02:30:00',
             'rel_presale_end_5': '',
-            'rel_presale_end_6': 'event__date_from',
+            'rel_presale_end_6': 'date_from',
             'rel_presale_end_7': 'before',
             'rel_presale_end_8': 'before',
             'quotas-TOTAL_FORMS': '1',
@@ -567,19 +567,19 @@ class SubEventsTest(SoupTest):
             'rel_presale_start_0': 'unset',
             'rel_presale_start_1': '',
             'rel_presale_start_2': '1',
-            'rel_presale_start_3': 'event__date_from',
+            'rel_presale_start_3': 'date_from',
             'rel_presale_start_4': '',
             'rel_presale_start_5': '',
-            'rel_presale_start_6': 'event__date_from',
+            'rel_presale_start_6': 'date_from',
             'rel_presale_start_7': 'before',
             'rel_presale_start_8': 'before',
             'rel_presale_end_1': '',
             'rel_presale_end_0': 'relative',
             'rel_presale_end_2': '1',
-            'rel_presale_end_3': 'event__date_from',
+            'rel_presale_end_3': 'date_from',
             'rel_presale_end_4': '13:29:31',
             'rel_presale_end_5': '',
-            'rel_presale_end_6': 'event__date_from',
+            'rel_presale_end_6': 'date_from',
             'rel_presale_end_7': 'before',
             'rel_presale_end_8': 'before',
             'quotas-TOTAL_FORMS': '1',
@@ -639,19 +639,19 @@ class SubEventsTest(SoupTest):
             'rel_presale_start_0': 'unset',
             'rel_presale_start_1': '',
             'rel_presale_start_2': '1',
-            'rel_presale_start_3': 'event__date_from',
+            'rel_presale_start_3': 'date_from',
             'rel_presale_start_4': '',
             'rel_presale_start_5': '',
-            'rel_presale_start_6': 'event__date_from',
+            'rel_presale_start_6': 'date_from',
             'rel_presale_start_7': 'before',
             'rel_presale_start_8': 'before',
             'rel_presale_end_0': 'unset',
             'rel_presale_end_1': '',
             'rel_presale_end_2': '1',
-            'rel_presale_end_3': 'event__date_from',
+            'rel_presale_end_3': 'date_from',
             'rel_presale_end_4': '13:29:31',
             'rel_presale_end_5': '',
-            'rel_presale_end_6': 'event__date_from',
+            'rel_presale_end_6': 'date_from',
             'rel_presale_end_7': 'before',
             'rel_presale_end_8': 'before',
             'quotas-TOTAL_FORMS': '1',
@@ -711,19 +711,19 @@ class SubEventsTest(SoupTest):
             'rel_presale_start_0': 'unset',
             'rel_presale_start_1': '',
             'rel_presale_start_2': '1',
-            'rel_presale_start_3': 'event__date_from',
+            'rel_presale_start_3': 'date_from',
             'rel_presale_start_4': '',
             'rel_presale_start_5': '',
-            'rel_presale_start_6': 'event__date_from',
+            'rel_presale_start_6': 'date_from',
             'rel_presale_start_7': 'before',
             'rel_presale_start_8': 'before',
             'rel_presale_end_0': 'unset',
             'rel_presale_end_1': '',
             'rel_presale_end_2': '1',
-            'rel_presale_end_3': 'event__date_from',
+            'rel_presale_end_3': 'date_from',
             'rel_presale_end_4': '13:29:31',
             'rel_presale_end_5': '',
-            'rel_presale_end_6': 'event__date_from',
+            'rel_presale_end_6': 'date_from',
             'rel_presale_end_7': 'before',
             'rel_presale_end_8': 'before',
             'quotas-TOTAL_FORMS': '1',

src/tests/plugins/paypal2/test_webhook.py

@@ -244,61 +244,6 @@ def get_test_refund():
     }
 
 
-def get_test_order_review_pending():
-    return {'id': '806440346Y391300T',
-            'intent': 'CAPTURE',
-            'status': 'COMPLETED',
-            'purchase_units': [{'reference_id': 'default',
-                                'amount': {'currency_code': 'EUR', 'value': '43.59'},
-                                'payee': {'email_address': 'dummy-facilitator@dummy.dummy',
-                                          'merchant_id': 'G6R2B9YXADKWW'},
-                                'description': 'Order JWJGC for PayPal v2',
-                                'custom_id': 'Order PAYPALV2-JWJGC',
-                                'soft_descriptor': 'MARTINFACIL',
-                                'payments': {'captures': [{'id': '22A4162004478570J',
-                                                           'status': 'PENDING',
-                                                           'status_details': {
-                                                               'reason': 'PENDING_REVIEW'
-                                                           },
-                                                           'amount': {'currency_code': 'EUR', 'value': '43.59'},
-                                                           'final_capture': True,
-                                                           'disbursement_mode': 'INSTANT',
-                                                           'seller_protection': {'status': 'ELIGIBLE',
-                                                                                 'dispute_categories': [
-                                                                                     'ITEM_NOT_RECEIVED',
-                                                                                     'UNAUTHORIZED_TRANSACTION']},
-                                                           'seller_receivable_breakdown': {
-                                                               'gross_amount': {'currency_code': 'EUR',
-                                                                                'value': '43.59'},
-                                                               'paypal_fee': {'currency_code': 'EUR', 'value': '1.18'},
-                                                               'net_amount': {'currency_code': 'EUR',
-                                                                              'value': '42.41'}},
-                                                           'custom_id': 'Order PAYPALV2-JWJGC',
-                                                           'links': [{
-                                                               'href': 'https://api.sandbox.paypal.com/v2/payments/captures/22A4162004478570J',
-                                                               'rel': 'self',
-                                                               'method': 'GET'},
-                                                               {
-                                                                   'href': 'https://api.sandbox.paypal.com/v2/payments/captures/22A4162004478570J/refund',
-                                                                   'rel': 'refund',
-                                                                   'method': 'POST'},
-                                                               {
-                                                                   'href': 'https://api.sandbox.paypal.com/v2/checkout/orders/806440346Y391300T',
-                                                                   'rel': 'up',
-                                                                   'method': 'GET'}],
-                                                           'create_time': '2022-04-28T12:00:22Z',
-                                                           'update_time': '2022-04-28T12:00:22Z'}]}}],
-            'payer': {'name': {'given_name': 'test', 'surname': 'buyer'},
-                      'email_address': 'dummy@dummy.dummy',
-                      'payer_id': 'Q739JNKWH67HE',
-                      'address': {'country_code': 'DE'}},
-            'create_time': '2022-04-28T11:59:59Z',
-            'update_time': '2022-04-28T12:00:22Z',
-            'links': [{'href': 'https://api.sandbox.paypal.com/v2/checkout/orders/806440346Y391300T',
-                       'rel': 'self',
-                       'method': 'GET'}]}
-
-
 class Object():
     pass
 
@@ -745,95 +690,3 @@ def test_webhook_refund2(env, client, monkeypatch):
         assert r.payment == order.payments.first()
         assert r.state == OrderRefund.REFUND_STATE_EXTERNAL
         assert r.source == OrderRefund.REFUND_SOURCE_EXTERNAL
-
-
-@pytest.mark.django_db
-def test_webhook_pending_payment(env, client, monkeypatch):
-    order = env[1]
-    order.status = Order.STATUS_PENDING
-    order.save()
-    with scopes_disabled():
-        order.payments.update(state=OrderPayment.PAYMENT_STATE_CREATED)
-
-    pp_order = Result(get_test_order_review_pending())
-    mock_orders_get_request = MagicMock(return_value=pp_order)
-    monkeypatch.setattr("paypalcheckoutsdk.orders.OrdersGetRequest", mock_orders_get_request)
-    monkeypatch.setattr("pretix.plugins.paypal2.payment.PaypalMethod.init_api", init_api)
-    with scopes_disabled():
-        ReferencedPayPalObject.objects.create(order=order, payment=order.payments.first(),
-                                              reference="806440346Y391300T")
-
-        assert order.payments.first().state == OrderPayment.PAYMENT_STATE_CREATED
-
-    client.post('/_paypal/webhook/', json.dumps(
-        {
-            "id": "WH-0AH02875JL566842H-2AF03788XV8252724",
-            "create_time": "2022-04-28T12:00:37.077Z",
-            "resource_type": "capture",
-            "event_type": "PAYMENT.CAPTURE.PENDING",
-            "summary": "Payment pending for € 43.59 EUR",
-            "resource": {
-                "update_time": "2022-04-28T12:00:22Z",
-                "create_time": "2022-04-28T11:59:59Z",
-                "amount": {
-                    "currency_code": "EUR",
-                    "value": "43.59"
-                },
-                "custom_id": "Order PAYPALV2-JWJGC",
-                "final_capture": True,
-                "id": "22A4162004478570J",
-                "links": [
-                    {
-                        "href": "https://api.sandbox.paypal.com/v2/payments/captures/5M631111V9599860P",
-                        "method": "GET",
-                        "rel": "self"
-                    },
-                    {
-                        "href": "https://api.sandbox.paypal.com/v2/payments/captures/5M631111V9599860P/refund",
-                        "method": "POST",
-                        "rel": "refund"
-                    },
-                    {
-                        "href": "https://api.sandbox.paypal.com/v2/checkout/orders/806440346Y391300T",
-                        "method": "GET",
-                        "rel": "up"
-                    }
-                ],
-                "payee": {
-                    "email_address": "sb-ybfun52428692@business.example.com",
-                    "merchant_id": "DLM8QKDR3CFZW"
-                },
-                "seller_protection": {
-                    "status": "NOT_ELIGIBLE"
-                },
-                "status": "PENDING",
-                "status_details": {
-                    "reason": "PENDING_REVIEW"
-                },
-                "supplementary_data": {
-                    "related_ids": {
-                        "order_id": "9L827155WD164573M"
-                    }
-                }
-            },
-            "links": [
-                {
-                    "href": "https://api.sandbox.paypal.com/v1/notifications/webhooks-events/WH-0AH02875JL566842H-2AF03788XV8252724",
-                    "method": "GET",
-                    "rel": "self"
-                },
-                {
-                    "href": "https://api.sandbox.paypal.com/v1/notifications/webhooks-events/WH-0AH02875JL566842H-2AF03788XV8252724/resend",
-                    "method": "POST",
-                    "rel": "resend"
-                }
-            ],
-            "event_version": "1.0",
-            "resource_version": "2.0"
-        }
-    ), content_type='application_json')
-
-    order = env[1]
-    order.refresh_from_db()
-    with scopes_disabled():
-        assert order.payments.first().state == OrderPayment.PAYMENT_STATE_PENDING

src/tests/plugins/sendmail/conftest.py

@@ -35,8 +35,6 @@ def event():
         organizer=o, name='Dummy', slug='dummy',
         date_from=now(), live=True,
         plugins='pretix.plugins.sendmail,tests.testdummy',
-        location='Foo City',
-        date_admission=now().replace(hour=11, minute=30),
     )
     return event
 
@@ -83,12 +81,7 @@ def event_series(event):
 
 @pytest.fixture
 def subevent1(event_series):
-    se1 = event_series.subevents.create(
-        name='Meow',
-        date_from=now() + datetime.timedelta(days=1),
-        location='Meow Town',
-        date_admission=now().replace(hour=10, minute=0),
-    )
+    se1 = event_series.subevents.create(name='Meow', date_from=now() + datetime.timedelta(days=1))
     return se1
 
 

src/tests/plugins/sendmail/test_rules.py

@@ -186,7 +186,7 @@ def test_sendmail_rule_send_order_vs_pos(send_to, amount_mails, recipients, orde
 
     order.event.sendmail_rules.create(date_is_absolute=True, send_date=dt_now - datetime.timedelta(hours=1),
                                       send_to=send_to,
-                                      subject='{event}: {event_location} @ {event_admission_time}', template='meow meow meow')
+                                      subject='meow', template='meow meow meow')
     order.all_positions.create(item=item, price=0, attendee_email='meow@dummy.test')
 
     sendmail_run_rules(None)
@@ -196,8 +196,6 @@ def test_sendmail_rule_send_order_vs_pos(send_to, amount_mails, recipients, orde
     _recipients = [mail.to[0] for mail in djmail.outbox]
     assert set(recipients) == set(_recipients)
 
-    assert djmail.outbox[0].subject == 'Dummy: Foo City @ 11:30'
-
 
 @pytest.mark.django_db
 @scopes_disabled()
@@ -245,7 +243,7 @@ def test_sendmail_rule_send_correct_subevent(order, event_series, subevent1, sub
 
     event_series.sendmail_rules.create(date_is_absolute=False, offset_is_after=False, send_offset_days=2,
                                        send_offset_time=datetime.time(9, 30), send_to=Rule.ATTENDEES,
-                                       subject='{event}: {event_location} @ {event_admission_time}', template='meow meow meow')
+                                       subject='meow', template='meow meow meow')
     p1 = order.all_positions.create(item=item, price=13, attendee_email='se1@dummy.test', subevent=subevent1)
     order.all_positions.create(item=item, price=23, attendee_email='se2@dummy.test', subevent=subevent2)
 
@@ -255,8 +253,6 @@ def test_sendmail_rule_send_correct_subevent(order, event_series, subevent1, sub
 
     assert djmail.outbox[0].to[0] == p1.attendee_email
 
-    assert djmail.outbox[0].subject == 'Meow: Meow Town @ 10:00'
-
 
 @pytest.mark.django_db
 @scopes_disabled()

src/tests/presale/test_event.py

@@ -1132,7 +1132,7 @@ class WaitingListTest(EventTestMixin, SoupTest):
     def test_auto_disable(self):
         self.event.settings.set('waiting_list_enabled', True)
         self.event.settings.waiting_list_auto_disable = RelativeDateWrapper(
-            RelativeDate(days=900, time=datetime.time(9, 0, 0), base_date_name='event__date_from', minutes=None, is_after=False)
+            RelativeDate(days=900, time=datetime.time(9, 0, 0), base_date_name='date_from', minutes=None, is_after=False)
         )
         response = self.client.get(
             '/%s/%s/' % (self.orga.slug, self.event.slug)

src/tests/presale/test_order_change.py

@@ -1527,7 +1527,7 @@ class OrderChangeAddonsTest(BaseOrdersTest):
         self.order.save()
         self._subevent_setup()
         self.event.settings.set('payment_term_last', RelativeDateWrapper(
-            RelativeDate(days=2, time=None, base_date_name='event__date_from', minutes=None)
+            RelativeDate(days=2, time=None, base_date_name='date_from', minutes=None)
         ))
 
         response = self.client.get(

src/tests/presale/test_orders.py

@@ -1076,7 +1076,7 @@ class OrdersTest(BaseOrdersTest):
         self.event.date_from = now() + datetime.timedelta(days=3)
         self.event.save()
         self.event.settings.set('ticket_download_date', RelativeDateWrapper(RelativeDate(
-            base_date_name='event__date_from', days=2, time=None, minutes=None
+            base_date_name='date_from', days=2, time=None, minutes=None
         )))
         response = self.client.post(
             '/%s/%s/order/%s/%s/download/%d/testdummy' % (self.orga.slug, self.event.slug, self.order.code,

vite.config.ts

@@ -31,6 +31,7 @@ export default defineConfig({
 			// Allow serving source files from sibling plugin directories
 			allow: ['src', ...pluginDirs],
 		},
+		cors: { origin: /^https?:\/\/(?:(?:[^:]+\.)?localhost|127\.0\.0\.1|\[::1\]|[^:]+\.pretix\.work)(?::\d+)?$/ },
 	},
 	build: {
 		manifest: true,
@@ -47,7 +48,7 @@ export default defineConfig({
 	},
 	optimizeDeps: {
 		exclude: ['moment', 'jquery']
-	}
+	},
 })
 
 // Virtual module plugin: generates re-export entries for each shared dep