TODO markings

rebase migration and migrate order-level questions as well
QuestionnaireChild: system_question und user_question in system_datafield und user_datafield umbenennen
2026-08-29 13:44:40 +00:00 · 2026-08-13 16:53:15 +02:00 · 2026-08-13 16:40:43 +02:00 · 2026-08-13 16:40:20 +02:00 · 2026-08-13 16:17:21 +02:00 · 2026-08-13 15:13:34 +02:00
62 changed files with 2796 additions and 1098 deletions
@@ -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",
@@ -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",
@@ -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

@@ -975,7 +975,7 @@ class DeviceEventSettingsSerializer(EventSettingsSerializer):
        'reusable_media_type_nfc_mf0aes',
        'reusable_media_type_nfc_mf0aes_random_uid',
        'reusable_media_usage_enforced',
-        'system_question_order',
+        'system_question_order',  # TODO(questionnaires) - remove or replace
        'tax_rule_payment',
        'tax_rule_cancellation',
    ]
@@ -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)
+        question = Question.objects.create(**validated_data, container_type=Question.ContainerType.ORDERPOSITION)
        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_datafield:
+            return qc.system_datafield
+        elif qc.user_datafield_id:
+            return qc.user_datafield_id
+        else:
+            return None
+
+    def to_internal_value(self, data):
+        if type(data) == int:
+            return {'user_datafield': super().to_internal_value(data), 'system_datafield': None}
+        elif type(data) == str or data is None:
+            return {'user_datafield': None, 'system_datafield': 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_datafield'] or child['dependency_question']['system_datafield']) not in prev_questions:
+                    raise ValidationError('A question can only depend on a previous question from the same questionnaire.')
+
+            if child['user_datafield']:
+                prev_questions[child['user_datafield']] = child
+            if child['system_datafield']:
+                prev_questions[child['system_datafield']] = 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)
@@ -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)
@@ -48,13 +48,15 @@ from pretix.api.pagination import TotalOrderingFilter
 from pretix.api.serializers.item import (
    ItemAddOnSerializer, ItemBundleSerializer, ItemCategorySerializer,
    ItemProgramTimeSerializer, ItemSerializer, ItemVariationSerializer,
-    QuestionOptionSerializer, QuestionSerializer, QuotaSerializer,
+    QuestionnaireSerializer, QuestionOptionSerializer, QuestionSerializer,
+    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,7 +477,10 @@ class QuestionViewSet(ConditionalListView, viewsets.ModelViewSet):
    write_permission = 'event.items:write'

    def get_queryset(self):
-        return self.request.event.questions.prefetch_related('options').all()
+        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()

    @transaction.atomic()
    def perform_create(self, serializer):
@@ -563,6 +568,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

@@ -638,447 +638,241 @@ class PortraitImageField(SizeValidationMixin, ExtValidationMixin, forms.FileFiel

 class BaseQuestionsForm(forms.Form):
    """
-    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.
+    This is the base form class responsible for asking order- or ticket-related questions.
    """
    address_validation = False

-    def __init__(self, *args, **kwargs):
-        """
-        Takes two additional keyword arguments:
-
-        :param cartpos: The cart position the form should be for
-        :param event: The event this belongs to
-        """
-        request = kwargs.pop('request', None)
-        cartpos = self.cartpos = kwargs.pop('cartpos', None)
-        orderpos = self.orderpos = kwargs.pop('orderpos', None)
-        pos = cartpos or orderpos
-        item = pos.item
-        questions = pos.item.questions_to_ask
-        event = kwargs.pop('event')
-        self.all_optional = kwargs.pop('all_optional', False)
-        self.attendee_addresses_required = event.settings.attendee_addresses_required and not self.all_optional
-
-        super().__init__(*args, **kwargs)
-
-        if cartpos and item.validity_mode == Item.VALIDITY_MODE_DYNAMIC and item.validity_dynamic_start_choice:
-            if item.validity_dynamic_start_choice_day_limit:
-                max_date = time_machine_now().astimezone(event.timezone) + timedelta(days=item.validity_dynamic_start_choice_day_limit)
-            else:
-                max_date = None
-            min_date = time_machine_now()
+    def build_user_question_field(self, request, event, answerlist, qc, datafield):
+        # Do we already have an answer? Provide it as the initial value
+        answers = [a for a in answerlist if a.question_id == datafield.id]
+        if answers:
+            initial = answers[0]
+        else:
            initial = None
-            if (item.require_membership or (pos.variation and pos.variation.require_membership)) and pos.used_membership:
-                if pos.used_membership.date_start >= time_machine_now():
-                    initial = min_date = pos.used_membership.date_start
-                max_date = min(max_date, pos.used_membership.date_end) if max_date else pos.used_membership.date_end
-            if item.validity_dynamic_duration_months or item.validity_dynamic_duration_days:
-                attrs = {}
-                if max_date:
-                    attrs['data-max'] = max_date.date().isoformat()
-                if min_date:
-                    attrs['data-min'] = min_date.date().isoformat()
-                self.fields['requested_valid_from'] = forms.DateField(
-                    label=_('Start date'),
-                    help_text='' if initial else _('If you keep this empty, the ticket will be valid starting at the time of purchase.'),
-                    required=bool(initial),
-                    initial=pos.requested_valid_from or initial,
-                    widget=DatePickerWidget(attrs),
-                    validators=([MaxDateValidator(max_date.date())] if max_date else []) + [MinDateValidator(min_date.date())]
-                )
+        tz = ZoneInfo(event.settings.timezone)
+        required = qc.required and not self.all_optional
+        if datafield.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:
-                self.fields['requested_valid_from'] = forms.SplitDateTimeField(
-                    label=_('Start date'),
-                    help_text='' if initial else _('If you keep this empty, the ticket will be valid starting at the time of purchase.'),
-                    required=bool(initial),
-                    initial=pos.requested_valid_from or initial,
-                    widget=SplitDateTimePickerWidget(
-                        time_format=get_format_without_seconds('TIME_INPUT_FORMATS'),
-                        min_date=min_date,
-                        max_date=max_date
-                    ),
-                    validators=([MaxDateTimeValidator(max_date)] if max_date else []) + [MinDateTimeValidator(min_date)]
-                )
+                widget = forms.CheckboxInput()

-        add_fields = {}
+            if initial:
+                initialbool = (initial.answer == "True")
+            else:
+                initialbool = False

-        if item.ask_attendee_data and event.settings.attendee_names_asked:
-            add_fields['attendee_name_parts'] = NamePartsFormField(
-                max_length=255,
-                required=event.settings.attendee_names_required and not self.all_optional,
-                scheme=event.settings.name_scheme,
-                titles=event.settings.name_scheme_titles,
-                label=_('Attendee name'),
-                initial=(cartpos.attendee_name_parts if cartpos else orderpos.attendee_name_parts),
+            field = forms.BooleanField(
+                label=escape(qc.label), required=required,
+                help_text=rich_text(qc.help_text),
+                initial=initialbool, widget=widget,
            )
-        if item.ask_attendee_data and event.settings.attendee_emails_asked:
-            add_fields['attendee_email'] = forms.EmailField(
-                required=event.settings.attendee_emails_required and not self.all_optional,
-                label=_('Attendee email'),
-                initial=(cartpos.attendee_email if cartpos else orderpos.attendee_email),
-                widget=forms.EmailInput(
-                    attrs={
-                        'autocomplete': 'email'
-                    }
-                )
+        elif datafield.type == Question.TYPE_NUMBER:
+            field = forms.DecimalField(
+                label=escape(qc.label), required=required,
+                min_value=datafield.valid_number_min or Decimal('0.00'),
+                max_value=datafield.valid_number_max,
+                help_text=rich_text(qc.help_text),
+                initial=initial.answer if initial else None,
            )
-        if item.ask_attendee_data and event.settings.attendee_company_asked:
-            add_fields['company'] = forms.CharField(
-                required=event.settings.attendee_company_required and not self.all_optional,
-                label=_('Company'),
-                max_length=255,
-                initial=(cartpos.company if cartpos else orderpos.company),
+        elif datafield.type == Question.TYPE_STRING:
+            field = forms.CharField(
+                label=escape(qc.label), required=required,
+                max_length=datafield.valid_string_length_max,
+                help_text=rich_text(qc.help_text),
+                initial=initial.answer if initial else None,
            )
-
-        if item.ask_attendee_data and event.settings.attendee_addresses_asked:
-            add_fields['street'] = forms.CharField(
-                required=self.attendee_addresses_required,
-                label=_('Address'),
-                widget=forms.Textarea(attrs={
-                    'rows': 2,
-                    'placeholder': _('Street and Number'),
-                    'autocomplete': 'street-address'
-                }),
-                initial=(cartpos.street if cartpos else orderpos.street),
+        elif datafield.type == Question.TYPE_TEXT:
+            field = forms.CharField(
+                label=escape(qc.label), required=required,
+                max_length=datafield.valid_string_length_max,
+                help_text=rich_text(qc.help_text),
+                widget=forms.Textarea,
+                initial=initial.answer if initial else None,
            )
-            add_fields['zipcode'] = forms.CharField(
-                required=False,
-                max_length=30,
-                label=_('ZIP code'),
-                initial=(cartpos.zipcode if cartpos else orderpos.zipcode),
-                widget=forms.TextInput(attrs={
-                    'autocomplete': 'postal-code',
-                }),
-            )
-            add_fields['city'] = forms.CharField(
-                required=False,
-                label=_('City'),
-                max_length=255,
-                initial=(cartpos.city if cartpos else orderpos.city),
-                widget=forms.TextInput(attrs={
-                    'autocomplete': 'address-level2',
-                }),
-            )
-            country = (cartpos.country if cartpos else orderpos.country) or guess_country_from_request(request, event)
-            add_fields['country'] = CountryField(
-                countries=CachedCountries
+        elif datafield.type == Question.TYPE_COUNTRYCODE:
+            field = CountryField(
+                countries=CachedCountries,
+                blank=True, null=True, blank_label=' ',
            ).formfield(
-                required=self.attendee_addresses_required,
-                label=_('Country'),
-                initial=country,
-                widget=forms.Select(attrs={
-                    'autocomplete': 'country',
-                    'data-trigger-address-info': 'on',
-                }),
+                label=escape(qc.label), required=required,
+                help_text=rich_text(qc.help_text),
+                widget=forms.Select,
+                empty_label=' ',
+                initial=initial.answer if initial else (guess_country_from_request(request, event) if required else None),
            )
-            c = [('', '---')]
-            fprefix = str(self.prefix) + '-' if self.prefix is not None and self.prefix != '-' else ''
-            cc = None
-            state = None
-            if fprefix + 'country' in self.data:
-                cc = str(self.data[fprefix + 'country'])
-            elif country:
-                cc = str(country)
-            if cc and cc in COUNTRIES_WITH_STATE_IN_ADDRESS:
-                types, form = COUNTRIES_WITH_STATE_IN_ADDRESS[cc]
-                statelist = [s for s in pycountry.subdivisions.get(country_code=cc) if s.type in types]
-                c += sorted([(s.code[3:], s.name) for s in statelist], key=lambda s: s[1])
-                state = (cartpos.state if cartpos else orderpos.state)
-            elif fprefix + 'state' in self.data:
-                self.data = self.data.copy()
-                del self.data[fprefix + 'state']
-
-            add_fields['state'] = forms.ChoiceField(
-                label=pgettext_lazy('address', 'State'),
-                required=False,
-                choices=c,
-                initial=state,
-                widget=forms.Select(attrs={
-                    'autocomplete': 'address-level1',
-                }),
+        elif datafield.type == Question.TYPE_CHOICE:
+            field = forms.ModelChoiceField(
+                queryset=datafield.options,
+                label=escape(qc.label), required=required,
+                help_text=rich_text(qc.help_text),
+                widget=forms.Select,
+                to_field_name='identifier',
+                empty_label='',
+                initial=initial.options.first() if initial else None,
            )
-            add_fields['state'].widget.is_required = True
-
-        field_positions = list(
-            [
-                (n, event.settings.system_question_order.get(n if n != 'state' else 'country', 0))
-                for n in add_fields.keys()
-            ]
-        )
-
-        for q in questions:
-            # 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]
+        elif datafield.type == Question.TYPE_CHOICE_MULTIPLE:
+            field = forms.ModelMultipleChoiceField(
+                queryset=datafield.options,
+                label=escape(qc.label), required=required,
+                help_text=rich_text(qc.help_text),
+                to_field_name='identifier',
+                widget=QuestionCheckboxSelectMultiple,
+                initial=initial.options.all() if initial else None,
+            )
+        elif datafield.type == Question.TYPE_FILE:
+            if datafield.valid_file_portrait:
+                field = PortraitImageField(
+                    label=escape(qc.label), required=required,
+                    help_text=rich_text(qc.help_text),
+                    initial=initial.file if initial else None,
+                    widget=PortraitImageWidget(answer=initial, request=request, attrs={'data-portrait-photo': 'true'}),
+                )
            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,
+                field = ExtFileField(
+                    label=escape(qc.label), required=required,
+                    help_text=rich_text(qc.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_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'}),
+        elif datafield.type == Question.TYPE_DATE:
+            attrs = {}
+            if datafield.valid_date_min:
+                attrs['data-min'] = datafield.valid_date_min.isoformat()
+            if datafield.valid_date_max:
+                attrs['data-max'] = datafield.valid_date_max.isoformat()
+            help_text = qc.help_text
+            if not help_text:
+                if datafield.valid_date_min and datafield.valid_date_max:
+                    help_text = format_lazy(
+                        _('Please enter a date between {min} and {max}.'),
+                        min=date_format(datafield.valid_date_min, "SHORT_DATE_FORMAT"),
+                        max=date_format(datafield.valid_date_max, "SHORT_DATE_FORMAT"),
                    )
-                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 datafield.valid_date_min:
+                    help_text = format_lazy(
+                        _('Please enter a date no earlier than {min}.'),
+                        min=date_format(datafield.valid_date_min, "SHORT_DATE_FORMAT"),
                    )
-            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:
+                elif datafield.valid_date_max:
+                    help_text = format_lazy(
+                        _('Please enter a date no later than {max}.'),
+                        max=date_format(datafield.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
-                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:
+            else:
+                _initial = None
+            field = forms.DateField(
+                label=escape(qc.label), required=required,
+                help_text=rich_text(help_text),
+                initial=_initial,
+                widget=DatePickerWidget(attrs),
+            )
+            if datafield.valid_date_min:
+                field.validators.append(MinDateValidator(datafield.valid_date_min))
+            if datafield.valid_date_max:
+                field.validators.append(MaxDateValidator(datafield.valid_date_max))
+        elif datafield.type == Question.TYPE_TIME:
+            if initial and initial.answer:
+                try:
+                    _initial = dateutil.parser.parse(initial.answer).time()
+                except dateutil.parser.ParserError:
                    _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"),
-                        )
+            else:
+                _initial = None
+            field = forms.TimeField(
+                label=escape(qc.label), required=required,
+                help_text=rich_text(qc.help_text),
+                initial=_initial,
+                widget=TimePickerWidget(without_seconds=True),
+            )
+        elif datafield.type == Question.TYPE_DATETIME:
+            help_text = qc.help_text
+            if not help_text:
+                if datafield.valid_datetime_min and datafield.valid_datetime_max:
+                    help_text = format_lazy(
+                        _('Please enter a date and time between {min} and {max}.'),
+                        min=date_format(datafield.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
+                        max=date_format(datafield.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
+                    )
+                elif datafield.valid_datetime_min:
+                    help_text = format_lazy(
+                        _('Please enter a date and time no earlier than {min}.'),
+                        min=date_format(datafield.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
+                    )
+                elif datafield.valid_datetime_max:
+                    help_text = format_lazy(
+                        _('Please enter a date and time no later than {max}.'),
+                        max=date_format(datafield.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:
+            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
+            field = SplitDateTimeField(
+                label=escape(qc.label), required=required,
+                help_text=rich_text(help_text),
+                initial=_initial,
+                widget=SplitDateTimePickerWidget(
+                    time_format=get_format_without_seconds('TIME_INPUT_FORMATS'),
+                    min_date=datafield.valid_datetime_min,
+                    max_date=datafield.valid_datetime_max
+                ),
+            )
+            if datafield.valid_datetime_min:
+                field.validators.append(MinDateTimeValidator(datafield.valid_datetime_min))
+            if datafield.valid_datetime_max:
+                field.validators.append(MaxDateTimeValidator(datafield.valid_datetime_max))
+        elif datafield.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)
+            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]
+            field = PhoneNumberField(
+                label=escape(qc.label), required=required,
+                help_text=rich_text(qc.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.datafield = datafield
+        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
+        if qc.dependency_question_id:
+            field.widget.attrs['data-question-dependency'] = qc.dependency_question_id
+            field.widget.attrs['data-question-dependency-values'] = escapejson_attr(json.dumps(qc.dependency_values))
+            if datafield.type != 'M':
+                field.widget.attrs['required'] = qc.required and not self.all_optional
+                field._required = qc.required and not self.all_optional
+            field.required = False

-            add_fields['question_%s' % q.id] = field
-            field_positions.append(('question_%s' % q.id, q.position))
-
-        field_positions.sort(key=lambda e: e[1])
-        for fname, p in field_positions:
-            self.fields[fname] = add_fields[fname]
-
-        responses = question_form_fields.send(sender=event, position=pos)
-        data = pos.meta_info_data
-        for r, response in sorted(responses, key=lambda r: str(r[0])):
-            for key, value in response.items():
-                # We need to be this explicit, since OrderedDict.update does not retain ordering
-                self.fields[key] = value
-                value.initial = data.get('question_form_data', {}).get(key)
-
-        for k, v in self.fields.items():
-            if isinstance(v.widget, forms.MultiWidget):
-                for w in v.widget.widgets:
-                    autocomplete = w.attrs.get('autocomplete', '')
-                    if autocomplete.strip() == "off":
-                        w.attrs['autocomplete'] = 'off'
-                    else:
-                        w.attrs['autocomplete'] = 'section-{} '.format(self.prefix) + autocomplete
-            if v.widget.attrs.get('autocomplete') or k == 'attendee_name_parts':
-                autocomplete = v.widget.attrs.get('autocomplete', '')
-                if autocomplete.strip() == "off":
-                    v.widget.attrs['autocomplete'] = 'off'
-                else:
-                    v.widget.attrs['autocomplete'] = 'section-{} '.format(self.prefix) + autocomplete
-
-    def clean(self):
-        from pretix.base.addressvalidation import \
-            validate_address  # local import to prevent impact on startup time
-
-        d = super().clean()
-
-        if self.address_validation:
-            self.cleaned_data = d = validate_address(d, all_optional=not self.attendee_addresses_required)
-
-        if d.get('street') and d.get('country') and str(d['country']) in COUNTRIES_WITH_STATE_IN_ADDRESS:
-            if not d.get('state'):
-                self.add_error('state', _('This field is required.'))
+        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):
@@ -1123,6 +917,265 @@ class BaseQuestionsForm(forms.Form):
                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)
+
+        # TODO(questionnaires) - switch olq's to questionnaires !
+        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
+    the attendee name for admission tickets, if the corresponding setting is enabled,
+    as well as additional questions defined by the organizer.
+    """
+
+    def __init__(self, *args, **kwargs):
+        """
+        Takes two additional keyword arguments:
+
+        :param cartpos: The cart position the form should be for
+        :param event: The event this belongs to
+        """
+        request = kwargs.pop('request', None)
+        cartpos = self.cartpos = kwargs.pop('cartpos', None)
+        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
+
+        super().__init__(*args, **kwargs)
+
+        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)
+
+        for questionnaire in questionnaires:
+            for child in getattr(questionnaire, 'childlist', questionnaire.children.all()):
+                if child.user_datafield:
+                    df = child.user_datafield
+                    self.fields['question_%s' % df.id] = self.build_user_question_field(request, event, pos.answerlist, child, df)
+                elif child.system_datafield:
+                    self.fields[child.system_datafield] = self.build_system_question_field(request, event, pos, child)
+
+        responses = question_form_fields.send(sender=event, position=pos)
+        data = pos.meta_info_data
+        for r, response in sorted(responses, key=lambda r: str(r[0])):
+            for key, value in response.items():
+                # We need to be this explicit, since OrderedDict.update does not retain ordering
+                self.fields[key] = value
+                value.initial = data.get('question_form_data', {}).get(key)
+
+        for k, v in self.fields.items():
+            if isinstance(v.widget, forms.MultiWidget):
+                for w in v.widget.widgets:
+                    autocomplete = w.attrs.get('autocomplete', '')
+                    if autocomplete.strip() == "off":
+                        w.attrs['autocomplete'] = 'off'
+                    else:
+                        w.attrs['autocomplete'] = 'section-{} '.format(self.prefix) + autocomplete
+            if v.widget.attrs.get('autocomplete') or k == 'attendee_name_parts':
+                autocomplete = v.widget.attrs.get('autocomplete', '')
+                if autocomplete.strip() == "off":
+                    v.widget.attrs['autocomplete'] = 'off'
+                else:
+                    v.widget.attrs['autocomplete'] = 'section-{} '.format(self.prefix) + autocomplete
+
+    def build_requested_valid_from_field(self, event, pos, item):
+        if item.validity_dynamic_start_choice_day_limit:
+            max_date = time_machine_now().astimezone(event.timezone) + timedelta(days=item.validity_dynamic_start_choice_day_limit)
+        else:
+            max_date = None
+        min_date = time_machine_now()
+        initial = None
+        if (item.require_membership or (pos.variation and pos.variation.require_membership)) and pos.used_membership:
+            if pos.used_membership.date_start >= time_machine_now():
+                initial = min_date = pos.used_membership.date_start
+            max_date = min(max_date, pos.used_membership.date_end) if max_date else pos.used_membership.date_end
+        if item.validity_dynamic_duration_months or item.validity_dynamic_duration_days:
+            attrs = {}
+            if max_date:
+                attrs['data-max'] = max_date.date().isoformat()
+            if min_date:
+                attrs['data-min'] = min_date.date().isoformat()
+            return forms.DateField(
+                label=_('Start date'),
+                help_text='' if initial else _('If you keep this empty, the ticket will be valid starting at the time of purchase.'),
+                required=bool(initial),
+                initial=pos.requested_valid_from or initial,
+                widget=DatePickerWidget(attrs),
+                validators=([MaxDateValidator(max_date.date())] if max_date else []) + [MinDateValidator(min_date.date())]
+            )
+        else:
+            return forms.SplitDateTimeField(
+                label=_('Start date'),
+                help_text='' if initial else _('If you keep this empty, the ticket will be valid starting at the time of purchase.'),
+                required=bool(initial),
+                initial=pos.requested_valid_from or initial,
+                widget=SplitDateTimePickerWidget(
+                    time_format=get_format_without_seconds('TIME_INPUT_FORMATS'),
+                    min_date=min_date,
+                    max_date=max_date
+                ),
+                validators=([MaxDateTimeValidator(max_date)] if max_date else []) + [MinDateTimeValidator(min_date)]
+            )
+
+    def build_system_question_field(self, request, event, pos, qc):
+        field_name = qc.system_datafield
+        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.label),
+                help_text=rich_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.label),
+                help_text=rich_text(qc.help_text),
+                initial=pos.attendee_email,
+                widget=forms.EmailInput(
+                    attrs={
+                        'autocomplete': 'email'
+                    }
+                )
+            )
+        if field_name == 'company':
+            return forms.CharField(
+                required=qc.required and not self.all_optional,
+                label=escape(qc.label),
+                help_text=rich_text(qc.help_text),
+                max_length=255,
+                initial=pos.company,
+            )
+
+        if field_name == 'street':
+            return forms.CharField(
+                required=qc.required and not self.all_optional,
+                label=escape(qc.label),
+                help_text=rich_text(qc.help_text),
+                widget=forms.Textarea(attrs={
+                    'rows': 2,
+                    'placeholder': _('Street and Number'),
+                    'autocomplete': 'street-address'
+                }),
+                initial=pos.street,
+            )
+        if field_name == 'zipcode':
+            return forms.CharField(
+                required=False,
+                max_length=30,
+                label=escape(qc.label),
+                help_text=rich_text(qc.help_text),
+                initial=pos.zipcode,
+                widget=forms.TextInput(attrs={
+                    'autocomplete': 'postal-code',
+                }),
+            )
+        if field_name == 'city':
+            return forms.CharField(
+                required=False,
+                label=escape(qc.label),
+                help_text=rich_text(qc.help_text),
+                max_length=255,
+                initial=pos.city,
+                widget=forms.TextInput(attrs={
+                    'autocomplete': 'address-level2',
+                }),
+            )
+        if field_name == 'country':
+            country = pos.country or guess_country_from_request(request, event)
+            return CountryField(
+                countries=CachedCountries
+            ).formfield(
+                required=qc.required and not self.all_optional,
+                label=escape(qc.label),
+                help_text=rich_text(qc.help_text),
+                initial=country,
+                widget=forms.Select(attrs={
+                    'autocomplete': 'country',
+                    'data-trigger-address-info': 'on',
+                }),
+            )
+        if field_name == 'state':
+            country = pos.country or guess_country_from_request(request, event)
+            c = [('', '---')]
+            fprefix = str(self.prefix) + '-' if self.prefix is not None and self.prefix != '-' else ''
+            cc = None
+            state = None
+            if fprefix + 'country' in self.data:
+                cc = str(self.data[fprefix + 'country'])
+            elif country:
+                cc = str(country)
+            if cc and cc in COUNTRIES_WITH_STATE_IN_ADDRESS:
+                types, form = COUNTRIES_WITH_STATE_IN_ADDRESS[cc]
+                statelist = [s for s in pycountry.subdivisions.get(country_code=cc) if s.type in types]
+                c += sorted([(s.code[3:], s.name) for s in statelist], key=lambda s: s[1])
+                state = (pos.state)
+            elif fprefix + 'state' in self.data:
+                self.data = self.data.copy()
+                del self.data[fprefix + 'state']
+
+            field = forms.ChoiceField(
+                label=escape(qc.label),
+                help_text=rich_text(qc.help_text),
+                required=False,
+                choices=c,
+                initial=state,
+                widget=forms.Select(attrs={
+                    'autocomplete': 'address-level1',
+                }),
+            )
+            field.widget.is_required = True
+            return field
+
+    def clean(self):
+        from pretix.base.addressvalidation import \
+            validate_address  # local import to prevent impact on startup time
+
+        d = super().clean()
+
+        if self.address_validation:
+            self.cleaned_data = d = validate_address(d, all_optional=not self.attendee_addresses_required)
+
+        if d.get('street') and d.get('country') and str(d['country']) in COUNTRIES_WITH_STATE_IN_ADDRESS:
+            if not d.get('state'):
+                self.add_error('state', _('This field is required.'))
+
+        self.check_user_questions(d)
+
        return d


@@ -1201,15 +1254,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 = '<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.')),
-            ])
+            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.'
+            )
        else:
-            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.')),
-            ])
+            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.'
+            )

        transmission_type_choices = [
            (t.identifier, t.public_name) for t in get_transmission_types()
@@ -1295,8 +1348,8 @@ class BaseInvoiceAddressForm(forms.ModelForm):
            del self.fields['beneficiary']

        if event.settings.invoice_address_custom_field:
-            self.fields['custom_field'].label = event.settings.invoice_address_custom_field
-            self.fields['custom_field'].help_text = event.settings.invoice_address_custom_field_helptext
+            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)
        else:
            del self.fields['custom_field']

@@ -47,6 +47,7 @@ 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):
@@ -157,36 +158,26 @@ 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, position, event, answer):
+        def __init__(self, file, answer, request):
            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):
-            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,
-                })
+            token = get_token(self.request, self.answer)
+            if self.request.resolver_match.namespace == 'control':
+                return self.answer.backend_file_url + '?token=' + token
            else:
-                return eventreverse(self.event, 'presale:event.cart.download.answer', kwargs={
-                    'answer': self.answer.pk,
-                })
+                return self.answer.frontend_file_url + '?token=' + token

    def get_context(self, name, value, attrs):
        # Browsers can't recognize that the server already has a file uploaded
@@ -199,7 +190,7 @@ class UploadedFileWidget(forms.ClearableFileInput):

    def format_value(self, value):
        if self.is_initial(value):
-            return self.FakeFile(value, self.position, self.event, self.answer)
+            return self.FakeFile(value, self.answer, self.request)


 class SplitDateTimePickerWidget(forms.SplitDateTimeWidget):
@@ -0,0 +1,63 @@
+# 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",
+            ),
+        ),
+    ]
@@ -0,0 +1,33 @@
+# 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')},
+        ),
+    ]
@@ -0,0 +1,196 @@
+# 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_datafield=child.id,
+                        required=child.required,
+                        label=child.question,
+                    )
+                else:
+                    deps[child.id] = QuestionnaireChild.objects.create(
+                        questionnaire=questionnaire,
+                        position=position + 1,
+                        user_datafield=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 ticket-level questions (user-defined and system provided), along with the products for which they're asked
+        questions = event.questions.filter(container_type='P')
+        children = sorted(chain((
+            (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')
+        ), (
+            (item, q.position, q.id, q)
+            for q in questions.filter(hidden=False)
+            for item in q.items.values_list('id', 'internal_name', 'name')
+        )), key=lambda t: (t[0], t[1]))
+
+        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]))
+
+        create_grouped_item_questionnaires(event, children, 'Hidden questions for ', 'PH')
+
+        # get all order-level questions
+        questions = list(event.questions.filter(container_type='O', hidden=False).order_by('position'))
+        if questions:
+            # create questionnaires and children
+            questionnaire = Questionnaire.objects.create(
+                event=event, type='OS', position=0, all_sales_channels=True,
+                internal_name='Per-order questions',
+            )
+            deps = {}
+            for position, child in enumerate(questions):
+                deps[child.id] = QuestionnaireChild.objects.create(
+                    questionnaire=questionnaire,
+                    position=position + 1,
+                    user_datafield=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,
+                )
+
+
+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', '0309_alter_questionanswer_unique_together_and_more'),
+    ]
+
+    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_datafield', 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_datafield', 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(questionnaires) remove old columns from Question model
+    ]
@@ -37,8 +37,8 @@ from .invoices import Invoice, InvoiceLine, invoice_filename
 from .items import (
    Item, ItemAddOn, ItemBundle, ItemCategory, ItemMetaProperty, ItemMetaValue,
    ItemProgramTime, ItemVariation, ItemVariationMetaValue, Question,
-    QuestionOption, Quota, SubEventItem, SubEventItemVariation,
-    itempicture_upload_to,
+    Questionnaire, QuestionnaireChild, QuestionOption, Quota, SubEventItem,
+    SubEventItemVariation, itempicture_upload_to,
 )
 from .log import LogEntry
 from .mail import OutgoingMail
@@ -33,6 +33,7 @@ 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
@@ -409,6 +410,17 @@ 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)
@@ -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``)
@@ -1592,7 +1594,7 @@ class Question(LoggedModel):
    :param required: Whether answering this question is required for submitting an order including
                     items associated with this question.
    :type required: bool
-    :param items: A set of ``Items`` objects that this question should be applied to
+    :param items: TO BE REMOVED
    :param ask_during_checkin: Whether to ask this question during check-in instead of during check-out.
    :type ask_during_checkin: bool
    :param show_during_checkin: Whether to show the answer to this question during check-in.
@@ -1606,6 +1608,9 @@ 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"
@@ -1641,7 +1646,14 @@ 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(
+        # TODO(questionnaires) : to be renamed to 'internal_name'
        verbose_name=_("Question")
    )
    identifier = models.CharField(
@@ -1657,6 +1669,7 @@ class Question(LoggedModel):
        ],
    )
    help_text = I18nTextField(
+        # TODO(questionnaires) : 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,
@@ -1666,22 +1679,22 @@ class Question(LoggedModel):
        choices=TYPE_CHOICES,
        verbose_name=_("Question type")
    )
-    required = models.BooleanField(
+    required = models.BooleanField(  # TODO(questionnaires) : to be removed, -> QuestionnaireChild
        default=False,
        verbose_name=_("Required question")
    )
-    items = models.ManyToManyField(
+    items = models.ManyToManyField(  # TODO(questionnaires) : 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(  # TODO(questionnaires) : to be removed, -> Questionnaire + QuestionnaireChild
        default=0,
        verbose_name=_("Position")
    )
-    ask_during_checkin = models.BooleanField(
+    ask_during_checkin = models.BooleanField(  # TODO(questionnaires) : 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
@@ -1691,7 +1704,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
@@ -1700,10 +1713,10 @@ class Question(LoggedModel):
        verbose_name=_('Print answer on invoices'),
        default=False
    )
-    dependency_question = models.ForeignKey(
+    dependency_question = models.ForeignKey(  # TODO(questionnaires) : 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=[])  # TODO(questionnaires) : 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'))
@@ -1737,9 +1750,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):
@@ -1885,7 +1898,7 @@ class Question(LoggedModel):
        return answer

    @staticmethod
-    def clean_items(event, items):
+    def clean_items(event, items):  # TODO(questionnaires) : remove method / move to qc
        for item in items:
            if event != item.event:
                raise ValidationError(_('One or more items do not belong to this event.'))
@@ -1964,6 +1977,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_datafield = models.ForeignKey(
+        Question,
+        related_name="references",
+        on_delete=models.CASCADE,
+        null=True, blank=True,
+    )
+    system_datafield = 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
@@ -1304,10 +1304,9 @@ 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=event.organizer.slug,
-        ev=event.slug,
+        org=instance.event.organizer.slug,
+        ev=instance.event.slug,
        secret=secret,
        filename=escape_uri_path(filename),
    )
@@ -1336,6 +1335,14 @@ 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
    )
@@ -1351,16 +1358,21 @@ class QuestionAnswer(models.Model):
    objects = ScopedManager(organizer='question__event__organizer')

    class Meta:
-        unique_together = [['orderposition', 'question'], ['cartposition', 'question']]
+        unique_together = [
+            ['orderposition', 'question'],
+            ['cartposition', 'question'],
+            ['order', 'question'],
+            ['checkoutsession', 'question'],
+        ]

    @property
    def backend_file_url(self):
        if self.file:
-            if self.orderposition:
+            if self.associated_order:
                return reverse('control:event.order.download.answer', kwargs={
-                    'code': self.orderposition.order.code,
-                    'event': self.orderposition.order.event.slug,
-                    'organizer': self.orderposition.order.event.organizer.slug,
+                    'code': self.associated_order.code,
+                    'event': self.associated_order.event.slug,
+                    'organizer': self.associated_order.event.organizer.slug,
                    'answer': self.pk,
                })
        return ""
@@ -1370,14 +1382,14 @@ class QuestionAnswer(models.Model):
        from pretix.multidomain.urlreverse import eventreverse

        if self.file:
-            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,
+            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,
                    'answer': self.pk,
                })
            else:
-                url = eventreverse(self.cartposition.event, 'presale:event.cart.download.answer', kwargs={
+                url = eventreverse(self.event, 'presale:event.cart.download.answer', kwargs={
                    'answer': self.pk,
                })

@@ -1392,6 +1404,24 @@ 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)

@@ -1447,6 +1477,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.')
@@ -1591,53 +1627,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_datafield_id and qc.user_datafield_id in self.answer_cache:
+                qc.answer = self.answer_cache[qc.user_datafield_id]
+                #qc.answer.question = qc  # cache object
+            elif qc.system_datafield:
+                qc.answer = self.get_system_answer(qc.system_datafield)
+                #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_datafield_id:
+            if qc.user_datafield_id not in self.answer_cache:
+                return None
+            answer = self.answer_cache[qc.user_datafield_id]
+            return answer.to_dependency_values()
+        elif qc.system_datafield:
+            return [self.get_system_answer(qc.system_datafield)]
+        else:
+            raise ValueError('Questionnaire child without datafield has no answer')
+
+    def get_system_answer(self, system_datafield_name):
+        if system_datafield_name == 'attendee_name_parts':
+            return self.attendee_name_parts
+        elif system_datafield_name == 'attendee_email':
+            return self.attendee_email
+        elif system_datafield_name == 'street':
+            return self.street
+        elif system_datafield_name == 'zipcode':
+            return self.zipcode
+        elif system_datafield_name == 'city':
+            return self.city
+        elif system_datafield_name == 'state':
+            return self.state
+        elif system_datafield_name == 'country':
+            return self.country
+        else:
+            raise ValueError('Unknown system question name')

    @property
    def net_price(self):
@@ -3177,6 +3240,39 @@ 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
@@ -3381,6 +3477,13 @@ 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,
@@ -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__)
@@ -1148,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,
@@ -1416,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 = []
@@ -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 OrderFee
+from pretix.base.models.orders import CheckoutSession, OrderFee
 from pretix.base.models.tax import TaxRule
 from pretix.base.reldate import RelativeDateWrapper
 from pretix.base.services.checkin import _save_answers
@@ -472,6 +472,16 @@ 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.
@@ -1559,6 +1569,7 @@ class CartManager:

    def commit(self):
        self._check_presale_dates()
+        self._ensure_checkout_session()
        self._check_max_cart_size()

        err = self._delete_out_of_timeframe()
@@ -892,6 +892,7 @@ 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():
@@ -33,6 +33,7 @@ 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


@@ -43,6 +44,10 @@ 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()

@@ -73,8 +73,8 @@ from pretix.base.models import (
 )
 from pretix.base.models.event import SubEvent
 from pretix.base.models.orders import (
-    BlockedTicketSecret, InvoiceAddress, OrderFee, OrderRefund,
-    generate_secret,
+    BlockedTicketSecret, CheckoutSession, InvoiceAddress, OrderFee,
+    OrderRefund, generate_secret,
 )
 from pretix.base.models.organizer import SalesChannel, TeamAPIToken
 from pretix.base.models.tax import TAXED_ZERO, TaxedPrice, TaxRule
@@ -1030,7 +1030,8 @@ 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):
+                  customer=None, valid_if_pending=False, api_meta: dict=None, tax_rounding_mode=None,
+                  cart_id: str=None):
    payments = []

    try:
@@ -1113,6 +1114,14 @@ 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
@@ -1160,7 +1169,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):
+                   shown_total=None, customer=None, api_meta: dict=None, tax_rounding_mode=None, cart_id: str=None):
    for p in payment_requests:
        p['pprov'] = event.get_payment_providers(cached=True)[p['provider']]
        if not p['pprov']:
@@ -1267,6 +1276,7 @@ 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:
@@ -3169,12 +3179,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):
+                  api_meta: dict=None, cart_id: str=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)
+                                      sales_channel, shown_total, customer, api_meta, cart_id=cart_id)
            except LockTimeoutException:
                self.retry()
        except (MaxRetriesExceededError, LockTimeoutException):
@@ -379,7 +379,7 @@ DEFAULTS = {

        )
    },
-    'system_question_order': {
+    'system_question_order': {  # TODO(questionnaires) - remove this
        'default': {},
        'type': dict,
        'serializer_class': serializers.DictField,
@@ -27,23 +27,26 @@ 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, BaseQuestionsForm,
+    BaseInvoiceAddressForm, BaseInvoiceNameForm, OrderLevelQuestionsForm,
+    TicketLevelQuestionsForm,
 )
 from pretix.base.models import (
    CartPosition, InvoiceAddress, OrderPosition, Question, QuestionAnswer,
-    QuestionOption,
+    QuestionnaireChild, QuestionOption,
 )
 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:
-    form_class = BaseQuestionsForm
+    order_form_class = OrderLevelQuestionsForm
+    orderposition_form_class = TicketLevelQuestionsForm
    all_optional = False

    @cached_property
@@ -56,6 +59,28 @@ 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
+        )
+        return form
+
    @cached_property
    def forms(self):
        """
@@ -69,15 +94,17 @@ class BaseQuestionsViewMixin:
            orderpos = cr if isinstance(cr, OrderPosition) else None

            kwargs = self.question_form_kwargs(cr)
-            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 = 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.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
@@ -130,8 +157,38 @@ 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
@@ -140,10 +197,8 @@ 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
@@ -181,64 +236,19 @@ class BaseQuestionsViewMixin:
                            else:
                                self._save_to_answer(field, field.answer, v)
                                field.answer.save()
-                                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)
+
+                                answer_dict = self._build_answer_dict(field, field.answer, k)
+                                prof.store_answer(answer_dict)
                        elif v != '' and v is not None:
-                            answer = QuestionAnswer(
-                                cartposition=(form.pos if isinstance(form.pos, CartPosition) else None),
-                                orderposition=(form.pos if isinstance(form.pos, OrderPosition) else None),
+                            answer = self._upsert_answer(
+                                field, v,
+                                cartposition=cartposition,
+                                orderposition=orderposition,
                                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()

-                            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)
+                            answer_dict = self._build_answer_dict(field, answer, k)
+                            prof.store_answer(answer_dict)

                    else:
                        field = form.fields[k]
@@ -257,10 +267,7 @@ class BaseQuestionsViewMixin:
                            'question_type': None,
                            'question_identifier': None,
                        }
-                        if k in answers_key_to_index:
-                            prof.answers[answers_key_to_index[k]] = answer_dict
-                        else:
-                            prof.answers.append(answer_dict)
+                        prof.store_answer(answer_dict)

            form.pos.meta_info = json.dumps(meta_info)
            form.pos.save()
@@ -271,6 +278,23 @@ 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])
@@ -294,6 +318,21 @@ 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
@@ -307,27 +346,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)
+            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_datafield', 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
@@ -397,6 +446,7 @@ 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
@@ -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,
        })

@@ -153,11 +153,16 @@ class QuestionForm(I18nModelForm):

    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
-        self.fields['items'].queryset = self.instance.event.items.all()
-        self.fields['items'].required = True
+        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']
+        self.fields['dependency_question'].widget.attrs['data-container-type'] = self.instance.container_type
        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
+            ask_during_checkin=False,
+            container_type=self.instance.container_type,
        )
        if self.instance.pk:
            self.fields['dependency_question'].queryset = self.fields['dependency_question'].queryset.exclude(
@@ -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.'),
@@ -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'),
@@ -13,9 +13,11 @@
 					{% 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>
-			{% 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 %}
+            </ul>
 		{% 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">
@@ -12,142 +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" %}
-                {% bootstrap_field form.items layout="control" %}
-                {% 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" %}
-                {% 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">
-                    <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" %}
@@ -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(questionnaires) : 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 %}
@@ -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,49 +10,52 @@
        {% endblocktrans %}
    </p>
    {% csrf_token %}
-    {% 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 question" %}
-            </a>
-        </p>
+
+    {% 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 data field" %}
+                </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 data field" %}
+                </a>
+            </p>
+        {% endif %}
+
+        <h2>{% trans "Per-ticket data fields" %}</h2>
+        <p>{% trans "These data field can be used on individual tickets." %}</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 data field" %}
+                </a>
+            </p>
+        {% endif %}
    {% 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 %}">
-            {% for q in questions %}
-                <tr data-dnd-id="{{ q.id }}">
+            <tbody>
+            {% for q in questions %}{% if q.container_type == "P" %}
+                <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 %}
@@ -63,47 +66,97 @@
                        {% 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>
-                    <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>
-            {% endfor %}
+            {% endif %}{% endfor %}
            </tbody>
        </table>
    </div>
+
+    {% if request.event.settings.feature_flag_order_level_questions %}
+        <h2>
+            {% trans "Per-order data fields" %}
+            <small><span class="label label-info" title="
+                {% trans "This functionality is in active development and expected to change significantly over the coming months." %}
+                {% trans "In pretixPOS, per-order data fields are currently not supported and will not be displayed." %}
+            " data-toggle="tooltip">
+                <span class="fa fa-flask" aria-hidden="true"></span>
+                {% trans "Experimental feature" %}
+            </span></small>
+        </h2>
+        <p>{% trans "These data fields are asked once per order." %}</p>
+        <div class="table-responsive">
+            <table class="table table-hover table-quotas">
+                <thead>
+                <tr>
+                    <th>{% trans "Internal name" %}</th>
+                    <th>{% trans "Type" %}</th>
+                    <th class="iconcol"></th>
+                    <th class="iconcol"></th>
+                    <th class="iconcol"></th>
+                    <th class="action-col-2"></th>
+                </tr>
+                </thead>
+                <tbody>
+                {% for q in questions %}{% if q.container_type == "O" %}
+                    <tr>
+                        <td>
+                            <strong>
+                                <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>
+                            {{ q.get_type_display }}
+                        </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>
+                        <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 %}
+                            {% endif %}
+                        </td>
+                    </tr>
+                {% endif %}{% endfor %}
+                </tbody>
+            </table>
+        </div>
+    {% endif %}
 {% endblock %}
@@ -35,6 +35,18 @@
                    </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">
@@ -0,0 +1,30 @@
+{% 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 }}
+    {% elif question.type %}
+        {{ answer.to_string_i18n|rich_text_snippet }}
+    {% else %}
+        {{ answer|linebreaksbr }}
+    {% endif %}
+{% else %}
+    <em>{% trans "not answered" %}</em>
+{% endif %}
@@ -427,6 +427,14 @@
                                </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>
@@ -602,60 +610,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"
@@ -664,6 +621,7 @@
                                                {% endif %}
                                            </dt>
                                            <dd>
+                                                {#
                                                {% if q.answer %}
                                                    {% if q.answer.file %}
                                                        <span class="fa fa-file"></span>
@@ -683,12 +641,29 @@
                                                        {% endif %}
                                                    {% elif q.type == "M" %}
                                                        {{ q.answer.to_string_i18n|rich_text_snippet }}
-                                                    {% else %}
+                                                    {% elif q.type %}
                                                        {{ q.answer.to_string_i18n|linebreaksbr }}
+                                                    {% else %}<!-- TODO(questionnaires): proper separation of QuestionAnswer objects and system answers......   -->
+                                                        {{ q.answer|linebreaksbr }}
                                                    {% endif %}
                                                {% else %}
                                                    <em>{% trans "not answered" %}</em>
                                                {% endif %}
+                                                #}
+                                                {% include "pretixcontrol/order/fragment_question_answer.html" with request=request question=q answer=q.answer %}
+                                                {% if q.system_datafield == "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 %}
@@ -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'),
@@ -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

@@ -426,7 +426,7 @@ def reorder_categories(request, organizer, event):


 FakeQuestion = namedtuple(
-    'FakeQuestion', 'id question position required'
+    'FakeQuestion', 'id question position required container_type'
 )


@@ -436,140 +436,7 @@ class QuestionList(ListView):
    template_name = 'pretixcontrol/items/questions.html'

    def get_queryset(self):
-        return self.request.event.questions.prefetch_related('items')
-
-    def get_context_data(self, **kwargs):
-        ctx = super().get_context_data(**kwargs)
-        questions = []
-
-        if self.request.event.settings.attendee_names_asked:
-            questions.append(
-                FakeQuestion(
-                    id='attendee_name_parts',
-                    question=_('Attendee name'),
-                    position=self.request.event.settings.system_question_order.get(
-                        'attendee_name_parts', 0
-                    ),
-                    required=self.request.event.settings.attendee_names_required,
-                )
-            )
-
-        if self.request.event.settings.attendee_emails_asked:
-            questions.append(
-                FakeQuestion(
-                    id='attendee_email',
-                    question=_('Attendee email'),
-                    position=self.request.event.settings.system_question_order.get(
-                        'attendee_email', 0
-                    ),
-                    required=self.request.event.settings.attendee_emails_required,
-                )
-            )
-
-        if self.request.event.settings.attendee_company_asked:
-            questions.append(
-                FakeQuestion(
-                    id='company',
-                    question=_('Company'),
-                    position=self.request.event.settings.system_question_order.get(
-                        'company', 0
-                    ),
-                    required=self.request.event.settings.attendee_company_required,
-                )
-            )
-
-        if self.request.event.settings.attendee_addresses_asked:
-            questions.append(
-                FakeQuestion(
-                    id='street',
-                    question=_('Street'),
-                    position=self.request.event.settings.system_question_order.get(
-                        'street', 0
-                    ),
-                    required=self.request.event.settings.attendee_addresses_required,
-                )
-            )
-            questions.append(
-                FakeQuestion(
-                    id='zipcode',
-                    question=_('ZIP code'),
-                    position=self.request.event.settings.system_question_order.get(
-                        'zipcode', 0
-                    ),
-                    required=self.request.event.settings.attendee_addresses_required,
-                )
-            )
-            questions.append(
-                FakeQuestion(
-                    id='city',
-                    question=_('City'),
-                    position=self.request.event.settings.system_question_order.get(
-                        'city', 0
-                    ),
-                    required=self.request.event.settings.attendee_addresses_required,
-                )
-            )
-            questions.append(
-                FakeQuestion(
-                    id='country',
-                    question=_('Country'),
-                    position=self.request.event.settings.system_question_order.get(
-                        'country', 0
-                    ),
-                    required=self.request.event.settings.attendee_addresses_required,
-                )
-            )
-
-        questions += list(ctx['questions'])
-        questions.sort(key=lambda q: q.position)
-        ctx['questions'] = questions
-        return ctx
-
-
-@transaction.atomic
-@event_permission_required("event.items:write")
-@require_http_methods(["POST"])
-def reorder_questions(request, organizer, event):
-    try:
-        ids = json.loads(request.body.decode('utf-8'))['ids']
-    except (JSONDecodeError, KeyError, ValueError):
-        return HttpResponseBadRequest("expected JSON: {ids:[]}")
-
-    # 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(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) != request.event.questions.count():
-        raise Http404(_("Not all objects have been selected."))
-
-    for q in input_questions:
-        pos = ids.index(str(q.pk))
-        if pos != q.position:  # Save unneccessary UPDATE queries
-            q.position = pos
-            q.save(update_fields=['position'])
-            q.log_action(
-                'pretix.event.question.reordered', user=request.user, data={
-                    'position': pos,
-                }
-            )
-
-    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()
+        return self.request.event.questions


 class QuestionDelete(EventPermissionRequiredMixin, CompatDeleteView):
@@ -805,6 +672,9 @@ 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:
@@ -836,6 +706,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
@@ -2226,6 +2226,10 @@ 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
@@ -2587,7 +2591,11 @@ class AnswerDownload(EventPermissionRequiredMixin, OrderViewMixin, ListView):
        answid = kwargs.get('answer')
        token = request.GET.get('token', '')

-        answer = get_object_or_404(QuestionAnswer, orderposition__order=self.order, id=answid)
+        answer = get_object_or_404(
+            QuestionAnswer,
+            Q(orderposition__order=self.order) | Q(order=self.order),
+            id=answid
+        )
        if not answer.file:
            raise Http404()
        if not check_token(request, answer, token):
@@ -2597,7 +2605,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,
+            answer.orderposition.positionid if answer.orderposition else '',
            os.path.basename(answer.file.name).split('.', 1)[1]
        )
        return resp
@@ -24,17 +24,21 @@ 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 = TimestampSigner()
+    signer = SafeDownloadSigner()
    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 = TimestampSigner()
+    signer = SafeDownloadSigner()
    try:
        return payload == signer.unsign(token, max_age=3600 * 24)
    except BadSignature:
@@ -95,12 +95,14 @@ 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_is_free, get_cart_positions,
+)
 from pretix.presale.views.cart import (
    _items_from_post_data, cart_session, create_empty_cart_id,
    get_or_create_cart_id,
 )
-from pretix.presale.views.questions import QuestionsViewMixin
+from pretix.presale.views.questions import CartQuestionsViewMixin


 class BaseCheckoutFlowStep:
@@ -494,7 +496,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
@@ -772,7 +774,7 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
                       sales_channel=request.sales_channel.identifier, override_now_dt=time_machine_now(default=None))


-class QuestionsStep(QuestionsViewMixin, CartMixin, TemplateFlowStep):
+class QuestionsStep(CartQuestionsViewMixin, CartMixin, TemplateFlowStep):
    priority = 50
    identifier = "questions"
    template_name = "pretixpresale/event/checkout_questions.html"
@@ -1061,26 +1063,18 @@ class QuestionsStep(QuestionsViewMixin, 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 +1083,16 @@ class QuestionsStep(QuestionsViewMixin, 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_datafield_id and question_is_required(qc) and qc.user_datafield_id not in cp.answer_cache:
+                            if warn:
+                                messages.warning(request, _('Please fill in answers to all required questions.'))
+                            return False
+                        if qc.system_datafield and question_is_required(qc) and not cp.get_system_answer(qc.system_datafield):
+                            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,6 +1104,7 @@ class QuestionsStep(QuestionsViewMixin, 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
@@ -1563,6 +1543,7 @@ 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

@@ -1660,6 +1641,7 @@ 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):
@@ -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, BaseQuestionsForm, WrappedPhoneNumberPrefixWidget,
-    guess_phone_prefix_from_request,
+    BaseInvoiceAddressForm, TicketLevelQuestionsForm,
+    WrappedPhoneNumberPrefixWidget, guess_phone_prefix_from_request,
 )
 from pretix.base.templatetags.rich_text import rich_text
 from pretix.base.validators import EmailBanlistValidator
@@ -139,11 +139,14 @@ class InvoiceNameForm(InvoiceAddressForm):
                del self.fields[f]


-class QuestionsForm(BaseQuestionsForm):
+class CustomerAwareQuestionsForm(TicketLevelQuestionsForm):
    """
-    This form class is responsible for asking order-related questions. This includes
+    The base 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.
+
+    This class adds support for pre-filling data like name and address from a
+    customer profile, in case the user is logged-in with a customer account.
    """
    required_css_class = 'required'
    address_validation = True
@@ -162,6 +162,26 @@
                        {% 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 %}
@@ -68,6 +68,18 @@
                    </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>
@@ -204,29 +204,9 @@
                            {% endif %}
                        {% endif %}
                        {% for q in line.questions %}
-                            <dt>{{ q.question }}</dt>
+                            <dt>{{ q.label }}</dt>
                            <dd>
-                                {% 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 %}
+                                {% include "pretixpresale/event/fragment_question_answer.html" with request=request question=q answer=q.answer %}
                            </dd>
                        {% endfor %}
                        {% for q in line.additional_answers %}
@@ -0,0 +1,24 @@
+{% 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 %}
@@ -346,6 +346,16 @@
                            {% 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>
@@ -48,6 +48,18 @@
                    </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">
@@ -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,6 +54,8 @@ from pretix.base.models import (
    CartPosition, Customer, InvoiceAddress, ItemAddOn, OrderFee, Question,
    QuestionAnswer, QuestionOption, TaxRule,
 )
+from pretix.base.models.items import QuestionnaireChild
+from pretix.base.models.orders import CheckoutSession
 from pretix.base.services.cart import get_fees
 from pretix.base.services.pricing import apply_rounding
 from pretix.base.templatetags.money import money_filter
@@ -94,13 +96,22 @@ 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':
@@ -389,7 +400,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'):
@@ -397,8 +408,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)
+            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(
@@ -419,18 +433,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_datafield', 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:
@@ -440,6 +459,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):
    """
@@ -491,7 +512,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,
@@ -67,6 +67,7 @@ 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,
@@ -388,6 +389,7 @@ 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 = {}
@@ -398,6 +400,7 @@ 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)

@@ -846,15 +849,19 @@ 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,
-            cartposition__cart_id=get_or_create_cart_id(self.request),
+            Q(cartposition__cart_id=cart_id) | Q(checkoutsession__cart_id=cart_id),
            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, _ = mimetypes.guess_type(answer.file.name)
+        ftype, _1 = mimetypes.guess_type(answer.file.name)
        filename = '{}-cart-{}'.format(
            self.request.event.slug.upper(),
            os.path.basename(answer.file.name).split('.', 1)[1]
@@ -862,6 +869,7 @@ class AnswerDownload(EventViewMixin, View):
        resp = FileResponse(
            answer.file,
            filename=filename,
+            as_attachment=True,
            content_type=ftype or 'application/binary'
        )
        return resp
@@ -90,7 +90,9 @@ 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 InvoiceAddressForm, QuestionsForm
+from pretix.presale.forms.checkout import (
+    CustomerAwareQuestionsForm, InvoiceAddressForm,
+)
 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
@@ -806,10 +808,14 @@ class OrderInvoiceCreate(EventViewMixin, OrderDetailMixin, View):

@method_decorator(xframe_options_exempt, 'dispatch')
 class OrderModify(EventViewMixin, OrderDetailMixin, OrderQuestionsViewMixin, TemplateView):
-    form_class = QuestionsForm
+    orderposition_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':
@@ -940,7 +946,7 @@ class OrderModify(EventViewMixin, OrderDetailMixin, OrderQuestionsViewMixin, Tem

@method_decorator(xframe_options_exempt, 'dispatch')
 class OrderPositionModify(EventViewMixin, OrderPositionDetailMixin, OrderQuestionsViewMixin, TemplateView):
-    form_class = QuestionsForm
+    orderposition_form_class = CustomerAwareQuestionsForm
    invoice_form_class = None
    template_name = "pretixpresale/event/position_modify.html"

@@ -948,6 +954,10 @@ 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]
@@ -1144,7 +1154,11 @@ class AnswerDownload(EventViewMixin, OrderDetailMixin, View):
        answid = kwargs.get('answer')
        token = request.GET.get('token', '')

-        answer = get_object_or_404(QuestionAnswer, orderposition__order=self.order, id=answid)
+        answer = get_object_or_404(
+            QuestionAnswer,
+            Q(orderposition__order=self.order) | Q(order=self.order),
+            id=answid,
+        )
        if not answer.file:
            raise Http404()
        if not check_token(request, answer, token):
@@ -1154,7 +1168,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,
+            answer.orderposition.positionid if answer.orderposition else '',
            os.path.basename(answer.file.name).split('.', 1)[1]
        )
        return resp
@@ -35,14 +35,18 @@
 from django.utils.functional import cached_property

 from pretix.base.views.mixins import BaseQuestionsViewMixin
-from pretix.presale.forms.checkout import QuestionsForm
+from pretix.presale.forms.checkout import CustomerAwareQuestionsForm
 from pretix.presale.views import get_cart


-class QuestionsViewMixin(BaseQuestionsViewMixin):
-    form_class = QuestionsForm
+class CartQuestionsViewMixin(BaseQuestionsViewMixin):
+    orderposition_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)
@@ -131,7 +131,8 @@ $(function () {
        $val.parent().append("<div class=\"help-block loading-indicator\"><span class=\"fa" +
            " fa-cog fa-spin\"></span></div>");

-        apiGET('/api/v1/organizers/' + $("body").attr("data-organizer") + '/events/' + $("body").attr("data-event") + '/questions/' + val + '/', function (data) {
+				// 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) {
            if (data.type === "B") {
                $val.append($("<option>").attr("value", "True").text(gettext("Yes")));
                $val.append($("<option>").attr("value", "False").text(gettext("No")));
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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}/`);
+}
@@ -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 },
+});
@@ -0,0 +1,4 @@
+import { createApp } from 'vue'
+import App from './App.vue'
+
+createApp(App).mount('#questionnaires-editor')
@@ -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,
+};
@@ -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%;
@@ -0,0 +1,2 @@
+- modernize the sometimes native form submitting?
+- destructure props?
@@ -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
Author	SHA1	Message	Date
Mira Weller	2db1e978b2	TODO markings	2026-08-13 16:53:15 +02:00
Mira Weller	d47245feb5	rebase migration and migrate order-level questions as well	2026-08-13 16:40:43 +02:00
Mira Weller	e423c52540	QuestionnaireChild: system_question und user_question in system_datafield und user_datafield umbenennen	2026-08-13 16:40:20 +02:00
Mira Weller	50431047f1	Rebased --- Squashed commit of the following: commit `2177bebf6a` Merge: `ea613bf271` `d08216d8c5` Author: Mira Weller <weller@rami.io> Date: Fri Aug 7 21:22:31 2026 +0200 Merge branch 'master' into questions-vue3 commit `ea613bf271` Author: Mira Weller <weller@rami.io> Date: Fri Aug 7 21:21:35 2026 +0200 wip commit `c8bed5e3b9` Author: Mira Weller <weller@rami.io> Date: Fri Aug 7 10:15:00 2026 +0200 rename get_cart to get_cart_positions (keep old name alive) commit `1ec27fff05` Author: Mira Weller <weller@rami.io> Date: Fri Aug 7 10:01:38 2026 +0200 filter questionnaires by sales channel commit `0294f205d0` Author: Mira Weller <weller@rami.io> Date: Thu Aug 6 20:06:05 2026 +0200 refactor: extract build_requested_valid_from_field method commit `3424aacdc3` Author: Mira Weller <weller@rami.io> Date: Thu Aug 6 20:05:44 2026 +0200 rename presale question forms and mixins commit `4012889076` Author: Mira Weller <weller@rami.io> Date: Thu Aug 6 19:42:29 2026 +0200 rebase migration commit `fe15d71cd2` Merge: `3ea7ea31b6` `4d9dfa88fe` Author: Mira Weller <weller@rami.io> Date: Thu Aug 6 19:25:44 2026 +0200 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 commit `3ea7ea31b6` Author: Mira Weller <weller@rami.io> Date: Fri Jul 24 17:37:46 2026 +0200 wip commit `5b34a25fb5` Author: Mira Weller <weller@rami.io> Date: Wed Jun 17 16:21:11 2026 +0200 use questionnaire data for rendering checkout questions step commit `9467f1d08d` Author: Mira Weller <weller@rami.io> Date: Wed Jun 17 15:54:14 2026 +0200 refactor: extract build_system_question_field method commit `85344a7690` Author: Mira Weller <weller@rami.io> Date: Wed Jun 17 15:50:41 2026 +0200 refactor: extract build_user_question_field method commit `3b47f4aaa7` Author: Mira Weller <weller@rami.io> Date: Wed Jun 17 15:49:34 2026 +0200 refactor: cartpos / orderpos commit `0309b05121` Author: Mira Weller <weller@rami.io> Date: Thu Mar 19 13:52:18 2026 +0100 vite config: allow cors access from pretix.work subdomains commit `ad092ae0d1` Author: Mira Weller <weller@rami.io> Date: Wed Jun 17 12:35:33 2026 +0200 re-add vue-slicksort dep commit `9f42d679cc` Author: Mira Weller <weller@rami.io> Date: Wed Jun 17 12:28:53 2026 +0200 rebase migration commit `9eae9c6de7` Merge: `84c51e031e` `694b915d89` Author: Mira Weller <weller@rami.io> Date: Wed Jun 17 12:24:49 2026 +0200 Merge branch 'master' into questions-vue3 # Conflicts: # .github/workflows/tests.yml # .gitignore # Dockerfile # package-lock.json # package.json # src/pretix/base/management/commands/runserver.py # src/pretix/base/middleware.py # src/pretix/base/templatetags/vite.py # src/pretix/control/forms/global_settings.py # src/pretix/control/templates/pretixcontrol/checkin/list_edit.html # src/pretix/control/views/item.py # src/pretix/presale/views/widget.py # src/pretix/settings.py # src/pretix/static/pretixcontrol/js/ui/checkinrules/App.vue # src/pretix/static/pretixcontrol/js/ui/checkinrules/constants.ts # src/pretix/static/pretixcontrol/js/ui/checkinrules/django-interop.ts # src/pretix/static/pretixcontrol/js/ui/checkinrules/lookup-select2.vue # src/pretix/static/pretixcontrol/js/ui/checkinrules/timefield.vue # src/pretix/static/pretixcontrol/js/ui/checkinrules/viz-node.vue # src/pretix/static/pretixpresale/widget/index.html # src/pretix/static/pretixpresale/widget/src/api.ts # src/pretix/static/pretixpresale/widget/src/button.ts # src/pretix/static/pretixpresale/widget/src/components/PriceBox.vue # src/pretix/static/pretixpresale/widget/src/main.ts # src/pretix/static/pretixpresale/widget/src/sharedStore.ts # src/pretix/static/pretixpresale/widget/src/utils.ts # src/pretix/static/pretixpresale/widget/src/widget.ts # src/tests/e2e/conftest.py # vite.config.ts commit `84c51e031e` Merge: `902ee9242e` `222b453b43` Author: Mira Weller <weller@rami.io> Date: Wed Jun 17 12:20:05 2026 +0200 Merge branch 'master' into questions-vue3 commit `902ee9242e` Author: Mira Weller <weller@rami.io> Date: Wed Jun 17 12:19:26 2026 +0200 css comment commit `b758efd4a9` Author: Mira Weller <weller@rami.io> Date: Wed Jun 17 12:19:19 2026 +0200 question dependencies commit `c68fe00502` Author: Mira Weller <weller@rami.io> Date: Wed Jun 17 12:18:00 2026 +0200 add data field edit link commit `b7da9bb6c1` Author: Mira Weller <weller@rami.io> Date: Wed Jun 17 12:16:20 2026 +0200 handle hidden questions commit `897120d3da` Author: Mira Weller <weller@rami.io> Date: Tue May 12 13:04:08 2026 +0200 add ts model definitions commit `09abc5725e` Author: Mira Weller <weller@rami.io> Date: Tue May 12 11:30:12 2026 +0200 reorder and save commit `9a7d5abb1f` Author: Mira Weller <weller@rami.io> Date: Tue May 12 11:29:37 2026 +0200 fix unhandled exception in taxrules API commit `3cee5f524b` Author: Mira Weller <weller@rami.io> Date: Tue May 5 18:12:21 2026 +0200 use slicksort for reordering questionnaires and questions commit `3a1a6b988e` Author: Mira Weller <weller@rami.io> Date: Tue Apr 28 19:23:35 2026 +0200 improve i18n, implement "add text block" dialog commit `bdc720f5a2` Author: Mira Weller <weller@rami.io> Date: Fri Mar 27 18:57:22 2026 +0100 wip commit `583184af38` Author: Mira Weller <weller@rami.io> Date: Thu Mar 19 21:45:32 2026 +0100 change existing views commit `63d9f7cea8` Author: Mira Weller <weller@rami.io> Date: Thu Mar 19 21:45:32 2026 +0100 adapt vue app to new data model (wip) commit `c3d6fb1bd6` Author: Mira Weller <weller@rami.io> Date: Thu Mar 19 21:44:47 2026 +0100 add Questionnaire and QuestionnaireChild models and their API; migrate existing data commit `bb43acd257` Author: Mira Weller <weller@rami.io> Date: Thu Mar 19 13:52:28 2026 +0100 vite config: add questionnaires app commit `e0744951e8` Author: Mira Weller <weller@rami.io> Date: Thu Mar 19 13:52:18 2026 +0100 vite config: allow cors access from pretix.work subdomains commit `fef1e356f7` Author: Mira Weller <weller@rami.io> Date: Thu Mar 19 13:33:24 2026 +0100 fix out-of-the-box experience commit `81775f5d2d` Author: Mira Weller <weller@rami.io> Date: Thu Mar 19 13:33:24 2026 +0100 setup questionnaires vue app, add code from question editor proof of concept commit `4bbcc398cc` Merge: `a924d0a266` `58840a5fd6` Author: Mira Weller <weller@rami.io> Date: Thu Mar 19 13:13:32 2026 +0100 Merge remote-tracking branch 'refs/remotes/origin/master' into questions-vue3	2026-08-13 16:17:21 +02:00
Mira Weller	e55de75679	Remove stray id attribute	2026-08-13 15:13:34 +02:00
Mira Weller	2412312a37	Fix question dependency selection on OLQs, add undocumented parameter container_type to API	2026-08-13 14:50:10 +02:00
Mira Weller	845f917766	Show "Additional order information" box only if questions exist, part two	2026-08-13 14:41:37 +02:00
Mira Weller	076ebd58f9	Show "Additional order information" box only if questions exist	2026-08-12 22:42:33 +02:00
Mira Weller	3e3daa3636	Unify label and help text formatting	2026-08-12 22:31:38 +02:00
Mira Weller	ecb488338b	Add missing return statement in _save_answers race condition branch	2026-08-12 21:30:05 +02:00
Mira Weller	6f01ec525f	Use answers.update() instead of looping over answers	2026-08-12 21:02:01 +02:00
Mira Weller	1bc00f0cb4	Fix download from UploadedFileWidget in backend	2026-08-12 21:02:01 +02:00
Mira Weller	8bee2b4a4f	Get rid of CheckoutSession / Order distinction in OrderLevelQuestionsForm, both behave the same way	2026-08-12 20:39:18 +02:00
luelistaandRichard Schreiber	9dcd94f65c	Update src/pretix/base/forms/questions.py Co-authored-by: Richard Schreiber <schreiber@pretix.eu>	2026-08-12 15:57:21 +02:00
Mira Weller	85eba9e543	TicketQuestionsForm -> TicketLevelQuestionsForm	2026-08-12 15:56:53 +02:00
Mira Weller	dc662c973b	Reuse get_fake_attendee_questions in QuestionList	2026-08-12 15:47:15 +02:00
Mira Weller	1c13a16f79	Fix default order of system questions	2026-08-12 15:46:55 +02:00
Mira Weller	776a83b36e	Fix answer file download on presale order info page	2026-08-12 13:59:20 +02:00
Mira Weller	64c6929084	Show order level question answers on presale order info page	2026-08-12 13:57:06 +02:00
Mira Weller	d7eab0630a	Fix attendee system questions	2026-08-12 13:38:21 +02:00
Mira Weller	4fa1b9eb2c	Display answers in confirm step, fix file upload/download	2026-08-12 13:38:09 +02:00
Mira Weller	f8c69120d4	Explanation of experimental	2026-08-11 18:30:28 +02:00
Mira Weller	346f481093	Use models.TextChoices	2026-08-11 16:25:11 +02:00
Mira Weller	eec6df166d	Fix list html in question_delete	2026-08-11 16:25:01 +02:00
Mira Weller	0c01e67cfb	Hide order-level questions UI behind feature flag	2026-08-11 16:24:43 +02:00
Mira Weller	c1e35f597e	set default for Question container_type	2026-08-11 13:06:33 +02:00
Mira Weller	8a16b52a72	add order-level questions to order modify form	2026-08-11 12:53:00 +02:00
Mira Weller	2c210cd883	isort	2026-08-11 12:38:41 +02:00
Mira Weller	31e5091b36	Order-level questions	2026-08-11 12:36:11 +02:00
Mira Weller	49a67646d7	wip	2026-08-11 10:50:22 +02:00
Mira Weller	15d2340064	wip	2026-08-08 12:41:37 +02:00
Mira Weller	d4066aa1d4	Transfer order-level question answers from checkoutsession unto order	2026-08-07 21:56:00 +02:00
Mira Weller	82ff98bdc8	add order-level QuestionAnswers	2026-08-07 21:56:00 +02:00
Mira Weller	39df70e654	Fix migration	2026-08-07 21:49:03 +02:00
Mira Weller	daa7235c96	Create and delete CheckoutSession throught cart lifetime	2026-08-07 21:32:36 +02:00
Mira Weller	cbc9231ab9	Add CheckoutSession model	2026-08-07 21:32:36 +02:00