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-09-15 16:34:42 +00:00 · 2026-09-15 16:37:23 +02:00 · 2026-09-15 16:37:23 +02:00 · 2026-09-15 16:37:22 +02:00 · 2026-09-15 16:37:22 +02:00 · 2026-09-15 13:16:36 +02:00
61 changed files with 1951 additions and 773 deletions
@@ -0,0 +1,2 @@
+# Format pre-vue code with eslint where possible (2026-09-10)
+d85e52c83ed3639e040372fd0052e842e4899d90
@@ -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",
@@ -4148,9 +4149,9 @@
      }
    },
    "node_modules/smol-toml": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.6.1.tgz",
-      "integrity": "sha512-dWUG8F5sIIARXih1DTaQAX4SsiTXhInKf1buxdY9DIg4ZYPZK5nGM1VRIYmEbDbsHt7USo99xSLFu5Q1IqTmsg==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.7.1.tgz",
+      "integrity": "sha512-PPlsspAZ4jbMBu5DMFhfUGDQLu/vrL4SyBROVS37x8ynnVmFIs1VPBz1Co8Xks3TvpIaZXmU85y4DrQ+UyVFoQ==",
      "dev": true,
      "license": "BSD-3-Clause",
      "engines": {
@@ -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",
@@ -37,7 +37,7 @@ dependencies = [
  "css-inline==0.21.*",
  "defusedcsv>=3.0.0",
  "dnspython==2.*",
-  "Django[argon2]==5.2.*",
+  "Django[argon2]==5.2.*,>=5.2.17",
  "django-bootstrap3==26.2",
  "django-compressor==4.6.0",
  "django-countries==9.0.*",
@@ -84,7 +84,7 @@ dependencies = [
  "pycountry",
  "pycparser==3.0",
  "pycryptodome==3.23.*",
-  "pypdf==6.5.*",
+  "pypdf==6.11.*",
  "python-bidi==0.6.*",  # Support for Arabic in reportlab
  "python-dateutil==2.9.*",
  "pytz",
@@ -979,7 +979,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_string_length_min', 'valid_file_portrait')
+                  'valid_string_length_max', 'valid_string_length_min', 'valid_file_portrait', 'internal_name',)

    def validate_identifier(self, value):
        Question._clean_identifier(self.context['event'], value, self.instance)
@@ -626,6 +628,160 @@ class QuestionSerializer(I18nAwareModelSerializer):
        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
@@ -566,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

@@ -36,7 +36,6 @@ import copy
 import json
 import logging
 import re
-from collections import namedtuple
 from datetime import timedelta
 from decimal import Decimal
 from io import BytesIO
@@ -350,16 +349,22 @@ class WrappedPhonePrefixSelect(Select):
        return super().render(name, value or self.initial, *args, **kwargs)

    def get_context(self, name, value, attrs):
-        if value and self.choices[1][0] != value:
-            matching_choices = len([1 for p, c in self.choices if p == value])
+        # self.choices is lazy evaluated, needs to be realized to be modifiable
+        choices = list(self.choices)
+        if value and choices[1][0] != value:
+            matching_choices = len([1 for p, c in choices if p == value])
            if matching_choices > 1:
                # Some countries share a phone prefix, for example +1 is used all over the Americas.
                # This causes a UX problem: If the default value or the existing data is +12125552368,
                # the widget will just show the first <option> entry with value="+1" as selected,
                # which alphabetically is America Samoa, although most numbers statistically are from
-                # the US. As a workaround, we detect this case and add an aditional choice value with
+                # the US. As a workaround, we detect this case and add an additional choice value with
                # just <option value="+1">+1</option> without an explicit country.
-                self.choices.insert(1, (value, value))
+                self.choices = [
+                    choices[0],
+                    (value, value),
+                    *choices[1:],
+                ]
        context = super().get_context(name, value, attrs)
        return context

@@ -637,49 +642,22 @@ class PortraitImageField(SizeValidationMixin, ExtValidationMixin, forms.FileFiel
        super().__init__(*args, **kwargs)


-FakeQuestion = namedtuple(
-    'FakeQuestion', 'id question position required help_text container_type', defaults=('', Question.ContainerType.ORDERPOSITION)
-)
-
-
-def get_fake_attendee_questions(settings):
-    fq = []
-    sqo = settings.system_question_order
-
-    if settings.attendee_names_asked:
-        fq.append(FakeQuestion('attendee_name_parts', _('Attendee name'), sqo.get('attendee_name_parts', 0), settings.attendee_names_required))
-
-    if settings.attendee_emails_asked:
-        fq.append(FakeQuestion('attendee_email', _('Attendee email'), sqo.get('attendee_email', 0), settings.attendee_emails_required))
-
-    if settings.attendee_company_asked:
-        fq.append(FakeQuestion('company', _('Company'), sqo.get('company', 0), settings.attendee_company_required))
-
-    if settings.attendee_addresses_asked:
-        fq.append(FakeQuestion('street', _('Street'), sqo.get('street', 0), settings.attendee_addresses_required))
-        fq.append(FakeQuestion('zipcode', _('ZIP code'), sqo.get('zipcode', 0), settings.attendee_addresses_required))
-        fq.append(FakeQuestion('city', _('City'), sqo.get('city', 0), settings.attendee_addresses_required))
-        fq.append(FakeQuestion('state', _('State'), sqo.get('country', 0), settings.attendee_addresses_required))
-        fq.append(FakeQuestion('country', _('Country'), sqo.get('country', 0), settings.attendee_addresses_required))
-    return fq
-
-
 class BaseQuestionsForm(forms.Form):
    """
    This is the base form class responsible for asking order- or ticket-related questions.
    """
    address_validation = False

-    def build_user_question_field(self, request, event, answerlist, q):
+    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 == q.id]
+        answers = [a for a in answerlist if a.question_id == datafield.id]
        if answers:
            initial = answers[0]
        else:
            initial = None
        tz = ZoneInfo(event.settings.timezone)
-        required = q.required and not self.all_optional
-        if q.type == Question.TYPE_BOOLEAN:
+        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.
@@ -693,107 +671,105 @@ class BaseQuestionsForm(forms.Form):
                initialbool = False

            field = forms.BooleanField(
-                label=escape(q.question), required=required,
-                help_text=rich_text(q.help_text),
+                label=escape(qc.label), required=required,
+                help_text=rich_text(qc.help_text),
                initial=initialbool, widget=widget,
            )
-        elif q.type == Question.TYPE_NUMBER:
+        elif datafield.type == Question.TYPE_NUMBER:
            field = forms.DecimalField(
-                label=escape(q.question), required=required,
-                min_value=q.valid_number_min or Decimal('0.00'),
-                max_value=q.valid_number_max,
-                help_text=rich_text(q.help_text),
+                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,
            )
-        elif q.type == Question.TYPE_STRING:
+        elif datafield.type == Question.TYPE_STRING:
            field = forms.CharField(
-                label=escape(q.question), required=required,
-                min_length=q.valid_string_length_min,
-                max_length=q.valid_string_length_max,
-                help_text=rich_text(q.help_text),
+                label=escape(qc.label), required=required,
+                min_length=datafield.valid_string_length_min,
+                max_length=datafield.valid_string_length_max,
+                help_text=rich_text(qc.help_text),
                initial=initial.answer if initial else None,
            )
-        elif q.type == Question.TYPE_TEXT:
+        elif datafield.type == Question.TYPE_TEXT:
            field = forms.CharField(
-                label=escape(q.question), required=required,
-                min_length=q.valid_string_length_min,
-                max_length=q.valid_string_length_max,
-                help_text=rich_text(q.help_text),
+                label=escape(qc.label), required=required,
+                min_length=datafield.valid_string_length_min,
+                max_length=datafield.valid_string_length_max,
+                help_text=rich_text(qc.help_text),
                widget=forms.Textarea,
                initial=initial.answer if initial else None,
            )
-        elif q.type == Question.TYPE_COUNTRYCODE:
+        elif datafield.type == Question.TYPE_COUNTRYCODE:
            field = CountryField(
                countries=CachedCountries,
                blank=True, null=True, blank_label=' ',
            ).formfield(
-                label=escape(q.question), required=required,
-                help_text=rich_text(q.help_text),
+                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),
+                initial=initial.answer if initial else (guess_country_from_request(request, event) if required else None),
            )
-        elif q.type == Question.TYPE_CHOICE:
+        elif datafield.type == Question.TYPE_CHOICE:
            field = forms.ModelChoiceField(
-                queryset=q.options,
-                label=escape(q.question), required=required,
-                help_text=rich_text(q.help_text),
+                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,
            )
-        elif q.type == Question.TYPE_CHOICE_MULTIPLE:
+        elif datafield.type == Question.TYPE_CHOICE_MULTIPLE:
            field = forms.ModelMultipleChoiceField(
-                queryset=q.options,
-                label=escape(q.question), required=required,
-                help_text=rich_text(q.help_text),
+                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 q.type == Question.TYPE_FILE:
-            if q.valid_file_portrait:
+        elif datafield.type == Question.TYPE_FILE:
+            if datafield.valid_file_portrait:
                field = PortraitImageField(
-                    label=escape(q.question), required=required,
-                    help_text=rich_text(q.help_text),
+                    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'}),
+                    widget=PortraitImageWidget(answer=initial, request=request, attrs={'data-portrait-photo': 'true'}),
                )
            else:
                field = ExtFileField(
-                    label=escape(q.question), required=required,
-                    help_text=rich_text(q.help_text),
+                    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_DATE:
+        elif datafield.type == Question.TYPE_DATE:
            attrs = {}
-            if q.valid_date_min:
-                attrs['data-min'] = q.valid_date_min.isoformat()
-            if q.valid_date_max:
-                attrs['data-max'] = q.valid_date_max.isoformat()
-            help_text = q.help_text
+            if 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 q.valid_date_min and q.valid_date_max:
+                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(q.valid_date_min, "SHORT_DATE_FORMAT"),
-                        max=date_format(q.valid_date_max, "SHORT_DATE_FORMAT"),
+                        min=date_format(datafield.valid_date_min, "SHORT_DATE_FORMAT"),
+                        max=date_format(datafield.valid_date_max, "SHORT_DATE_FORMAT"),
                    )
-                elif q.valid_date_min:
+                elif datafield.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"),
+                        min=date_format(datafield.valid_date_min, "SHORT_DATE_FORMAT"),
                    )
-                elif q.valid_date_max:
+                elif datafield.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"),
+                        max=date_format(datafield.valid_date_max, "SHORT_DATE_FORMAT"),
                    )
            if initial and initial.answer:
                try:
@@ -803,16 +779,16 @@ class BaseQuestionsForm(forms.Form):
            else:
                _initial = None
            field = forms.DateField(
-                label=escape(q.question), required=required,
+                label=escape(qc.label), required=required,
                help_text=rich_text(help_text),
                initial=_initial,
                widget=DatePickerWidget(attrs),
            )
-            if q.valid_date_min:
-                field.validators.append(MinDateValidator(q.valid_date_min))
-            if q.valid_date_max:
-                field.validators.append(MaxDateValidator(q.valid_date_max))
-        elif q.type == Question.TYPE_TIME:
+            if 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()
@@ -821,29 +797,29 @@ class BaseQuestionsForm(forms.Form):
            else:
                _initial = None
            field = forms.TimeField(
-                label=escape(q.question), required=required,
-                help_text=rich_text(q.help_text),
+                label=escape(qc.label), required=required,
+                help_text=rich_text(qc.help_text),
                initial=_initial,
                widget=TimePickerWidget(without_seconds=True),
            )
-        elif q.type == Question.TYPE_DATETIME:
-            help_text = q.help_text
+        elif datafield.type == Question.TYPE_DATETIME:
+            help_text = qc.help_text
            if not help_text:
-                if q.valid_datetime_min and q.valid_datetime_max:
+                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(q.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
-                        max=date_format(q.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
+                        min=date_format(datafield.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
+                        max=date_format(datafield.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
                    )
-                elif q.valid_datetime_min:
+                elif datafield.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"),
+                        min=date_format(datafield.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
                    )
-                elif q.valid_datetime_max:
+                elif datafield.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"),
+                        max=date_format(datafield.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
                    )

            if initial and initial.answer:
@@ -855,20 +831,20 @@ class BaseQuestionsForm(forms.Form):
                _initial = None

            field = SplitDateTimeField(
-                label=escape(q.question), required=required,
+                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=q.valid_datetime_min,
-                    max_date=q.valid_datetime_max
+                    min_date=datafield.valid_datetime_min,
+                    max_date=datafield.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 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)
@@ -881,26 +857,27 @@ class BaseQuestionsForm(forms.Form):
                    initial = "+{}.".format(phone_prefix)

            field = PhoneNumberField(
-                label=escape(q.question), required=required,
-                help_text=rich_text(q.help_text),
+                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.question = q
+        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
+        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
+
        return field

    def check_user_questions(self, d):
@@ -964,6 +941,7 @@ class OrderLevelQuestionsForm(BaseQuestionsForm):

        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,
@@ -998,6 +976,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
        orderpos = self.orderpos = kwargs.pop('orderpos', None)
        pos = cartpos or orderpos
        item = pos.item
+        questionnaires = pos.item.relevant_questionnaires
        event = kwargs.pop('event')
        self.all_optional = kwargs.pop('all_optional', False)
        self.attendee_addresses_required = event.settings.attendee_addresses_required and not self.all_optional
@@ -1007,18 +986,13 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
        if cartpos and item.validity_mode == Item.VALIDITY_MODE_DYNAMIC and item.validity_dynamic_start_choice:
            self.fields['requested_valid_from'] = self.build_requested_valid_from_field(event, pos, item)

-        questions = []
-        if item.ask_attendee_data:
-            questions += get_fake_attendee_questions(event.settings)
-        questions += pos.item.questions_to_ask
-
-        questions.sort(key=lambda q: q.position)
-
-        for q in questions:
-            if isinstance(q, FakeQuestion):
-                self.fields[q.id] = self.build_system_question_field(request, event, pos, q)
-            else:
-                self.fields['question_%s' % q.id] = self.build_user_question_field(request, event, pos.answerlist, q)
+        for questionnaire in questionnaires:
+            for child in getattr(questionnaire, 'childlist', questionnaire.children.all()):
+                if child.user_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
@@ -1083,21 +1057,21 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
            )

    def build_system_question_field(self, request, event, pos, qc):
-        field_name = qc.id
+        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.question),
+                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.question),
+                label=escape(qc.label),
                help_text=rich_text(qc.help_text),
                initial=pos.attendee_email,
                widget=forms.EmailInput(
@@ -1109,7 +1083,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
        if field_name == 'company':
            return forms.CharField(
                required=qc.required and not self.all_optional,
-                label=escape(qc.question),
+                label=escape(qc.label),
                help_text=rich_text(qc.help_text),
                max_length=255,
                initial=pos.company,
@@ -1118,7 +1092,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
        if field_name == 'street':
            return forms.CharField(
                required=qc.required and not self.all_optional,
-                label=escape(qc.question),
+                label=escape(qc.label),
                help_text=rich_text(qc.help_text),
                widget=forms.Textarea(attrs={
                    'rows': 2,
@@ -1131,7 +1105,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
            return forms.CharField(
                required=False,
                max_length=30,
-                label=escape(qc.question),
+                label=escape(qc.label),
                help_text=rich_text(qc.help_text),
                initial=pos.zipcode,
                widget=forms.TextInput(attrs={
@@ -1141,7 +1115,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
        if field_name == 'city':
            return forms.CharField(
                required=False,
-                label=escape(qc.question),
+                label=escape(qc.label),
                help_text=rich_text(qc.help_text),
                max_length=255,
                initial=pos.city,
@@ -1155,7 +1129,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
                countries=CachedCountries
            ).formfield(
                required=qc.required and not self.all_optional,
-                label=escape(qc.question),
+                label=escape(qc.label),
                help_text=rich_text(qc.help_text),
                initial=country,
                widget=forms.Select(attrs={
@@ -1183,7 +1157,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
                del self.data[fprefix + 'state']

            field = forms.ChoiceField(
-                label=escape(qc.question),
+                label=escape(qc.label),
                help_text=rich_text(qc.help_text),
                required=False,
                choices=c,
@@ -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
@@ -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.
@@ -1651,6 +1653,7 @@ class Question(LoggedModel):
        default=ContainerType.ORDERPOSITION,
    )
    question = I18nTextField(
+        # TODO(questionnaires) : to be renamed to 'internal_name'
        verbose_name=_("Question")
    )
    identifier = models.CharField(
@@ -1666,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,
@@ -1675,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
@@ -1700,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
@@ -1709,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'))
@@ -1751,9 +1755,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):
@@ -1904,7 +1908,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.'))
@@ -1985,6 +1989,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
@@ -1449,6 +1449,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.')
@@ -1593,53 +1599,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):
@@ -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__)
@@ -1165,7 +1165,7 @@ class FreeOrderProvider(BasePaymentProvider):
    def is_allowed(self, request: HttpRequest, total: Decimal=None) -> bool:
        from .services.cart import get_fees

-        cart = get_cart(request)
+        cart = get_cart_positions(request)

        try:
            fees = get_fees(event=request.event, request=request,
@@ -1433,7 +1433,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 = []
@@ -1232,9 +1232,7 @@ class Renderer:

            for i, page in enumerate(fg_pdf.pages):
                bg_page = self.bg_pdf.pages[i]
-                _correct_page_media_box(bg_page)
-                page.merge_page(bg_page, over=False)
-                output.add_page(page)
+                _merge_with_correct_page_media_box(output, page, bg_page)

            # pdf_header is a string like "%pdf-X.X"
            if float(self.bg_pdf.pdf_header[5:]) > float(fg_pdf.pdf_header[5:]):
@@ -1299,39 +1297,32 @@ def merge_background(fg_pdf: PdfWriter, bg_pdf: PdfWriter, out_file, compress):
            bg_pdf.write(bg_filename)
            subprocess.run(pdftk_cmd, check=True, stdout=out_file)
    else:
+        output = PdfWriter()
        for i, page in enumerate(fg_pdf.pages):
            bg_page = bg_pdf.pages[i]
-            _correct_page_media_box(bg_page)
-            page.merge_page(bg_page, over=False)
+            _merge_with_correct_page_media_box(output, page, bg_page)

        # pdf_header is a string like "%pdf-X.X"
-        if float(bg_pdf.pdf_header[5:]) > float(fg_pdf.pdf_header[5:]):
-            fg_pdf.pdf_header = bg_pdf.pdf_header
-
-        fg_pdf.write(out_file)
+        output.pdf_header = (
+            bg_pdf.pdf_header
+            if float(bg_pdf.pdf_header[5:]) > float(fg_pdf.pdf_header[5:])
+            else fg_pdf.pdf_header
+        )
+        output.write(out_file)


-def _correct_page_media_box(page: pypdf.PageObject):
-    if page.rotation != 0:
-        page.transfer_rotation_to_content()
-    media_box = page.mediabox
+def _merge_with_correct_page_media_box(output: pypdf.PdfWriter, fg_page: pypdf.PageObject, bg_page: pypdf.PageObject):
+    if bg_page.rotation != 0:
+        bg_page.transfer_rotation_to_content()
+    media_box = bg_page.mediabox
    trsf = pypdf.Transformation()
    if media_box.bottom != 0:
        trsf = trsf.translate(0, -media_box.bottom)
    if media_box.left != 0:
        trsf = trsf.translate(-media_box.left, 0)
-    page.add_transformation(trsf, False)
-    for b in ["/MediaBox", "/CropBox", "/BleedBox", "/TrimBox", "/ArtBox"]:
-        if b in page:
-            rr = pypdf.generic.RectangleObject(page[b])
-            pt1 = trsf.apply_on(rr.lower_left)
-            pt2 = trsf.apply_on(rr.upper_right)
-            page[pypdf.generic.NameObject(b)] = pypdf.generic.RectangleObject((
-                min(pt1[0], pt2[0]),
-                min(pt1[1], pt2[1]),
-                max(pt1[0], pt2[0]),
-                max(pt1[1], pt2[1]),
-            ))
+
+    fg_page = output.add_page(fg_page)
+    fg_page.merge_transformed_page(bg_page, trsf, over=False, expand=False)


@deconstructible
@@ -27,7 +27,7 @@ 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

@@ -37,7 +37,7 @@ from pretix.base.forms.questions import (
 )
 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
@@ -348,27 +348,37 @@ class OrderQuestionsViewMixin(BaseQuestionsViewMixin):

    @cached_property
    def positions(self):
-        qqs = self.request.event.questions.all()
+        qqs = self.request.event.questionnaires.all()
        if self.only_user_visible:
-            qqs = qqs.filter(ask_during_checkin=False, hidden=False, container_type=Question.ContainerType.ORDERPOSITION)
+            qqs = qqs.filter(type='PS')
+        else:
+            qqs = qqs.filter(type__startswith='P')
+        qqs = qqs.filter(
+            Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=self.order.sales_channel.identifier)
+        )
        return list(self.order.positions.select_related(
            'item', 'variation'
        ).prefetch_related(
            Prefetch('answers',
                     QuestionAnswer.objects.prefetch_related('options'),
                     to_attr='answerlist'),
-            Prefetch('item__questions',
+            Prefetch('item__questionnaires',
                     qqs.prefetch_related(
-                         Prefetch('options', QuestionOption.objects.prefetch_related(Prefetch(
-                             # This prefetch statement is utter bullshit, but it actually prevents Django from doing
-                             # a lot of queries since ModelChoiceIterator stops trying to be clever once we have
-                             # a prefetch lookup on this query...
-                             'question',
-                             Question.objects.none(),
-                             to_attr='dummy'
-                         )))
-                     ).select_related('dependency_question'),
-                     to_attr='questions_to_ask')
+                         Prefetch('children', QuestionnaireChild.objects.prefetch_related(
+                             Prefetch('user_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
@@ -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,
        })

@@ -105,12 +105,12 @@ class GlobalSettingsForm(SettingsForm):
                    domain=settings.SITE_URL
                )
            )),
-            ('widget_vite_origins', forms.CharField(
+            ('widget_vue2_origins', forms.CharField(
                widget=forms.Textarea(attrs={'rows': '3'}),
                required=False,
                # Not translated on purpose, this is a temporary feature and contains too many special case words
-                label="Vite widget origins",
-                help_text="One origin per line (e.g. https://example.com). Requests from these origins will be served the new vite-based widget.",
+                label="Vue2 widget origins",
+                help_text="One origin per line (e.g. https://example.com). Requests from these origins will be served the old vue2-based widget.",
            ))
        ])
        responses = register_global_settings.send(self)
@@ -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'),
@@ -12,151 +12,120 @@
 {% endblock %}
 {% block inside %}
    {% if question %}
-        <h1>{% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}</h1>
+        <h1>{% blocktrans with name=question.question %}Data field: {{ name }}{% endblocktrans %}</h1>
    {% else %}
-        <h1>{% trans "Question" %}</h1>
+        <h1>{% trans "Data field" %}</h1>
    {% endif %}
    <form action="" method="post" class="form-horizontal">
        {% csrf_token %}
        {% bootstrap_form_errors form %}
-        <div class="tabbed-form">
-            <fieldset>
-                <legend>{% trans "General" %}</legend>
-                {% bootstrap_field form.question layout="control" %}
-                {% bootstrap_field form.type layout="control" %}
-                {% if form.items %}
-                    {% bootstrap_field form.items layout="control" %}
-                {% endif %}
-                {% bootstrap_field form.required layout="control" %}
-                <div class="alert alert-info alert-required-boolean">
-                    {% blocktrans trimmed %}
-                        If you mark a Yes/No question as required, it means that the user has to select Yes and No is not
-                        accepted. If you want to allow both options, do not make this field required.
-                    {% endblocktrans %}
-                </div>
-                <div id="valid-number">
-                    {% bootstrap_field form.valid_number_min layout="control" %}
-                    {% bootstrap_field form.valid_number_max layout="control" %}
-                </div>
-                <div id="valid-date">
-                    {% bootstrap_field form.valid_date_min layout="control" %}
-                    {% bootstrap_field form.valid_date_max layout="control" %}
-                </div>
-                <div id="valid-datetime">
-                    {% bootstrap_field form.valid_datetime_min layout="control" %}
-                    {% bootstrap_field form.valid_datetime_max layout="control" %}
-                </div>
-                <div id="valid-string">
-                    {% bootstrap_field form.valid_string_length_min layout="control" %}
-                    {% bootstrap_field form.valid_string_length_max layout="control" %}
-                </div>
-                <div id="valid-file">
-                    {% bootstrap_field form.valid_file_portrait layout="control" %}
-                </div>
-                <div id="answer-options">
-                    <h3>{% trans "Answer options" %}</h3>
-                    <noscript>
-                        <p>{% trans "Only applicable if you choose 'Choose one/multiple from a list' above." %}</p>
-                    </noscript>
-                    <div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}" data-formset-delete-confirm-text="{% trans "If you delete an answer option, you will no longer be able to see statistical data on customers who previously selected this option, and when such customers edit their answers, they need to select a different option." %}">
-                        {{ formset.management_form }}
-                        {% bootstrap_formset_errors formset %}
-                        <div data-formset-body>
-                            {% for form in formset %}
-                                <div data-formset-form>
-                                    <div class="sr-only">
-                                        {{ form.id }}
-                                        {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
-                                        {% bootstrap_field form.ORDER form_group_class="" layout="inline" %}
-                                    </div>
-                                    <div class="row question-option-row">
-                                        <div class="col-xs-10">
-                                    <span class="text-muted">
-                                        {% blocktrans trimmed with id=form.instance.identifier %}
-                                            Answer option {{ id }}
-                                        {% endblocktrans %}
-                                    </span>
-                                            {% bootstrap_form_errors form %}
-                                            {% bootstrap_field form.answer layout='inline' form_group_class="" %}
-                                        </div>
-                                        <div class="col-xs-2 text-right flip">
-                                            <span>&nbsp;</span><br>
-                                            <button type="button" class="btn btn-default" data-formset-move-up-button>
-                                                <i class="fa fa-arrow-up"></i></button>
-                                            <button type="button" class="btn btn-default" data-formset-move-down-button>
-                                                <i class="fa fa-arrow-down"></i></button>
-                                            <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                                <i class="fa fa-trash"></i></button>
-                                        </div>
-                                    </div>
-                                </div>
-                            {% endfor %}
-                        </div>
-                        <script type="form-template" data-formset-empty-form>
-                            {% escapescript %}
-                                <div data-formset-form>
-                                    <div class="sr-only">
-                                        {{ formset.empty_form.id }}
-                                        {% bootstrap_field formset.empty_form.DELETE form_group_class="" layout="inline" %}
-                                        {% bootstrap_field formset.empty_form.ORDER form_group_class="" layout="inline" %}
-                                    </div>
-                                    <div class="row question-option-row">
-                                        <div class="col-xs-10">
-                                    <span class="text-muted">
-                                        {% trans "New answer option" %}
-                                    </span>
-                                            {% bootstrap_field formset.empty_form.answer layout='inline' form_group_class="" %}
-                                        </div>
-                                        <div class="col-xs-2 text-right flip">
-                                            <span>&nbsp;</span><br>
-                                            <button type="button" class="btn btn-default" data-formset-move-up-button>
-                                                <i class="fa fa-arrow-up"></i></button>
-                                            <button type="button" class="btn btn-default" data-formset-move-down-button>
-                                                <i class="fa fa-arrow-down"></i></button>
-                                            <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                                <i class="fa fa-trash"></i></button>
-                                        </div>
-                                    </div>
-                                </div>
-                            {% endescapescript %}
-                        </script>
-                        <p>
-                            <button type="button" class="btn btn-default" data-formset-add>
-                                <i class="fa fa-plus"></i> {% trans "Add a new option" %}</button>
-                        </p>
-                    </div>
-                </div>
-            </fieldset>
-            <fieldset>
-                <legend>{% trans "Advanced" %}</legend>
-                {% bootstrap_field form.help_text layout="control" %}
-                {% bootstrap_field form.identifier layout="control" %}
-                {% if form.ask_during_checkin %}
-                    {% bootstrap_field form.ask_during_checkin layout="control" %}
-                {% endif %}
-                {% if form.show_during_checkin %}
-                    {% bootstrap_field form.show_during_checkin layout="control" %}
-                {% endif %}
-                {% bootstrap_field form.hidden layout="control" %}
-                {% if form.print_on_invoice %}
-                    {% bootstrap_field form.print_on_invoice layout="control" %}
-                {% endif %}
-
-                <div class="form-group">
-                    <label class="col-md-3 control-label" for="id_dependency_question">
-                        {% trans "Question dependency" %}
-                        <br><span class="optional">{% trans "Optional" context "form" %}</span>
-                    </label>
-                    <div class="col-md-4">
-                        {% bootstrap_field form.dependency_question layout="inline" form_group_class="inner" %}
-                    </div>
-                    <div class="col-md-5">
-                        <script type="text/plain" id="dependency_value_val">{{ form.instance.dependency_values|escapejson_dumps }}</script>
-                        {% bootstrap_field form.dependency_values layout="inline" form_group_class="inner" %}
-                    </div>
-                </div>
-            </fieldset>
+        {% bootstrap_field form.question layout="control" %}
+        {% bootstrap_field form.type layout="control" %}
+        <div id="valid-number">
+            {% bootstrap_field form.valid_number_min layout="control" %}
+            {% bootstrap_field form.valid_number_max layout="control" %}
        </div>
+        <div id="valid-date">
+            {% bootstrap_field form.valid_date_min layout="control" %}
+            {% bootstrap_field form.valid_date_max layout="control" %}
+        </div>
+        <div id="valid-datetime">
+            {% bootstrap_field form.valid_datetime_min layout="control" %}
+            {% bootstrap_field form.valid_datetime_max layout="control" %}
+        </div>
+        <div id="valid-string">
+            {% bootstrap_field form.valid_string_length_min layout="control" %}
+            {% 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" %}
+        {% if form.ask_during_checkin %}
+            {% bootstrap_field form.ask_during_checkin layout="control" %}
+        {% endif %}
+        {% if form.show_during_checkin %}
+            {% bootstrap_field form.show_during_checkin layout="control" %}
+        {% endif %}
+        {% bootstrap_field form.hidden layout="control" %}
+        {% if form.print_on_invoice %}
+            {% bootstrap_field form.print_on_invoice layout="control" %}
+        {% endif %}
+
+
        <div class="form-group 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
@@ -14,19 +14,19 @@
    {% if request.event.settings.feature_flag_order_level_questions %}
        {% if 'event.items:write' in request.eventpermset %}
            <p>
-                <a href="{% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug %}?container_type=P" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new per-ticket question" %}
+                <a 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 question" %}
+                <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 questions" %}</h2>
-        <p>{% trans "These questions are asked for every ticket, so possibly multiple times in the same order." %}</p>
+        <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 question" %}
+                <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 %}
@@ -35,39 +35,27 @@
        <table class="table table-hover table-quotas">
            <thead>
            <tr>
-                <th>{% trans "Question" %}</th>
+                <th>{% trans "Internal name" %}</th>
                <th>{% trans "Type" %}</th>
                <th class="iconcol"></th>
                <th class="iconcol"></th>
                <th class="iconcol"></th>
-                <th>{% trans "Products" %}</th>
-                {% if 'event.items:write' in request.eventpermset %}
-                    <th class="action-col-2"></th>
-                {% endif %}
                <th class="action-col-2"></th>
            </tr>
            </thead>
-            <tbody data-dnd-url="{% url "control:event.items.questions.reorder" organizer=request.event.organizer.slug event=request.event.slug %}?container_type=P">
+            <tbody>
            {% for q in questions %}{% if q.container_type == "P" %}
-                <tr data-dnd-id="{{ q.id }}">
+                <tr>
                    <td>
                        <strong>
-                            {% if q.pk %}
-                                <a href="{% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}">
-                            {% endif %}
-                            {{ q.question }}
-                            {% if q.pk %}
-                                </a>
-                            {% endif %}
+                            <a href="{% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}">
+                                {{ q.question }}
+                            </a>
                        </strong><br>
                        <small class="text-muted">{{ q.identifier }}</small>
                    </td>
                    <td>
-                        {% if q.pk %}
-                            {{ q.get_type_display }}
-                        {% else %}
-                            {% trans "System question" %}
-                        {% endif %}
+                        {{ q.get_type_display }}
                    </td>
                    <td>
                        {% if q.required %}
@@ -84,35 +72,11 @@
                            <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>
@@ -123,34 +87,31 @@

    {% if request.event.settings.feature_flag_order_level_questions %}
        <h2>
-            {% trans "Per-order questions" %}
+            {% 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 "Per-order questions are currently not supported and will not be displayed in pretixPOS." %}
+                {% 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 questions are asked once per order." %}</p>
+        <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 "Question" %}</th>
+                    <th>{% trans "Internal name" %}</th>
                    <th>{% trans "Type" %}</th>
                    <th class="iconcol"></th>
                    <th class="iconcol"></th>
                    <th class="iconcol"></th>
-                    {% if 'event.items:write' in request.eventpermset %}
-                        <th class="action-col-2"></th>
-                    {% endif %}
                    <th class="action-col-2"></th>
                </tr>
                </thead>
-                <tbody data-dnd-url="{% url "control:event.items.questions.reorder" organizer=request.event.organizer.slug event=request.event.slug %}?container_type=O">
+                <tbody>
                {% for q in questions %}{% if q.container_type == "O" %}
-                    <tr data-dnd-id="{{ q.id }}">
+                    <tr>
                        <td>
                            <strong>
                                {{ q.question }}
@@ -158,11 +119,7 @@
                            <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 %}
@@ -179,10 +136,6 @@
                                <span class="fa fa-eye-slash text-muted" data-toggle="tooltip" title="{% trans "Hidden question" %}"></span>
                            {% endif %}
                        </td>
-                        {% if 'event.items:write' in request.eventpermset %}
-                            <td class="dnd-container">
-                            </td>
-                        {% endif %}
                        <td class="text-right flip">
                            {% if q.pk %}
                                {% if 'event.items:write' in request.eventpermset %}
@@ -20,8 +20,10 @@
        {% endif %}
    {% elif question.type == "M" %}
        {{ answer.to_string_i18n|rich_text_snippet }}
+    {% elif question.type %}
+        {{ answer.to_string_i18n|rich_text_snippet }}
    {% else %}
-        {{ answer.to_string_i18n|linebreaksbr }}
+        {{ answer|linebreaksbr }}
    {% endif %}
 {% else %}
    <em>{% trans "not answered" %}</em>
@@ -610,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"
@@ -672,7 +621,49 @@
                                                {% endif %}
                                            </dt>
                                            <dd>
+                                                {#
+                                                {% if q.answer %}
+                                                    {% if q.answer.file %}
+                                                        <span class="fa fa-file"></span>
+                                                        <a href="{{ q.answer.backend_file_url }}?token={% answer_token request q.answer %}">
+                                                            {{ q.answer.file_name }}
+                                                        </a>
+                                                        <span class="label label-danger" data-toggle="tooltip"
+                                                                title="{% trans "This file has been uploaded by a user and could contain viruses or other malicious content." %}">
+                                                            {% trans "UNSAFE" %}
+                                                        </span>
+                                                        {% if q.answer.is_image %}
+                                                            <br>
+                                                            <a href="{{ q.answer.backend_file_url }}?token={% answer_token request q.answer %}" data-lightbox="order"
+                                                                class="answer-thumb">
+                                                                <img src="{{ q.answer.backend_file_url }}?token={% answer_token request q.answer %}">
+                                                            </a>
+                                                        {% endif %}
+                                                    {% elif q.type == "M" %}
+                                                        {{ q.answer.to_string_i18n|rich_text_snippet }}
+                                                    {% elif q.type %}
+                                                        {{ q.answer.to_string_i18n|linebreaksbr }}
+                                                    {% else %}<!-- TODO(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'),
@@ -163,6 +163,9 @@ class DiscountCreate(EventPermissionRequiredMixin, CreateView):
            i = modelcopy(self.copy_from)
            i.pk = None
            kwargs['instance'] = i
+            kwargs["initial"]["limit_sales_channels"] = self.copy_from.limit_sales_channels.all()
+            kwargs["initial"]["condition_limit_products"] = self.copy_from.condition_limit_products.all()
+            kwargs["initial"]["benefit_limit_products"] = self.copy_from.benefit_limit_products.all()
        else:
            kwargs['instance'] = Discount(event=self.request.event)

@@ -56,7 +56,7 @@ from django.utils.functional import cached_property
 from django.utils.timezone import now
 from django.utils.translation import gettext, gettext_lazy as _
 from django.views.decorators.http import require_http_methods
-from django.views.generic import FormView, ListView, View
+from django.views.generic import FormView, ListView, TemplateView, View
 from django.views.generic.detail import DetailView, SingleObjectMixin
 from django_countries.fields import Country

@@ -65,7 +65,6 @@ from pretix.api.serializers.item import (
    ItemVariationSerializer,
 )
 from pretix.base.forms import I18nFormSet
-from pretix.base.forms.questions import get_fake_attendee_questions
 from pretix.base.models import (
    CartPosition, Item, ItemCategory, ItemProgramTime, ItemVariation, LogEntry,
    OrderPosition, Question, QuestionAnswer, QuestionOption, Quota,
@@ -437,66 +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 = get_fake_attendee_questions(self.request.event.settings)
-
-        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:[]}")
-
-    qs = request.event.questions.filter(container_type=request.GET['container_type'])
-
-    # filter system_questions - normal questions are int/digit, system_questions strings
-    custom_question_ids = [i for i in ids if i.isdigit()]
-    input_questions = list(qs.filter(id__in=custom_question_ids))
-
-    if len(input_questions) != len(custom_question_ids):
-        raise Http404(_("Some of the provided object ids are invalid."))
-
-    if len(input_questions) != qs.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,
-                }
-            )
-
-    if request.GET['container_type'] == Question.ContainerType.ORDERPOSITION:
-        system_question_order = {}
-        for s in ('attendee_name_parts', 'attendee_email', 'company', 'street', 'zipcode', 'city', 'country'):
-            if s in ids:
-                system_question_order[s] = ids.index(s)
-            else:
-                system_question_order[s] = -1
-        request.event.settings.system_question_order = system_question_order
-        request.event.log_action(
-            'pretix.event.settings', user=request.user, data={
-                'system_question_order': system_question_order,
-            }
-        )
-
-    return HttpResponse()
+        return self.request.event.questions


 class QuestionDelete(EventPermissionRequiredMixin, CompatDeleteView):
@@ -766,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
@@ -144,7 +144,7 @@ class VoucherList(VoucherQueryMixin, PaginationMixin, EventPermissionRequiredMix
        headers = [
            _('Voucher code'), _('Valid until'), _('Product'), _('Reserve quota'), _('Bypass quota'),
            _('Price effect'), _('Value'), _('Tag'), _('Redeemed'), _('Maximum usages'), _('Seat'),
-            _('Comment')
+            _('Comment'), _('Budget'), _('Budget used')
        ]
        writer.writerow(headers)

@@ -170,7 +170,9 @@ class VoucherList(VoucherQueryMixin, PaginationMixin, EventPermissionRequiredMix
                str(v.redeemed),
                str(v.max_usages),
                str(v.seat) if v.seat else "",
-                str(v.comment) if v.comment else ""
+                str(v.comment) if v.comment else "",
+                str(v.budget) if v.budget is not None else "",
+                str(v.budget_used) if v.budget is not None else "",
            ]
            writer.writerow(row)

@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-08-24 15:35+0000\n"
-"PO-Revision-Date: 2026-08-24 14:30+0000\n"
+"PO-Revision-Date: 2026-09-04 14:29+0000\n"
 "Last-Translator: Albizuri <oier@puntu.eus>\n"
-"Language-Team: Basque <https://translate.pretix.eu/projects/pretix/pretix/eu/"
-">\n"
+"Language-Team: Basque <https://translate.pretix.eu/projects/pretix/pretix/"
+"eu/>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2026.8.1\n"
+"X-Generator: Weblate 2026.9\n"

 #: pretix/_base_settings.py
 msgid "English"
@@ -891,7 +891,7 @@ msgstr "Produktuaren data"
 #: pretix/control/templates/pretixcontrol/order/index.html
 #: pretix/presale/templates/pretixpresale/event/order.html
 msgid "Order details"
-msgstr ""
+msgstr "Eskaeraren xehetasunak"

 #: pretix/base/datasync/sourcefields.py pretix/base/modelimport_orders.py
 #: pretix/control/forms/filter.py
@@ -17296,7 +17296,7 @@ msgstr ""

 #: pretix/control/logdisplay.py
 msgid "The order details have been changed."
-msgstr ""
+msgstr "Eskaeraren xehetasunak aldatu dira."

 #: pretix/control/logdisplay.py
 msgid "The order has been marked as unpaid."
@@ -23106,7 +23106,7 @@ msgstr ""
 #: pretix/control/templates/pretixcontrol/order/index.html
 #, python-format
 msgid "Order details: %(code)s"
-msgstr ""
+msgstr "Eskaeraren xehetasunak: %(code)s"

 #: pretix/control/templates/pretixcontrol/order/index.html
 #: pretix/control/templates/pretixcontrol/orders/index.html
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-08-24 15:35+0000\n"
-"PO-Revision-Date: 2026-08-16 22:00+0000\n"
-"Last-Translator: Hijiri Umemoto <hijiri@umemoto.org>\n"
+"PO-Revision-Date: 2026-09-07 18:00+0000\n"
+"Last-Translator: Yasunobu YesNo Kawaguchi <kawaguti@gmail.com>\n"
 "Language-Team: Japanese <https://translate.pretix.eu/projects/pretix/pretix/"
 "ja/>\n"
 "Language: ja\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2026.8.1\n"
+"X-Generator: Weblate 2026.9\n"

 #: pretix/_base_settings.py
 msgid "English"
@@ -93,7 +93,7 @@ msgstr "ヘブライ語"

 #: pretix/_base_settings.py
 msgid "Hungarian"
-msgstr ""
+msgstr "ハンガリー語"

 #: pretix/_base_settings.py
 msgid "Indonesian"
@@ -220,7 +220,7 @@ msgstr "ターゲットURL"
 #: pretix/api/models.py pretix/base/models/devices.py
 #: pretix/base/models/organizer.py
 msgid "All events (including newly created ones)"
-msgstr "すべてのイベント（最近作成されたイベントを含む）"
+msgstr "すべてのイベント（今後作成されるものを含む）"

 #: pretix/api/models.py pretix/base/models/devices.py
 #: pretix/base/models/organizer.py
@@ -428,10 +428,8 @@ msgid "You cannot exchange a medium for a medium."
 msgstr "メディアを別のメディアに変更することはできません。"

 #: pretix/api/views/checkin.py
-#, fuzzy
-#| msgid "Product does not support medium exchange."
 msgid "You cannot simulate a medium exchange."
-msgstr "本製品は中程度の交換に対応していません。"
+msgstr "メディアの交換をシミュレートすることはできません。"

 #: pretix/api/views/oauth.py pretix/control/logdisplay.py
 #, python-brace-format
@@ -5691,7 +5689,7 @@ msgstr "国コード（ISO 3166-1 alpha-2）"

 #: pretix/base/models/items.py
 msgid "Asked on"
-msgstr ""
+msgstr "質問日"

 #: pretix/base/models/items.py pretix/base/models/organizer.py
 msgid ""
@@ -7340,12 +7338,9 @@ msgid "The payment for this invoice has already been received."
 msgstr "この請求書の支払いはすでに受領済みです。"

 #: pretix/base/payment.py
-#, fuzzy
-#| msgid ""
-#| "This payment is already being processed and can not be canceled any more."
 msgid ""
 "This payment is already being processed and cannot be canceled any more."
-msgstr "この支払いは処理中のため、キャンセルできません。"
+msgstr "この支払いはすでに処理中のため、キャンセルできません。"

 #: pretix/base/payment.py
 msgid "Automatic refunds are not supported by this payment provider."
@@ -8105,16 +8100,12 @@ msgid "Presale end"
 msgstr "前売り終了"

 #: pretix/base/reldate.py
-#, fuzzy
-#| msgid "Order email"
 msgid "Order creation"
-msgstr "注文者メール"
+msgstr "注文の作成"

 #: pretix/base/reldate.py
-#, fuzzy
-#| msgid "Order expired"
 msgid "Order expiry"
-msgstr "注文の有効期限が切れました"
+msgstr "注文の失効"

 #: pretix/base/reldate.py
 msgid "before"
@@ -8143,22 +8134,22 @@ msgstr "未設定"
 #: pretix/base/reldate.py
 #, python-brace-format
 msgid "A relative date cannot be expressed as \"before\" for \"{}\""
-msgstr ""
+msgstr "相対的な日付は、「{}」に対して「before」で表すことはできません"

 #: pretix/base/reldate.py
 #, python-brace-format
 msgid "A relative date cannot be expressed as \"after\" for \"{}\""
-msgstr ""
+msgstr "相対的な日付は「{}」に対して「after」として表すことはできません"

 #: pretix/base/reldate.py
 #, python-brace-format
 msgid "A relative time cannot be expressed as \"before\" for \"{}\""
-msgstr ""
+msgstr "相対時間は「{}」に対して「before」で表すことはできません"

 #: pretix/base/reldate.py
 #, python-brace-format
 msgid "A relative time cannot be expressed as \"after\" for \"{}\""
-msgstr ""
+msgstr "相対時間は「{}」に対して「after」で表すことはできません"

 #: pretix/base/secrets.py
 msgid "Random (default, works with all pretix apps)"
@@ -10067,12 +10058,12 @@ msgstr ""

 #: pretix/base/settings.py
 msgid "No dates match your criteria."
-msgstr ""
+msgstr "条件に合致する日付はありません。"

 #: pretix/base/settings.py
 msgctxt "subevents"
 msgid "Text for empty date results"
-msgstr ""
+msgstr "空の日付結果のテキスト"

 #: pretix/base/settings.py
 msgctxt "subevents"
@@ -10083,6 +10074,10 @@ msgid ""
 "touch with you to arrange further dates. We do not recommend more than one "
 "or two sentences."
 msgstr ""
+"このテキストは、カレンダーまたは日付リストが空の場合に表示されます。たとえば"
+"、月に日付が含まれていない場合や、ユーザーが選択したフィルターに結果が見つか"
+"らない場合です。これをご利用いただくことで、今後の日程調整のために連絡する方"
+"法を宣伝できます。1文または2文以上は推奨いたしません。"

 #: pretix/base/settings.py
 msgid "Guidance text"
@@ -13902,26 +13897,20 @@ msgid ""
 msgstr "ギフトカードの有効期限を発行年を含めた{}年に設定しました。"

 #: pretix/control/forms/event.py
-#, fuzzy
-#| msgid "Payment date"
 msgid "Payment term"
-msgstr "支払い日"
+msgstr "支払条件"

 #: pretix/control/forms/event.py
 msgid "same as above"
-msgstr ""
+msgstr "上記と同じ"

 #: pretix/control/forms/event.py
-#, fuzzy
-#| msgid "Payment term in days"
 msgid "different payment term in days"
-msgstr "支払い条件（日数）"
+msgstr "日数で表す異なる支払条件"

 #: pretix/control/forms/event.py
-#, fuzzy
-#| msgid "Payment term in minutes"
 msgid "different payment term in minutes"
-msgstr "支払い期限（分単位）"
+msgstr "分で表す異なる支払条件"

 #: pretix/control/forms/event.py
 msgid "Prices including tax"
@@ -22533,28 +22522,24 @@ msgstr ""
 "食事を提供する場合、ユーザーに食事制限について尋ねることができる一例です。"

 #: pretix/control/templates/pretixcontrol/items/questions.html
-#, fuzzy
-#| msgid "Create a new question"
 msgid "Create a new per-ticket question"
-msgstr "新しい質問を作成"
+msgstr "チケットごとに新しい質問を作成"

 #: pretix/control/templates/pretixcontrol/items/questions.html
-#, fuzzy
-#| msgid "Create a new question"
 msgid "Create a new order-level question"
-msgstr "新しい質問を作成"
+msgstr "注文ごとに新しい質問を作成"

 #: pretix/control/templates/pretixcontrol/items/questions.html
-#, fuzzy
-#| msgid "Delete question"
 msgid "Per-ticket questions"
-msgstr "質問を削除"
+msgstr "チケットごとの質問"

 #: pretix/control/templates/pretixcontrol/items/questions.html
 msgid ""
 "These questions are asked for every ticket, so possibly multiple times in "
 "the same order."
 msgstr ""
+"これらの質問はすべてのチケットに対して尋ねられるため、同じ順序で複数回になる"
+"可能性があります。"

 #: pretix/control/templates/pretixcontrol/items/questions.html
 msgid "Create a new question"
@@ -22573,28 +22558,24 @@ msgid "All personalized products"
 msgstr "すべてのパーソナライズされた製品"

 #: pretix/control/templates/pretixcontrol/items/questions.html
-#, fuzzy
-#| msgid "Include questions"
 msgid "Per-order questions"
-msgstr "質問を含む"
+msgstr "注文ごとの質問"

 #: pretix/control/templates/pretixcontrol/items/questions.html
 msgid ""
 "This functionality is in active development and expected to change "
 "significantly over the coming months."
-msgstr ""
+msgstr "この機能は現在開発が活発で、今後数か月で大幅に変化すると予想されています。"

 #: pretix/control/templates/pretixcontrol/items/questions.html
 msgid ""
 "Per-order questions are currently not supported and will not be displayed in "
 "pretixPOS."
-msgstr ""
+msgstr "注文ごとの質問は現在サポートされておらず、pretixPOSでは表示されません。"

 #: pretix/control/templates/pretixcontrol/items/questions.html
-#, fuzzy
-#| msgid "The question has been reordered."
 msgid "These questions are asked once per order."
-msgstr "質問の並び順が変更されました。"
+msgstr "これらの質問は、注文ごとに1回ずつ尋ねられます。"

 #: pretix/control/templates/pretixcontrol/items/quota.html
 #: pretix/control/templates/pretixcontrol/items/quota_edit.html
@@ -23186,10 +23167,8 @@ msgstr "(任意)"
 #: pretix/presale/templates/pretixpresale/event/checkout_confirm.html
 #: pretix/presale/templates/pretixpresale/event/checkout_questions.html
 #: pretix/presale/templates/pretixpresale/event/order_modify.html
-#, fuzzy
-#| msgid "Additional information"
 msgid "Additional order information"
-msgstr "追加情報"
+msgstr "追加の注文情報"

 #: pretix/control/templates/pretixcontrol/order/delete.html
 msgid "Delete order"
@@ -24856,14 +24835,13 @@ msgid "Hardware model"
 msgstr "ハードウェアの機種"

 #: pretix/control/templates/pretixcontrol/organizers/devices.html
-#, fuzzy, python-format
-#| msgid "Begin: %(time)s"
+#, python-format
 msgid "Last seen: %(time)s"
-msgstr "開始: %(time)s"
+msgstr "最後の閲覧: %(time)s"

 #: pretix/control/templates/pretixcontrol/organizers/devices.html
 msgid "No recent contact"
-msgstr ""
+msgstr "最近の連絡なし"

 #: pretix/control/templates/pretixcontrol/organizers/devices.html
 msgid "Not yet initialized"
@@ -28220,19 +28198,14 @@ msgstr ""
 "に高いことを意味します。ドメインのDNS設定を更新すべきです。"

 #: pretix/control/views/mailsetup.py
-#, fuzzy
-#| msgid ""
-#| "We did not find DMARC record for your domain. This means that there is a "
-#| "very high chance most of the emails will be rejected or marked as spam. "
-#| "You should update the DNS settings of your domain."
 msgid ""
 "We did not find a DMARC record for your domain. This means that there is a "
 "very high chance most of the emails will be rejected or marked as spam. You "
 "should update the DNS settings of your domain."
 msgstr ""
-"お客様のドメインのDMARCレコードが見つかりませんでした。これは、ほとんどのメー"
-"ルが拒否されたりスパムとしてマークされたりする可能性が非常に高いことを意味し"
-"ます。ドメインのDNS設定を更新すべきです。"
+"あなたのドメインのDMARCレコードが見つかりませんでした。これは、ほとんどの"
+"メールが拒否されたかスパムとしてマークされた可能性が非常に高いことを意味しま"
+"す。ドメインのDNS設定を更新すべきです。"

 #: pretix/control/views/mailsetup.py
 msgid "The verification code was incorrect, please try again."
@@ -30906,7 +30879,7 @@ msgstr ""

 #: pretix/plugins/paypal2/payment.py
 msgid "Allow further payments during compliance hold"
-msgstr ""
+msgstr "コンプライアンス保留の間、追加の支払いを許可する"

 #: pretix/plugins/paypal2/payment.py
 msgid ""
@@ -30916,16 +30889,20 @@ msgid ""
 "attempts during that window. This might result in them being charged twice "
 "if the original payment is approved."
 msgstr ""
+"PayPalの不正防止は、個々の支払いの処理をかなりの期間ブロックする可能性があり"
+"ます。この期間中、支払いは「保留中」とマークされています。顧客がその期間中に"
+"別の支払い試行を開始できるように許可することができます。元の支払いが承認され"
+"た場合、二重に請求される可能性があります。"

 #: pretix/plugins/paypal2/payment.py
 msgid "Timeout further payment attempts"
-msgstr ""
+msgstr "追加の支払い試行がタイムアウト"

 #: pretix/plugins/paypal2/payment.py
 msgid ""
 "Time duration in minutes after which another payment attempt is possible, "
 "while the last payment is still under investigation."
-msgstr ""
+msgstr "最後の支払いがまだ調査中である間、別の支払い試行が可能となる時間（分）。"

 #: pretix/plugins/paypal2/payment.py
 msgid "-- Automatic --"
@@ -31190,6 +31167,10 @@ msgid ""
 "twice in case PayPal allows your initial payment attempt. Please contact us "
 "to resolve this case."
 msgstr ""
+"支払いはPayPalで処理されています。通常より時間がかかります。PayPalが支払いを"
+"確認するまでお待ちいただくか、こちらまたは別の支払い方法で再度お支払いをお試"
+"しください。PayPalが最初の支払い試行を許可した場合、二重に請求される可能性が"
+"あります。この件を解決するために、弊社までご連絡ください。"

 #: pretix/plugins/paypal2/views.py
 msgid ""
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-08-24 15:35+0000\n"
-"PO-Revision-Date: 2026-03-30 21:00+0000\n"
+"PO-Revision-Date: 2026-09-02 08:35+0000\n"
 "Last-Translator: Renne Rocha <renne@rocha.dev.br>\n"
 "Language-Team: Portuguese (Brazil) <https://translate.pretix.eu/projects/"
 "pretix/pretix/pt_BR/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.16.2\n"
+"X-Generator: Weblate 2026.8.1\n"

 #: pretix/_base_settings.py
 msgid "English"
@@ -93,7 +93,7 @@ msgstr "Hebraico"

 #: pretix/_base_settings.py
 msgid "Hungarian"
-msgstr ""
+msgstr "Húngaro"

 #: pretix/_base_settings.py
 msgid "Indonesian"
@@ -153,7 +153,7 @@ msgstr "Espanhol (América latina)"

 #: pretix/_base_settings.py
 msgid "Thai"
-msgstr ""
+msgstr "Tailandês"

 #: pretix/_base_settings.py
 msgid "Turkish"
@@ -3022,11 +3022,12 @@ msgid ""
 "The field \"%(label)s\" may not contain special characters such as "
 "\"%(chars)s\"."
 msgstr ""
+"O campo \"%(label)s\" não pode conter caracteres especiais como %(chars)s\"."

 #: pretix/base/forms/questions.py
 #, python-format
 msgid "The field \"%(label)s\" may not contain an URL (%(url)s)."
-msgstr ""
+msgstr "O campo \"%(label)s\" não pode conter uma URL (%(url)s)."

 #: pretix/base/forms/questions.py
 msgctxt "phonenumber"
@@ -8173,7 +8174,7 @@ msgstr "Permitida"
 #: pretix/base/permissions.py
 msgctxt "permission_level"
 msgid "Access existing events"
-msgstr ""
+msgstr "Acessar eventos existentes"

 #: pretix/base/permissions.py
 msgctxt "permission_level"
@@ -13607,11 +13608,15 @@ msgstr "Por favor, continue em uma nova aba"
 #: pretix/base/templates/pretixbase/framebreak.html
 msgid "For security reasons, the following step is only possible in a new tab."
 msgstr ""
+"Por razões de segurança, o passo seguinte só é possível de ser feito em uma "
+"nova aba."

 #: pretix/base/templates/pretixbase/framebreak.html
 msgid ""
 "If the new tab did not open automatically, please click the following button:"
 msgstr ""
+"Se uma nova aba não abrir automaticamente, por favor, clique no botão a "
+"seguir:"

 #: pretix/base/templates/pretixbase/framebreak.html
 #: pretix/presale/templates/pretixpresale/event/cookies.html
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-08-24 15:35+0000\n"
-"PO-Revision-Date: 2026-08-09 06:00+0000\n"
-"Last-Translator: Julien <julien@circusiloveyou.com>\n"
+"PO-Revision-Date: 2026-09-04 14:29+0000\n"
+"Last-Translator: Linnea Thelander <linnea@coeo.events>\n"
 "Language-Team: Swedish <https://translate.pretix.eu/projects/pretix/pretix/"
 "sv/>\n"
 "Language: sv\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2026.8.1\n"
+"X-Generator: Weblate 2026.9\n"

 #: pretix/_base_settings.py
 msgid "English"
@@ -19170,8 +19170,9 @@ msgstr ""
 #: pretix/presale/templates/pretixpresale/event/order_pay.html
 #: pretix/presale/templates/pretixpresale/event/order_pay_change.html
 #: pretix/presale/templates/pretixpresale/event/position_change.html
+#, fuzzy
 msgid "Continue"
-msgstr "Fortsätta"
+msgstr "Fortsätt"

 #: pretix/control/templates/pretixcontrol/auth/oauth_authorization.html
 msgid "Authorize an application"
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-07-06 15:52+0000\n"
-"PO-Revision-Date: 2026-08-09 06:00+0000\n"
-"Last-Translator: Julien <julien@circusiloveyou.com>\n"
+"PO-Revision-Date: 2026-09-04 14:29+0000\n"
+"Last-Translator: Linnea Thelander <linnea@coeo.events>\n"
 "Language-Team: Swedish <https://translate.pretix.eu/projects/pretix/pretix-"
 "js/sv/>\n"
 "Language: sv\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2026.8.1\n"
+"X-Generator: Weblate 2026.9\n"

 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js
 msgid "Marked as paid"
@@ -133,8 +133,9 @@ msgstr "Mercado Pago"
 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/i18n.ts
 #: pretix/static/pretixpresale/js/ui/cart.js
+#, fuzzy
 msgid "Continue"
-msgstr "Fortsätta"
+msgstr "Fortsätt"

 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js
 #: pretix/plugins/stripe/static/pretixplugins/stripe/pretix-stripe.js
@@ -55,7 +55,6 @@ from django.db.models.functions import Cast, Coalesce
 from django.utils.timezone import make_aware
 from django.utils.translation import gettext as _, gettext_lazy, pgettext_lazy
 from pypdf import PageObject, PdfReader, PdfWriter, Transformation
-from pypdf.generic import RectangleObject
 from reportlab.lib import pagesizes
 from reportlab.lib.units import inch, mm
 from reportlab.pdfgen import canvas
@@ -238,15 +237,8 @@ def _render_nup_page(nup_pdf: PdfWriter, input_pages: PageObject, opt: dict) ->
        di = i % badges_per_page
        tx = opt['margins'][3] + (di % opt['cols']) * opt['offsets'][0]
        ty = opt['margins'][2] + (opt['rows'] - 1 - (di // opt['cols'])) * opt['offsets'][1]
-        page.add_transformation(Transformation().translate(tx, ty))
-        page.mediabox = RectangleObject((
-            Decimal('%.5f' % (page.mediabox.left.as_numeric() + tx)),
-            Decimal('%.5f' % (page.mediabox.bottom.as_numeric() + ty)),
-            Decimal('%.5f' % (page.mediabox.right.as_numeric() + tx)),
-            Decimal('%.5f' % (page.mediabox.top.as_numeric() + ty))
-        ))
        page.trimbox = page.cropbox = page.mediabox
-        nup_page.merge_page(page)
+        nup_page.merge_transformed_page(page, Transformation().translate(tx, ty))
    return nup_page


@@ -55,6 +55,8 @@ from django_countries.fields import Country
 from reportlab.lib import colors
 from reportlab.lib.enums import TA_CENTER
 from reportlab.lib.units import mm
+from reportlab.lib.utils import simpleSplit
+from reportlab.pdfbase.pdfmetrics import stringWidth
 from reportlab.pdfgen.canvas import Canvas
 from reportlab.platypus import PageBreak, Spacer, Table, TableStyle

@@ -226,10 +228,20 @@ class ReportlabExportMixin:
    def page_header(self, canvas, doc):
        from reportlab.lib.units import mm

-        canvas.setFont('OpenSans', 10)
-        canvas.drawString(doc.leftMargin, self.pagesize[1] - 15 * mm, self.get_left_header_string())
+        font_name = 'OpenSans'
+        font_size = 10
+        left_string = self.get_left_header_string()
+        right_string = self.get_right_header_string()
+        right_width = stringWidth(right_string, font_name, font_size)
+        max_left_width = self.pagesize[0] - doc.leftMargin - doc.rightMargin - right_width - 5 * mm
+        left_string_lines = simpleSplit(left_string, font_name, font_size, max_left_width)
+        if len(left_string_lines) > 1:
+            left_string = left_string_lines[0] + " …"
+
+        canvas.setFont(font_name, font_size)
+        canvas.drawString(doc.leftMargin, self.pagesize[1] - 15 * mm, left_string)
        canvas.drawRightString(self.pagesize[0] - doc.rightMargin, self.pagesize[1] - 15 * mm,
-                               self.get_right_header_string())
+                               right_string)
        canvas.setStrokeColorRGB(0, 0, 0)
        canvas.line(doc.leftMargin, self.pagesize[1] - 17 * mm,
                    self.pagesize[0] - doc.rightMargin, self.pagesize[1] - 17 * mm)
@@ -355,9 +355,9 @@ class OrderSendView(BaseSenderView):
            statusq |= Q(status=Order.STATUS_PENDING, require_approval=False, valid_if_pending=True)
        orders = qs.filter(statusq)

-        opq = OrderPosition.objects.filter(
+        opq = OrderPosition.objects.with_scopes_disabled().filter(
            Q(item_id__in=[i.pk for i in form.cleaned_data.get('items')]) | Q(Exists(
-                OrderPosition.objects.filter(
+                OrderPosition.objects.with_scopes_disabled().filter(
                    addon_to_id=OuterRef('pk'),
                    item_id__in=[i.pk for i in form.cleaned_data.get('items')]
                )
@@ -98,7 +98,9 @@ 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,
@@ -497,7 +499,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
@@ -1090,26 +1092,18 @@ class QuestionsStep(CartQuestionsViewMixin, CartMixin, TemplateFlowStep):
                return False

        for cp in self._positions_for_questions:
-            answ = {
-                aw.question_id: aw for aw in cp.answerlist
-            }
-            question_cache = {
-                q.pk: q for q in cp.item.questions_to_ask
+            qc_cache = {
+                qc.pk: qc for qq in cp.item.relevant_questionnaires for qc in qq.childlist
            }

            def question_is_visible(parentid, qvals):
-                if parentid not in question_cache:
+                if parentid not in qc_cache:
                    return False
-                parentq = question_cache[parentid]
-                if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
+                parentqc = qc_cache[parentid]
+                if parentqc.dependency_question_id and not question_is_visible(parentqc.dependency_question_id, parentqc.dependency_values):
                    return False
-                if parentid not in answ:
-                    return False
-                return (
-                    ('True' in qvals and answ[parentid].answer == 'True')
-                    or ('False' in qvals and answ[parentid].answer == 'False')
-                    or (any(qval in [o.identifier for o in answ[parentid].options.all()] for qval in qvals))
-                )
+                answer_values = cp.get_dependency_answer_values(parentqc)
+                return any(qval in answer_values for qval in qvals)

            def question_is_required(q):
                return (
@@ -1118,31 +1112,16 @@ class QuestionsStep(CartQuestionsViewMixin, CartMixin, TemplateFlowStep):
                )

            if not self.all_optional:
-                for q in cp.item.questions_to_ask:
-                    if question_is_required(q) and q.id not in answ:
-                        if warn:
-                            messages.warning(request, _('Please fill in answers to all required questions.'))
-                        return False
-                if cp.item.ask_attendee_data and self.request.event.settings.get('attendee_names_required', as_type=bool) \
-                        and not cp.attendee_name_parts:
-                    if warn:
-                        messages.warning(request, _('Please fill in answers to all required questions.'))
-                    return False
-                if cp.item.ask_attendee_data and self.request.event.settings.get('attendee_emails_required', as_type=bool) \
-                        and cp.attendee_email is None:
-                    if warn:
-                        messages.warning(request, _('Please fill in answers to all required questions.'))
-                    return False
-                if cp.item.ask_attendee_data and self.request.event.settings.get('attendee_company_required', as_type=bool) \
-                        and cp.company is None:
-                    if warn:
-                        messages.warning(request, _('Please fill in answers to all required questions.'))
-                    return False
-                if cp.item.ask_attendee_data and self.request.event.settings.get('attendee_addresses_required', as_type=bool) \
-                        and (cp.street is None and cp.city is None and cp.country is None):
-                    if warn:
-                        messages.warning(request, _('Please fill in answers to all required questions.'))
-                    return False
+                for qq in cp.item.relevant_questionnaires:
+                    for qc in qq.childlist:
+                        if qc.user_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', {})
@@ -204,7 +204,7 @@
                            {% endif %}
                        {% endif %}
                        {% for q in line.questions %}
-                            <dt>{{ q.question }}</dt>
+                            <dt>{{ q.label }}</dt>
                            <dd>
                                {% include "pretixpresale/event/fragment_question_answer.html" with request=request question=q answer=q.answer %}
                            </dd>
@@ -3,7 +3,7 @@
 {% load escapejson %}

 {% if payment_qr_codes %}
-    <div class="tabcontainer col-md-6 col-sm-6 hidden-xs text-center js-only blank-after">
+    <div class="tabcontainer col-md-6 col-sm-6 col-xs-12 text-center js-only blank-after">
        <div id="banktransfer_qrcodes_tabs_content" class="tabpanels blank-after">
            {% for code_info in payment_qr_codes %}
                <div id="banktransfer_qrcodes_{{ code_info.id }}"
@@ -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,7 @@ 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
@@ -95,7 +96,7 @@ 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):
@@ -399,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'):
@@ -407,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, container_type=Question.ContainerType.ORDERPOSITION)
+            qqs = request.event.questionnaires.all()
+            qqs = qqs.filter(
+                Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=request.sales_channel.identifier),
+                type='PS'
+            )
            request._cart_cache = CartPosition.objects.filter(
                cart_id=cart_id, event=request.event
            ).annotate(
@@ -429,18 +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:
@@ -450,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):
    """
@@ -501,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,
@@ -122,19 +122,20 @@ def widget_css_etag(request, version, **kwargs):
        return f'{_get_source_cache_key(version)}-{request.organizer.cache.get_or_set("css_version", default=lambda: int(time.time()))}'


+# use vite by default, serve old vue2-based widget only for widget_vue2_origins
 def _use_vite(request):
-    if getattr(settings, 'PRETIX_WIDGET_VITE', False) or "beta" in request.GET:
-        return True
+    if getattr(settings, 'PRETIX_WIDGET_VUE', False) or "legacy" in request.GET:
+        return False
    origin = request.META.get('HTTP_ORIGIN', '')
    gs = GlobalSettingsObject()
-    vite_origins = gs.settings.get('widget_vite_origins', as_type=str, default='')
-    if vite_origins and not origin:
+    vue_origins = gs.settings.get('widget_vue2_origins', as_type=str, default='')
+    if vue_origins and not origin:
        referer = request.META.get('HTTP_REFERER', '')
        origin = '/'.join(referer.split('/', 3)[:3])
-    if origin and vite_origins:
-        origins_list = [o.strip() for o in vite_origins.strip().splitlines() if o.strip()]
-        return origin in origins_list
-    return False
+    if origin and vue_origins:
+        origins_list = [o.strip() for o in vue_origins.strip().splitlines() if o.strip()]
+        return origin not in origins_list
+    return True


 def widget_js_etag(request, version, lang, **kwargs):
@@ -913,7 +913,7 @@ VITE_DEV_SERVER_PORT = 5173
 VITE_DEV_SERVER = f"http://localhost:{VITE_DEV_SERVER_PORT}"
 VITE_DEV_MODE = DEBUG
 VITE_IGNORE = False  # Used to ignore `collectstatic`/`rebuild`
-PRETIX_WIDGET_VITE = os.environ.get('PRETIX_WIDGET_VITE', '') not in ('', '0')
+PRETIX_WIDGET_VUE = os.environ.get('PRETIX_WIDGET_VUE', '') not in ('', '0')

 if DEBUG:
    # Reload if settings file changes
@@ -1,7 +1,7 @@
 document.addEventListener('DOMContentLoaded', function () {
 	document.querySelectorAll('a[href^="mailto:"]').forEach(function (link) {
 		// Replace [at] with @ and the [dot] with . in both the href and the displayed text (if needed)
-		link.href = link.href.replace('[at]', '@').replace('[dot]', '.')
-		link.textContent = link.textContent.replace('[at]', '@').replace('[dot]', '.')
+		link.href = link.href.replace('[at]', '@').replaceAll('[dot]', '.')
+		link.textContent = link.textContent.replace('[at]', '@').replaceAll('[dot]', '.')
 	})
 })
@@ -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%;
@@ -233,6 +233,7 @@ let form_handlers = function (el) {

 function setup_basics (el) {
 	el.find('form').attr('novalidate', true).on('submit', function (e) {
+		if (e.originalEvent && e.originalEvent.submitter && e.originalEvent.submitter.formNoValidate) return;
 		if (!this.checkValidity()) {
 			let input = this.querySelector(':invalid:not(fieldset)');
 			(input.labels[0] || input).scrollIntoView()
@@ -0,0 +1,2 @@
+- modernize the sometimes native form submitting?
+- destructure props?
@@ -514,10 +514,6 @@ export function createWidgetStore (config: {
 					// button with subevent but no items
 					redirectUrl += `${this.subevent}/`
 				}
-				if (this.subevent && !this.cartId) {
-					// button with subevent but no items
-					redirectUrl += `${this.subevent}/`
-				}
 				redirectUrl += `?iframe=1&locale=${LANG}`
 				if (this.cartId) {
 					// ajax to make sure the cart-id is used, even if the cart is currently empty
@@ -128,9 +128,9 @@ class VoucherFormTest(SoupTestMixin, TransactionTestCase):
        doc = self.client.get('/control/event/%s/%s/vouchers/?download=yes' % (self.orga.slug, self.event.slug))
        assert doc.content.decode().strip() == '"Voucher code","Valid until","Product","Reserve quota",' \
                                               '"Bypass quota","Price effect","Value","Tag","Redeemed",' \
-                                               '"Maximum usages","Seat","Comment"' \
+                                               '"Maximum usages","Seat","Comment","Budget","Budget used"' \
                                               '\r\n"ABCDEFG","","Early-bird ticket","No","No","No effect","","","0",' \
-                                               '"1","",""'
+                                               '"1","","","",""'

    def test_filter_status_valid(self):
        with scopes_disabled():
@@ -89,11 +89,11 @@ def _widget_assets():
                f'Start it with: npm run dev:widget'
            )
        yield
-    elif os.environ.get("PRETIX_WIDGET_VITE"):
+    elif os.environ.get("PRETIX_WIDGET_VUE"):
+        yield  # Old widget, no build needed
+    else:
        subprocess.check_call(['npm', 'run', 'build:widget'], cwd=PROJECT_ROOT)
        yield
-    else:
-        yield  # Old widget, no build needed


 # ============================================================================
@@ -155,10 +155,6 @@ def live_server_url(live_server, settings):

    settings.SITE_URL = live_server.url

-    # Enable Vite widget if requested via env var
-    if os.environ.get("PRETIX_WIDGET_VITE") or os.environ.get("PRETIX_WIDGET_VITE_DEV"):
-        settings.PRETIX_WIDGET_VITE = True
-
    return live_server.url


@@ -50,7 +50,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	54726d6fcd	TODO markings	2026-09-15 16:37:23 +02:00
Mira Weller	8e3cc12357	rebase migration and migrate order-level questions as well	2026-09-15 16:37:23 +02:00
Mira Weller	53a8a7954d	QuestionnaireChild: system_question und user_question in system_datafield und user_datafield umbenennen	2026-09-15 16:37:22 +02:00
Mira Weller	59cebf3ee8	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-09-15 16:37:22 +02:00
Richard Schreiber	3648ef28d7	Fix deanonymizing emails with multiple dots (#6559 )	2026-09-15 13:16:36 +02:00
Richard Schreiber	689b99c3aa	PDF: fix inline merge_background on fg_pdf instead of its own PdfWriter (#6555 ) * PDF: fix inline merge_background on fg_pdf instead of its own PdfWriter * fix pdf_header * fix flake8	2026-09-14 15:45:54 +02:00
Raphael Michel	6c40daa863	Hotfix for JS issue when submit() is called from JS	2026-09-14 15:33:25 +02:00
dependabot[bot]andRaphael Michel	efdc83f72a	Update pypdf requirement from ==6.5.* to ==6.11.* (#6176 ) * Update pypdf requirement from ==6.5.* to ==6.11.* Updates the requirements on [pypdf](https://github.com/py-pdf/pypdf) to permit the latest version. - [Release notes](https://github.com/py-pdf/pypdf/releases) - [Changelog](https://github.com/py-pdf/pypdf/blob/main/CHANGELOG.md) - [Commits](https://github.com/py-pdf/pypdf/compare/6.5.0...6.11.0) --- updated-dependencies: - dependency-name: pypdf dependency-version: 6.11.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Try to adjust code --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Raphael Michel <michel@rami.io>	2026-09-14 14:09:28 +02:00
dependabot[bot]	8b10534c74	Bump smol-toml from 1.6.1 to 1.7.1 (#6546 ) Bumps [smol-toml](https://github.com/squirrelchat/smol-toml) from 1.6.1 to 1.7.1. - [Release notes](https://github.com/squirrelchat/smol-toml/releases) - [Commits](https://github.com/squirrelchat/smol-toml/compare/v1.6.1...v1.7.1) --- updated-dependencies: - dependency-name: smol-toml dependency-version: 1.7.1 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-09-14 10:31:12 +02:00
Raphael Michel	bcacff2ee7	Voucher list: Add budget and budget used to CSV export (Z#23237857) (#6520 ) * Voucher list: Add budget and budget used to CSV export (Z#23237857) * Fix failing test	2026-09-14 10:31:07 +02:00
Kara Engelhardt	47096f7f1b	sendmail: fix query performance when filtering on checkin (Z#23244045)	2026-09-14 10:24:58 +02:00
Raphael Michel	c240ebcb8e	Force Django update	2026-09-14 09:51:32 +02:00
Raphael Michel	ce3e59e020	PDF reports: Fix headers for overlong event names (Z#23239566) (#6521 )	2026-09-14 09:38:44 +02:00
Raphael Michel	4a9da40028	[A11y] Form JavaScript: Support for <button formnovalidate> (#6536 )	2026-09-14 09:38:34 +02:00
Raphael Michelandpajowu	eab1efd5f4	Phone number input: Fix workaround for prefixes shared between countries (fixes #6544 ) (#6545 ) * Phone number input: Fix workaround for prefixes shared between countries (fixes #6544) * Update src/pretix/base/forms/questions.py Co-authored-by: pajowu <engelhardt@pretix.eu> --------- Co-authored-by: pajowu <engelhardt@pretix.eu>	2026-09-14 09:35:32 +02:00
Richard Schreiber	c7290b614e	Show payment-QR-codes on mobile (#6503 )	2026-09-14 08:50:45 +02:00
Raphael Michel	1aea5633eb	Discounts: Fix ManyToMany fields when cloning (#6547 )	2026-09-11 18:35:37 +02:00
Richard Schreiber	86cc719651	Widget: serve vite by default, origin-whitelist for vue2 (#6403 )	2026-09-11 08:53:42 +02:00
Mira Weller	742a69f09f	Add git-blame-ignore-revs file (see #6541 )	2026-09-10 12:54:51 +02:00
Yasunobu YesNo Kawaguchi	c05dee7af5	Translations: Update Japanese Currently translated at 100.0% (6419 of 6419 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/ja/ powered by weblate	2026-09-10 12:36:49 +02:00
Albizuri	e399a49c8b	Translations: Update Basque Currently translated at 48.0% (3086 of 6419 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/eu/ powered by weblate	2026-09-10 12:36:49 +02:00
Linnea Thelander	b9b951e56b	Translations: Update Swedish Currently translated at 98.0% (255 of 260 strings) Translation: pretix/pretix (JavaScript parts) Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/sv/ powered by weblate	2026-09-10 12:36:49 +02:00
Linnea Thelander	88bb1f4008	Translations: Update Swedish Currently translated at 85.8% (5509 of 6419 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/sv/ powered by weblate	2026-09-10 12:36:49 +02:00
Renne Rocha	24e7db7ddd	Translations: Update Portuguese (Brazil) Currently translated at 92.4% (5937 of 6419 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/pt_BR/ powered by weblate	2026-09-10 12:36:49 +02:00
Hijiri Umemoto	96ed6fe1a6	Translations: Update Japanese Currently translated at 100.0% (6419 of 6419 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/ja/ powered by weblate	2026-09-10 12:36:49 +02:00