Fix answers with files in API

System datafield keys now always start with an @ (e.g. "@attendee_email"), to distinguish from user datafields

Renamed SystemQuestion enum to SystemDatafield

Improve details in editor UI

package-lock.json

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

package.json

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

src/pretix/api/auth/devicesecurity.py

@@ -100,6 +100,10 @@ class PretixScanSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:itemcategory-list'),
         ('GET', 'api-v1:item-list'),
         ('GET', 'api-v1:question-list'),
+        ('GET', 'api-v1:compatquestion-list'),
+        ('GET', 'api-v1:datafield-list'),
+        ('GET', 'api-v1:questionnaire-list'),
+        ('GET', 'api-v1:questionnairechild-list'),
         ('GET', 'api-v1:badgelayout-list'),
         ('GET', 'api-v1:badgeitem-list'),
         ('GET', 'api-v1:checkinlist-list'),
@@ -141,6 +145,10 @@ class PretixScanNoSyncNoSearchSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:itemcategory-list'),
         ('GET', 'api-v1:item-list'),
         ('GET', 'api-v1:question-list'),
+        ('GET', 'api-v1:compatquestion-list'),
+        ('GET', 'api-v1:datafield-list'),
+        ('GET', 'api-v1:questionnaire-list'),
+        ('GET', 'api-v1:questionnairechild-list'),
         ('GET', 'api-v1:badgelayout-list'),
         ('GET', 'api-v1:badgeitem-list'),
         ('GET', 'api-v1:checkinlist-list'),
@@ -177,6 +185,10 @@ class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:itemcategory-list'),
         ('GET', 'api-v1:item-list'),
         ('GET', 'api-v1:question-list'),
+        ('GET', 'api-v1:compatquestion-list'),
+        ('GET', 'api-v1:datafield-list'),
+        ('GET', 'api-v1:questionnaire-list'),
+        ('GET', 'api-v1:questionnairechild-list'),
         ('GET', 'api-v1:badgelayout-list'),
         ('GET', 'api-v1:badgeitem-list'),
         ('GET', 'api-v1:checkinlist-list'),

src/pretix/api/compat.py

@@ -0,0 +1,80 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2020-today pretix GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from functools import reduce
+
+from rest_framework import serializers
+
+from pretix.api.exceptions import CompatException
+
+
+class MergeField(serializers.Field):
+    """
+    Read-only field that iterates over a list of related objects, picks a value from each, and merges the values
+    in a configurable way (mode parameter).
+
+    :param mode: list:       returns a list of all picked values
+                 consensus:  returns the value only if it is equal on all related objects, otherwise
+                             raises or returns an error object
+                 union:      only supported if picked values are iterables - generates union of all sub-items
+                 bool_or:    returns a boolean that is true if at least one picked value is truthy
+    """
+    def __init__(self, related_name, inner_field, mode, **kwargs):
+        self.inner_field = inner_field
+        self.related_name = related_name
+        self.merge_mode = mode
+        assert mode in ('list', 'consensus', 'union', 'bool_or',)
+        kwargs['source'] = '*'
+        kwargs['read_only'] = True
+        super().__init__(**kwargs)
+
+    def bind(self, field_name, parent):
+        self.field_name = field_name
+        self.parent = parent
+        self.inner_field.bind(field_name, parent)
+
+    def get_attribute(self, instance):
+        vals = []
+        for ref in getattr(instance, self.related_name).all():
+            val = self.inner_field.get_attribute(ref)
+            if val is not None:
+                val = self.inner_field.to_representation(val)
+            vals.append(val)
+        if self.merge_mode == 'list':
+            return vals
+        elif self.merge_mode == 'consensus':
+            if len(vals) >= 1 and all(val == vals[0] for val in vals):
+                return vals[0]
+            else:
+                errmes = 'Questionnaire configuration incompatible with old data model due to conflicting values of ' + self.field_name
+                if self.context['ignore_errors']:
+                    return {'_error': errmes, '_values': vals}
+                else:
+                    raise CompatException({'detail': errmes, '_values': vals})
+        elif self.merge_mode == 'union':
+            return sorted(set(sum(vals, [])))
+        elif self.merge_mode == 'bool_or':
+            return reduce(lambda a, b: a or bool(b), vals, False)
+        else:
+            raise Exception('Unknown merge mode: ' + self.merge_mode)
+
+    def to_representation(self, value):
+        return value

src/pretix/api/exceptions.py

@@ -0,0 +1,28 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2020-today pretix GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from rest_framework.exceptions import APIException
+
+
+class CompatException(APIException):
+    status = 410
+    default_code = 'incompatible_data'
+

src/pretix/api/serializers/cart.py

@@ -32,6 +32,7 @@ from rest_framework.exceptions import ValidationError
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.api.serializers.order import (
     AnswerCreateSerializer, AnswerSerializer, InlineSeatSerializer,
+    MixedAnswerListSerializer,
 )
 from pretix.base.models import SalesChannel, Seat, Voucher
 from pretix.base.models.orders import CartPosition
@@ -43,7 +44,7 @@ class TaxIncludedField(serializers.Field):
 
 
 class CartPositionSerializer(I18nAwareModelSerializer):
-    answers = AnswerSerializer(many=True)
+    answers = MixedAnswerListSerializer(child=AnswerSerializer(), source='*')
     seat = InlineSeatSerializer()
     includes_tax = TaxIncludedField(source='*')
 
@@ -55,7 +56,7 @@ class CartPositionSerializer(I18nAwareModelSerializer):
 
 
 class BaseCartPositionCreateSerializer(I18nAwareModelSerializer):
-    answers = AnswerCreateSerializer(many=True, required=False)
+    answers = MixedAnswerListSerializer(child=AnswerCreateSerializer(required=False), source='*', required=False)
     attendee_name = serializers.CharField(required=False, allow_null=True)
     includes_tax = serializers.BooleanField(required=False, allow_null=True)
 
@@ -193,7 +194,7 @@ class BaseCartPositionCreateSerializer(I18nAwareModelSerializer):
         cp = CartPosition.objects.create(event=self.context['event'], **validated_data)
 
         for answ_data in answers_data:
-            options = answ_data.pop('options')
+            options = answ_data.pop('options', [])
             if isinstance(answ_data['answer'], File):
                 an = answ_data.pop('answer')
                 answ = cp.answers.create(**answ_data, answer='')

src/pretix/api/serializers/event.py

@@ -764,15 +764,6 @@ class EventSettingsSerializer(SettingsSerializer):
         'event_calendar_future_only',
         'frontpage_text',
         'event_info_text',
-        'attendee_names_asked',
-        'attendee_names_required',
-        'attendee_emails_asked',
-        'attendee_emails_required',
-        'attendee_addresses_asked',
-        'attendee_addresses_required',
-        'attendee_company_asked',
-        'attendee_company_required',
-        'attendee_data_explanation_text',
         'confirm_texts',
         'order_email_asked_twice',
         'order_phone_asked',
@@ -941,14 +932,6 @@ class DeviceEventSettingsSerializer(EventSettingsSerializer):
         'show_quota_left',
         'show_dates_on_frontpage',
         'max_items_per_order',
-        'attendee_names_asked',
-        'attendee_names_required',
-        'attendee_emails_asked',
-        'attendee_emails_required',
-        'attendee_addresses_asked',
-        'attendee_addresses_required',
-        'attendee_company_asked',
-        'attendee_company_required',
         'ticket_download',
         'ticket_download_addons',
         'ticket_download_nonadm',
@@ -979,7 +962,6 @@ class DeviceEventSettingsSerializer(EventSettingsSerializer):
         'reusable_media_type_nfc_mf0aes',
         'reusable_media_type_nfc_mf0aes_random_uid',
         'reusable_media_usage_enforced',
-        'system_question_order',
         'tax_rule_payment',
         'tax_rule_cancellation',
     ]
@@ -1004,6 +986,18 @@ class DeviceEventSettingsSerializer(EventSettingsSerializer):
             )
         )
 
+        # Provide fixed values for old configuration fields to ensure apps never use their built-in FakeQuestions, only the
+        # ones we provide from POSCompatQuestionViewSet
+        self.fields['system_question_order'] = serializers.JSONField(read_only=True, default=dict(), source='_invalid')
+        self.fields['attendee_names_asked'] = serializers.BooleanField(read_only=True, default=False, source='_invalid')
+        self.fields['attendee_names_required'] = serializers.BooleanField(read_only=True, default=False, source='_invalid')
+        self.fields['attendee_emails_asked'] = serializers.BooleanField(read_only=True, default=False, source='_invalid')
+        self.fields['attendee_emails_required'] = serializers.BooleanField(read_only=True, default=False, source='_invalid')
+        self.fields['attendee_addresses_asked'] = serializers.BooleanField(read_only=True, default=False, source='_invalid')
+        self.fields['attendee_addresses_required'] = serializers.BooleanField(read_only=True, default=False, source='_invalid')
+        self.fields['attendee_company_asked'] = serializers.BooleanField(read_only=True, default=False, source='_invalid')
+        self.fields['attendee_company_required'] = serializers.BooleanField(read_only=True, default=False, source='_invalid')
+
 
 class MultiLineStringField(serializers.Field):
 

src/pretix/api/serializers/fields.py

@@ -36,6 +36,7 @@ from collections import OrderedDict
 
 from django.core.exceptions import ValidationError
 from rest_framework import serializers
+from rest_framework.fields import SerializerMethodField
 
 from pretix.api.auth.utils import get_session_key_for_api_request
 
@@ -133,3 +134,75 @@ class PluginsField(serializers.Field):
         return {
             'plugins': data
         }
+
+
+class WritableSerializerMethodField(SerializerMethodField):
+    """
+    A field that get its representation from calling a method on the
+    parent serializer class. The method called will be of the form
+    "get_{field_name}", and should take a single argument, which is the
+    object being serialized.
+
+    When the field is written, a method of the form "put_{field_name}"
+    is called, with the instance and the incoming data as arguments. It
+    should return a dictionary of data to be update validated_data with.
+
+    For example:
+
+    class ExampleSerializer(Serializer):
+        extra_info = WritableSerializerMethodField()
+
+        def get_extra_info(self, obj):
+            return ...  # Calculate some data to return.
+
+        def put_extra_info(self, obj, new_value):
+            # Store new value
+    """
+
+    def __init__(self, method_name=None, put_method_name=None, **kwargs):
+        self.put_method_name = put_method_name
+        super().__init__(method_name, **kwargs)
+        self.read_only = False
+
+    def bind(self, field_name, parent):
+        # The method name defaults to `get_{field_name}`.
+        if self.method_name is None:
+            self.method_name = f'get_{field_name}'
+        if self.put_method_name is None:
+            self.put_method_name = f'put_{field_name}'
+
+        super().bind(field_name, parent)
+
+    def to_representation(self, value):
+        method = getattr(self.parent, self.method_name)
+        return method(value)
+
+    def to_internal_value(self, data):
+        method = getattr(self.parent, self.put_method_name)
+        return method(self.parent.instance, data)
+
+
+class ContextAwareQueryMixin:
+
+    def __init__(self, *args, **kwargs):
+        assert not kwargs.get('read_only', False), (
+            'Scoped related fields are useless when read-only, '
+            'use a regular RelatedField instead.'
+        )
+        assert callable(kwargs.get('queryset', None)), (
+            'Scoped related fields must provide a callable `queryset`.'
+        )
+        super().__init__(*args, **kwargs)
+
+    def get_queryset(self):
+        return self.queryset(**self.context)
+
+
+class PrimaryKeyScopedRelatedField(ContextAwareQueryMixin, serializers.PrimaryKeyRelatedField):
+    pass
+
+
+class SlugScopedRelatedField(ContextAwareQueryMixin, serializers.SlugRelatedField):
+    pass
+
+

src/pretix/api/serializers/item.py

@@ -19,7 +19,8 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-
+import copy
+import logging
 # This file is based on an earlier version of pretix which was released under the Apache License 2.0. The full text of
 # the Apache License 2.0 can be obtained at <http://www.apache.org/licenses/LICENSE-2.0>.
 #
@@ -33,26 +34,44 @@
 # License for the specific language governing permissions and limitations under the License.
 import os.path
 from decimal import Decimal
+from itertools import zip_longest
 
+import rest_framework
 from django.conf import settings
 from django.core.exceptions import ValidationError
-from django.db import transaction
+from django.db import transaction, models
 from django.db.models import QuerySet
 from django.utils.functional import cached_property, lazy
 from django.utils.translation import gettext_lazy as _
+from i18nfield.rest_framework import I18nField
+from i18nfield.strings import LazyI18nString
 from rest_framework import serializers
+from rest_framework.exceptions import ValidationError as DrfValidationError
+from rest_framework.serializers import as_serializer_error
 
+from pretix.api.compat import MergeField
 from pretix.api.serializers import (
     CompatDecimalField, SalesChannelMigrationMixin,
 )
 from pretix.api.serializers.event import MetaDataField
-from pretix.api.serializers.fields import UploadedFileField
+from pretix.api.serializers.fields import PrimaryKeyScopedRelatedField, \
+    UploadedFileField, \
+    WritableSerializerMethodField
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
+from pretix.base.forms.questions import REQUIRED_NAME_PARTS
 from pretix.base.models import (
     Item, ItemAddOn, ItemBundle, ItemCategory, ItemMetaValue, ItemProgramTime,
-    ItemVariation, ItemVariationMetaValue, Question, QuestionOption, Quota,
-    SalesChannel,
+    ItemVariation, ItemVariationMetaValue, Question, QuestionAnswer,
+    QuestionOption, Quota, SalesChannel,
 )
+from pretix.base.models.items import Questionnaire, QuestionnaireRow
+from pretix.base.settings import (
+    PERSON_NAME_SALUTATIONS, PERSON_NAME_SCHEMES, PERSON_NAME_TITLE_GROUPS, LazyI18nStringList,
+)
+from pretix.base.templatetags.rich_text import rich_text
+from pretix.helpers.i18n import i18n_all_from_gettext
+
+logger = logging.getLogger(__name__)
 
 
 class InlineItemVariationSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
@@ -293,6 +312,9 @@ class ItemSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
     program_times = InlineItemProgramTimeSerializer(many=True, required=False)
     tax_rate = ItemTaxRateField(source='*', read_only=True, max_digits=7, decimal_places=4)
     meta_data = MetaDataField(required=False, source='*')
+    personalized = WritableSerializerMethodField(required=False)
+    questionnaires = PrimaryKeyScopedRelatedField(many=True, allow_null=True, required=False,
+                                                  queryset=lambda event, **kw: event.questionnaires.filter(type__startswith='position_'))
     picture = UploadedFileField(required=False, allow_null=True, allowed_types=(
         'image/png', 'image/jpeg', 'image/gif'
     ), max_size=settings.FILE_UPLOAD_MAX_SIZE_IMAGE)
@@ -320,7 +342,7 @@ class ItemSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
                   'grant_membership_duration_months', 'validity_mode', 'validity_fixed_from', 'validity_fixed_until',
                   'validity_dynamic_duration_minutes', 'validity_dynamic_duration_hours', 'validity_dynamic_duration_days',
                   'validity_dynamic_duration_months', 'validity_dynamic_start_choice', 'validity_dynamic_start_choice_day_limit',
-                  'media_policy', 'media_type')
+                  'media_policy', 'media_type', 'questionnaires')
         read_only_fields = ('has_variations',)
 
     def __init__(self, *args, **kwargs):
@@ -333,6 +355,36 @@ class ItemSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
             self.fields['limit_sales_channels'].child_relation.queryset = self.context['event'].organizer.sales_channels.all()
             self.fields['variations'].child.fields['limit_sales_channels'].child_relation.queryset = self.context['event'].organizer.sales_channels.all()
 
+    def get_personalized(self, item):
+        if 'questionnaires' in getattr(item, '_prefetched_objects_cache', {}):
+            if all(hasattr(q, 'has_attendee_data') for q in item.questionnaires.all()):
+                return any(q.has_attendee_data for q in item.questionnaires.all())
+
+        return QuestionnaireRow.objects.filter(questionnaire__items=item, system_datafield__in=('@attendee_name_parts', '@attendee_email')).exists()
+
+    def put_personalized(self, item, new_value):
+        if item and new_value != self.get_personalized(item):
+            raise ValidationError({'personalized': 'Deprecated field "personalized" can not be updated.'})
+        if new_value and not item:
+            try:
+                return {'questionnaires': [self._get_or_create_compat_personalization_questionnaire()]}
+            except Questionnaire.DoesNotExist:
+                raise ValidationError({'personalized': 'To create new products with personalized=True, a questionnaire named "Attendee data" must exist.'})
+        return {}
+
+    def _get_or_create_compat_personalization_questionnaire(self):
+        event = self.context['request'].event
+        try:
+            return event.questionnaires.get(type=Questionnaire.QuestionnaireType.POSITION_PURCHASE, compat_personalization=True)
+        except Questionnaire.DoesNotExist:
+            q = event.questionnaires.create(internal_name=str(_('Attendee data')), type=Questionnaire.QuestionnaireType.POSITION_PURCHASE, position=0, compat_personalization=True)
+            system_datafields_asked = {df: (label, helptext, required) for df, label, helptext, required in QuestionnaireRow.objects.filter(
+                questionnaire__event=event, system_datafield__isnull=False, questionnaire__type=Questionnaire.QuestionnaireType.POSITION_PURCHASE
+            ).values_list('system_datafield', 'label', 'help_text', 'required')}
+            for i, (df, (label, helptext, required)) in enumerate(system_datafields_asked.items()):
+                q.rows.create(label=label, help_text=helptext, required=required, system_datafield=df, position=i)
+            return q
+
     def validate(self, data):
         data = super().validate(data)
         if self.instance and ('addons' in data or 'variations' in data or 'bundles' in data or 'program_times' in data):
@@ -343,15 +395,6 @@ class ItemSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
         Item.clean_available(data.get('available_from'), data.get('available_until'))
         Item.clean_media_settings(self.context['event'], data.get('media_policy'), data.get('media_type'), data.get('issue_giftcard'))
 
-        if data.get('personalized') and not data.get('admission'):
-            raise ValidationError(_('Only admission products can currently be personalized.'))
-
-        if data.get('admission') and 'personalized' not in data and not self.instance:
-            # Backwards compatibility
-            data['personalized'] = True
-        elif 'admission' in data and not data['admission']:
-            data['personalized'] = False
-
         if data.get('issue_giftcard'):
             if data.get('tax_rule') and data.get('tax_rule').rate > 0:
                 raise ValidationError(
@@ -417,9 +460,11 @@ class ItemSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
         picture = validated_data.pop('picture', None)
         require_membership_types = validated_data.pop('require_membership_types', [])
         limit_sales_channels = validated_data.pop('limit_sales_channels', [])
+        questionnaires = validated_data.pop('questionnaires', [])
         item = Item.objects.create(**validated_data)
         if limit_sales_channels and not validated_data.get('all_sales_channels'):
             item.limit_sales_channels.add(*limit_sales_channels)
+        item.questionnaires.add(*questionnaires)
         if picture:
             item.picture.save(os.path.basename(picture.name), picture)
         if require_membership_types:
@@ -458,6 +503,7 @@ class ItemSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
                     value=value,
                     item=item
                 )
+
         return item
 
     def update(self, instance, validated_data):
@@ -530,27 +576,151 @@ class InlineQuestionOptionSerializer(I18nAwareModelSerializer):
         fields = ('id', 'identifier', 'answer', 'position')
 
 
+class DatafieldRelatedField(serializers.SlugRelatedField):
+    default_error_messages = {
+        'invalid_choice': _('"{input}" is not a valid choice.')
+    }
+    def __init__(self, *args, **kwargs):
+        super().__init__(slug_field='identifier', **kwargs)
+
+    def get_queryset(self):
+        return self.context['event'].questions.all()
+
+    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.identifier
+        else:
+            return None
+
+    def to_internal_value(self, data):
+        if data is None:
+            return {'user_datafield': None, 'system_datafield': None}
+        elif type(data) == str and data.startswith('@'):
+            if data not in QuestionnaireRow.SystemDatafield.values:
+                self.fail("invalid_choice", input=data)
+            return {'user_datafield': None, 'system_datafield': data}
+        elif type(data) == str:
+            return {'user_datafield': super().to_internal_value(data), 'system_datafield': None}
+        else:
+            self.fail('incorrect_type', data_type=type(data).__name__)
+
+    def use_pk_only_optimization(self):
+        return self.source == '*'
+
+
 class LegacyDependencyValueField(serializers.CharField):
 
     def to_representation(self, obj):
         return obj[0] if obj else None
 
-    def to_internal_value(self, data):
-        return [data] if data else []
+
+class QuestionFormSerializer(I18nAwareModelSerializer):
+    datafield = DatafieldRelatedField(allow_null=True, source='*')
+    question = I18nField(source='label', allow_null=True)
+    type = serializers.CharField(source='user_datafield.type', allow_null=True, default=Question.FieldType.STRING)
+    identifier = serializers.SerializerMethodField(read_only=True)
+    show_during_checkin = serializers.BooleanField(source='user_datafield.show_during_checkin', allow_null=True, default=False)
+
+    print_on_invoice = serializers.BooleanField(source='user_datafield.print_on_invoice', allow_null=True, default=False)
+    valid_number_min = serializers.IntegerField(source='user_datafield.valid_number_min', allow_null=True)
+    valid_number_max = serializers.IntegerField(source='user_datafield.valid_number_max', allow_null=True)
+    valid_date_min = serializers.DateField(source='user_datafield.valid_date_min', allow_null=True)
+    valid_date_max = serializers.DateField(source='user_datafield.valid_date_max', allow_null=True)
+    valid_datetime_min = serializers.DateTimeField(source='user_datafield.valid_datetime_min', allow_null=True)
+    valid_datetime_max = serializers.DateTimeField(source='user_datafield.valid_datetime_max', allow_null=True)
+    valid_string_length_max = serializers.IntegerField(source='user_datafield.valid_string_length_max', allow_null=True)
+    valid_string_length_min = serializers.IntegerField(source='user_datafield.valid_string_length_min', allow_null=True)
+    valid_file_portrait = serializers.BooleanField(source='user_datafield.valid_file_portrait', allow_null=True)
+
+    dependency_question = DatafieldRelatedField(allow_null=True, required=False)
+    items = serializers.PrimaryKeyRelatedField(source='questionnaire.items', many=True, queryset=Item.objects.none(), allow_null=True, required=False)
+    questionnaire_id = serializers.IntegerField(source='questionnaire.id', read_only=True)
+
+    options = InlineQuestionOptionSerializer(source='user_datafield.options', many=True, required=False, default=[])
+
+    class Meta:
+        model = QuestionnaireRow
+        fields = ('datafield', 'label', 'type', 'required', 'help_text', 'items', 'options', 'position',
+                  'show_during_checkin', 'identifier', 'dependency_question', 'dependency_values',
+                  'print_on_invoice', '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', 'questionnaire_id')
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['items'].child_relation.queryset = self.context['event'].items.all() if 'event' in self.context else Item.objects.none()
+
+    def get_attribute(self, instance):
+        if isinstance(instance, QuestionAnswer):
+            position = instance.cartposition if instance.cartposition_id else instance.orderposition
+            print('searching ', repr(instance), repr(position), repr(instance.question), instance.pk, position.item_id, self.context)   # TODO remove print
+            qcs = list(QuestionnaireRow.objects.filter(user_datafield_id=instance.question_id, questionnaire__items__in=[position.item_id]))
+            return next((qc for qc in qcs if qc.questionnaire.type == self.context.get('preferred_questionnaire_type', Questionnaire.QuestionnaireType.POSITION_PURCHASE)), qcs[0])
+
+        return super().get_attribute(instance)
+
+    def cook_dependency_question_id(self, qc):
+        if qc.dependency_question:
+            return qc.dependency_question.cooked_id
+        else:
+            return None
+
+    def get_identifier(self, qc):
+        return qc.user_datafield.identifier if qc.user_datafield else qc.system_datafield
+
+    @property
+    def data(self):
+        results = super().data
+        mangled_results = []
+        pos_offset = 0
+        for row in results:
+            row['position'] += pos_offset
+            if row['identifier'] == '@attendee_name_parts' and self.context.get('expand_attendee_name'):
+                settings = self.context['event'].settings
+                for k, v, w, *__ in PERSON_NAME_SCHEMES.get(settings.name_scheme)['fields']:
+                    part = dict(row)
+                    part["identifier"] += ":" + k
+                    part["question"] = i18n_all_from_gettext(v, settings.locales)
+                    if k == "title" and settings.name_scheme_titles:
+                        part["type"] = Question.FieldType.CHOICE
+                        part["options"] = [{"id": idx + 1, "identifier": k, "answer": i18n_all_from_gettext(k, settings.locales), "position": idx + 1} for idx, k in
+                                           enumerate(PERSON_NAME_TITLE_GROUPS.get(settings.name_scheme_titles)[1])]
+                    elif k == "salutation":
+                        part["type"] = Question.FieldType.CHOICE
+                        part["options"] = [{"id": idx + 1, "identifier": k, "answer": i18n_all_from_gettext(v, settings.locales), "position": idx + 1} for idx, (k, v) in
+                                           enumerate(PERSON_NAME_SALUTATIONS)]
+                    part["id"] = QuestionnaireRow.cook_id_from_parts(row['questionnaire_id'], None, part["identifier"])
+                    part["required"] = part["required"] and k in REQUIRED_NAME_PARTS
+                    mangled_results.append(part)
+                    pos_offset += 1
+                    row["position"] += 1
+            else:
+                if row['identifier'] == '@country':
+                    row['type'] = Question.FieldType.COUNTRYCODE
+                mangled_results.append(row)
+        return mangled_results
 
 
-class QuestionSerializer(I18nAwareModelSerializer):
+class DatafieldSerializer(I18nAwareModelSerializer):
     options = InlineQuestionOptionSerializer(many=True, required=False)
     identifier = serializers.CharField(allow_null=True)
-    dependency_value = LegacyDependencyValueField(source='dependency_values', required=False, allow_null=True)
+
+    #referenced_by_questionnaires = MergeField('referenced_by', serializers.IntegerField(source='questionnaire.id'), mode='list')
+    #questionnaire_types = MergeField('referenced_by', serializers.CharField(source='questionnaire.type'), mode='list')
 
     class Meta:
         model = Question
-        fields = ('id', 'question', 'type', 'required', 'items', 'options', 'position',
-                  'ask_during_checkin', 'show_during_checkin', 'identifier', 'dependency_question', 'dependency_values',
-                  'hidden', 'dependency_value', 'print_on_invoice', 'help_text', 'valid_number_min',
+        fields = ('id', 'internal_name', 'identifier', 'type',
+                  'show_during_checkin',
+                  'print_on_invoice', 'print_on_invoice_label', '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',
+                  #'referenced_by_questionnaires', 'questionnaire_types',
+                  'options')
 
     def validate_identifier(self, value):
         Question._clean_identifier(self.context['event'], value, self.instance)
@@ -561,14 +731,6 @@ class QuestionSerializer(I18nAwareModelSerializer):
             self.instance.clean_type_change(self.instance.type, value)
         return value
 
-    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
-
     def validate(self, data):
         data = super().validate(data)
         if self.instance and 'options' in data:
@@ -580,21 +742,6 @@ class QuestionSerializer(I18nAwareModelSerializer):
         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
-
         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.'))
 
@@ -617,15 +764,378 @@ class QuestionSerializer(I18nAwareModelSerializer):
     @transaction.atomic
     def create(self, validated_data):
         options_data = validated_data.pop('options') if 'options' in validated_data else []
-        items = validated_data.pop('items', [])
 
-        question = Question.objects.create(**validated_data, container_type=Question.ContainerType.ORDERPOSITION)
-        question.items.set(items)
+        question = Question.objects.create(**validated_data, container_type=self.context['container_type'])
         for opt_data in options_data:
             QuestionOption.objects.create(question=question, **opt_data)
         return question
 
 
+class CompatQuestionSerializer(DatafieldSerializer):
+    question = MergeField('referenced_by', I18nField(source='label'), mode='consensus')
+    required = MergeField('referenced_by', serializers.BooleanField(), mode='consensus')
+    items = MergeField('referenced_by', serializers.PrimaryKeyRelatedField(source='questionnaire.items', many=True, queryset=Item.objects.none(), allow_null=True, required=False), mode='union')
+    position = serializers.IntegerField(required=False, read_only=True, default=0)
+    ask_during_checkin = MergeField('referenced_by', serializers.BooleanField(source='questionnaire.ask_during_checkin'), mode='bool_or')
+    hidden = MergeField('referenced_by', serializers.BooleanField(source='questionnaire.hidden'), mode='bool_or')
+
+    dependency_question = MergeField('referenced_by', serializers.IntegerField(source='dependency_question.user_datafield_id', required=False, default=None, allow_null=True), mode='consensus')
+    dependency_values = MergeField('referenced_by', serializers.JSONField(), mode='consensus')
+    dependency_value = MergeField('referenced_by', LegacyDependencyValueField(source='dependency_values'), mode='consensus')
+    help_text = MergeField('referenced_by', I18nField(), mode='consensus')
+
+    class Meta:
+        model = Question
+        fields = (
+            'id', 'question', 'type', 'required', 'items', 'options', 'position',
+            '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',
+            # new
+            #'internal_name', 'referenced_by_questionnaires', 'questionnaire_types',
+        )
+
+    def __init__(self, *args, **kwargs):
+        self.fields['items'].inner_field.child_relation.queryset = kwargs['context']['event'].items.all()
+        super().__init__(*args, **kwargs)
+
+
+class POSCompatQuestionSerializer(QuestionFormSerializer):
+    id = serializers.IntegerField(source='cooked_id', read_only=True)
+    question = I18nField(source='label', allow_null=True)
+    type = serializers.CharField(source='user_datafield.type', allow_null=True, default=Question.FieldType.STRING)
+    identifier = serializers.SerializerMethodField(read_only=True)
+    show_during_checkin = serializers.BooleanField(source='user_datafield.show_during_checkin', allow_null=True, default=False)
+    ask_during_checkin = serializers.BooleanField(source='questionnaire.ask_during_checkin')
+    hidden = serializers.BooleanField(source='questionnaire.hidden')
+    print_on_invoice = serializers.BooleanField(source='user_datafield.print_on_invoice', allow_null=True, default=False)
+    valid_number_min = serializers.IntegerField(source='user_datafield.valid_number_min', allow_null=True)
+    valid_number_max = serializers.IntegerField(source='user_datafield.valid_number_max', allow_null=True)
+    valid_date_min = serializers.DateField(source='user_datafield.valid_date_min', allow_null=True)
+    valid_date_max = serializers.DateField(source='user_datafield.valid_date_max', allow_null=True)
+    valid_datetime_min = serializers.DateTimeField(source='user_datafield.valid_datetime_min', allow_null=True)
+    valid_datetime_max = serializers.DateTimeField(source='user_datafield.valid_datetime_max', allow_null=True)
+    valid_string_length_max = serializers.IntegerField(source='user_datafield.valid_string_length_max', allow_null=True)
+    valid_string_length_min = serializers.IntegerField(source='user_datafield.valid_string_length_min', allow_null=True)
+    valid_file_portrait = serializers.BooleanField(source='user_datafield.valid_file_portrait', allow_null=True)
+    dependency_question = serializers.SerializerMethodField('cook_dependency_question_id', read_only=True)
+    dependency_value = serializers.SerializerMethodField('empty', read_only=True)
+    position = serializers.SerializerMethodField(read_only=True)
+    items = serializers.PrimaryKeyRelatedField(source='questionnaire.items', many=True, queryset=Item.objects.none(), allow_null=True, required=False)
+    questionnaire_id = serializers.IntegerField(source='questionnaire.id', read_only=True)
+
+    options = InlineQuestionOptionSerializer(source='user_datafield.options', many=True, required=False, default=[])
+
+    class Meta:
+        model = QuestionnaireRow
+        fields = ('id', 'question', 'type', 'required', 'items', 'options', 'position',
+                  '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', 'questionnaire_id')
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['items'].child_relation.queryset = self.context['event'].items.all() if 'event' in self.context else Item.objects.none()
+
+    def get_attribute(self, instance):
+        if isinstance(instance, QuestionAnswer):
+            position = instance.cartposition if instance.cartposition_id else instance.orderposition
+            print('searching ', repr(instance), repr(position), repr(instance.question), instance.pk, position.item_id, self.context)   # TODO remove print
+            qcs = list(QuestionnaireRow.objects.filter(user_datafield_id=instance.question_id, questionnaire__items__in=[position.item_id]))
+            return next((qc for qc in qcs if qc.questionnaire.type == self.context.get('preferred_questionnaire_type', Questionnaire.QuestionnaireType.POSITION_PURCHASE)), qcs[0])
+
+        return super().get_attribute(instance)
+
+    def cook_dependency_question_id(self, qc):
+        if qc.dependency_question:
+            return qc.dependency_question.cooked_id
+        else:
+            return None
+
+    def get_identifier(self, qc):
+        return qc.user_datafield.identifier if qc.user_datafield else qc.system_datafield
+
+    def empty(self, qc):
+        return None
+
+    def get_position(self, qc):
+        return qc.questionnaire.position * 1000000000 + qc.position
+
+    @staticmethod
+    def mangle_results(event, results):
+        mangled_results = []
+        pos_offset = 0
+        for row in results:
+            row['position'] += pos_offset
+            if row['identifier'] == '@attendee_name_parts':
+                settings = event.settings
+                for k, v, w, *__ in PERSON_NAME_SCHEMES.get(settings.name_scheme)['fields']:
+                    part = dict(row)
+                    part["identifier"] += ":" + k
+                    part["question"] = i18n_all_from_gettext(v, settings.locales)
+                    if k == "title" and settings.name_scheme_titles:
+                        part["type"] = Question.FieldType.CHOICE
+                        part["options"] = [{"id": idx + 1, "identifier": k, "answer": i18n_all_from_gettext(k, settings.locales), "position": idx + 1} for idx, k in
+                                           enumerate(PERSON_NAME_TITLE_GROUPS.get(settings.name_scheme_titles)[1])]
+                    elif k == "salutation":
+                        part["type"] = Question.FieldType.CHOICE
+                        part["options"] = [{"id": idx + 1, "identifier": k, "answer": i18n_all_from_gettext(v, settings.locales), "position": idx + 1} for idx, (k, v) in
+                                           enumerate(PERSON_NAME_SALUTATIONS)]
+                    part["id"] = QuestionnaireRow.cook_id_from_parts(row['questionnaire_id'], None, part["identifier"])
+                    part["required"] = part["required"] and k in REQUIRED_NAME_PARTS
+                    mangled_results.append(part)
+                    pos_offset += 1
+                    row["position"] += 1
+            else:
+                if row['identifier'] == '@country':
+                    row['type'] = Question.FieldType.COUNTRYCODE
+                mangled_results.append(row)
+        return mangled_results
+
+
+class RenderedMarkdownField(serializers.CharField):
+    def to_representation(self, value):
+        return rich_text(value)
+
+
+class InlineUserDatafieldSerializer(I18nAwareModelSerializer):
+    options = InlineQuestionOptionSerializer(many=True, required=False)
+    identifier = serializers.CharField(allow_null=True)
+
+    class Meta:
+        model = Question
+        fields = ('id', 'internal_name', 'identifier', 'type',
+                  'show_during_checkin',
+                  'print_on_invoice', 'print_on_invoice_label', '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', 'options')
+
+
+class InlineDatafieldField(serializers.Field):
+    def to_representation(self, value):
+        if value.user_datafield:
+            return DatafieldSerializer().to_representation(instance=value.user_datafield)
+        elif value.system_datafield:
+            part = {
+                'show_during_checkin': False,
+                'print_on_invoice': False,
+                'print_on_invoice_label': {},
+                'valid_number_min': None,
+                'valid_number_max': None,
+                'valid_date_min': None,
+                'valid_date_max': None,
+                'valid_datetime_min': None,
+                'valid_datetime_max': None,
+                'valid_string_length_max': None,
+                'valid_string_length_min': None,
+                'valid_file_portrait': False,
+                'options': []
+            }
+            if value.system_datafield.startswith('@attendee_name_parts:'):
+                settings = self.context['event'].settings
+                part["type"] = "S"
+                for fieldname, label, *__ in PERSON_NAME_SCHEMES.get(settings.name_scheme)['fields']:
+                    if fieldname != value.system_datafield.split(":")[1]:
+                        continue
+                    part["internal_name"] = str(QuestionnaireRow.SystemDatafield(value.system_datafield.split(":")[0]).label) + ": " + str(label)
+                    if fieldname == "title" and settings.name_scheme_titles:
+                        part["type"] = Question.FieldType.CHOICE
+                        part["options"] = [
+                            {"id": None, "identifier": k, "answer": i18n_all_from_gettext(k, settings.locales),
+                             "position": idx + 1} for idx, k in
+                            enumerate(PERSON_NAME_TITLE_GROUPS.get(settings.name_scheme_titles)[1])
+                        ]
+                    elif fieldname == "salutation":
+                        part["type"] = Question.FieldType.CHOICE
+                        part["options"] = [
+                            {"id": None, "identifier": k, "answer": i18n_all_from_gettext(v, settings.locales),
+                             "position": idx + 1} for idx, (k, v) in
+                            enumerate(PERSON_NAME_SALUTATIONS)
+                        ]
+                return {
+                    'id': None,
+                    'identifier': value.system_datafield,
+                    **part,
+                }
+            else:
+                return {
+                    'id': None,
+                    'internal_name': str(QuestionnaireRow.SystemDatafield(value.system_datafield).label),
+                    'identifier': value.system_datafield,
+                    'type': QuestionnaireRow.SYSTEM_DATAFIELD_TYPES[value.system_datafield],
+                    **part,
+                }
+
+
+class InlineQuestionnaireRowListSerializer(serializers.ListSerializer):
+    def expanded_rows(self, data):
+        for r in data:
+            if r.system_datafield == '@attendee_name_parts':
+                settings = self.context['event'].settings
+                for k, v, w, *__ in PERSON_NAME_SCHEMES.get(settings.name_scheme)['fields']:
+                    copied = copy.copy(r)
+                    copied.system_datafield = r.system_datafield + ":" + k
+                    labels = LazyI18nString.from_gettext(v).data
+                    copied.label = LazyI18nString({
+                        locale: r.label.localize(locale) + ": " + labels[locale] for locale in r.label.data
+                    })
+                    copied.required = r.required and k in REQUIRED_NAME_PARTS
+                    yield copied
+            else:
+                yield r
+
+    def to_representation(self, data):
+        iterable = data.all() if isinstance(data, models.manager.BaseManager) else data
+        if self.context.get("expand_name_fields"):
+            iterable = self.expanded_rows(iterable)
+
+        return [
+            self.child.to_representation(item) for item in iterable
+        ]
+
+
+class InlineQuestionnaireRowSerializer(I18nAwareModelSerializer):
+    datafield = DatafieldRelatedField(allow_null=True, source='*')
+    dependency_datafield = DatafieldRelatedField(allow_null=True, required=False, source='dependency_question')
+    rendered_help_text = RenderedMarkdownField(read_only=True, source='help_text')
+    cooked_id = serializers.IntegerField(read_only=True, allow_null=True)
+
+    class Meta:
+        model = QuestionnaireRow
+        fields = ('datafield', 'required', 'label', 'help_text', 'dependency_datafield', 'dependency_values', 'rendered_help_text', 'cooked_id')
+        list_serializer_class = InlineQuestionnaireRowListSerializer
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if "rows.datafield" in self.context.get("expand", {}):
+            self.fields["datafield"] = InlineDatafieldField(read_only=True, source='*')
+
+    def validate_dependency_question(self, value):
+        if value:
+            if value['user_datafield']:
+                if value['user_datafield'].type not in Question.TYPES_ALLOWED_AS_DEPENDENCIES:
+                    raise ValidationError('Question dependencies can only be set to boolean or choice questions.')
+        return value
+
+
+class QuestionnaireSerializer(I18nAwareModelSerializer):
+    items = serializers.PrimaryKeyRelatedField(many=True, queryset=Item.objects.none(), allow_null=True, required=False)
+    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', 'compat_personalization', 'rows')
+        read_only_fields = ('compat_personalization', )
+
+    def __init__(self, *args, **kwargs):
+        self.fields['items'].child_relation.queryset = kwargs['context']['event'].items.all()
+        self.fields['limit_sales_channels'].child_relation.queryset = kwargs['context']['event'].organizer.sales_channels.all()
+        super().__init__(*args, **kwargs)
+        self.fields['rows'] = InlineQuestionnaireRowSerializer(
+            many=True, required=True, context=kwargs['context'], partial=False
+        )
+
+    def validate(self, data):
+        data = super().validate(data)
+
+        if self.context.get('expand_name_fields'):
+           raise ValidationError("Expanding of name fields is not supported on write.")
+
+        try:
+            full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
+            full_data.update(data)
+        except rest_framework.exceptions.ValidationError as e:
+            # we already have invalid state in the database, what should we do? hope it gets better after saving?
+            logger.exception("Invalid state in database, ignoring some validations!")
+        else:
+            #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 [])
+
+            if (full_data.get('type') == Questionnaire.QuestionnaireType.POSITION_CHECKIN
+                    and any(c.get('dependency_question') for c in full_data['rows'])):
+                raise ValidationError('Dependencies are not supported during check-in.')
+
+            if (not full_data.get('type').startswith('position_')
+                    and any(c['system_datafield'] for c in full_data['rows'])):
+                raise ValidationError('System data fields are only supported on order positions.')
+
+            system_fields = set(c['system_datafield'] for c in full_data['rows'])
+            if ('@zipcode' in system_fields or '@state' in system_fields or '@street' in system_fields or '@city' in system_fields) and '@country' not in system_fields:
+                raise ValidationError('The system data fields "street", "zip code", "city", and "state" can only be used in combination with the "country" field.')
+
+        return data
+
+    @transaction.atomic
+    def create(self, validated_data):
+        rows_data = validated_data.pop('rows') if 'rows' in validated_data else []
+        questionnaire = super().create(validated_data)
+        self.set_rows(questionnaire, rows_data)
+        try:
+            Questionnaire.check_constraints(questionnaire.event)
+        except ValidationError as e:
+            raise DrfValidationError(as_serializer_error(e))
+        return questionnaire
+
+    @transaction.atomic
+    def update(self, instance, validated_data):
+        rows_data = validated_data.pop('rows', None)
+        questionnaire = super().update(instance, validated_data)
+        try:
+            if rows_data is not None:
+                self.set_rows(questionnaire, rows_data)
+            Questionnaire.check_constraints(questionnaire.event)
+        except ValidationError as e:
+            raise DrfValidationError(as_serializer_error(e))
+        return questionnaire
+
+    def set_rows(self, questionnaire, new_data):
+        result = {}
+        child_serializer = self.fields['rows'].child
+        existing_rows = questionnaire.rows.all()
+        def q(qc):
+            return qc['user_datafield'] or qc['system_datafield']
+        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)
+        for existing, update_data in zip_longest(existing_rows, new_data):
+            if update_data:
+                if update_data.get('dependency_question'):
+                    try:
+                        update_data['dependency_question'] = result[q(update_data['dependency_question'])]
+                    except KeyError:
+                        raise ValidationError('A question can only depend on a previous question from the same questionnaire.')
+                    if update_data['dependency_question'].datafield_type not in Question.TYPES_ALLOWED_AS_DEPENDENCIES:
+                        raise ValidationError('A question can only depend on a boolean or choice question.')
+                if existing:
+                    result[q(update_data)] = child_serializer.update(existing, update_data)
+                else:
+                    result[q(update_data)] = child_serializer.create(update_data)
+            else:
+                existing.delete()
+        return result
+
+
 class QuotaSerializer(I18nAwareModelSerializer):
     available = serializers.BooleanField(read_only=True)
     available_number = serializers.IntegerField(read_only=True)

src/pretix/api/serializers/order.py

@@ -38,16 +38,19 @@ from django_countries.fields import Country
 from django_scopes import scopes_disabled
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
+from rest_framework.fields import get_attribute
 from rest_framework.relations import SlugRelatedField
 from rest_framework.reverse import reverse
+from rest_framework.serializers import ListSerializer
 
 from pretix.api.auth.utils import get_session_key_for_api_request
 from pretix.api.serializers import CompatDecimalField, CompatibleJSONField
 from pretix.api.serializers.event import SubEventSerializer
+from pretix.api.serializers.fields import PrimaryKeyScopedRelatedField, SlugScopedRelatedField
 from pretix.api.serializers.forms import form_field_to_serializer_field
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.api.serializers.item import (
-    InlineItemVariationSerializer, ItemSerializer, QuestionSerializer,
+    InlineItemVariationSerializer, ItemSerializer, POSCompatQuestionSerializer,
 )
 from pretix.api.signals import order_api_details, orderposition_api_details
 from pretix.base.decimal import round_decimal
@@ -57,8 +60,8 @@ from pretix.base.media import MEDIA_TYPES
 from pretix.base.models import (
     CachedFile, Checkin, Customer, Device, GiftCard, Invoice, InvoiceAddress,
     InvoiceLine, Item, ItemVariation, Order, OrderPosition, Question,
-    QuestionAnswer, ReusableMedium, SalesChannel, Seat, SubEvent, TaxRule,
-    Voucher,
+    QuestionAnswer, QuestionnaireRow, ReusableMedium, SalesChannel, Seat,
+    SubEvent, TaxRule, Voucher,
 )
 from pretix.base.models.orders import (
     BlockedTicketSecret, CartPosition, OrderFee, OrderPayment, OrderRefund,
@@ -74,7 +77,8 @@ from pretix.base.services.pricing import (
 )
 from pretix.base.services.quotas import QuotaAvailability
 from pretix.base.settings import (
-    COUNTRIES_WITH_STATE_IN_ADDRESS, ROUNDING_MODES,
+    COUNTRIES_WITH_STATE_IN_ADDRESS, PERSON_NAME_SALUTATIONS,
+    PERSON_NAME_SCHEMES, PERSON_NAME_TITLE_GROUPS, ROUNDING_MODES,
 )
 from pretix.base.signals import register_ticket_outputs
 from pretix.helpers.countries import CachedCountries
@@ -210,17 +214,19 @@ class InvoiceAddressSerializer(I18nAwareModelSerializer):
         return data
 
 
-class AnswerQuestionIdentifierField(serializers.Field):
-    def to_representation(self, instance: QuestionAnswer):
-        return instance.question.identifier
-
-
 class AnswerQuestionOptionsIdentifierField(serializers.Field):
     def to_representation(self, instance: QuestionAnswer):
         if isinstance(instance, WrappedModel) or instance.pk:
             return [o.identifier for o in instance.options.all()]
         return []
 
+    def to_internal_value(self, data):
+        if not isinstance(data, list):
+            self.fail('invalid')
+        if not all(isinstance(i, str) for i in data):
+            self.fail('invalid')
+        return {self.field_name: data}
+
 
 class InlineSeatSerializer(I18nAwareModelSerializer):
 
@@ -229,9 +235,161 @@ class InlineSeatSerializer(I18nAwareModelSerializer):
         fields = ('id', 'name', 'seat_guid', 'zone_name', 'row_name', 'row_label', 'seat_label', 'seat_number')
 
 
+class MixedAnswerListSerializer(ListSerializer):
+    def __init__(self, instance=None, *args, **kwargs):
+        self.parent_instance = instance
+        super().__init__(instance.answers if instance else None, *args, **kwargs)
+
+    def get_value(self, dictionary):
+        return dictionary
+
+    def to_representation(self, instance):
+        try:
+            answers_qs = get_attribute(instance, ['answers'])
+        except (KeyError, AttributeError):
+            return None
+        answers = super().to_representation(answers_qs)
+        answers_dict = {answer["question"]: answer for answer in answers}
+        for qc in QuestionnaireRow.objects.filter(
+                Q(system_datafield__isnull=False) | Q(user_datafield_id__isnull=False),
+                questionnaire__items__id=instance.item_id
+        ):
+            if qc.user_datafield_id:
+                if answer := answers_dict.get(qc.user_datafield_id):
+                    answer = dict(answer)
+                    answer["question"] = qc.cooked_id
+                    answer["questionnaire_id"] = qc.questionnaire_id
+                    answers.append(answer)
+            elif (sys_answer := instance.system_answers[qc.system_datafield]) is not None:
+                if qc.system_datafield == QuestionnaireRow.SystemDatafield.ATTENDEE_NAME_PARTS:
+                    name_parts = instance.attendee_name_parts
+                    settings = self.context['event'].settings
+                    for k, v, w, *__ in PERSON_NAME_SCHEMES.get(settings.name_scheme)['fields']:
+                        if k in name_parts:
+                            options = []
+                            options_ident = []
+                            try:
+                                if k == "salutation":
+                                    salutation_keys = [key for key, value in PERSON_NAME_SALUTATIONS]
+                                    options = [salutation_keys.index(name_parts[k]) + 1]
+                                    options_ident = [name_parts[k]]
+                                elif k == "title" and settings.name_scheme_titles:
+                                    options = [PERSON_NAME_TITLE_GROUPS.get(settings.name_scheme_titles)[1].index(name_parts[k]) + 1]
+                                    options_ident = [name_parts[k]]
+                            except ValueError:
+                                pass
+                            answers.append({
+                                "question": QuestionnaireRow.cook_id_from_parts(qc.questionnaire_id, None, f'{qc.system_datafield}:{k}'),
+                                "answer": name_parts[k],
+                                "question_identifier": f'{qc.system_datafield}:{k}',
+                                "datafield": f'{qc.system_datafield}:{k}',
+                                "options": options,
+                                "option_identifiers": options_ident,
+                                "questionnaire_id": qc.questionnaire_id,
+                            })
+                answers.append({
+                    "question": qc.cooked_id,
+                    "answer": sys_answer,
+                    "question_identifier": f'{qc.system_datafield}',
+                    "datafield": f'{qc.system_datafield}',
+                    "options": [],
+                    "option_identifiers": [],
+                    "questionnaire_id": qc.questionnaire_id,
+                })
+        return answers
+
+    def to_internal_value(self, data):
+        result = {}
+        if "answers" in data:
+            answers = []
+            attendee_name_parts = {}
+            settings = self.context['event'].settings
+            for answer in data["answers"]:
+                if "question" in answer or ("datafield" in answer and answer["datafield"] in QuestionnaireRow.SYSTEM_DATAFIELD_NUMBERS):
+                    if "question" in answer:
+                        qid, dfid, sys_df = QuestionnaireRow.uncook_id(answer["question"])
+                    else:
+                        qid, dfid, sys_df = None, None, answer["datafield"]
+                    if dfid:
+                        answer["question"] = dfid
+                        answers.append(answer)
+                    elif sys_df == "@country":
+                        result['country'] = Country(answer["answer"])
+                        if not result['country'].name:
+                            raise ValidationError("Data field @country needs a valid country code.")
+                    elif sys_df == "@attendee_name_parts:salutation":
+                        valid_salutations = dict(PERSON_NAME_SALUTATIONS)
+                        if "options" in answer and len(answer["options"]) == 1 and answer["options"][0] <= len(PERSON_NAME_SALUTATIONS):
+                            attendee_name_parts['salutation'] = PERSON_NAME_SALUTATIONS[answer["options"][0] - 1][0]
+                        elif "option_identifiers" in answer and len(answer["option_identifiers"]) == 1 and answer["option_identifiers"][0] in valid_salutations:
+                            attendee_name_parts['salutation'] = answer["option_identifiers"][0]
+                        else:
+                            raise ValidationError("Data field @attendee_name_parts:salutation requires valid options")
+                    elif sys_df == "@attendee_name_parts:title" and settings.name_scheme_titles:
+                        valid_titles = PERSON_NAME_TITLE_GROUPS.get(settings.name_scheme_titles)[1]
+                        if "options" in answer and len(answer["options"]) == 1 and answer["options"][0] <= len(valid_titles):
+                            attendee_name_parts['title'] = valid_titles[answer["options"][0] - 1]
+                        elif "option_identifiers" in answer and len(answer["option_identifiers"]) == 1 and answer["option_identifiers"][0] in valid_titles:
+                            attendee_name_parts['title'] = answer["option_identifiers"][0]
+                        else:
+                            raise ValidationError("Data field @attendee_name_parts:title requires valid options")
+                    elif sys_df.startswith("@attendee_name_parts:"):
+                        attendee_name_parts[sys_df[len("@attendee_name_parts:"):]] = answer["answer"]
+                    else:
+                        result[sys_df[1:]] = answer["answer"]
+                else:
+                    answers.append(answer)
+            result["answers"] = super().to_internal_value(answers)
+            if attendee_name_parts:
+                result["attendee_name_parts"] = attendee_name_parts
+        return result
+
+
+class OrderAnswerListSerializer(ListSerializer):
+
+    def update(self, instance, validated_data):
+        qs_seen = set()
+        answercache = {
+            a.question_id: a for a in instance.answers.all()
+        }
+        for answ_data in validated_data:
+            if not answ_data.get('answer'):
+                continue
+            options = answ_data.pop('options', [])
+            if answ_data['question'].pk in qs_seen:
+                raise ValidationError(f'Question {answ_data["question"]} was sent twice.')
+            if answ_data['question'].pk in answercache:
+                a = answercache[answ_data['question'].pk]
+                if isinstance(answ_data.get('answer'), File):
+                    a.file.save(answ_data['answer'].name, answ_data['answer'], save=False)
+                    a.answer = 'file://' + a.file.name
+                elif a.answer.startswith('file://') and answ_data['answer'] == "file:keep":
+                    pass  # keep current file
+                else:
+                    for attr, value in answ_data.items():
+                        setattr(a, attr, value)
+                a.save()
+            else:
+                if isinstance(answ_data.get('answer'), File):
+                    an = answ_data.pop('answer')
+                    a = instance.answers.create(**answ_data, answer='')
+                    a.file.save(os.path.basename(an.name), an, save=False)
+                    a.answer = 'file://' + a.file.name
+                    a.save()
+                else:
+                    a = instance.answers.create(**answ_data)
+            a.options.set(options)
+            qs_seen.add(a.question_id)
+        for qid, a in answercache.items():
+            if qid not in qs_seen:
+                a.delete()
+
+
 class AnswerSerializer(I18nAwareModelSerializer):
-    question_identifier = AnswerQuestionIdentifierField(source='*', read_only=True)
-    option_identifiers = AnswerQuestionOptionsIdentifierField(source='*', read_only=True)
+    question = PrimaryKeyScopedRelatedField(queryset=lambda event, **kw: event.positiondatafields, required=False)
+    datafield = SlugScopedRelatedField(slug_field='identifier', source='question', queryset=lambda event, **kw: event.positiondatafields, required=False)
+    question_identifier = serializers.SlugRelatedField(slug_field='identifier', source='question', read_only=True)
+    option_identifiers = AnswerQuestionOptionsIdentifierField(source='*', required=False)
 
     def to_representation(self, instance):
         r = super().to_representation(instance)
@@ -242,18 +400,18 @@ class AnswerSerializer(I18nAwareModelSerializer):
                 'pk': instance.orderposition.pk,
                 'question': instance.question_id,
             }, request=self.context['request'])
+        elif r['answer'].startswith('file://') and instance.order:
+            r['answer'] = reverse('api-v1:order-answer', kwargs={
+                'organizer': instance.order.event.organizer.slug,
+                'event': instance.order.event.slug,
+                'code': instance.order.code,
+                'question': instance.question_id,
+            }, request=self.context['request'])
         return r
 
     class Meta:
         model = QuestionAnswer
-        fields = ('question', 'answer', 'question_identifier', 'options', 'option_identifiers')
-
-    def validate_question(self, q):
-        if q.event != self.context['event']:
-            raise ValidationError(
-                'The specified question does not belong to this event.'
-            )
-        return q
+        fields = ('datafield', 'answer', 'options', 'option_identifiers', 'question', 'question_identifier')
 
     def _handle_file_upload(self, data):
         if data['answer'] == 'file:keep':
@@ -285,34 +443,48 @@ class AnswerSerializer(I18nAwareModelSerializer):
 
         data['options'] = []
         data['answer'] = cf.file
+        data.pop('option_identifiers', None)
         return data
 
     def validate(self, data):
         if not data.get('question'):
-            raise ValidationError('Question not specified.')
+            raise ValidationError('Data field not specified.')
         elif data.get('question').type == Question.TYPE_FILE:
             return self._handle_file_upload(data)
         elif data.get('question').type in (Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE):
-            if not data.get('options'):
+            if not data.get('options') and not data.get("option_identifiers"):
                 raise ValidationError(
-                    'You need to specify options if the question is of a choice type.'
+                    'You need to specify either options or option_identifiers if the data field is of a choice type.'
                 )
-            if data.get('question').type == Question.TYPE_CHOICE and len(data.get('options')) > 1:
+            if 'options' in data and "option_identifiers" in data:
                 raise ValidationError(
-                    'You can specify at most one option for this question.'
+                    'You need to specify either options or option_identifiers, not both.'
                 )
-            for o in data.get('options'):
-                if o.question_id != data.get('question').pk:
-                    raise ValidationError(
-                        'The specified option does not belong to this question.'
-                    )
-
-            data['answer'] = ", ".join([str(o) for o in data.get('options')])
-
+            if data.get('question').type == Question.TYPE_CHOICE and len(data.get('options') or data.get('option_identifiers')) > 1:
+                raise ValidationError(
+                    'You can specify at most one option for this data field.'
+                )
+            if 'options' in data:
+                for o in data.get('options'):
+                    if o.question_id != data.get('question').pk:
+                        raise ValidationError({
+                            'options': 'The specified option {opt} does not belong to this data field.'.format(opt=o.pk)
+                        })
+                data['answer'] = ", ".join([str(o) for o in data['options']])
+            elif 'option_identifiers' in data:
+                opt_cache = {o.identifier: o for o in data['question'].options.filter(identifier__in=data.get('option_identifiers'))}
+                for o in data.get('option_identifiers'):
+                    if o not in opt_cache:
+                        raise ValidationError({
+                            'option_identifiers': 'The specified option "{opt}" does not belong to this data field.'.format(opt=o)
+                        })
+                data['options'] = list(opt_cache.values())
+                del data['option_identifiers']
+                data['answer'] = ", ".join([str(o) for o in data['options']])
         else:
-            if data.get('options'):
+            if data.get('options') or data.get('option_identifiers'):
                 raise ValidationError(
-                    'You should not specify options if the question is not of a choice type.'
+                    'You should not specify options if the data field is not of a choice type.'
                 )
 
             if data.get('question').type == Question.TYPE_BOOLEAN:
@@ -322,7 +494,7 @@ class AnswerSerializer(I18nAwareModelSerializer):
                     data['answer'] = 'False'
                 else:
                     raise ValidationError(
-                        'Please specify "true" or "false" for boolean questions.'
+                        'Please specify "true" or "false" for boolean data fields.'
                     )
             elif data.get('question').type == Question.TYPE_NUMBER:
                 serializers.DecimalField(
@@ -335,9 +507,20 @@ class AnswerSerializer(I18nAwareModelSerializer):
                 data['answer'] = serializers.TimeField().to_internal_value(data.get('answer'))
             elif data.get('question').type == Question.TYPE_DATETIME:
                 data['answer'] = serializers.DateTimeField().to_internal_value(data.get('answer'))
+
+        data.pop('option_identifiers', None)
         return data
 
 
+class OrderAnswerSerializer(AnswerSerializer):
+    datafield = SlugScopedRelatedField(slug_field='identifier', source='question', queryset=lambda event, **kw: event.orderdatafields, required=False)
+    question = None
+
+    class Meta:
+        model = QuestionAnswer
+        fields = ('datafield', 'answer', 'options', 'option_identifiers')
+
+
 class InlineCheckinSerializer(I18nAwareModelSerializer):
     device_id = serializers.SlugRelatedField(
         source='device',
@@ -591,7 +774,7 @@ class OrderPositionPluginDataField(serializers.Field):
 class OrderPositionSerializer(I18nAwareModelSerializer):
     checkins = InlineCheckinSerializer(many=True, read_only=True)
     print_logs = PrintLogSerializer(many=True, read_only=True)
-    answers = AnswerSerializer(many=True)
+    answers = MixedAnswerListSerializer(child=AnswerSerializer(), source='*')
     downloads = PositionDownloadsField(source='*', read_only=True)
     order = serializers.SlugRelatedField(slug_field='code', read_only=True)
     pdf_data = PdfDataSerializer(source='*', read_only=True)
@@ -692,6 +875,7 @@ class AttendeeNamePartsField(serializers.Field):
 
 class CheckinListOrderPositionSerializer(OrderPositionSerializer):
     require_attention = RequireAttentionField(source='*')
+    answers = AnswerSerializer(many=True)
     attendee_name = AttendeeNameField(source='*')
     attendee_name_parts = AttendeeNamePartsField(source='*')
     order__status = serializers.SlugRelatedField(read_only=True, slug_field='status', source='order')
@@ -721,7 +905,7 @@ class CheckinListOrderPositionSerializer(OrderPositionSerializer):
             self.fields['variation'] = InlineItemVariationSerializer(read_only=True, context=self.context)
 
         if 'answers.question' in self.context['expand']:
-            self.fields['answers'].child.fields['question'] = QuestionSerializer(read_only=True)
+            self.fields['answers'].child.fields['question'] = POSCompatQuestionSerializer(read_only=True)   # TODO(questionnaires)
 
         if 'addons' in self.context['expand']:
             # Experimental feature, undocumented on purpose for now in case we need to remove it again
@@ -881,6 +1065,7 @@ class OrderSerializer(I18nAwareModelSerializer):
         required=False,
     )
     plugin_data = OrderPluginDataField(source='*', allow_null=True, read_only=True)
+    answers = OrderAnswerListSerializer(child=OrderAnswerSerializer())
 
     class Meta:
         model = Order
@@ -890,7 +1075,7 @@ class OrderSerializer(I18nAwareModelSerializer):
             'payment_provider', 'fees', 'total', 'tax_rounding_mode', 'comment', 'custom_followup_at', 'invoice_address',
             'positions', 'downloads', 'checkin_attention', 'checkin_text', 'last_modified', 'payments', 'refunds',
             'require_approval', 'sales_channel', 'url', 'customer', 'valid_if_pending', 'api_meta', 'cancellation_date',
-            'plugin_data',
+            'plugin_data', 'answers',
         )
         read_only_fields = (
             'code', 'status', 'testmode', 'secret', 'datetime', 'expires', 'payment_date',
@@ -974,6 +1159,10 @@ class OrderSerializer(I18nAwareModelSerializer):
                 except InvoiceAddress.DoesNotExist:
                     InvoiceAddress.objects.create(order=instance, **iadata)
 
+        order_answers = validated_data.pop('answers', None)
+        if order_answers is not None:
+            self.fields['answers'].update(instance, order_answers)
+
         for attr, value in validated_data.items():
             if attr in update_fields:
                 setattr(instance, attr, value)
@@ -997,6 +1186,7 @@ class SimulatedOrderPositionSerializer(OrderPositionSerializer):
 
 
 class SimulatedOrderSerializer(OrderSerializer):
+    answers = SimulatedAnswerSerializer(many=True)
     positions = SimulatedOrderPositionSerializer(many=True, read_only=True)
 
 
@@ -1041,7 +1231,7 @@ class OrderFeeCreateSerializer(I18nAwareModelSerializer):
 
 
 class OrderPositionCreateSerializer(I18nAwareModelSerializer):
-    answers = AnswerCreateSerializer(many=True, required=False)
+    answers = MixedAnswerListSerializer(child=AnswerCreateSerializer(required=False), source='*', required=False)
     addon_to = serializers.IntegerField(required=False, allow_null=True)
     secret = serializers.CharField(required=False)
     attendee_name = serializers.CharField(required=False, allow_null=True)
@@ -1218,6 +1408,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
     tax_rounding_mode = serializers.ChoiceField(choices=ROUNDING_MODES, allow_null=True, required=False,)
     locale = serializers.ChoiceField(choices=[], required=False, allow_null=True)
     use_gift_cards = serializers.ListField(child=serializers.CharField(required=False), required=False)
+    answers = OrderAnswerListSerializer(child=OrderAnswerSerializer(required=False), required=False)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -1233,7 +1424,8 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         fields = ('code', 'status', 'testmode', 'email', 'phone', 'locale', 'payment_provider', 'fees', 'comment', 'sales_channel',
                   'invoice_address', 'positions', 'checkin_attention', 'checkin_text', 'payment_info', 'payment_date',
                   'consume_carts', 'force', 'send_email', 'simulate', 'customer', 'custom_followup_at',
-                  'require_approval', 'valid_if_pending', 'expires', 'api_meta', 'tax_rounding_mode', 'use_gift_cards')
+                  'require_approval', 'valid_if_pending', 'expires', 'api_meta', 'tax_rounding_mode', 'use_gift_cards',
+                  'answers',)
 
     def validate_payment_provider(self, pp):
         if pp is None:
@@ -1329,6 +1521,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         force = validated_data.pop('force', False)
         simulate = validated_data.pop('simulate', False)
         gift_card_secrets = validated_data.pop('use_gift_cards') if 'use_gift_cards' in validated_data else []
+        order_answers = validated_data.pop('answers', None)
 
         if (payment_provider is not None or payment_info != '{}') and len(gift_card_secrets) > 0:
             raise ValidationError({"use_gift_cards": ['The attribute use_gift_cards is not compatible with payment_provider or payment_info']})
@@ -1591,6 +1784,17 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
                 order.invoice_address = ia
                 ia.last_modified = now()
 
+        if simulate:
+            answers = []
+            for answ_data in (order_answers or []):
+                options = answ_data.pop('options', [])
+                answ = WrappedModel(QuestionAnswer(**answ_data))
+                answ.options = WrappedList(options)
+                answers.append(answ)
+            order.answers = answers
+        elif order_answers is not None:
+            self.fields['answers'].update(order, order_answers)
+
         # Generate position objects
         pos_map = {}
         for pos_data in positions_data:

src/pretix/api/serializers/orderchange.py

@@ -30,7 +30,8 @@ from rest_framework.exceptions import ValidationError
 
 from pretix.api.serializers.order import (
     AnswerCreateSerializer, AnswerSerializer, CompatibleCountryField,
-    OrderFeeCreateSerializer, OrderPositionCreateSerializer,
+    MixedAnswerListSerializer, OrderFeeCreateSerializer,
+    OrderPositionCreateSerializer,
 )
 from pretix.base.models import ItemVariation, Order, OrderFee, OrderPosition
 from pretix.base.services.orders import OrderChangeManager, OrderError
@@ -41,7 +42,7 @@ logger = logging.getLogger(__name__)
 
 class OrderPositionCreateForExistingOrderSerializer(OrderPositionCreateSerializer):
     order = serializers.SlugRelatedField(slug_field='code', queryset=Order.objects.none(), required=True, allow_null=False)
-    answers = AnswerCreateSerializer(many=True, required=False)
+    answers = MixedAnswerListSerializer(child=AnswerCreateSerializer(required=False), source='*', required=False)
     addon_to = serializers.IntegerField(required=False, allow_null=True)
     secret = serializers.CharField(required=False)
     attendee_name = serializers.CharField(required=False, allow_null=True)
@@ -154,7 +155,7 @@ class OrderFeeCreateForExistingOrderSerializer(OrderFeeCreateSerializer):
 
 
 class OrderPositionInfoPatchSerializer(serializers.ModelSerializer):
-    answers = AnswerSerializer(many=True)
+    answers = MixedAnswerListSerializer(child=AnswerSerializer(), source='*')
     country = CompatibleCountryField(source='*')
     attendee_name = serializers.CharField(required=False)
 

src/pretix/api/serializers/organizer.py

@@ -26,6 +26,7 @@ from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import transaction
 from django.db.models import Q
+from django.templatetags.static import static
 from django.utils.crypto import get_random_string
 from django.utils.translation import gettext, gettext_lazy as _
 from i18nfield.rest_framework import I18nField
@@ -219,10 +220,12 @@ class FlexibleTicketRelatedField(serializers.PrimaryKeyRelatedField):
 
 class SalesChannelSerializer(I18nAwareModelSerializer):
     type = serializers.CharField(default="api")
+    icon_url = serializers.SerializerMethodField()
 
     class Meta:
         model = SalesChannel
-        fields = ('identifier', 'type', 'label', 'position')
+        fields = ('identifier', 'type', 'label', 'position', 'icon', 'icon_url')
+        read_only_fields = ('icon',)
 
     def validate_type(self, value):
         if (not self.instance or not self.instance.pk) and value != "api":
@@ -246,6 +249,10 @@ class SalesChannelSerializer(I18nAwareModelSerializer):
             )
         return value
 
+    def get_icon_url(self, instance):
+        if '.' in instance.icon:
+            return static(instance.icon)
+
 
 class GiftCardSerializer(I18nAwareModelSerializer):
     value = serializers.DecimalField(max_digits=13, decimal_places=2, min_value=Decimal('0.00'))

src/pretix/api/urls.py

@@ -80,7 +80,10 @@ 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'questions', item.CompatQuestionViewSet, basename='compatquestion')
+event_router.register(r'datafields/position', item.PositionDatafieldViewSet, basename='positiondatafield')
+event_router.register(r'datafields/order', item.OrderDatafieldViewSet, basename='orderdatafield')
+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)
@@ -107,8 +110,11 @@ subevent_router.register(r'seats', event.SeatViewSet)
 checkinlist_router = routers.DefaultRouter()
 checkinlist_router.register(r'positions', checkin.CheckinListPositionViewSet, basename='checkinlistpos')
 
-question_router = routers.DefaultRouter()
-question_router.register(r'options', item.QuestionOptionViewSet)
+orderdatafield_router = routers.DefaultRouter()
+orderdatafield_router.register(r'options', item.OrderDatafieldOptionViewSet)
+
+positiondatafield_router = routers.DefaultRouter()
+positiondatafield_router.register(r'options', item.PositionDatafieldOptionViewSet)
 
 item_router = routers.DefaultRouter()
 item_router.register(r'variations', item.ItemVariationViewSet)
@@ -148,7 +154,11 @@ urlpatterns = [
     re_path(r'^organizers/(?P<organizer>[^/]+)/teams/(?P<team>[^/]+)/', include(team_router.urls)),
     re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/items/(?P<item>[^/]+)/', include(item_router.urls)),
     re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/questions/(?P<question>[^/]+)/',
-            include(question_router.urls)),
+            include(positiondatafield_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/datafields/order/(?P<question>[^/]+)/',
+            include(orderdatafield_router.urls)),
+    re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/datafields/position/(?P<question>[^/]+)/',
+            include(positiondatafield_router.urls)),
     re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/checkinlists/(?P<list>[^/]+)/',
             include(checkinlist_router.urls)),
     re_path(r'^organizers/(?P<organizer>[^/]+)/events/(?P<event>[^/]+)/orders/(?P<order>[^/]+)/', include(order_router.urls)),

src/pretix/api/views/checkin.py

@@ -55,7 +55,7 @@ from pretix.api.serializers.checkin import (
     CheckinListSerializer, CheckinRPCAnnulInputSerializer,
     CheckinRPCRedeemInputSerializer, MiniCheckinListSerializer,
 )
-from pretix.api.serializers.item import QuestionSerializer
+from pretix.api.serializers.item import POSCompatQuestionSerializer
 from pretix.api.serializers.order import (
     CheckinListOrderPositionSerializer, CheckinSerializer,
     FailedCheckinSerializer,
@@ -65,7 +65,8 @@ from pretix.api.views.order import OrderPositionFilter
 from pretix.base.i18n import language
 from pretix.base.models import (
     CachedFile, Checkin, CheckinList, Device, Event, Order, OrderPosition,
-    Question, ReusableMedium, RevokedTicketSecret, TeamAPIToken,
+    Question, Questionnaire, QuestionnaireRow, ReusableMedium,
+    RevokedTicketSecret, TeamAPIToken,
 )
 from pretix.base.models.orders import PrintLog
 from pretix.base.permissions import AnyPermissionOf
@@ -330,6 +331,8 @@ with scopes_disabled():
 
 
 def _handle_file_upload(data, user, auth):
+    if not data:
+        return None
     try:
         cf = CachedFile.objects.get(
             file__isnull=False,
@@ -489,6 +492,7 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
             'pdf_data': pdf_data and (
                 user if user and user.is_authenticated else auth
             ).has_event_permission(request.organizer, event, 'event.orders:read', request),
+            'preferred_questionnaire_type': Questionnaire.QuestionnaireType.POSITION_CHECKIN,
         }
 
     common_checkin_args = dict(
@@ -797,16 +801,19 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
     # 5. Pre-validate all incoming answers, handle file upload
     given_answers = {}
     if answers_data:
-        for q in op.item.questions.filter(ask_during_checkin=True):
-            if str(q.pk) in answers_data:
+        for qc in QuestionnaireRow.objects.filter(
+                questionnaire__items__in=[op.item], questionnaire__type=Questionnaire.QuestionnaireType.POSITION_CHECKIN
+        ):
+            if qc.user_datafield_id and (str(qc.user_datafield_id) in answers_data or str(qc.cooked_id) in answers_data):
                 try:
-                    if q.type == Question.TYPE_FILE:
-                        if answers_data[str(q.pk)]:
-                            given_answers[q] = _handle_file_upload(answers_data[str(q.pk)], user, auth)
-                        else:
-                            given_answers[q] = None
+                    try:
+                        ans = answers_data[str(qc.user_datafield_id)]
+                    except KeyError:
+                        ans = answers_data[str(qc.cooked_id)]
+                    if qc.user_datafield.type == Question.TYPE_FILE:
+                        given_answers[qc.user_datafield] = _handle_file_upload(ans, user, auth)
                     else:
-                        given_answers[q] = q.clean_answer(answers_data[str(q.pk)])
+                        given_answers[qc.user_datafield] = qc.clean_answer(ans)
                 except (ValidationError, BaseValidationError):
                     pass
 
@@ -867,14 +874,13 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
             else:
                 perform_checkin(**checkin_args)
         except RequiredQuestionsError as e:
+            qs = POSCompatQuestionSerializer(context={'event': op.order.event})
             return Response({
                 'status': 'incomplete',
                 'require_attention': op.require_checkin_attention,
                 'checkin_texts': op.checkin_texts,
                 'position': CheckinListOrderPositionSerializer(op, context=_make_context(context, op.order.event)).data,
-                'questions': [
-                    QuestionSerializer(q).data for q in e.questions
-                ],
+                'questions': POSCompatQuestionSerializer.mangle_results(op.order.event, (qs.to_representation(q) for q in e.questionnaire_rows)),  # TODO(questionnaires)
                 'list': MiniCheckinListSerializer(list_by_event[op.order.event_id]).data,
             }, status=400)
         except RequiredMediaExchangeError as e:
@@ -973,6 +979,7 @@ class CheckinListPositionViewSet(viewsets.ReadOnlyModelViewSet):
         ctx['event'] = self.request.event
         ctx['expand'] = self.request.query_params.getlist('expand')
         ctx['pdf_data'] = self.request.query_params.get('pdf_data', 'false').lower() == 'true'
+        ctx['preferred_questionnaire_type'] = Questionnaire.QuestionnaireType.POSITION_CHECKIN
         return ctx
 
     def get_filterset_kwargs(self):

src/pretix/api/views/item.py

@@ -32,33 +32,43 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
 
+import logging
+from typing import Mapping
+
 import django_filters
 from django.db import transaction
-from django.db.models import Q
+from django.db.models import Q, Prefetch
+from django.db.models.expressions import Exists, OuterRef
 from django.shortcuts import get_object_or_404
 from django.utils.functional import cached_property
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
 from django_scopes import scopes_disabled
-from rest_framework import viewsets
+from rest_framework import generics, viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import PermissionDenied, ValidationError
 from rest_framework.response import Response
 
+from pretix.api.exceptions import CompatException
 from pretix.api.pagination import TotalOrderingFilter
 from pretix.api.serializers.item import (
-    ItemAddOnSerializer, ItemBundleSerializer, ItemCategorySerializer,
-    ItemProgramTimeSerializer, ItemSerializer, ItemVariationSerializer,
-    QuestionOptionSerializer, QuestionSerializer, QuotaSerializer,
+    CompatQuestionSerializer, DatafieldSerializer, ItemAddOnSerializer,
+    ItemBundleSerializer, ItemCategorySerializer, ItemProgramTimeSerializer,
+    ItemSerializer, ItemVariationSerializer, POSCompatQuestionSerializer,
+    QuestionFormSerializer, QuestionnaireSerializer, QuestionOptionSerializer, QuotaSerializer,
 )
 from pretix.api.views import ConditionalListView
 from pretix.base.models import (
-    CartPosition, Item, ItemAddOn, ItemBundle, ItemCategory, ItemProgramTime,
-    ItemVariation, Question, QuestionOption, Quota,
+    CartPosition, Device, Item, ItemAddOn, ItemBundle, ItemCategory,
+    ItemProgramTime, ItemVariation, Question, QuestionOption, Quota,
 )
+from pretix.base.models.items import Questionnaire, QuestionnaireRow
 from pretix.base.services.quotas import QuotaAvailability
 from pretix.helpers.dicts import merge_dicts
 from pretix.helpers.i18n import i18ncomp
 
+logger = logging.getLogger(__name__)
+
+
 with scopes_disabled():
     class ItemFilter(FilterSet):
         tax_rate = django_filters.CharFilter(method='tax_rate_qs')
@@ -107,7 +117,12 @@ class ItemViewSet(ConditionalListView, viewsets.ModelViewSet):
             'variations', 'addons', 'bundles', 'meta_values', 'meta_values__property',
             'variations__meta_values', 'variations__meta_values__property',
             'require_membership_types', 'variations__require_membership_types',
-            'limit_sales_channels', 'variations__limit_sales_channels', 'program_times'
+            'limit_sales_channels', 'variations__limit_sales_channels', 'program_times',
+            Prefetch('questionnaires', Questionnaire.objects.annotate(
+                has_attendee_data=Exists(QuestionnaireRow.objects.filter(
+                    questionnaire=OuterRef('pk'), system_datafield__in=('@attendee_name_parts', '@attendee_email')
+                ))
+            )),
         ).all()
 
     @transaction.atomic()
@@ -458,27 +473,282 @@ class ItemCategoryViewSet(ConditionalListView, viewsets.ModelViewSet):
 
 
 with scopes_disabled():
-    class QuestionFilter(FilterSet):
+    class DatafieldFilter(FilterSet):
         class Meta:
             model = Question
-            fields = ['ask_during_checkin', 'required', 'identifier']
+            fields = ['identifier']
 
 
-class QuestionViewSet(ConditionalListView, viewsets.ModelViewSet):
-    serializer_class = QuestionSerializer
+class BaseDatafieldViewSet(viewsets.ReadOnlyModelViewSet):
+    serializer_class = DatafieldSerializer
     queryset = Question.objects.none()
     filter_backends = (DjangoFilterBackend, TotalOrderingFilter)
-    filterset_class = QuestionFilter
-    ordering_fields = ('id', 'position')
-    ordering = ('position', 'id')
+    filterset_class = DatafieldFilter
+    ordering_fields = ('id')
+    ordering = ('id')
     permission = None
-    write_permission = 'event.items:write'
 
     def get_queryset(self):
-        return self.request.event.questions.filter(
-            # the container_type parameter is undocumented, this API is going to change in a later release
-            container_type=self.request.GET.get('container_type', Question.ContainerType.ORDERPOSITION),
-        ).prefetch_related('options').all()
+        return self.request.event.questions.filter(container_type=self.container_type).prefetch_related('options')
+
+    def get_object(self):
+        queryset = self.filter_queryset(self.get_queryset())
+
+        lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field
+        lookup_value = self.kwargs[lookup_url_kwarg]
+
+        try:
+            numeric_id = int(lookup_value)
+        except ValueError:
+            obj = get_object_or_404(queryset, identifier=lookup_value)
+        else:
+            qid, dfid, sys_df = QuestionnaireRow.uncook_id(numeric_id)
+            self.via_questionnaire_id = qid
+            obj = get_object_or_404(queryset, pk=dfid)
+
+        # May raise a permission denied
+        self.check_object_permissions(self.request, obj)
+
+        return obj
+
+    def get_serializer_context(self):
+        ctx = super().get_serializer_context()
+        ctx['event'] = self.request.event
+        ctx['container_type'] = self.container_type
+        return ctx
+
+
+class BaseWritableDatafieldViewSet(BaseDatafieldViewSet, viewsets.ModelViewSet):
+    write_permission = 'event.items:write'
+
+    @transaction.atomic()
+    def perform_create(self, serializer):
+        serializer.save(event=self.request.event)
+        serializer.instance.log_action(
+            'pretix.event.question.added',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=self.request.data
+        )
+
+    @transaction.atomic()
+    def perform_update(self, serializer):
+        serializer.save(event=self.request.event)
+        serializer.instance.log_action(
+            'pretix.event.question.changed',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=self.request.data
+        )
+
+    @transaction.atomic()
+    def perform_destroy(self, instance):
+        instance.log_action(
+            'pretix.event.question.deleted',
+            user=self.request.user,
+            auth=self.request.auth,
+        )
+        super().perform_destroy(instance)
+
+
+class PositionDatafieldViewSet(ConditionalListView, BaseWritableDatafieldViewSet):
+    container_type = Question.ContainerType.ORDERPOSITION
+
+
+class OrderDatafieldViewSet(ConditionalListView, BaseWritableDatafieldViewSet):
+    container_type = Question.ContainerType.ORDER
+
+
+def ordered_union(*lists):
+    from graphlib import TopologicalSorter
+    items_set = {item for lst in lists for __ignore, item in lst}
+    dependencies = {item: set() for item in items_set}
+    for lst in lists:
+        for i in range(1, len(lst)):
+            current_item = lst[i][1]
+            previous_item = lst[i - 1][1]
+            dependencies[current_item].add(previous_item)
+    ts = TopologicalSorter(dependencies)
+    try:
+        return list(ts.static_order())
+    except ValueError:
+        raise CompatException("Questionnaire configuration incompatible with old data model due to conflicting field orders.")
+
+
+class DeprecationWarningMixin:
+    def finalize_response(self, request, response, *args, **kwargs):
+        if self.deprecation_warning and isinstance(getattr(response, 'data', None), Mapping) and not 'x-deprecated' in response.headers:
+            response.data = {
+                'deprecation_warning': self.deprecation_warning,
+                **response.data
+            }
+            response.headers['x-deprecated'] = self.deprecation_warning
+        return super().finalize_response(request, response, *args, **kwargs)
+
+
+class CompatListMixin(DeprecationWarningMixin):
+    deprecation_warning = (
+        f'This API endpoint is deprecated and will be removed in the future. It only works as long as '
+        f'your event\'s questionnaire configuration is compatible with the old data model. '
+        f'Please switch to the .../datafields/ and .../questionnaires/ endpoints.'
+    )
+
+    @property
+    def ignore_errors(self):
+        return self.request.query_params.get('ignore_errors', '') == 'true'
+
+    def get_serializer_context(self):
+        ctx = super().get_serializer_context()
+        ctx['ignore_errors'] = self.ignore_errors
+        return ctx
+
+    def do_the_topo_sort(self, queryset):
+        products = {}
+        for df in queryset:
+            for qc in df.referenced_by.all():
+                for item_id in qc.questionnaire.items.values_list('pk', flat=True):
+                    k = (qc.questionnaire.type, item_id)
+                    products[k] = products.get(k, []) + [((qc.questionnaire.position, qc.position), df)]
+        for q in products.values():
+            q.sort()
+        try:
+            result = ordered_union(*products.values())
+            for i, d in enumerate(result):
+                d.position = i
+        except ValueError:
+            if self.ignore_errors:
+                pass
+            else:
+                raise
+        return result
+
+    def list(self, request, **kwargs):
+        logger.info('Returning compatible datafield list on %s/%s', request.organizer.slug, request.event.slug)
+
+        queryset = self.filter_queryset(self.get_queryset())
+        queryset = self.do_the_topo_sort(queryset)
+        serializer = self.get_serializer(queryset, many=True)
+        resultlist = serializer.data
+        return Response({
+            'count': len(resultlist), 'next': None, 'previous': None,
+            'results': resultlist,
+        })
+
+
+with scopes_disabled():
+    class CompatDatafieldFilter(FilterSet):
+        ask_during_checkin = django_filters.BooleanFilter(method='ask_during_checkin_qs')
+        required = django_filters.BooleanFilter(method='required_qs')
+
+        class Meta:
+            model = Question
+            fields = ['identifier']
+
+        def ask_during_checkin_qs(self, qs, name, value):
+            return qs.filter(
+                Exists(QuestionnaireRow.objects.filter(
+                    questionnaire__type=Questionnaire.QuestionnaireType.POSITION_CHECKIN if value else Questionnaire.QuestionnaireType.POSITION_PURCHASE,
+                    user_datafield=OuterRef('pk'),
+                ))
+            )
+
+        def required_qs(self, qs, name, value):
+            cond = Exists(QuestionnaireRow.objects.filter(
+                required=True,
+                user_datafield=OuterRef('pk'),
+            ))
+            if value:
+                return qs.filter(cond)
+            else:
+                return qs.filter(~cond)
+
+class CompatQuestionViewSet(ConditionalListView, CompatListMixin, BaseDatafieldViewSet):
+    container_type = Question.ContainerType.ORDERPOSITION
+    serializer_class = CompatQuestionSerializer
+    filterset_class = CompatDatafieldFilter
+    pagination_class = None
+
+    def get_queryset(self):
+        return super().get_queryset().prefetch_related('referenced_by', 'referenced_by__questionnaire')
+
+    def _check_defer(self, mode, request, *args, **kwargs):
+        sales_channel_ident = request.query_params.get('sales_channel', None)
+        if sales_channel_ident is None and isinstance(request.auth, Device):
+            sales_channel_ident = 'pretixpos' if (request.auth.software_brand or '').startswith('pretixPOS') else 'web'
+        if sales_channel_ident:
+            logger.info('Returning app compatible question %s for %s (device: %r %s %s) on %s/%s',  mode, sales_channel_ident, request.auth, getattr(request.auth, 'software_brand', ''), getattr(request.auth, 'software_version', ''), request.organizer.slug, request.event.slug)
+            return POSCompatQuestionViewSet.as_view(
+                {'get': mode}, sales_channel_ident=sales_channel_ident
+            )(*self.args, request=request._request, **self.kwargs)
+
+    def list(self, request, *args, **kwargs):
+        if response := self._check_defer('list', request, *args, **kwargs):
+            return response
+
+        logger.info('Returning compatible datafield list on %s/%s', request.organizer.slug, request.event.slug)
+        return super().list(request, *args, **kwargs)
+
+    def retrieve(self, request, *args, **kwargs):
+        if response := self._check_defer('retrieve', request, *args, **kwargs):
+            return response
+
+        return super().retrieve(request, *args, **kwargs)
+
+
+class POSCompatQuestionViewSet(DeprecationWarningMixin, viewsets.ReadOnlyModelViewSet):
+    serializer_class = POSCompatQuestionSerializer
+    queryset = QuestionnaireRow.objects.none()
+    permission = None
+    sales_channel_ident = None
+
+    def __init__(self, sales_channel_ident, *args, **kwargs):
+        self.sales_channel_ident = sales_channel_ident
+        super().__init__(*args, **kwargs)
+
+    @property
+    def deprecation_warning(self):
+        return (
+            f'This API endpoint is deprecated and will be removed in the future. '
+            f'Results are generated on-the-fly, count and page size may be inaccurate. '
+            f'Filtered for sales_channel "{self.sales_channel_ident}"'
+        )
+
+    def get_queryset(self):
+        return QuestionnaireRow.objects.filter(
+            # only matching sales channel
+            Q(questionnaire__all_sales_channels=True) | Q(questionnaire__limit_sales_channels__identifier=self.sales_channel_ident),
+            # only real questions, no text blocks
+            Q(user_datafield_id__isnull=False) | Q(system_datafield__isnull=False),
+            questionnaire__event=self.request.event,
+            # we do legacy compat only for position-level questions
+            questionnaire__type__startswith='P',
+        ).prefetch_related(
+            'user_datafield', 'user_datafield__options', 'questionnaire'
+        ).order_by('questionnaire__position', 'position', 'id')
+
+    def list(self, request, **kwargs):
+        resp = super().list(request, **kwargs)
+        resp.data['results'] = POSCompatQuestionSerializer.mangle_results(self.request.event, resp.data['results'])
+        return resp
+
+    def get_object(self):
+        queryset = self.filter_queryset(self.get_queryset())
+
+        lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field
+
+        qid, dfid, sys_df = QuestionnaireRow.uncook_id(self.kwargs[lookup_url_kwarg])
+        print(self.kwargs[lookup_url_kwarg], qid, dfid, sys_df)
+        if qid and sys_df:
+            obj = get_object_or_404(queryset, questionnaire__pk=qid, system_datafield=sys_df)
+        elif qid and dfid:
+            obj = get_object_or_404(queryset, questionnaire__pk=qid, user_datafield__pk=dfid)
+        else:
+            obj = get_object_or_404(queryset, user_datafield__pk=dfid)
+
+        # May raise a permission denied
+        self.check_object_permissions(self.request, obj)
+
+        return obj
 
     @transaction.atomic()
     def perform_create(self, serializer):
@@ -515,7 +785,7 @@ class QuestionViewSet(ConditionalListView, viewsets.ModelViewSet):
         super().perform_destroy(instance)
 
 
-class QuestionOptionViewSet(viewsets.ModelViewSet):
+class BaseDatafieldOptionViewSet(viewsets.ModelViewSet):
     serializer_class = QuestionOptionSerializer
     queryset = QuestionOption.objects.none()
     filter_backends = (DjangoFilterBackend, TotalOrderingFilter,)
@@ -524,19 +794,25 @@ class QuestionOptionViewSet(viewsets.ModelViewSet):
     permission = None
     write_permission = 'event.items:write'
 
+    def get_question(self):
+        return get_object_or_404(
+            Question,
+            Q(pk=self.kwargs['question']) | Q(identifier=self.kwargs['question']),
+            event=self.request.event, container_type=self.container_type,
+        )
+
     def get_queryset(self):
-        q = get_object_or_404(Question, pk=self.kwargs['question'], event=self.request.event)
-        return q.options.all()
+        return self.get_question().options.all()
 
     def get_serializer_context(self):
         ctx = super().get_serializer_context()
         ctx['event'] = self.request.event
-        ctx['question'] = get_object_or_404(Question, pk=self.kwargs['question'], event=self.request.event)
+        ctx['question'] = self.get_question()
         return ctx
 
     @transaction.atomic()
     def perform_create(self, serializer):
-        q = get_object_or_404(Question, pk=self.kwargs['question'], event=self.request.event)
+        q = self.get_question()
         serializer.save(question=q)
         q.log_action(
             'pretix.event.question.option.added',
@@ -566,6 +842,85 @@ class QuestionOptionViewSet(viewsets.ModelViewSet):
         super().perform_destroy(instance)
 
 
+class OrderDatafieldOptionViewSet(BaseDatafieldOptionViewSet):
+    container_type = Question.ContainerType.ORDER
+
+
+class PositionDatafieldOptionViewSet(BaseDatafieldOptionViewSet):
+    container_type = Question.ContainerType.ORDERPOSITION
+
+
+with scopes_disabled():
+    class QuestionnaireFilter(FilterSet):
+        sales_channel = django_filters.CharFilter(method='sales_channel_qs')
+
+        class Meta:
+            model = Questionnaire
+            fields = ['type', 'items', 'sales_channel']
+
+        def sales_channel_qs(self, qs, name, value):
+            return qs.filter(
+                Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=value)
+            )
+
+
+class QuestionnaireViewSet(ConditionalListView, viewsets.ModelViewSet):
+    serializer_class = QuestionnaireSerializer
+    queryset = Questionnaire.objects.none()
+    filter_backends = (DjangoFilterBackend, TotalOrderingFilter)
+    filterset_class = QuestionnaireFilter
+    ordering_fields = ('id', 'position')
+    ordering = ('position', 'id')
+    permission = None
+    write_permission = 'event.items:write'
+
+    def get_queryset(self):
+        if 'rows.datafield' in self.request.query_params.getlist('expand'):
+            prefetch_rows = Prefetch(
+                'rows',
+                queryset=QuestionnaireRow.objects.select_related('user_datafield').prefetch_related('user_datafield__options'),
+            )
+        else:
+            prefetch_rows = 'rows'
+        return self.request.event.questionnaires.prefetch_related(prefetch_rows).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
+        ctx['expand'] = self.request.query_params.getlist('expand')
+        ctx['expand_name_fields'] = self.request.query_params.get('expand_name_fields', '').lower() == 'true'
+        return ctx
+
+    def perform_update(self, serializer):
+        if new_type := serializer.validated_data.get('type'):
+            if new_type.split('_', 1)[0] != serializer.instance.type.split('_', 1)[0]:
+                raise ValidationError({'type': 'Cannot change container part of type field'})
+        serializer.save(event=self.request.event)
+        serializer.instance.log_action(
+            'pretix.event.questionnaire.changed',
+            user=self.request.user,
+            auth=self.request.auth,
+            data=self.request.data
+        )
+
+    def perform_destroy(self, instance):
+        instance.log_action(
+            'pretix.event.questionnaire.deleted',
+            user=self.request.user,
+            auth=self.request.auth,
+        )
+        super().perform_destroy(instance)
+
+
 class NumberInFilter(django_filters.BaseInFilter, django_filters.NumberFilter):
     pass
 

src/pretix/api/views/order.py

@@ -287,7 +287,9 @@ class OrderViewSetMixin:
                     Prefetch('checkins', queryset=Checkin.objects.select_related('device')),
                     Prefetch('print_logs', queryset=PrintLog.objects.select_related('device')),
                     'item', 'variation',
-                    Prefetch('answers', queryset=QuestionAnswer.objects.prefetch_related('options', 'question').order_by('question__position')),
+                    Prefetch('answers', queryset=QuestionAnswer.objects.prefetch_related('options', 'question')
+                             # TODO(questionnaires) .order_by('question__position')
+                             ),
                     'seat',
                 )
             )
@@ -706,6 +708,29 @@ class EventOrderViewSet(OrderViewSetMixin, viewsets.ModelViewSet):
                 status=status.HTTP_400_BAD_REQUEST
             )
 
+    @action(detail=True, url_name='answer', url_path=r'answer/(?P<question>\d+)')
+    def answer(self, request, **kwargs):
+        order = self.get_object()
+        answer = get_object_or_404(
+            QuestionAnswer,
+            order=order,
+            question_id=kwargs.get('question')
+        )
+        if not answer.file:
+            raise NotFound()
+
+        ftype, ignored = mimetypes.guess_type(answer.file.name)
+        return FileResponse(
+            answer.file,
+            filename='{}-{}-{}'.format(
+                self.request.event.slug.upper(),
+                order.code,
+                os.path.basename(answer.file.name).split('.', 1)[1]
+            ),
+            as_attachment=True,
+            content_type=ftype or 'application/binary'
+        )
+
     def create(self, request, *args, **kwargs):
         if 'send_mail' in request.data and 'send_email' not in request.data and isinstance(request.data, dict):
             request.data['send_email'] = request.data['send_mail']
@@ -1299,7 +1324,7 @@ class EventOrderPositionViewSet(OrderPositionViewSetMixin, viewsets.ModelViewSet
         pos = self.get_object()
         answer = get_object_or_404(
             QuestionAnswer,
-            orderposition=self.get_object(),
+            orderposition=pos,
             question_id=kwargs.get('question')
         )
         if not answer.file:

src/pretix/base/datasync/sourcefields.py

@@ -31,7 +31,7 @@ from pretix.base.settings import PERSON_NAME_SCHEMES
 from pretix.multidomain.urlreverse import eventreverse_absolute
 
 
-def get_answer(op, question_identifier=None):
+def get_position_answer(op, question_identifier=None):
     a = None
     if op.addon_to:
         if "answers" in getattr(op.addon_to, "_prefetched_objects_cache", {}):
@@ -70,6 +70,30 @@ def get_answer(op, question_identifier=None):
         return a.answer
 
 
+def get_order_answer(order, question_identifier=None):
+    a = None
+    if "answers" in getattr(order, "_prefetched_objects_cache", {}):
+        try:
+            a = [
+                a
+                for a in order.answers.all()
+                if a.question.identifier == question_identifier
+            ][0]
+        except IndexError:
+            pass
+    else:
+        a = order.answers.filter(question__identifier=question_identifier).first()
+
+    if not a:
+        return ""
+    else:
+        if a.question.type in (Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE):
+            return [str(o.identifier) for o in a.options.all()]
+        if a.question.type == Question.TYPE_BOOLEAN:
+            return a.answer == "True"
+        return a.answer
+
+
 def get_payment_date(order):
     if order.status == Order.STATUS_PENDING:
         return None
@@ -127,10 +151,11 @@ DataFieldCategory = namedtuple(
 
 CAT_ORDER_POSITION = DataFieldCategory(10, _('Order position details'))
 CAT_ATTENDEE = DataFieldCategory(11, _('Attendee details'))
-CAT_QUESTIONS = DataFieldCategory(12, _('Questions'))
+CAT_ORDER_POSITION_DATAFIELDS = DataFieldCategory(12, _('Order position data fields'))
 CAT_PRODUCT = DataFieldCategory(20, _('Product details'))
 CAT_ORDER = DataFieldCategory(21, _('Order details'))
-CAT_INVOICE_ADDRESS = DataFieldCategory(22, _('Invoice address'))
+CAT_ORDER_DATAFIELDS = DataFieldCategory(22, _('Order data fields'))
+CAT_INVOICE_ADDRESS = DataFieldCategory(23, _('Invoice address'))
 CAT_EVENT = DataFieldCategory(30, _('Event information'))
 CAT_EVENT_OR_SUBEVENT = DataFieldCategory(31, pgettext_lazy('subevent', 'Event or date information'))
 
@@ -584,15 +609,27 @@ def get_data_fields(event, for_model=None):
         ]
         + [
             DataFieldInfo(
-                ORDER_POSITION,
-                CAT_QUESTIONS,
+                ORDER,
+                CAT_ORDER_POSITION_DATAFIELDS,
                 "question_" + q.identifier,
-                _("Question: {name}").format(name=str(q.question)),
+                _("Data field: {name}").format(name=str(q.internal_name)),
                 q.type,
                 get_enum_opts(q),
-                partial(lambda qq, position: get_answer(position, qq.identifier), q),
+                partial(lambda qq, position: get_position_answer(position, qq.identifier), q),
             )
-            for q in event.questions.filter(~Q(type=Question.TYPE_FILE)).prefetch_related("options")
+            for q in event.positiondatafields.filter(~Q(type=Question.TYPE_FILE)).prefetch_related("options")
+        ]
+        + [
+            DataFieldInfo(
+                ORDER,
+                CAT_ORDER_DATAFIELDS,
+                "orderdatafield_" + q.identifier,
+                _("Order data field: {name}").format(name=str(q.internal_name)),
+                q.type,
+                get_enum_opts(q),
+                partial(lambda qq, order: get_order_answer(order, qq.identifier), q),
+            )
+            for q in event.orderdatafields.filter(~Q(type=Question.TYPE_FILE)).prefetch_related("options")
         ]
     )
     if not any(field_name == "given_name" for field_name, label, weight in name_scheme["fields"]):

src/pretix/base/exporters/answers.py

@@ -62,7 +62,7 @@ class AnswerFilesExporter(BaseExporter):
             [
                 ('questions',
                  forms.ModelMultipleChoiceField(
-                     queryset=self.event.questions.filter(type='F'),
+                     queryset=self.event.positiondatafields.filter(type='F'),
                      label=_('Questions'),
                      widget=forms.CheckboxSelectMultiple(
                          attrs={'class': 'scrolling-multiple-choice'}

src/pretix/base/exporters/json.py

@@ -84,7 +84,6 @@ class JSONExporter(BaseExporter):
                         'tax_rate': item.tax_rule.rate if item.tax_rule else Decimal('0.00'),
                         'tax_name': str(item.tax_rule.name) if item.tax_rule else None,
                         'admission': item.admission,
-                        'personalized': item.personalized,
                         'active': item.active,
                         'sales_channels': [c.identifier for c in (all_sales_channels if item.all_sales_channels else item.limit_sales_channels.all())],
                         'description': str(item.description),
@@ -149,13 +148,26 @@ class JSONExporter(BaseExporter):
                         'id': question.id,
                         'identifier': question.identifier,
                         'required': question.required,
-                        'question': str(question.question),
+                        'question': str(question.internal_name),
                         'position': question.position,
-                        'hidden': question.hidden,
-                        'ask_during_checkin': question.ask_during_checkin,
+                        'show_during_checkin': question.show_during_checkin,
+                        'print_on_invoice': question.print_on_invoice,
                         'help_text': str(question.help_text),
                         'type': question.type
-                    } for question in self.event.questions.all()
+                    } for question in self.event.positiondatafields
+                ],
+                'orderdatafields': [
+                    {
+                        'id': question.id,
+                        'identifier': question.identifier,
+                        'required': question.required,
+                        'question': str(question.internal_name),
+                        'position': question.position,
+                        'show_during_checkin': question.show_during_checkin,
+                        'print_on_invoice': question.print_on_invoice,
+                        'help_text': str(question.help_text),
+                        'type': question.type
+                    } for question in self.event.orderdatafields
                 ],
                 'orders': [
                     {

src/pretix/base/exporters/orderlist.py

@@ -677,16 +677,16 @@ class OrderListExporter(MultiSheetListExporter):
                 if form_data['group_multiple_choice']:
                     for o in q.options.all():
                         options[q.pk].append(o)
-                    headers.append(str(q.question))
+                    headers.append(str(q.internal_name))
                 else:
                     for o in q.options.all():
-                        headers.append(str(q.question) + ' – ' + str(o.answer))
+                        headers.append(str(q.internal_name) + ' – ' + str(o.answer))
                         options[q.pk].append(o)
             else:
                 if q.type == Question.TYPE_CHOICE:
                     for o in q.options.all():
                         options[q.pk].append(o)
-                headers.append(str(q.question))
+                headers.append(str(q.internal_name))
         headers += [
             _('Invoice address company'),
             _('Invoice address name'),

src/pretix/base/forms/questions.py

@@ -36,7 +36,6 @@ import copy
 import json
 import logging
 import re
-from collections import namedtuple
 from datetime import timedelta
 from decimal import Decimal
 from io import BytesIO
@@ -50,12 +49,13 @@ from django.contrib import messages
 from django.core.exceptions import ValidationError
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.validators import MaxValueValidator, MinValueValidator
-from django.db.models import QuerySet
+from django.db import ProgrammingError
+from django.db.models import Prefetch, Q, QuerySet
 from django.forms import Select, widgets
 from django.forms.widgets import FILE_INPUT_CONTRADICTION
 from django.utils.formats import date_format
 from django.utils.functional import lazy
-from django.utils.html import escape
+from django.utils.html import escape, format_html
 from django.utils.safestring import mark_safe
 from django.utils.text import format_lazy
 from django.utils.timezone import get_current_timezone
@@ -82,7 +82,10 @@ from pretix.base.i18n import (
 from pretix.base.invoicing.transmission import (
     get_transmission_types, transmission_types,
 )
-from pretix.base.models import InvoiceAddress, Item, Question, QuestionOption
+from pretix.base.models import (
+    InvoiceAddress, Item, Question, Questionnaire, QuestionnaireRow,
+    QuestionOption,
+)
 from pretix.base.models.tax import ask_for_vat_id
 from pretix.base.services.tax import (
     VATIDFinalError, VATIDTemporaryError, normalize_vat_id, validate_vat_id,
@@ -647,49 +650,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.
@@ -703,107 +679,105 @@ class BaseQuestionsForm(forms.Form):
                 initialbool = False
 
             field = forms.BooleanField(
-                label=escape(q.question), required=required,
-                help_text=rich_text(q.help_text),
+                label=self.make_label(qc), 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=self.make_label(qc), 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=self.make_label(qc), 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=self.make_label(qc), 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=self.make_label(qc), 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=self.make_label(qc), 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=self.make_label(qc), 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=self.make_label(qc), 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=self.make_label(qc), 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:
@@ -813,16 +787,16 @@ class BaseQuestionsForm(forms.Form):
             else:
                 _initial = None
             field = forms.DateField(
-                label=escape(q.question), required=required,
+                label=self.make_label(qc), 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()
@@ -831,29 +805,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=self.make_label(qc), 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:
@@ -865,20 +839,20 @@ class BaseQuestionsForm(forms.Form):
                 _initial = None
 
             field = SplitDateTimeField(
-                label=escape(q.question), required=required,
+                label=self.make_label(qc), 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)
@@ -891,72 +865,96 @@ class BaseQuestionsForm(forms.Form):
                     initial = "+{}.".format(phone_prefix)
 
             field = PhoneNumberField(
-                label=escape(q.question), required=required,
-                help_text=rich_text(q.help_text),
+                label=self.make_label(qc), 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
+        else:
+            raise ProgrammingError('Invalid question type')
+        field.datafield = datafield
+        field.questionnaire_row = qc
         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.form_field_name
+            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):
-        question_cache = {f.question.pk: f.question for f in self.fields.values() if getattr(f, 'question', None)}
+    def build_text_block(self, request, event, qc):
+        return forms.CharField(  # TODO(questionnaires): use a less hacky way to format this field
+            required=False,
+            label="",
+            help_text=rich_text((f"#### {qc.label}\n" if qc.label else "") + str(qc.help_text)),
+            disabled=True,
+            widget=QuestionCheckboxSelectMultiple,
+        )
 
-        def question_is_visible(parentid, qvals):
-            if parentid not in question_cache:
+    def make_label(self, qc):
+        label = escape(qc.label)
+        if qc.questionnaire.ask_during_checkin:
+            label += format_html(' <span class="fa fa-qrcode text-primary" data-toggle="tooltip" title="{}"></span>', _("This question will be asked during check-in."))
+        if qc.questionnaire.hidden:
+            label += format_html(' <span class="fa fa-eye-slash text-primary" data-toggle="tooltip" title="{}"></span>', _("Hidden question"))
+        return label
+
+    def check_user_questions(self, formdata):
+        row_cache = {f.questionnaire_row.pk: f.questionnaire_row for f in self.fields.values() if getattr(f, 'questionnaire_row', None)}
+        user_fields = [f for f in self.fields.values() if getattr(f, 'datafield', None)]
+
+        def question_is_visible(parentid, expectedvals):
+            if parentid is None:
+                return True
+            if parentid not in row_cache:
                 return False
-            parentq = question_cache[parentid]
-            if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
+            parentq = row_cache[parentid]
+            if not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
                 return False
-            if 'question_%d' % parentid not in d:
+            if parentq.form_field_name not in formdata:
                 return False
-            dval = d.get('question_%d' % parentid)
+            formval = formdata.get(parentq.form_field_name)
             return (
-                ('True' in qvals and dval)
-                or ('False' in qvals and not dval)
-                or (isinstance(dval, QuestionOption) and dval.identifier in qvals)
-                or (isinstance(dval, (list, QuerySet)) and any(qval in [o.identifier for o in dval] for qval in qvals))
+                ('True' in expectedvals and formval)
+                or ('False' in expectedvals and not formval)
+                or (isinstance(formval, QuestionOption) and formval.identifier in expectedvals)
+                or (isinstance(formval, (list, QuerySet)) and any(qval in [o.identifier for o in formval] for qval in expectedvals))
             )
 
-        def question_is_required(q):
-            return (
-                q.required and
-                (not q.dependency_question_id or question_is_visible(q.dependency_question_id, q.dependency_values))
-            )
+        def question_is_required(qr):
+            return qr.required and question_is_visible(qr.dependency_question_id, qr.dependency_values)
 
         if not self.all_optional:
-            for q in question_cache.values():
-                answer = d.get('question_%d' % q.pk)
-                field = self['question_%d' % q.pk]
-                if question_is_required(q) and not answer and answer != 0 and not field.errors:
-                    raise ValidationError({'question_%d' % q.pk: [_('This field is required.')]})
+            for field in user_fields:
+                qr = field.questionnaire_row
+                answer = formdata.get(qr.form_field_name)
+                field = self[qr.form_field_name]
+                if question_is_required(qr) and not answer and answer != 0 and not field.errors:
+                    raise ValidationError({qr.form_field_name: [_('This field is required.')]})
 
         # Strip invisible question from cleaned_data so they don't end up in the database
-        for q in question_cache.values():
-            answer = d.get('question_%d' % q.pk)
-            if q.dependency_question_id and not question_is_visible(q.dependency_question_id, q.dependency_values) and answer is not None:
-                d['question_%d' % q.pk] = None
+        for field in user_fields:
+            qr = field.questionnaire_row
+            answer = formdata.get(qr.form_field_name)
+            if not question_is_visible(qr.dependency_question_id, qr.dependency_values) and answer is not None:
+                formdata[qr.form_field_name] = None
 
         # Strip False answers to required yes/no questions even if all_optional is set, as our data model assumes that
         # required yes/no questions can only be answered with yes
-        for q in question_cache.values():
-            if q.required and q.type == Question.TYPE_BOOLEAN:
-                if 'question_%d' % q.pk in d and d['question_%d' % q.pk] is False:
-                    d['question_%d' % q.pk] = None
+        for field in user_fields:
+            qr = field.questionnaire_row
+            if qr.required and field.datafield.type == Question.TYPE_BOOLEAN:
+                if qr.form_field_name in formdata and formdata[qr.form_field_name] is False:
+                    formdata[qr.form_field_name] = None
 
 
 class OrderLevelQuestionsForm(BaseQuestionsForm):
@@ -964,8 +962,7 @@ class OrderLevelQuestionsForm(BaseQuestionsForm):
         """
         Takes two additional keyword arguments:
 
-        :param checkoutsession: The checkout session the form should be for
-        :param order: The order the form should be for
+        :param container: The checkout session or order the form should be for
         :param event: The event this belongs to
         """
         request = kwargs.pop('request', None)
@@ -974,14 +971,35 @@ class OrderLevelQuestionsForm(BaseQuestionsForm):
 
         super().__init__(*args, **kwargs)
 
-        questions = Question.objects.filter(
-            event=event, container_type=Question.ContainerType.ORDER,
-            ask_during_checkin=False, hidden=False,
-        ).order_by('position')
+        questionnaires = Questionnaire.objects.filter(
+            Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=container.sales_channel.identifier),
+            event=event, type=Questionnaire.QuestionnaireType.ORDER_PURCHASE,
+        ).order_by('position').prefetch_related(
+            Prefetch('rows', QuestionnaireRow.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='questionnairerowlist')
+        )
         answerlist = container.answers.prefetch_related('options')
 
-        for q in questions:
-            self.fields['question_%s' % q.id] = self.build_user_question_field(request, event, answerlist, q)
+        idx = 0
+        for questionnaire in questionnaires:
+            for qrow in getattr(questionnaire, 'questionnairerowlist', questionnaire.rows.all()):
+                if qrow.user_datafield:
+                    df = qrow.user_datafield
+                    self.fields[qrow.form_field_name] = self.build_user_question_field(request, event, answerlist, qrow, df)
+                else:
+                    self.fields[qrow.form_field_name] = self.build_text_block(request, event, qrow)
+                    idx += 1
 
     def clean(self):
         d = super().clean()
@@ -1008,6 +1026,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
@@ -1017,18 +1036,15 @@ 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 qrow in getattr(questionnaire, 'questionnairerowlist', questionnaire.rows.all()):
+                if qrow.user_datafield:
+                    df = qrow.user_datafield
+                    self.fields[qrow.form_field_name] = self.build_user_question_field(request, event, pos.answerlist, qrow, df)
+                elif qrow.system_datafield:
+                    self.fields[qrow.form_field_name] = self.build_system_question_field(request, event, pos, qrow)
+                else:
+                    self.fields[qrow.form_field_name] = self.build_text_block(request, event, qrow)
 
         responses = question_form_fields.send(sender=event, position=pos)
         data = pos.meta_info_data
@@ -1093,21 +1109,20 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
             )
 
     def build_system_question_field(self, request, event, pos, qc):
-        field_name = qc.id
-        if field_name == 'attendee_name_parts':
+        if qc.system_datafield == QuestionnaireRow.SystemDatafield.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=self.make_label(qc),
                 help_text=rich_text(qc.help_text),
                 initial=pos.attendee_name_parts,
             )
-        if field_name == 'attendee_email':
+        if qc.system_datafield == QuestionnaireRow.SystemDatafield.ATTENDEE_EMAIL:
             return forms.EmailField(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.question),
+                label=self.make_label(qc),
                 help_text=rich_text(qc.help_text),
                 initial=pos.attendee_email,
                 widget=forms.EmailInput(
@@ -1116,19 +1131,19 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
                     }
                 )
             )
-        if field_name == 'company':
+        if qc.system_datafield == QuestionnaireRow.SystemDatafield.COMPANY:
             return forms.CharField(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.question),
+                label=self.make_label(qc),
                 help_text=rich_text(qc.help_text),
                 max_length=255,
                 initial=pos.company,
             )
 
-        if field_name == 'street':
+        if qc.system_datafield == QuestionnaireRow.SystemDatafield.STREET:
             return forms.CharField(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.question),
+                label=self.make_label(qc),
                 help_text=rich_text(qc.help_text),
                 widget=forms.Textarea(attrs={
                     'rows': 2,
@@ -1137,21 +1152,21 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
                 }),
                 initial=pos.street,
             )
-        if field_name == 'zipcode':
+        if qc.system_datafield == QuestionnaireRow.SystemDatafield.ZIPCODE:
             return forms.CharField(
                 required=False,
                 max_length=30,
-                label=escape(qc.question),
+                label=self.make_label(qc),
                 help_text=rich_text(qc.help_text),
                 initial=pos.zipcode,
                 widget=forms.TextInput(attrs={
                     'autocomplete': 'postal-code',
                 }),
             )
-        if field_name == 'city':
+        if qc.system_datafield == QuestionnaireRow.SystemDatafield.CITY:
             return forms.CharField(
                 required=False,
-                label=escape(qc.question),
+                label=self.make_label(qc),
                 help_text=rich_text(qc.help_text),
                 max_length=255,
                 initial=pos.city,
@@ -1159,13 +1174,13 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
                     'autocomplete': 'address-level2',
                 }),
             )
-        if field_name == 'country':
+        if qc.system_datafield == QuestionnaireRow.SystemDatafield.COUNTRY:
             country = pos.country or guess_country_from_request(request, event)
             return CountryField(
                 countries=CachedCountries
             ).formfield(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.question),
+                label=self.make_label(qc),
                 help_text=rich_text(qc.help_text),
                 initial=country,
                 widget=forms.Select(attrs={
@@ -1173,7 +1188,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
                     'data-trigger-address-info': 'on',
                 }),
             )
-        if field_name == 'state':
+        if qc.system_datafield == QuestionnaireRow.SystemDatafield.STATE:
             country = pos.country or guess_country_from_request(request, event)
             c = [('', '---')]
             fprefix = str(self.prefix) + '-' if self.prefix is not None and self.prefix != '-' else ''
@@ -1193,7 +1208,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
                 del self.data[fprefix + 'state']
 
             field = forms.ChoiceField(
-                label=escape(qc.question),
+                label=self.make_label(qc),
                 help_text=rich_text(qc.help_text),
                 required=False,
                 choices=c,

src/pretix/base/management/commands/shell_scoped.py

@@ -39,8 +39,14 @@ class Command(BaseCommand):
         parser.add_argument(
             '--print-sql',
             action='store_true',
-            help='Print all SQL queries.',
+            help='Print all SQL queries (needs package `django-extensions`).',
         )
+        parser.description = "django-scopes aware shell"
+        parser.epilog = """
+        To wrap shell in scopes_disabled (completely ignore django-scopes), add --override.
+        
+        For more specific scopes, add --model__lookup=value flags, e.g. --organizer__slug=demo
+        """
 
     def handle(self, *args, **options):
         try:

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

@@ -0,0 +1,316 @@
+# Generated by Django 4.2.29 on 2026-03-19 14:24
+import json
+import logging
+from collections import namedtuple
+from itertools import chain, groupby
+
+import django.db.models.deletion
+import i18nfield.fields
+from django.db import migrations, models
+from django.db.models import F
+from django.utils.translation import pgettext_lazy
+from i18nfield.strings import LazyI18nString
+
+import pretix.base.models.base
+import pretix.base.models.fields
+from pretix.base.i18n import language
+from pretix.helpers.iter import sort_groupby, sort_groupby_exp
+
+
+logger = logging.getLogger(__name__)
+
+FakeQuestion = namedtuple(
+    'FakeQuestion', 'id question position required help_text'
+)
+
+
+def get_fake_questions(settings):
+    def b(s):
+        return s == 'True'
+    fq = []
+    sqo = json.loads(settings.get('system_question_order', '{}'))
+    _ = LazyI18nString.from_gettext
+
+    if LazyI18nString(settings.get('attendee_data_explanation_text', '')):
+        fq.append(FakeQuestion(None, '', -1, False, settings.get('attendee_data_explanation_text', '')))
+
+    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')), None))
+
+    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')), None))
+
+    if b(settings.get('attendee_company_asked')):
+        fq.append(FakeQuestion('@company', _('Company'), sqo.get('company', 0), b(settings.get('attendee_company_required')), None))
+
+    if b(settings.get('attendee_addresses_asked')):
+        fq.append(FakeQuestion('@street', _('Street'), sqo.get('street', 0), b(settings.get('attendee_addresses_required')), None))
+        fq.append(FakeQuestion('@zipcode', _('ZIP code'), sqo.get('zipcode', 0), b(settings.get('attendee_addresses_required')), None))
+        fq.append(FakeQuestion('@city', _('City'), sqo.get('city', 0), b(settings.get('attendee_addresses_required')), None))
+        fq.append(FakeQuestion('@state', _(pgettext_lazy("address", "State")), sqo.get('country', 0), b(settings.get('attendee_addresses_required')), None))
+        fq.append(FakeQuestion('@country', _('Country'), sqo.get('country', 0), b(settings.get('attendee_addresses_required')), None))
+    return fq
+
+
+def migrate_questions_forward(apps, schema_editor):
+    from django.utils.translation import (
+        get_supported_language_variant, gettext as _,
+    )
+
+    Event = apps.get_model("pretixbase", "Event")
+    Item = apps.get_model("pretixbase", "Item")
+    Question = apps.get_model("pretixbase", "Question")
+    Questionnaire = apps.get_model("pretixbase", "Questionnaire")
+    QuestionnaireRow = apps.get_model("pretixbase", "QuestionnaireRow")
+    EventSettingsStore = apps.get_model('pretixbase', 'Event_SettingsStore')
+
+    qc_candidate = namedtuple('qc_candidate', ['item_info', 'question_id', 'question'])
+
+    def create_grouped_item_questionnaires(event, qc_candidates_iter, label_prefix, questionnaire_type, personalized_items):
+        # group by item, creating a unique questionnaire per item  ->  iter[tuple[list[Question], item_info]]
+        item_questionnaires = (
+            ([c.question for c in group], item_info)
+            for item_info, group in sort_groupby(
+                qc_candidates_iter,
+                group_key=lambda c: c.item_info,
+                inner_sort_key=lambda c: c.question.position,
+            )
+        )
+
+        # group again, combining all questionnaires containing an identical set of questions (by means of grouping by a list of item-ids)
+        merged_questionnaires = sort_groupby_exp(item_questionnaires, group_key=lambda questions, item_info: [str(q.id) for q in questions])
+        for _unused, grouped_data in merged_questionnaires:
+            questions = grouped_data[0][0]
+            item_infos = [item_info for _c, item_info in grouped_data if item_info is not None]
+
+            internal_name = label_prefix + ', '.join(str(ii.internal_name or ii.name) for ii in item_infos)
+            compat_personalization = False
+            if all(ii.personalized for ii in item_infos) and len(item_infos) == len(personalized_items):
+                if questionnaire_type == "position_purchase":
+                    # if we have a questionnaire for exactly all personalized items, we just call it "Attendee data"
+                    # (same as the default questionnaire for new events)
+                    internal_name = _('Attendee data')
+                    compat_personalization = True
+                else:
+                    internal_name = label_prefix + _('personalized products')
+            if len(internal_name) > 255:
+                internal_name = internal_name[:250] + ' ...'
+
+            # create questionnaires and rows
+            questionnaire = Questionnaire.objects.create(
+                event=event, type=questionnaire_type, position=0, all_sales_channels=True,
+                internal_name=internal_name, compat_personalization=compat_personalization
+            )
+            questionnaire.items.set([ii.id for ii in item_infos])
+            valid_deps = {question.id for question in questions}
+            new_rows = {}
+            deps_to_add = []
+            for position, question in enumerate(questions):
+                if isinstance(question, FakeQuestion):
+                    QuestionnaireRow.objects.create(
+                        questionnaire=questionnaire,
+                        position=position + 1,
+                        system_datafield=question.id,
+                        required=question.required,
+                        label=question.question,
+                        help_text=question.help_text,
+                    )
+                else:
+                    if question.dependency_question_id and question.dependency_question_id not in valid_deps:
+                        logger.warning('Question with invalid dependency ignored %s/%s/%d', event.organizer.slug, event.slug, question.id)
+                        continue
+                    new_rows[question.id] = QuestionnaireRow.objects.create(
+                        questionnaire=questionnaire,
+                        position=position + 1,
+                        user_datafield=question,
+                        required=question.required,
+                        label=question.question,
+                        help_text=question.help_text,
+                        dependency_values=question.dependency_values,
+                    )
+                    if question.dependency_question:
+                        deps_to_add.append((question.id, question.dependency_question.id))
+            for q, dep in deps_to_add:
+                new_rows[q].dependency_question = new_rows[dep]
+                new_rows[q].save()
+
+    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', 'locale',
+                'attendee_data_explanation_text',
+            ))
+        }
+        with language(get_supported_language_variant(settings.get('locale', 'en'))):
+            # [P] 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')
+
+            personalized_items = event.items.filter(personalized=True).values_list('id', 'internal_name', 'name', 'personalized', named=True)
+
+            # [position_checkout] presale
+            rows = chain((
+                qc_candidate(item, 0, q)
+                for q in get_fake_questions(settings)
+                for item in personalized_items
+            ), (
+                qc_candidate(item, q.id, q)
+                for q in questions.filter(hidden=False, ask_during_checkin=False)
+                for item in q.items.values_list('id', 'internal_name', 'name', 'personalized', named=True)
+            ))
+
+            # Questionnaire.QuestionnaireType.POSITION_PURCHASE == "position_purchase"
+            create_grouped_item_questionnaires(event, rows, '', "position_purchase", personalized_items)
+
+            # [position_checkin] checkin
+            rows = chain((
+                qc_candidate(item, q.id, q)
+                for q in questions.filter(ask_during_checkin=True)
+                for item in q.items.values_list('id', 'internal_name', 'name', 'personalized', named=True)
+            ))
+
+            # Questionnaire.QuestionnaireType.POSITION_CHECKIN == "position_checkin"
+            create_grouped_item_questionnaires(event, rows, _('Check-in questions for '), "position_checkin", personalized_items)
+
+            # [position_hidden] hidden
+            rows = chain((
+                qc_candidate(item, q.id, q)
+                for q in questions.filter(hidden=True, ask_during_checkin=False)
+                for item in q.items.values_list('id', 'internal_name', 'name', 'personalized', named=True)
+            ))
+
+            # Questionnaire.QuestionnaireType.POSITION_HIDDEN == "position_hidden"
+            create_grouped_item_questionnaires(event, rows, _('Hidden questions for '), "position_hidden", personalized_items)
+
+            if len(personalized_items) == 0:
+                rows = chain((
+                    qc_candidate(None, 0, q)
+                    for q in get_fake_questions(settings)
+                ))
+                create_grouped_item_questionnaires(event, rows, '', "position_purchase", personalized_items)
+
+            # [O] get all order-level questions
+            questions = list(event.questions.filter(container_type='O', hidden=False).order_by('position'))
+            if questions:
+                # create questionnaires and rows
+                questionnaire = Questionnaire.objects.create(
+                    event=event, type="order_purchase", position=0, all_sales_channels=True,
+                    internal_name=_('Per-order questions'),
+                )
+                valid_deps = {question.id for question in questions}
+                new_rows = {}
+                deps_to_add = []
+                for position, question in enumerate(questions):
+                    if question.dependency_question_id and question.dependency_question_id not in valid_deps:
+                        logger.warning('Question with invalid dependency ignored %s/%s/%d', event.organizer.slug, event.slug, question.id)
+                        continue
+                    new_rows[question.id] = QuestionnaireRow.objects.create(
+                        questionnaire=questionnaire,
+                        position=position + 1,
+                        user_datafield=question,
+                        required=question.required,
+                        label=question.question,
+                        help_text=question.help_text,
+                        dependency_values=question.dependency_values,
+                    )
+                    if question.dependency_question:
+                        deps_to_add.append((question.id, question.dependency_question.id))
+                for q, dep in deps_to_add:
+                    new_rows[q].dependency_question = new_rows[dep]
+                    new_rows[q].save()
+
+
+            for question in event.questions.all():
+                question.internal_name = str(question.question)
+                if question.print_on_invoice:
+                    question.print_on_invoice_label = question.question
+                question.save()
+
+
+def migrate_questions_backward(apps, schema_editor):
+    Question = apps.get_model("pretixbase", "Question")
+    Question.objects.filter(question__isnull=True).update(question=F('internal_name'))
+
+
+def no_op(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0311_fix_unshredded_invoices'),
+    ]
+
+    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=25)),
+                ('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')),
+                ('compat_personalization', models.BooleanField(default=False)),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=(models.Model, pretix.base.models.base.LoggingMixin),
+        ),
+        migrations.CreateModel(
+            name='QuestionnaireRow',
+            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.questionnairerow')),
+                ('questionnaire', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rows', to='pretixbase.questionnaire')),
+                ('user_datafield', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='referenced_by', to='pretixbase.question')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=(models.Model, pretix.base.models.base.LoggingMixin),
+        ),
+        migrations.AddField(
+            model_name='question',
+            name='internal_name',
+            field=models.CharField(default='', max_length=255),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='question',
+            name='print_on_invoice_label',
+            field=i18nfield.fields.I18nTextField(null=True),
+        ),
+        migrations.RunPython(
+            migrate_questions_forward,
+            no_op,
+        ),
+        migrations.AlterField(
+            model_name='question',
+            name='question',
+            field=i18nfield.fields.I18nTextField(null=True, db_column='question'),
+        ),
+        migrations.RunPython(
+            no_op,
+            migrate_questions_backward,
+        ),
+        migrations.RenameField(
+            model_name='question',
+            old_name='question',
+            new_name='tbd_question',
+        ),
+        # add tbd_hidden, tbd_ask_during_checkin, ...
+
+        # TODO(questionnaires) remove old columns from Question model
+    ]

src/pretix/base/modelimport_orders.py

@@ -688,7 +688,7 @@ class QuestionColumn(ImportColumn):
 
     @property
     def verbose_name(self):
-        return _('Question') + ': ' + str(self.q.question)
+        return _('Question') + ': ' + str(self.q.internal_name)
 
     @property
     def identifier(self):
@@ -810,7 +810,7 @@ def get_order_import_columns(event):
         Expires(event),
         Comment(event),
     ]
-    for q in event.questions.prefetch_related('options').exclude(type=Question.TYPE_FILE):
+    for q in event.positiondatafields.prefetch_related('options').exclude(type=Question.TYPE_FILE):
         default.append(QuestionColumn(event, q))
 
     for recv, resp in order_import_columns.send(sender=event):

src/pretix/base/models/__init__.py

@@ -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, QuestionnaireRow, QuestionOption, Quota, SubEventItem,
+    SubEventItemVariation, itempicture_upload_to,
 )
 from .log import LogEntry
 from .mail import OutgoingMail

src/pretix/base/models/event.py

@@ -737,6 +737,9 @@ class Event(EventMixin, LoggedModel):
         self.settings.mail_send_order_approved_attendee = True
         self.settings.mail_send_order_approved_free_attendee = True
         self.settings.mail_send_download_reminder_attendee = True
+        from . import Questionnaire, QuestionnaireRow
+        q = self.questionnaires.create(internal_name=str(_('Attendee data')), type=Questionnaire.QuestionnaireType.POSITION_PURCHASE, position=0, compat_personalization=True)
+        q.rows.create(label=str(_('Attendee name')), system_datafield=QuestionnaireRow.SystemDatafield.ATTENDEE_NAME_PARTS, position=0)
 
     @property
     def social_image(self):
@@ -1426,6 +1429,10 @@ class Event(EventMixin, LoggedModel):
 
         return issues
 
+    @property
+    def sales_channels(self):
+        return self.organizer.sales_channels if self.all_sales_channels else self.limit_sales_channels
+
     def get_users_with_any_permission(self):
         """
         Returns a queryset of users who have any permission to this event.
@@ -1547,6 +1554,22 @@ class Event(EventMixin, LoggedModel):
             if presale_start > presale_end:
                 raise ValidationError(_('The event\'s presale cannot end before it starts.'))
 
+    @property
+    def orderdatafields(self):
+        from . import Question
+        qs = self.questions.filter(container_type=Question.ContainerType.ORDER)
+        if 'questions' in getattr(self, '_prefetched_objects_cache', {}):
+            qs._result_cache = [df for df in self.questions.all() if df.container_type == Question.ContainerType.ORDER]
+        return qs
+
+    @property
+    def positiondatafields(self):
+        from . import Question
+        qs = self.questions.filter(container_type=Question.ContainerType.ORDERPOSITION)
+        if 'questions' in getattr(self, '_prefetched_objects_cache', {}):
+            qs._result_cache = [df for df in self.questions.all() if df.container_type == Question.ContainerType.ORDERPOSITION]
+        return qs
+
 
 class SubEvent(EventMixin, LoggedModel):
     """

src/pretix/base/models/items.py

@@ -41,6 +41,7 @@ import warnings
 from collections import Counter, OrderedDict
 from datetime import date, datetime, time, timedelta
 from decimal import Decimal, DecimalException
+from itertools import groupby
 from typing import Optional, Tuple
 from zoneinfo import ZoneInfo
 
@@ -378,8 +379,6 @@ class Item(LoggedModel):
     :type tax_rate: decimal.Decimal
     :param admission: ``True``, if this item allows persons to enter the event (as opposed to e.g. merchandise)
     :type admission: bool
-    :param personalized: ``True``, if attendee information should be collected for this ticket
-    :type personalized: bool
     :param picture: A product picture to be shown next to the product description
     :type picture: File
     :param available_from: The date this product goes on sale
@@ -532,12 +531,13 @@ class Item(LoggedModel):
         ),
         default=False
     )
-    personalized = models.BooleanField(
+    tbd_personalized = models.BooleanField(  # TODO(questionnaires): field to be deleted
         verbose_name=_("Is a personalized ticket"),
         help_text=_(
             'Whether or not buying this product allows to enter attendee information'
         ),
-        default=False
+        default=False,
+        db_column='personalized',
     )
     generate_tickets = models.BooleanField(
         verbose_name=_("Generate tickets"),
@@ -822,9 +822,16 @@ class Item(LoggedModel):
             return self.event.settings.show_quota_left
         return self.show_quota_left
 
-    @property
-    def ask_attendee_data(self):
-        return self.admission and self.personalized
+    def get_asked_questions(self, questionnaire_type=None, sales_channel=None):
+        qs = QuestionnaireRow.objects.filter(
+            Q(system_datafield__isnull=False) | Q(user_datafield_id__isnull=False),
+            questionnaire__items=self,
+        )  # .prefetch_related('user_datafield')
+        if questionnaire_type is not None:
+            qs = qs.filter(questionnaire__type=questionnaire_type)
+        if sales_channel is not None:
+            qs = qs.filter(Q(questionnaire__all_sales_channels=True) | Q(questionnaire__limit_sales_channels=sales_channel))
+        return qs
 
     def tax(self, price=None, base_price_is='auto', currency=None, invoice_address=None, override_tax_rate=None,
             include_bundled=False, force_fixed_gross_price=False):
@@ -1565,12 +1572,14 @@ class ItemBundle(models.Model):
             raise ValidationError(_('The count needs to be equal to or greater than zero.'))
 
 
-class Question(LoggedModel):
+class Question(LoggedModel):  # TODO(questionnaires)  -  rename to Datafield ?
     """
-    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``)
@@ -1590,7 +1599,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.
@@ -1607,6 +1616,22 @@ class Question(LoggedModel):
     class ContainerType(models.TextChoices):
         ORDER = "O", _("Order")
         ORDERPOSITION = "P", _("Order position")
+
+    class FieldType(models.TextChoices):
+        NUMBER = "N", _("Number")
+        STRING = "S", _("Text (one line)")
+        TEXT = "T", _("Multiline text")
+        BOOLEAN = "B", _("Yes/No")
+        CHOICE = "C", _("Choose one from a list")
+        CHOICE_MULTIPLE = "M", _("Choose multiple from a list")
+        FILE = "F", _("File upload")
+        DATE = "D", _("Date")
+        TIME = "H", _("Time")
+        DATETIME = "W", _("Date and time")
+        COUNTRYCODE = "CC", _("Country code (ISO 3166-1 alpha-2)")
+        PHONENUMBER = "TEL", _("Phone number")
+
+    # compat
     TYPE_NUMBER = "N"
     TYPE_STRING = "S"
     TYPE_TEXT = "T"
@@ -1619,23 +1644,12 @@ class Question(LoggedModel):
     TYPE_DATETIME = "W"
     TYPE_COUNTRYCODE = "CC"
     TYPE_PHONENUMBER = "TEL"
-    TYPE_CHOICES = (
-        (TYPE_NUMBER, _("Number")),
-        (TYPE_STRING, _("Text (one line)")),
-        (TYPE_TEXT, _("Multiline text")),
-        (TYPE_BOOLEAN, _("Yes/No")),
-        (TYPE_CHOICE, _("Choose one from a list")),
-        (TYPE_CHOICE_MULTIPLE, _("Choose multiple from a list")),
-        (TYPE_FILE, _("File upload")),
-        (TYPE_DATE, _("Date")),
-        (TYPE_TIME, _("Time")),
-        (TYPE_DATETIME, _("Date and time")),
-        (TYPE_COUNTRYCODE, _("Country code (ISO 3166-1 alpha-2)")),
-        (TYPE_PHONENUMBER, _("Phone number")),
-    )
+    TYPE_CHOICES = FieldType.choices
+
     UNLOCALIZED_TYPES = [TYPE_DATE, TYPE_TIME, TYPE_DATETIME]
     ASK_DURING_CHECKIN_UNSUPPORTED = []
     SHOW_DURING_CHECKIN_UNSUPPORTED = [TYPE_FILE]
+    TYPES_ALLOWED_AS_DEPENDENCIES = {TYPE_BOOLEAN, TYPE_CHOICE, TYPE_CHOICE_MULTIPLE}
 
     event = models.ForeignKey(
         Event,
@@ -1648,8 +1662,13 @@ class Question(LoggedModel):
         verbose_name=_("Asked on"),
         default=ContainerType.ORDERPOSITION,
     )
-    question = I18nTextField(
-        verbose_name=_("Question")
+    internal_name = models.CharField(
+        verbose_name=_("Internal name"),
+        max_length=255,
+    )
+    tbd_question = I18nTextField(  # TODO(questionnaires) : to be removed
+        verbose_name=_("Internal name"),
+        null=True, blank=True, db_column="question",
     )
     identifier = models.CharField(
         max_length=190,
@@ -1663,54 +1682,63 @@ class Question(LoggedModel):
             ),
         ],
     )
-    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,
-    )
+    #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,
+    #)
     type = models.CharField(
         max_length=5,
-        choices=TYPE_CHOICES,
+        choices=FieldType.choices,
         verbose_name=_("Question type")
     )
-    required = models.BooleanField(
+    tbd_required = models.BooleanField(  # TODO(questionnaires) : to be removed, -> QuestionnaireRow
         default=False,
-        verbose_name=_("Required question")
+        verbose_name=_("Required question"),
+        db_column="required",
     )
-    items = models.ManyToManyField(
-        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(
+    # 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')
+    # )
+    tbd_position = models.PositiveIntegerField(  # TODO(questionnaires) : to be removed, -> Questionnaire + QuestionnaireRow
         default=0,
-        verbose_name=_("Position")
+        verbose_name=_("Position"),
+        db_column="position",
     )
-    ask_during_checkin = models.BooleanField(
+    tbd_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
+        default=False,
+        db_column="ask_during_checkin",
     )
     show_during_checkin = models.BooleanField(
         verbose_name=_('Show answer during check-in'),
         help_text=_('Not supported by all check-in apps for all question types.'),
         default=False
     )
-    hidden = models.BooleanField(
+    tbd_hidden = models.BooleanField(  # to be removed
         verbose_name=_('Hidden question'),
         help_text=_('This question will only show up in the backend.'),
-        default=False
+        default=False,
+        db_column="hidden",
     )
     print_on_invoice = models.BooleanField(
         verbose_name=_('Print answer on invoices'),
         default=False
     )
-    dependency_question = models.ForeignKey(
+    print_on_invoice_label = I18nTextField(
+        verbose_name=_('Label on invoice'),
+        null=True, blank=True,
+    )
+    dependency_question = models.ForeignKey(  # TODO(questionnaires) : to be removed, -> QuestionnaireRow
         '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, -> QuestionnaireRow
     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'))
@@ -1749,13 +1777,13 @@ 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 = ('internal_name', 'id')
         unique_together = (('event', 'identifier'),)
 
     def __str__(self):
-        return str(self.question)
+        return str(self.internal_name)
 
     def delete(self, *args, **kwargs):
         super().delete(*args, **kwargs)
@@ -1789,15 +1817,12 @@ class Question(LoggedModel):
 
     @property
     def sortkey(self):
-        return self.position, self.id
+        return self.id
 
     def __lt__(self, other) -> bool:
         return self.sortkey < other.sortkey
 
     def clean_answer(self, answer):
-        if self.required:
-            if not answer or (self.type == Question.TYPE_BOOLEAN and answer not in ("true", "True", True)):
-                raise ValidationError(_('An answer to this question is required to proceed.'))
         if not answer:
             if self.type == Question.TYPE_BOOLEAN:
                 return False
@@ -1902,7 +1927,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.'))
@@ -1983,6 +2008,237 @@ class QuestionOption(models.Model):
         ordering = ('position', 'id')
 
 
+class Questionnaire(LoggedModel):
+    class QuestionnaireType(models.TextChoices):
+        ORDER_PURCHASE = "order_purchase", _("Order-wide, before purchase")
+        POSITION_PURCHASE = "position_purchase", _("Per product, before purchase")
+        POSITION_ATTENDEE_ONLY = "position_attendee", _("Per product, via attendee link")
+        POSITION_CHECKIN = "position_checkin", _("Per product, at check-in")
+        POSITION_HIDDEN = "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=25,
+        choices=QuestionnaireType.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,
+    )
+    compat_personalization = models.BooleanField(default=False)
+
+    class Meta:
+        ordering = ('position', 'id')
+
+    def __str__(self) -> str:
+        return self.internal_name
+
+    @property
+    def sortkey(self):
+        return self.position, self.id
+
+    def __lt__(self, other) -> bool:
+        return self.sortkey < other.sortkey
+
+    @property
+    def ask_before_sale(self):
+        return self.type == Questionnaire.QuestionnaireType.POSITION_PURCHASE
+
+    @property
+    def ask_during_checkin(self):
+        return self.type == Questionnaire.QuestionnaireType.POSITION_CHECKIN
+
+    @property
+    def hidden(self):
+        return self.type == Questionnaire.QuestionnaireType.POSITION_HIDDEN
+
+    @staticmethod
+    def check_constraints(event):
+        errors = set()
+        all_questionnaires = Questionnaire.objects.filter(event=event).prefetch_related('rows', 'items')
+        all_sales_channels = event.sales_channels.all()
+        for (sales_channel, type, item_id, sdf, udf), fields in groupby(sorted(
+            (sales_channel, q.type, item.id, c.system_datafield or '', c.user_datafield_id or 0, q, item)
+            for q in all_questionnaires
+            for sales_channel in (q.limit_sales_channels if not q.all_sales_channels else all_sales_channels).values_list('pk', flat=True)
+            for item in q.items.all()
+            for c in q.rows.all()
+        ), key=lambda d: (d[0], d[1], d[2], d[3], d[4])):
+            fields = list(fields)
+            if len(fields) > 1:
+                sales_channel, type, item_id, sdf, udf, q, item = fields[0]
+                questionnaires = set(q for sc, type, item, sdf, udf, q, item in fields)
+                df_label = _('System data field') + f' "{sdf}"' if sdf else _('User-defined data field') + f' "{str(udf)}"'
+                if len(questionnaires) == 1:
+                    errors.add(_('{datafield} added twice to questionnaire "{questionnaire}"').format(
+                        datafield=df_label, questionnaire=next(str(q) for q in questionnaires)
+                    ))
+                else:
+                    errors.add(_('{datafield} added twice to the same item "{item}" via questionnaires "{questionnaires}"').format(
+                        datafield=df_label, item=str(item), questionnaires='" and "'.join(str(q) for q in questionnaires)
+                    ))
+        if errors:
+            raise ValidationError(list(errors))
+
+
+class QuestionnaireRow(LoggedModel):
+    class SystemDatafield(models.TextChoices):
+        ATTENDEE_NAME_PARTS = '@attendee_name_parts', _('Attendee name')
+        ATTENDEE_EMAIL = '@attendee_email', _('Attendee email')
+        COMPANY = '@company', _('Company')
+        STREET = '@street', _('Street')
+        ZIPCODE = '@zipcode', _('ZIP code')
+        CITY = '@city', _('City')
+        STATE = '@state', pgettext_lazy('address', 'State')
+        COUNTRY = '@country', _('Country')
+
+    # _name_schemes_all_fields = sorted(list(set(k for scheme in PERSON_NAME_SCHEMES.values() for k, v, w, *__ in scheme['fields'])))
+    _name_schemes_all_fields = ['calling_name', 'degree', 'family_name', 'full_name', 'given_name',
+                                'latin_transcription', 'middle_name', 'salutation', 'title']
+    SYSTEM_DATAFIELD_NUMBERS = [
+       # The index in this list is used to create fake IDs for legacy APIs, so do not reorder anything!
+       SystemDatafield.ATTENDEE_NAME_PARTS.value,
+       SystemDatafield.ATTENDEE_EMAIL.value,
+       SystemDatafield.COMPANY.value,
+       SystemDatafield.STREET.value,
+       SystemDatafield.ZIPCODE.value,
+       SystemDatafield.CITY.value,
+       SystemDatafield.STATE.value,
+       SystemDatafield.COUNTRY.value,
+    ] + [
+        '@attendee_name_parts:' + field
+        for field in _name_schemes_all_fields
+    ]
+    SYSTEM_DATAFIELD_TYPES = {
+       SystemDatafield.ATTENDEE_NAME_PARTS.value: Question.TYPE_STRING,
+       SystemDatafield.ATTENDEE_EMAIL.value: Question.TYPE_STRING,
+       SystemDatafield.COMPANY.value: Question.TYPE_STRING,
+       SystemDatafield.STREET.value: Question.TYPE_STRING,
+       SystemDatafield.ZIPCODE.value: Question.TYPE_STRING,
+       SystemDatafield.CITY.value: Question.TYPE_STRING,
+       SystemDatafield.STATE.value: Question.TYPE_STRING,
+       SystemDatafield.COUNTRY.value: Question.TYPE_COUNTRYCODE,
+    }
+
+    questionnaire = models.ForeignKey(
+        Questionnaire,
+        related_name="rows",
+        on_delete=models.CASCADE
+    )
+    position = models.PositiveIntegerField(
+        default=0,
+        verbose_name=_("Position")
+    )
+    user_datafield = models.ForeignKey(
+        Question,
+        related_name="referenced_by",
+        on_delete=models.CASCADE,
+        null=True, blank=True,
+    )
+    system_datafield = models.CharField(
+        max_length=25,
+        choices=SystemDatafield.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(
+        'QuestionnaireRow', null=True, blank=True, on_delete=models.SET_NULL, related_name='dependent_questions'
+    )
+    dependency_values = MultiStringField(default=[])
+
+    class Meta:
+        ordering = ('position', 'id')
+
+    @property
+    def datafield_type(self):
+        if self.system_datafield:
+            return QuestionnaireRow.SYSTEM_DATAFIELD_TYPES[self.system_datafield]
+        elif self.user_datafield:
+            return self.user_datafield.type
+
+    @property
+    def form_field_name(self):
+        if self.user_datafield_id:
+            return 'question_%s' % self.user_datafield_id
+        elif self.system_datafield:
+            return self.system_datafield[1:]
+        else:
+            return 'text_%s' % self.position
+
+    @property
+    def cooked_id(self):
+        if self.user_datafield_id or self.system_datafield:
+            return QuestionnaireRow.cook_id_from_parts(self.questionnaire_id, self.user_datafield_id, self.system_datafield)
+        else:
+            return None
+
+    @staticmethod
+    def cook_id_from_parts(qid, dfid, sys_df):
+        df_id = dfid + 100 if dfid else QuestionnaireRow.SYSTEM_DATAFIELD_NUMBERS.index(sys_df)
+        assert qid < 1000000000
+        return qid * 1000000000 + df_id
+
+    @staticmethod
+    def uncook_id(id):
+        id = int(id)
+        if id > 1000000000:
+            qid, dfid = divmod(id, 1000000000)
+            if dfid >= 100:
+                return qid, dfid - 100, None
+            else:
+                return qid, None, QuestionnaireRow.SYSTEM_DATAFIELD_NUMBERS[dfid]
+        else:
+            return None, id, None
+
+    def clean_answer(self, answer):
+        if not self.user_datafield:
+            raise ValueError('QuestionnaireRow.clean_answer is only implemented for rows referencing a user datafield')
+
+        if self.required:
+            if not answer or (self.user_datafield.type == Question.TYPE_BOOLEAN and answer not in ("true", "True", True)):
+                raise ValidationError(_('An answer to this question is required to proceed.'))
+
+        return self.user_datafield.clean_answer(answer)
+
+
 class Quota(LoggedModel):
     """
     A quota is a "pool of tickets". It is there to limit the number of items

src/pretix/base/models/orders.py

@@ -41,7 +41,7 @@ import logging
 import operator
 import string
 import warnings
-from collections import Counter
+from collections import Counter, namedtuple
 from datetime import datetime, time, timedelta
 from decimal import Decimal
 from functools import reduce
@@ -79,7 +79,7 @@ from pretix.base.banlist import banned
 from pretix.base.decimal import round_decimal
 from pretix.base.email import get_email_context
 from pretix.base.i18n import language
-from pretix.base.models import Customer, User
+from pretix.base.models import Customer, Questionnaire, User
 from pretix.base.reldate import RelativeDateWrapper
 from pretix.base.settings import PERSON_NAME_SCHEMES, ROUNDING_MODES
 from pretix.base.signals import allow_ticket_download, order_gracefully_delete
@@ -95,7 +95,9 @@ from ._transactions import (
 )
 from .base import LockModel, LoggedModel
 from .event import Event, SubEvent
-from .items import Item, ItemVariation, Question, QuestionOption, Quota
+from .items import (
+    Item, ItemVariation, Question, QuestionnaireRow, QuestionOption, Quota,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -108,6 +110,114 @@ def generate_position_secret():
     raise TypeError("Function no longer exists, use secret generators")
 
 
+FakeQuestionnaireRow = namedtuple('FakeQuestionnaireRow', ('user_datafield', 'label', 'answer'))
+
+
+class QuestionnaireRenderer:
+    def __init__(self, qrows, system_answers, answerlist):
+        self.qrows = qrows
+        self.row_cache = {
+            q.pk: q for q in self.qrows
+        }
+        self.system_answers = system_answers
+        self.answerlist = answerlist
+
+    def _row_is_visible(self, parentid, qvals):
+        # TODO(questionnaires): country-dependent address logic
+        if parentid is None:
+            return True
+        if parentid not in self.row_cache:
+            return False
+        parentrow = self.row_cache[parentid]
+        if not self._row_is_visible(parentrow.dependency_question_id, parentrow.dependency_values):
+            return False
+        answer_values = self.get_dependency_answer_values(parentrow)
+        return answer_values and any(qval in answer_values for qval in qvals)
+
+    def row_is_required(self, qrow):
+        # TODO(questionnaires): country-dependent address logic
+        return qrow.required and self._row_is_visible(qrow.dependency_question_id, qrow.dependency_values)
+
+    @cached_property
+    def answer_cache(self):
+        return {
+            **self.system_answers,
+            **{aw.question_id: aw for aw in self.answerlist},
+        }
+
+    def get_system_answer(self, field_name):
+        try:
+            return self.system_answers[field_name]
+        except KeyError:
+            raise KeyError('Unknown system datafield name: ' + field_name)
+
+    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')
+
+    @cached_property
+    def question_data(self) -> List[QuestionnaireRow]:
+        """
+        Returns a list of QuestionnaireRows extended with `answer` attributes, which contains either a QuestionAnswer
+        object or a string (in case of system data fields).
+        """
+        question_data = []
+        for qrow in self.qrows:
+            if not (qrow.user_datafield_id or qrow.system_datafield):
+                continue
+            try:
+                qrow.answer = self.answer_cache[qrow.user_datafield_id or qrow.system_datafield]
+            except KeyError:
+                pass
+            if self._row_is_visible(qrow.dependency_question_id, qrow.dependency_values):
+                question_data.append(qrow)
+        return question_data
+
+    def __iter__(self):
+        return iter(self.question_data)
+
+    def __bool__(self):
+        return len(self.question_data) > 0
+
+    @cached_property
+    def asked_questions(self):
+        return {qrow.user_datafield_id or qrow.system_datafield for qrow in self.question_data}
+
+    @property
+    def leftovers(self) -> List[FakeQuestionnaireRow]:
+        """
+        Returns a list of questionnaire-row-like objects for all answers that exist, but are not asked in the
+        questionnaire. These might either exist due to questionnaire changes after orders were already created,
+        or due to programmatically adding answers via the API.
+        """
+        return [FakeQuestionnaireRow(answer.question, answer.question.internal_name, answer) for answer in self.answerlist if answer.question.id not in self.asked_questions]
+
+    @property
+    def full_address_asked(self):
+        Field = QuestionnaireRow.SystemDatafield
+        return {Field.STREET, Field.ZIPCODE, Field.CITY, Field.STATE, Field.COUNTRY}.issubset(self.asked_questions)
+
+
+class OrderLevelAnswerableMixin:
+
+    @cached_property
+    def rendered_questions(self):
+        qrows = QuestionnaireRow.objects.filter(
+            Q(system_datafield__isnull=False) | Q(user_datafield_id__isnull=False),
+            Q(questionnaire__all_sales_channels=True) | Q(questionnaire__limit_sales_channels=self.sales_channel),
+            questionnaire__event=self.event,
+            questionnaire__type=Questionnaire.QuestionnaireType.ORDER_PURCHASE,
+        )
+        return QuestionnaireRenderer(qrows=qrows, system_answers={}, answerlist=self.answers.all())
+
+
 class OrderQuerySet(models.QuerySet):
     def get_with_secret_check(self, code, received_secret, tag, secret_length=64):
         dummy = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"[:secret_length]
@@ -136,7 +246,7 @@ class OrderQuerySet(models.QuerySet):
         return order
 
 
-class Order(LockModel, LoggedModel):
+class Order(OrderLevelAnswerableMixin, LockModel, LoggedModel):
     """
     An order is created when a user clicks 'buy' on his cart. It holds
     several OrderPositions and is connected to a user. It has an
@@ -918,7 +1028,7 @@ class Order(LockModel, LoggedModel):
         positions = list(
             self.positions.all().annotate(
                 has_checkin=Exists(Checkin.objects.filter(position_id=OuterRef('pk'), list__consider_tickets_used=True))
-            ).select_related('item').prefetch_related('item__questions')
+            ).select_related('item').prefetch_related('item__questionnaires')
         )
         if not self.event.settings.allow_modifications_after_checkin:
             for cp in positions:
@@ -927,9 +1037,8 @@ class Order(LockModel, LoggedModel):
 
         if self.event.settings.get('invoice_address_asked', as_type=bool) or self.event.settings.get('invoice_name_required', as_type=bool):
             return True
-        ask_names = self.event.settings.get('attendee_names_asked', as_type=bool)
         for cp in positions:
-            if (cp.item.ask_attendee_data and ask_names) or cp.item.questions.all():
+            if cp.item.get_asked_questions(questionnaire_type=Questionnaire.QuestionnaireType.POSITION_PURCHASE):
                 return True
 
         return False  # nothing there to modify
@@ -1394,6 +1503,13 @@ class QuestionAnswer(models.Model):
         elif self.checkoutsession:
             return self.checkoutsession.event
 
+    @property
+    def container_type(self):
+        if self.orderposition_id or self.cartposition_id:
+            return Question.ContainerType.ORDERPOSITION
+        elif self.order_id or self.checkoutsession_id:
+            return Question.ContainerType.ORDER
+
     def __str__(self):
         return self.to_string(use_cached=True)
 
@@ -1449,6 +1565,12 @@ class QuestionAnswer(models.Model):
         else:
             return self.answer
 
+    def to_dependency_values(self):
+        if self.question.type in (Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE):
+            return [o.identifier for o in self.options.all()]
+        elif self.question.type in (Question.TYPE_BOOLEAN, Question.TYPE_COUNTRYCODE):
+            return self.answer
+
     def save(self, *args, **kwargs):
         if self.orderposition and self.cartposition:
             raise ValueError('QuestionAnswer cannot be linked to an order and a cart position at the same time.')
@@ -1591,56 +1713,33 @@ class AbstractPosition(RoundingCorrectionMixin, models.Model):
     def meta_info_data(self, d):
         self.meta_info = json.dumps(d)
 
-    def cache_answers(self, all=True):
+    def get_questionnaire_renderer(self, questionnaire_type, sales_channel):
         """
-        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:
+        question_data: a list of QuestionnaireRow 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)
-            else:
-                questions = list(copy.copy(q) for q in self.item.questions.filter(ask_during_checkin=False,
-                                                                                  hidden=False))
+        if hasattr(self.item, 'relevant_questionnaires'):
+            qrows = list(copy.copy(qc) for qq in self.item.relevant_questionnaires for qc in qq.questionnairerowlist)
         else:
-            questions = list(copy.copy(q) for q in self.item.questions.all())
+            qrows = list(self.item.get_asked_questions(questionnaire_type=questionnaire_type, sales_channel=sales_channel))
+        return self._cache_question_data(qrows)
 
-        question_cache = {
-            q.pk: q for q in questions
+    @cached_property
+    def system_answers(self):
+        return {
+            "@attendee_name_parts": self.attendee_name,
+            "@attendee_email": self.attendee_email,
+            "@company": self.company,
+            "@street": self.street,
+            "@zipcode": self.zipcode,
+            "@city": self.city,
+            "@state": self.state,
+            "@country": str(self.country),
         }
 
-        def question_is_visible(parentid, qvals):
-            if parentid not in question_cache:
-                return False
-            parentq = question_cache[parentid]
-            if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
-                return False
-            if 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))
-            )
-
-        self.questions = []
-        for q in questions:
-            if q.id in self.answ:
-                q.answer = self.answ[q.id]
-                q.answer.question = q  # 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)
-
     @property
     def net_price(self):
         return self.price - self.tax_value
@@ -1652,20 +1751,21 @@ class AbstractPosition(RoundingCorrectionMixin, models.Model):
                 else self.variation.quotas.filter(subevent=self.subevent))
 
     def save(self, *args, **kwargs):
-        update_fields = kwargs.get('update_fields', set())
-        if 'attendee_name_parts' in update_fields:
-            kwargs['update_fields'] = {'attendee_name_cached'}.union(kwargs['update_fields'])
+        def ensure_updated(fieldname):
+            if 'update_fields' in kwargs:
+                kwargs['update_fields'] = {fieldname}.union(kwargs['update_fields'])
+
+        if 'attendee_name_parts' in kwargs.get('update_fields', set()):
+            ensure_updated('attendee_name_cached')
 
         name = self.attendee_name
         if name != self.attendee_name_cached:
             self.attendee_name_cached = name
-            if 'update_fields' in kwargs:
-                kwargs['update_fields'] = {'attendee_name_cached'}.union(kwargs['update_fields'])
+            ensure_updated('attendee_name_cached')
 
         if self.attendee_name_parts is None:
             self.attendee_name_parts = {}
-            if 'update_fields' in kwargs:
-                kwargs['update_fields'] = {'attendee_name_parts'}.union(kwargs['update_fields'])
+            ensure_updated('attendee_name_parts')
         super().save(*args, **kwargs)
 
     @property
@@ -2741,7 +2841,7 @@ class OrderPosition(AbstractPosition):
         positions = list(
             self.order.positions.all().annotate(
                 has_checkin=Exists(Checkin.objects.filter(position_id=OuterRef('pk'), list__consider_tickets_used=True))
-            ).select_related('item').prefetch_related('item__questions')
+            ).select_related('item').prefetch_related('item__questionnaires')
         )
         if not self.event.settings.allow_modifications_after_checkin:
             for cp in positions:
@@ -2751,7 +2851,7 @@ class OrderPosition(AbstractPosition):
         ask_names = self.event.settings.get('attendee_names_asked', as_type=bool)
         for cp in positions:
             if cp.pk == self.pk or cp.addon_to_id == self.pk:
-                if (cp.item.ask_attendee_data and ask_names) or cp.item.questions.all():
+                if cp.item.questionnaires.all():  # TODO(questionnaires) : filter to only QuestionnaireType.POSITION_PURCHASE
                     return True
 
         return False  # nothing there to modify
@@ -3179,7 +3279,7 @@ class Transaction(models.Model):
         return self.tax_value_includes_rounding_correction * self.count
 
 
-class CheckoutSession(models.Model):
+class CheckoutSession(OrderLevelAnswerableMixin, models.Model):
     """
     A checkout session optionally bundles cart positions with additional information. This is historically
     not required in pretix and currently only used in the Storefront API.

src/pretix/base/payment.py

@@ -72,7 +72,7 @@ from pretix.helpers.countries import CachedCountries
 from pretix.helpers.format import format_map
 from pretix.helpers.money import DecimalTextInput
 from pretix.multidomain.urlreverse import eventreverse_absolute
-from pretix.presale.views import get_cart
+from pretix.presale.views import get_cart_positions
 from pretix.presale.views.cart import cart_session, get_or_create_cart_id
 
 logger = logging.getLogger(__name__)
@@ -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 = []

src/pretix/base/pdf.py

@@ -581,11 +581,11 @@ def images_from_questions(sender, *args, **kwargs):
             return a.file
 
     d = {}
-    for q in sender.questions.all():
+    for q in sender.positiondatafields:
         if q.type != Question.TYPE_FILE:
             continue
         d['question_{}'.format(q.identifier)] = {
-            'label': _('Question: {question}').format(question=q.question),
+            'label': _('Data field: {question}').format(question=q.internal_name),
             'evaluate': partial(get_answer, question_id=q.pk, etag=False),
             'etag': partial(get_answer, question_id=q.pk, etag=True),
         }
@@ -619,18 +619,18 @@ def variables_from_questions(sender, *args, **kwargs):
             return a.to_string_i18n()
 
     d = {}
-    for q in sender.questions.all():
+    for q in sender.positiondatafields:
         if q.type == Question.TYPE_FILE:
             continue
         d['question_{}'.format(q.identifier)] = {
-            'label': _('Question: {question}').format(question=q.question),
-            'editor_sample': _('<Answer: {question}>').format(question=q.question),
+            'label': _('Data field: {question}').format(question=q.internal_name),
+            'editor_sample': _('<Answer: {question}>').format(question=q.internal_name),
             'evaluate': partial(get_answer, question_id=q.pk),
             'migrate_from': 'question_{}'.format(q.pk)
         }
         d['question_{}'.format(q.pk)] = {
-            'label': _('Question: {question}').format(question=q.question),
-            'editor_sample': _('<Answer: {question}>').format(question=q.question),
+            'label': _('Data field: {question}').format(question=q.internal_name),
+            'editor_sample': _('<Answer: {question}>').format(question=q.internal_name),
             'evaluate': partial(get_answer, question_id=q.pk),
             'hidden': True,
         }

src/pretix/base/services/cart.py

@@ -1410,10 +1410,11 @@ class CartManager:
                         for k, v in self._widget_data.items():
                             if not k.startswith('question-'):
                                 continue
+                            # TODO(questionnaires)  -  switch to QuestionnaireRow
                             q = cp.item.questions.filter(ask_during_checkin=False, identifier__iexact=k[9:]).first()
                             if q:
                                 try:
-                                    cp._answers[q] = q.clean_answer(v)
+                                    cp._answers[q] = q.clean_answer(v)  # TODO(questionnaires)  -  switch to row.clean_answer
                                 except ValidationError:
                                     pass
 

src/pretix/base/services/checkin.py

@@ -35,6 +35,7 @@ import logging
 import os
 from datetime import datetime, timedelta, timezone
 from functools import partial, reduce
+from typing import List
 
 import dateutil
 import dateutil.parser
@@ -55,8 +56,9 @@ from django_scopes import scope, scopes_disabled
 
 from pretix.base.models import (
     Checkin, CheckinList, Device, Event, Gate, Item, ItemVariation, Order,
-    OrderPosition, QuestionOption,
+    OrderPosition, Questionnaire, QuestionnaireRow, QuestionOption,
 )
+from pretix.base.models.orders import QuestionnaireRenderer
 from pretix.base.signals import checkin_created, periodic_task
 from pretix.helpers import OF_SELF
 from pretix.helpers.database import conditional_atomic
@@ -861,10 +863,10 @@ class CheckInError(Exception):
 
 
 class RequiredQuestionsError(Exception):
-    def __init__(self, msg, code, questions):
+    def __init__(self, msg, code, questionnaire_rows: List[QuestionnaireRow]):
         self.msg = msg
         self.code = code
-        self.questions = questions
+        self.questionnaire_rows = questionnaire_rows
         super().__init__(msg)
 
 
@@ -897,14 +899,14 @@ def _save_answers(op, answers, given_answers):
     written = False
     for q, a in given_answers.items():
         if not a:
-            if q in answers:
+            if q.id in answers:
                 written = True
-                answers[q].delete()
+                answers[q.id].delete()
             else:
                 continue
         if isinstance(a, QuestionOption):
-            if q in answers:
-                qa = answers[q]
+            if q.id in answers:
+                qa = answers[q.id]
                 qa.answer = str(a.answer)
                 qa.save()
                 written = True
@@ -913,8 +915,8 @@ def _save_answers(op, answers, given_answers):
                 qa = _create_answer(question=q, answer=str(a.answer))
             qa.options.add(a)
         elif isinstance(a, list):
-            if q in answers:
-                qa = answers[q]
+            if q.id in answers:
+                qa = answers[q.id]
                 qa.answer = ", ".join([str(o) for o in a])
                 qa.save()
                 written = True
@@ -923,8 +925,8 @@ def _save_answers(op, answers, given_answers):
                 qa = _create_answer(question=q, answer=", ".join([str(o) for o in a]))
             qa.options.add(*a)
         elif isinstance(a, File):
-            if q in answers:
-                qa = answers[q]
+            if q.id in answers:
+                qa = answers[q.id]
             else:
                 qa = _create_answer(question=q, answer=str(a))
             qa.file.save(os.path.basename(a.name), a, save=False)
@@ -932,8 +934,8 @@ def _save_answers(op, answers, given_answers):
             qa.save()
             written = True
         else:
-            if q in answers:
-                qa = answers[q]
+            if q.id in answers:
+                qa = answers[q.id]
                 qa.answer = str(a)
                 qa.save()
             else:
@@ -1033,17 +1035,20 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
 
     # Do this outside of transaction so it is saved even if the checkin fails for some other reason
     checkin_questions = list(
-        clist.event.questions.filter(ask_during_checkin=True, items__in=[op.item_id])
+        QuestionnaireRow.objects.filter(
+            questionnaire__event=clist.event, questionnaire__type=Questionnaire.QuestionnaireType.POSITION_CHECKIN,
+            questionnaire__items__in=[op.item_id],
+        ).select_related('user_datafield', 'questionnaire')
     )
     require_answers = []
     if type != Checkin.TYPE_EXIT and checkin_questions:
-        answers = {a.question: a for a in op.answers.all()}
+        qrenderer = QuestionnaireRenderer(qrows=[], system_answers=op.system_answers, answerlist=op.answers.all())
         for q in checkin_questions:
-            if q not in given_answers and q not in answers:
+            if q.user_datafield not in given_answers and q.user_datafield_id not in qrenderer.answer_cache:
                 require_answers.append(q)
 
         if not simulate:
-            _save_answers(op, answers, given_answers)
+            _save_answers(op, qrenderer.answer_cache, given_answers)
 
     with conditional_atomic(not simulate):
         # Lock order positions, if it is an entry. We don't need it for exits, as a race condition wouldn't be problematic
@@ -1110,7 +1115,7 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
             raise RequiredQuestionsError(
                 _('You need to answer questions to complete this check-in.'),
                 'incomplete',
-                require_answers
+                questionnaire_rows=require_answers,
             )
 
         required_media_policy = op.item.media_policy

src/pretix/base/services/invoices.py

@@ -279,13 +279,13 @@ def build_invoice(invoice: Invoice) -> Invoice:
             ).select_related(
                 'question'
             ).order_by(
-                'question__position',
+                'question__internal_name',
                 'question__id'
             )
             for answ in answers_qs:
                 desc += "<br />{}{} {}".format(
-                    answ.question.question,
-                    "" if str(answ.question.question).endswith("?") else ":",
+                    answ.question.print_on_invoice_label,
+                    "" if str(answ.question.print_on_invoice_label).endswith("?") else ":",
                     answ.to_string_i18n()
                 )
 

src/pretix/base/settings.py

@@ -379,99 +379,12 @@ DEFAULTS = {
 
         )
     },
-    'system_question_order': {
-        'default': {},
-        'type': dict,
-        'serializer_class': serializers.DictField,
-        'serializer_kwargs': lambda: dict(read_only=True, allow_empty=True),
-    },
-    'attendee_names_asked': {
-        'default': 'True',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_("Ask for attendee names"),
-            help_text=_("Ask for a name for all personalized tickets."),
-        )
-    },
-    'attendee_names_required': {
-        'default': 'False',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_("Require attendee names"),
-            help_text=_("Require customers to fill in the names of all attendees."),
-            widget=forms.CheckboxInput(attrs={'data-checkbox-dependency': '#id_settings-attendee_names_asked'}),
-        )
-    },
-    'attendee_emails_asked': {
-        'default': 'False',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_("Ask for email addresses per ticket"),
-            help_text=_("Normally, pretix asks for one email address per order and the order confirmation will be sent "
-                        "only to that email address. If you enable this option, the system will additionally ask for "
-                        "individual email addresses for every personalized ticket. This might be useful if you want to "
-                        "obtain individual addresses for every attendee even in case of group orders. However, "
-                        "pretix will send the order confirmation by default only to the one primary email address, not to "
-                        "the per-attendee addresses. You can however enable this in the email settings."),
-        )
-    },
-    'attendee_emails_required': {
-        'default': 'False',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_("Require email addresses per ticket"),
-            help_text=_("Require customers to fill in individual email addresses for all personalized tickets. See the "
-                        "above option for more details. One email address for the order confirmation will always be "
-                        "required regardless of this setting."),
-            widget=forms.CheckboxInput(attrs={'data-checkbox-dependency': '#id_settings-attendee_emails_asked'}),
-        )
-    },
-    'attendee_company_asked': {
-        'default': 'False',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_("Ask for company per ticket"),
-        )
-    },
-    'attendee_company_required': {
-        'default': 'False',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_("Require company per ticket"),
-            widget=forms.CheckboxInput(attrs={'data-checkbox-dependency': '#id_settings-attendee_company_asked'}),
-        )
-    },
-    'attendee_addresses_asked': {
-        'default': 'False',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_("Ask for postal addresses per ticket"),
-        )
-    },
-    'attendee_addresses_required': {
-        'default': 'False',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_("Require postal addresses per ticket"),
-            widget=forms.CheckboxInput(attrs={'data-checkbox-dependency': '#id_settings-attendee_addresses_asked'}),
-        )
-    },
+    # 'system_question_order': {  # TODO(questionnaires) - remove this
+    #     'default': {},
+    #     'type': dict,
+    #     'serializer_class': serializers.DictField,
+    #     'serializer_kwargs': lambda: dict(read_only=True, allow_empty=True),
+    # },
     'order_email_asked_twice': {
         'default': 'False',
         'type': bool,
@@ -3438,19 +3351,6 @@ Your {organizer} team"""))  # noqa: W291
                         "how to obtain a voucher code.")
         )
     },
-    'attendee_data_explanation_text': {
-        'default': '',
-        'type': LazyI18nString,
-        'serializer_class': I18nField,
-        'form_class': I18nFormField,
-        'form_kwargs': dict(
-            label=_("Attendee data explanation"),
-            widget=I18nMarkdownTextarea,
-            widget_kwargs={'attrs': {'rows': '2'}},
-            help_text=_("This text will be shown above the questions asked for every personalized product. You can use it e.g. to explain "
-                        "why you need information from them.")
-        )
-    },
     'checkout_success_text': {
         'default': '',
         'type': LazyI18nString,
@@ -4056,6 +3956,7 @@ PERSON_NAME_SCHEMES = OrderedDict([
             '_scheme': 'salutation_title_given_family_degree',
         },
     }),
+    # If new schemes add new fields, update QuestionnaireRow._name_schemes_all_fields
 ])
 
 DEFAULTS['name_scheme']['serializer_kwargs']['choices'] = ((k, k) for k in PERSON_NAME_SCHEMES)
@@ -4172,14 +4073,6 @@ def validate_event_settings(event, settings_dict):
         raise ValidationError({
             'locale': _('Your default locale must also be enabled for your event (see box above).')
         })
-    if settings_dict.get('attendee_names_required') and not settings_dict.get('attendee_names_asked'):
-        raise ValidationError({
-            'attendee_names_required': _('You cannot require specifying attendee names if you do not ask for them.')
-        })
-    if settings_dict.get('attendee_emails_required') and not settings_dict.get('attendee_emails_asked'):
-        raise ValidationError({
-            'attendee_emails_required': _('You have to ask for attendee emails if you want to make them required.')
-        })
     if settings_dict.get('invoice_address_required') and not settings_dict.get('invoice_address_asked'):
         raise ValidationError({
             'invoice_address_required': _('You have to ask for invoice addresses if you want to make them required.')

src/pretix/base/views/mixins.py

@@ -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,11 +37,12 @@ from pretix.base.forms.questions import (
 )
 from pretix.base.models import (
     CartPosition, InvoiceAddress, OrderPosition, Question, QuestionAnswer,
-    QuestionOption,
+    Questionnaire, QuestionnaireRow, QuestionOption,
 )
 from pretix.base.models.customers import AttendeeProfile
 from pretix.base.models.orders import CheckoutSession, Order
 from pretix.presale.signals import contact_form_fields_overrides
+from pretix.presale.views import prefetch_relevant_questionnaires
 
 
 class BaseQuestionsViewMixin:
@@ -107,20 +108,16 @@ class BaseQuestionsViewMixin:
             )
             form.pos = cartpos or orderpos
             form.show_copy_answers_to_addon_button = form.pos.addon_to and (
-                set(form.pos.addon_to.item.questions.all()) & set(form.pos.item.questions.all()) or
-                (form.pos.addon_to.item.ask_attendee_data and form.pos.item.ask_attendee_data and (
-                    self.request.event.settings.attendee_names_asked or
-                    self.request.event.settings.attendee_emails_asked or
-                    self.request.event.settings.attendee_company_asked or
-                    self.request.event.settings.attendee_addresses_asked
-                ))
+                # TODO(questionnaires)  -  prefetch this
+                set(qc.form_field_name for qc in form.pos.addon_to.item.get_asked_questions(questionnaire_type=Questionnaire.QuestionnaireType.POSITION_PURCHASE))
+                & set(qc.form_field_name for qc in form.pos.item.get_asked_questions(questionnaire_type=Questionnaire.QuestionnaireType.POSITION_PURCHASE))
             )
 
             override_sets = self.get_question_override_sets(cr, idx)
             for overrides in override_sets:
                 for question_name, question_field in form.fields.items():
-                    if hasattr(question_field, 'question'):
-                        src = overrides.get(question_field.question.identifier)
+                    if hasattr(question_field, 'datafield'):
+                        src = overrides.get(question_field.datafield.identifier)
                     else:
                         src = overrides.get(question_name)
                     if not src:
@@ -184,7 +181,7 @@ class BaseQuestionsViewMixin:
                                 field, v,
                                 checkoutsession=checkoutsession,
                                 order=order,
-                                question=field.question,
+                                question=field.datafield,
                             )
 
         for form in self.forms:
@@ -246,7 +243,7 @@ class BaseQuestionsViewMixin:
                                 field, v,
                                 cartposition=cartposition,
                                 orderposition=orderposition,
-                                question=field.question,
+                                question=field.datafield,
                             )
 
                             answer_dict = self._build_answer_dict(field, answer, k)
@@ -331,8 +328,8 @@ class BaseQuestionsViewMixin:
             'field_name': k,
             'field_label': str(field.label),
             'value': answer_value,
-            'question_type': field.question.type,
-            'question_identifier': field.question.identifier,
+            'question_type': field.datafield.type,
+            'question_identifier': field.datafield.identifier,
         }
 
 
@@ -348,27 +345,17 @@ class OrderQuestionsViewMixin(BaseQuestionsViewMixin):
 
     @cached_property
     def positions(self):
-        qqs = self.request.event.questions.all()
         if self.only_user_visible:
-            qqs = qqs.filter(ask_during_checkin=False, hidden=False, container_type=Question.ContainerType.ORDERPOSITION)
+            type = Questionnaire.QuestionnaireType.POSITION_PURCHASE
+        else:
+            type = None
         return list(self.order.positions.select_related(
             'item', 'variation'
         ).prefetch_related(
             Prefetch('answers',
                      QuestionAnswer.objects.prefetch_related('options'),
                      to_attr='answerlist'),
-            Prefetch('item__questions',
-                     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_relevant_questionnaires(self.request.event, self.order.sales_channel.identifier, type),
         ))
 
     @cached_property

src/pretix/base/views/redirect.py

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

src/pretix/control/forms/event.py

@@ -639,15 +639,6 @@ class EventSettingsForm(EventSettingsValidationMixin, FormPlaceholderMixin, Sett
         'event_calendar_future_only',
         'frontpage_text',
         'event_info_text',
-        'attendee_names_asked',
-        'attendee_names_required',
-        'attendee_emails_asked',
-        'attendee_emails_required',
-        'attendee_company_asked',
-        'attendee_company_required',
-        'attendee_addresses_asked',
-        'attendee_addresses_required',
-        'attendee_data_explanation_text',
         'order_phone_asked',
         'order_phone_required',
         'checkout_phone_helptext',

src/pretix/control/forms/filter.py

@@ -728,7 +728,7 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
         self.fields['quota'].widget.choices = self.fields['quota'].choices
         for q in self.event.questions.all():
             kwargs = {
-                "label": q.question,
+                "label": q.internal_name,
                 "required": False,
             }
             fname = 'question_{}'.format(q.pk)
@@ -887,29 +887,30 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
             ).distinct()
         for q in self.event.questions.all():
             if fdata.get(f'question_{q.pk}'):
+                ref = {'orderposition__order_id': OuterRef('pk')} if q.container_type == Question.ContainerType.ORDERPOSITION else {'order_id': OuterRef('pk')}
                 if q.type in (Question.TYPE_BOOLEAN, Question.TYPE_NUMBER):
                     answers = QuestionAnswer.objects.filter(
                         question_id=q.pk,
-                        orderposition__order_id=OuterRef('pk'),
-                        answer__exact=fdata.get(f'question_{q.pk}')
+                        answer__exact=fdata.get(f'question_{q.pk}'),
+                        **ref,
                     )
                 elif q.type in (Question.TYPE_DATE, Question.TYPE_TIME, Question.TYPE_DATETIME):
                     answers = QuestionAnswer.objects.filter(
                         question_id=q.pk,
-                        orderposition__order_id=OuterRef('pk'),
-                        answer__exact=str(fdata.get(f'question_{q.pk}'))
+                        answer__exact=str(fdata.get(f'question_{q.pk}')),
+                        **ref,
                     )
                 elif q.type in (Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE):
                     answers = QuestionAnswer.objects.filter(
                         question_id=q.pk,
-                        orderposition__order_id=OuterRef('pk'),
-                        options=fdata.get(f'question_{q.pk}')
+                        options=fdata.get(f'question_{q.pk}'),
+                        **ref,
                     )
                 else:
                     answers = QuestionAnswer.objects.filter(
                         question_id=q.pk,
-                        orderposition__order_id=OuterRef('pk'),
-                        answer__iexact=fdata.get(f'question_{q.pk}')
+                        answer__iexact=fdata.get(f'question_{q.pk}'),
+                        **ref,
                     )
                 qs = qs.annotate(**{f'q_{q.pk}': Exists(answers)}).filter(**{f'q_{q.pk}': True})
 

src/pretix/control/forms/item.py

@@ -60,12 +60,13 @@ from pretix.base.models import (
     Item, ItemCategory, ItemProgramTime, ItemVariation, Question,
     QuestionOption, Quota,
 )
-from pretix.base.models.items import ItemAddOn, ItemBundle, ItemMetaValue
+from pretix.base.models.items import (
+    ItemAddOn, ItemBundle, ItemMetaValue, Questionnaire,
+)
 from pretix.base.signals import item_copy_data
 from pretix.control.forms import (
-    ButtonGroupRadioSelect, ExtFileField, ItemMultipleChoiceField,
-    SalesChannelCheckboxSelectMultiple, SplitDateTimeField,
-    SplitDateTimePickerWidget,
+    ButtonGroupRadioSelect, ExtFileField, SalesChannelCheckboxSelectMultiple,
+    SplitDateTimeField, SplitDateTimePickerWidget,
 )
 from pretix.control.forms.widgets import Select2, Select2ItemVarMulti
 from pretix.helpers.models import modelcopy
@@ -145,61 +146,16 @@ class CategoryForm(I18nModelForm):
 
 
 class QuestionForm(I18nModelForm):
-    question = I18nFormField(
-        label=_("Question"),
-        widget_kwargs={'attrs': {'rows': 2}},
-        widget=I18nTextarea
-    )
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if self.instance.container_type == Question.ContainerType.ORDERPOSITION:
-            self.fields['items'].queryset = self.instance.event.items.all()
-            self.fields['items'].required = True
-        else:
-            del self.fields['items']
-            del self.fields['ask_during_checkin']
+        if self.instance.container_type != Question.ContainerType.ORDERPOSITION:
             del self.fields['show_during_checkin']
             del self.fields['print_on_invoice']
-        self.fields['dependency_question'].widget.attrs['data-container-type'] = self.instance.container_type
-        self.fields['dependency_question'].queryset = self.instance.event.questions.filter(
-            type__in=(Question.TYPE_BOOLEAN, Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE),
-            ask_during_checkin=False,
-            container_type=self.instance.container_type,
-        )
-        if self.instance.pk:
-            self.fields['dependency_question'].queryset = self.fields['dependency_question'].queryset.exclude(
-                pk=self.instance.pk
-            )
+            del self.fields['print_on_invoice_label']
+        else:
+            self.fields['print_on_invoice_label'].widget.attrs['data-display-dependency'] = '#id_print_on_invoice'
+            self.fields['print_on_invoice_label'].widget.attrs['rows'] = '2'
         self.fields['identifier'].required = False
-        self.fields['dependency_values'].required = False
-        self.fields['help_text'].widget.attrs['rows'] = 3
-
-    def clean_dependency_values(self):
-        val = self.data.getlist('dependency_values')
-        return val
-
-    def clean_dependency_question(self):
-        dep = val = self.cleaned_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 val
-
-    def clean_ask_during_checkin(self):
-        val = self.cleaned_data.get('ask_during_checkin')
-
-        if val and self.cleaned_data.get('type') in Question.ASK_DURING_CHECKIN_UNSUPPORTED:
-            raise ValidationError(_('This type of question cannot be asked during check-in.'))
-
-        return val
 
     def clean_show_during_checkin(self):
         val = self.cleaned_data.get('show_during_checkin')
@@ -232,18 +188,12 @@ class QuestionForm(I18nModelForm):
         model = Question
         localized_fields = '__all__'
         fields = [
-            'question',
-            'help_text',
+            'internal_name',
             'type',
-            'required',
-            'ask_during_checkin',
             'show_during_checkin',
-            'hidden',
             'identifier',
-            'items',
-            'dependency_question',
-            'dependency_values',
             'print_on_invoice',
+            'print_on_invoice_label',
             'valid_number_min',
             'valid_number_max',
             'valid_datetime_min',
@@ -259,17 +209,11 @@ class QuestionForm(I18nModelForm):
             'valid_datetime_max': SplitDateTimePickerWidget(without_seconds=True),
             'valid_date_min': DatePickerWidget(),
             'valid_date_max': DatePickerWidget(),
-            'items': forms.CheckboxSelectMultiple(
-                attrs={'class': 'scrolling-multiple-choice'}
-            ),
-            'dependency_values': forms.SelectMultiple,
             'help_text': I18nMarkdownTextarea,
         }
         field_classes = {
             'valid_datetime_min': SplitDateTimeField,
             'valid_datetime_max': SplitDateTimeField,
-            'items': ItemMultipleChoiceField,
-            'dependency_question': SafeModelChoiceField,
         }
 
 
@@ -447,13 +391,20 @@ class ItemCreateForm(I18nModelForm):
                                         help_text=_('Select this option e.g. for t-shirts that come in multiple sizes. '
                                                     'You can select the variations in the next step.'),
                                         required=False)
+    questionnaires = SafeModelMultipleChoiceField(
+        queryset=Questionnaire.objects.none(),
+        required=False,
+        label=_('Questionnaires'),
+        widget=forms.CheckboxSelectMultiple(attrs={
+            'class': 'scrolling-multiple-choice'
+        }),
+    )
 
     def __init__(self, *args, **kwargs):
         self.event = kwargs['event']
         self.user = kwargs.pop('user')
         kwargs.setdefault('initial', {})
         kwargs['initial'].setdefault('admission', True)
-        kwargs['initial'].setdefault('personalized', True)
         super().__init__(*args, **kwargs)
 
         self.fields['category'].queryset = self.instance.event.categories.all()
@@ -469,6 +420,8 @@ class ItemCreateForm(I18nModelForm):
         )
         self.fields['category'].widget.choices = self.fields['category'].choices
 
+        self.fields['questionnaires'].queryset = self.instance.event.questionnaires.filter(type__startswith='position_')
+
         self.fields['tax_rule'].queryset = self.instance.event.tax_rules.all()
         change_decimal_field(self.fields['default_price'], self.instance.event.currency)
         self.fields['copy_from'] = forms.ModelChoiceField(
@@ -575,10 +528,15 @@ class ItemCreateForm(I18nModelForm):
                 self.instance.picture.save(os.path.basename(src.picture.name), src.picture)
 
         self.instance.position = (self.event.items.aggregate(p=Max('position'))['p'] or 0) + 1
-        if not self.instance.admission:
-            self.instance.personalized = False
         instance = super().save(*args, **kwargs)
 
+        instance.questionnaires.clear()
+        instance.questionnaires.add(*self.cleaned_data['questionnaires'])
+        try:
+            Questionnaire.check_constraints(self.event)
+        except ValidationError as exc:
+            raise ValidationError({'questionnaires': exc})
+
         if not self.event.has_subevents and not self.cleaned_data.get('has_variations'):
             if self.cleaned_data.get('quota_option') == self.EXISTING and self.cleaned_data.get('quota_add_existing') is not None:
                 quota = self.cleaned_data.get('quota_add_existing')
@@ -669,7 +627,6 @@ class ItemCreateForm(I18nModelForm):
             'internal_name',
             'category',
             'admission',
-            'personalized',
             'default_price',
             'tax_rule',
         ]
@@ -702,6 +659,14 @@ class ItemUpdateForm(I18nModelForm):
         max_size=settings.FILE_UPLOAD_MAX_SIZE_IMAGE,
         required=False,
     )
+    questionnaires = SafeModelMultipleChoiceField(
+        queryset=Questionnaire.objects.none(),
+        required=False,
+        label=_('Questionnaires'),
+        widget=forms.CheckboxSelectMultiple(attrs={
+            'class': 'scrolling-multiple-choice'
+        }),
+    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -797,6 +762,9 @@ class ItemUpdateForm(I18nModelForm):
         )
         self.fields['category'].widget.choices = self.fields['category'].choices
 
+        self.fields['questionnaires'].queryset = self.instance.event.questionnaires.filter(type__startswith='position_')
+        self.initial['questionnaires'] = self.instance.questionnaires.values_list('pk', flat=True)
+
         self.fields['free_price_suggestion'].widget.attrs['data-display-dependency'] = '#id_free_price'
 
         self.fields['validity_dynamic_start_choice'] = forms.TypedChoiceField(
@@ -860,11 +828,8 @@ class ItemUpdateForm(I18nModelForm):
                 )
             )
 
-        if not d.get('admission'):
-            d['personalized'] = False
-
         if d.get('grant_membership_type'):
-            if not d['grant_membership_type'].transferable and not d['personalized']:
+            if not d['grant_membership_type'].transferable and not d['personalized']:  # TODO(questionnaires)
                 self.add_error(
                     'personalized' if d.get('admission') else 'admission',
                     _("Your product grants a non-transferable membership and should therefore be a personalized "
@@ -891,6 +856,16 @@ class ItemUpdateForm(I18nModelForm):
 
         return d
 
+    def save(self, *args, **kwargs):
+        instance = super().save(*args, **kwargs)
+        instance.questionnaires.clear()
+        instance.questionnaires.add(*self.cleaned_data['questionnaires'])
+        try:
+            Questionnaire.check_constraints(self.event)
+        except ValidationError as exc:
+            raise ValidationError({'questionnaires': exc})
+        return instance
+
     class Meta:
         model = Item
         localized_fields = '__all__'
@@ -902,7 +877,6 @@ class ItemUpdateForm(I18nModelForm):
             'all_sales_channels',
             'limit_sales_channels',
             'admission',
-            'personalized',
             'description',
             'picture',
             'default_price',
@@ -1197,6 +1171,10 @@ class ItemAddOnForm(I18nModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['addon_category'].queryset = self.event.categories.all()
+        self.fields['addon_category'].help_text = format_html('<a href="{}" data-iframe-dialog="true" data-iframe-dialog-target="<[name$=addon_category]" target="_blank">{}</a>', reverse('control:event.items.categories.add', kwargs={
+                    'event': self.event.slug,
+                    'organizer': self.event.organizer.slug,
+                }), _("Create a new category"))
         self.fields['addon_category'].widget = Select2(
             attrs={
                 'data-model-select2': 'generic',

src/pretix/control/logdisplay.py

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

src/pretix/control/navigation.py

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

src/pretix/control/templates/pretixcontrol/checkin/simulator.html

@@ -76,7 +76,7 @@
                         {% for q in result.questions %}
                             <li>
                                 <a href="{% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}">
-                                    {{ q.question }}
+                                    {{ q.internal_name }}
                                 </a>
                             </li>
                         {% endfor %}
@@ -115,7 +115,7 @@
                             {% if a.question.show_during_checkin %}
                                 <p>
                                     <span class="fa fa-question-circle text-muted fa-fw"></span>
-                                    <strong>{{ a.question.question }}</strong>
+                                    <strong>{{ a.question.internal_name }}</strong>
                                     {{ a }}
                                 </p>
                             {% endif %}

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

@@ -4,6 +4,7 @@
 {% load static %}
 {% load hierarkey_form %}
 {% load formset_tags %}
+{% load icon %}
 {% block title %}{% trans "General settings" %}{% endblock %}
 {% block custom_header %}
     {{ block.super }}
@@ -94,13 +95,6 @@
                     </div>
                 </div>
 
-                <h4>{% trans "Attendee data (once per personalized ticket)" %}</h4>
-
-                {% bootstrap_field sform.attendee_names_asked_required layout="control" %}
-                {% bootstrap_field sform.attendee_emails_asked_required layout="control" %}
-                {% bootstrap_field sform.attendee_company_asked_required layout="control" %}
-                {% bootstrap_field sform.attendee_addresses_asked_required layout="control" %}
-
                 <div class="form-group">
                     <label class="control-label col-md-3">
                         {% trans "Custom fields" %}
@@ -109,12 +103,30 @@
                         <p>
                             <a href="{% url "control:event.items.questions" event=request.event.slug organizer=request.organizer.slug %}"
                                target="_blank">
-                                {% trans "Manage questions" %}
+                                {% trans "Manage questionnaires" %}
+                            </a>
+                        </p>
+                    </div>
+                </div>
+
+                <h4>{% trans "Attendee data (once per personalized ticket)" %}</h4>
+
+                <div class="form-group">
+                    <label class="control-label col-md-3">
+                    </label>
+                    <div class="col-md-9 static-form-row">
+                        <p>
+                            <a href="{% url "control:event.items.questionnaires" event=request.event.slug organizer=request.organizer.slug %}"
+                               target="_blank" class="btn btn-default">
+                                {% icon "wrench" %} {% trans "Manage questionnaires" %}
+                            </a>
+                            <a href="{% url "control:event.items.questions" event=request.event.slug organizer=request.organizer.slug %}"
+                               target="_blank" class="btn btn-default">
+                                {% icon "wrench" %} {% trans "Manage data fields" %}
                             </a>
                         </p>
                     </div>
                 </div>
-                {% bootstrap_field sform.attendee_data_explanation_text layout="control" %}
 
                 <h4>{% trans "Form settings" %}</h4>
                 {% bootstrap_field sform.name_scheme layout="control" %}

src/pretix/control/templates/pretixcontrol/item/create.html

@@ -64,47 +64,7 @@
                 </div>
             </div>
 
-            <div class="form-group" data-display-dependency="#admission_on">
-                <label class="col-md-3 control-label">{% trans "Personalization" %}</label>
-                <div class="col-md-9">
-                    <div class="big-radio radio">
-                        <label>
-                            <input type="radio" value="on" name="{{ form.personalized.html_name }}" {% if form.personalized.value %}checked{% endif %}>
-                            <span class="fa fa-fw fa-id-card-o"></span>
-                            <strong>{% trans "Personalized ticket" %}</strong><br>
-                            <div class="help-block">
-                                {% blocktrans trimmed %}
-                                    When this ticket is purchased, the system will ask for a name or other details according
-                                    to your event settings.
-                                {% endblocktrans %}
-                                {% if not request.event.settings.attendee_names_asked and not request.event.settings.attendee_emails_asked and not request.event.settings.attendee_company_asked and not request.event.settings.attendee_addresses_asked %}
-                                    <br>
-                                    <span class="text-warning">
-                                        <span class="fa fa-warning" aria-hidden="true"></span>
-                                        {% trans "This will currently have no effect since all data fields are turned off in event settings." %}
-                                    </span>
-                                    <a href="{% url "control:event.settings" organizer=request.event.organizer.slug event=request.event.slug %}#tab-0-2-open"
-                                       class="btn btn-default btn-xs" target="_blank">{% trans "Change settings" %}</a>
-                               {% endif %}
-                            </div>
-                        </label>
-                    </div>
-                    <div class="big-radio radio">
-                        <label>
-                            <input type="radio" value="" name="{{ form.personalized.html_name }}" {% if not form.personalized.value %}checked{% endif %}>
-                            <span class="fa fa-fw fa-circle-o"></span>
-                            <strong>{% trans "Non-personalized ticket" %}</strong>
-                            <div class="help-block">
-                                {% blocktrans trimmed %}
-                                    The system will not ask for a name or other attendee details. This only affects
-                                    system-provided fields, you can still add your own questions.
-                                {% endblocktrans %}
-                            </div>
-                        </label>
-                    </div>
-                </div>
-            </div>
-
+            {% bootstrap_field form.questionnaires layout="control" %}
             {% bootstrap_field form.category layout="control" %}
 
             <div class="form-group">

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

@@ -72,51 +72,7 @@
                             </div>
                         </div>
 
-                        <div class="form-group" data-display-dependency="#admission_on">
-                            <label class="col-md-3 control-label">{% trans "Personalization" %}</label>
-                            <div class="col-md-9">
-                                {% for e in form.errors.personalized %}
-                                    <div class="alert alert-danger has-error">
-                                        {{ e }}
-                                    </div>
-                                {% endfor %}
-                                <div class="big-radio radio">
-                                    <label>
-                                        <input type="radio" value="on" name="{{ form.personalized.html_name }}" {% if form.personalized.value %}checked{% endif %}>
-                                        <span class="fa fa-fw fa-id-card-o"></span>
-                                        <strong>{% trans "Personalized ticket" %}</strong><br>
-                                        <div class="help-block">
-                                            {% blocktrans trimmed %}
-                                                When this ticket is purchased, the system will ask for a name or other details according
-                                                to your event settings.
-                                            {% endblocktrans %}
-                                            {% if not request.event.settings.attendee_names_asked and not request.event.settings.attendee_emails_asked and not request.event.settings.attendee_company_asked and not request.event.settings.attendee_addresses_asked %}
-                                                <br>
-                                                <span class="text-warning">
-                                                    <span class="fa fa-warning" aria-hidden="true"></span>
-                                                    {% trans "This will currently have no effect since all data fields are turned off in event settings." %}
-                                                </span>
-                                                <a href="{% url "control:event.settings" organizer=request.event.organizer.slug event=request.event.slug %}#tab-0-2-open"
-                                                   class="btn btn-default btn-xs" target="_blank">{% trans "Change settings" %}</a>
-                                            {% endif %}
-                                        </div>
-                                    </label>
-                                </div>
-                                <div class="big-radio radio">
-                                    <label>
-                                        <input type="radio" value="" name="{{ form.personalized.html_name }}" {% if not form.personalized.value %}checked{% endif %}>
-                                        <span class="fa fa-fw fa-file-text-o"></span>
-                                        <strong>{% trans "Non-personalized ticket" %}</strong>
-                                        <div class="help-block">
-                                            {% blocktrans trimmed %}
-                                                The system will not ask for a name or other attendee details. This only affects
-                                                system-provided fields, you can still add your own questions.
-                                            {% endblocktrans %}
-                                        </div>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
+                        {% bootstrap_field form.questionnaires layout="control" %}
 
                         {% bootstrap_field form.description layout="control" %}
                         {% bootstrap_field form.picture layout="control" %}

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

@@ -45,6 +45,7 @@
                     <th class="iconcol"></th>
                     <th class="iconcol"></th>
                     <th class="iconcol"></th>
+                    <th class="iconcol"></th>
                     <th class="text-right flip">{% trans "Default price" %}</th>
                     <th class="action-col-2"><span class="sr-only">Edit</span></th>
                 </tr>
@@ -108,15 +109,25 @@
                             </td>
                             <td>
                                 {% if i.admission %}
-                                    {% if i.personalized %}
-                                        <span class="fa fa-id-card-o fa-fw text-muted" data-toggle="tooltip" title="{% trans "Personalized admission ticket" %}"></span>
-                                    {% else %}
-                                        <span class="fa fa-user fa-fw text-muted" data-toggle="tooltip" title="{% trans "Admission ticket without personalization" %}"></span>
-                                    {% endif %}
+                                    <span class="fa fa-user fa-fw text-muted" data-toggle="tooltip" title="{% trans "Admission ticket" %}"></span>
                                 {% elif i.issue_giftcard %}
                                     <span class="fa fa-gift fa-fw text-muted" data-toggle="tooltip" title="{% trans "Gift card" %}"></span>
                                 {% endif %}
                             </td>
+                            <td>
+                                {% if i.attendee_data_required %}
+                                    <i class="fa-stack fa-stack-small fa-fw " data-toggle="tooltip_html" title="<div class='text-left'>{% trans "Personal data of attendees required" %}. {% if i.custom_questions_asked %}{% trans "Custom questions asked" %}. {% endif %}{% trans "Questionnaires" %}:<br>{{ i.questionnaire_names_html }}</div>">
+                                        <i class="fa text-muted fa-id-card-o fa-stack-1x"></i>
+                                        <i class="fa fa-stack-shifted fa-asterisk fa-stack-1x fa-stack-shift-up fa-stack-sm"></i>
+                                    </i>
+                                {% elif i.attendee_data_asked %}
+                                    <i class="fa-stack fa-stack-small fa-fw" data-toggle="tooltip_html" title="<div class='text-left'>{% trans "Personal data of attendees asked" %}. {% if i.custom_questions_asked %}{% trans "Custom questions asked" %}. {% endif %}{% trans "Questionnaires" %}:<br>{{ i.questionnaire_names_html }}</div>">
+                                        <span class="fa fa-id-card-o fa-fw text-muted" ></span>
+                                    </i>
+                                {% elif i.custom_questions_asked %}
+                                    <span class="fa fa-question-circle-o fa-fw text-muted" data-toggle="tooltip_html" title="<div class='text-left'>{% trans "Custom questions asked" %}. {% trans "Questionnaires" %}:<br>{{ i.questionnaire_names_html }}</div>"></span>
+                                {% endif %}
+                            </td>
                             <td>
                                 {% if i.var_count %}
                                     <span class="fa fa-bars fa-fw text-muted" data-toggle="tooltip" title="{% trans "Product with variations" %}"></span>

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

@@ -3,10 +3,10 @@
 {% load bootstrap3 %}
 {% load escapejson %}
 {% load formset_tags %}
-{% block title %}{% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}{% endblock %}
+{% block title %}{% blocktrans with name=question.internal_name %}Data field: {{ name }}{% endblocktrans %}{% endblock %}
 {% block inside %}
     <h1>
-        {% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}
+        {% blocktrans with name=question.internal_name %}Data field: {{ name }}{% endblocktrans %}
         {% if 'event.items:write' in request.eventpermset %}
             <a href="{% url "control:event.items.questions.edit" event=request.event.slug organizer=request.event.organizer.slug question=question.pk %}"
                     class="btn btn-default">

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

@@ -1,16 +1,16 @@
 {% extends "pretixcontrol/items/base.html" %}
 {% load i18n %}
 {% load bootstrap3 %}
-{% block title %}{% trans "Delete question" %}{% endblock %}
+{% block title %}{% trans "Delete data field" %}{% endblock %}
 {% block inside %}
-	<h1>{% trans "Delete question" %}</h1>
+	<h1>{% trans "Delete data field" %}</h1>
 	<form action="" method="post" class="form-horizontal">
 		{% csrf_token %}
-		<p>{% blocktrans %}Are you sure you want to delete the question <strong>{{ question }}</strong>?{% endblocktrans %}</p>
+		<p>{% blocktrans %}Are you sure you want to delete the data field <strong>{{ question }}</strong>?{% endblocktrans %}</p>
 		{% if dependent|length > 0 %}
 			<div class="alert alert-warning">
 				<p>{% blocktrans %}All answers to the question given by the buyers of the following products will be <strong>lost</strong>.{% endblocktrans %}
-					{% blocktrans with url=edit_url|add:"#tab-0-1-open" %}If you want to keep the answers, <a href="{{url}}">edit the question</a> and set it to hidden.{% endblocktrans %}
+					{% blocktrans with url=edit_url|add:"#tab-0-1-open" %}If you want to keep the answers, <a href="{{url}}">edit the data field</a> and set it to hidden.{% endblocktrans %}
 				</p>
 			</div>
             <ul>
@@ -24,7 +24,7 @@
                 {% trans "Cancel" %}
             </a>
             <button type="submit" class="btn btn-danger btn-save">
-                {% trans "Delete question and all answers" %}
+                {% trans "Delete data field and all answers" %}
             </button>
 		</div>
 	</form>

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

@@ -5,158 +5,143 @@
 {% load escapejson %}
 {% block title %}
     {% if question %}
-        {% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}
+        {% blocktrans with name=question.internal_name %}Data field: {{ name }}{% endblocktrans %}
     {% else %}
-        {% trans "Question" %}
+        {% trans "Create new data field" %}
     {% endif %}
 {% endblock %}
 {% block inside %}
     {% if question %}
-        <h1>{% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}</h1>
+        <h1>{% blocktrans with name=question.internal_name %}Data field: {{ name }}{% endblocktrans %}</h1>
     {% else %}
-        <h1>{% trans "Question" %}</h1>
+        <h1>{% trans "Create new 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.internal_name layout="control" %}
+        {% bootstrap_field form.type layout="control" %}
+        <div id="valid-number" class="panel panel-default">
+            <div class="panel-heading"><h4 class="panel-title">{% trans "Validation" %}</h4></div>
+            <div class="panel-body">
+                {% bootstrap_field form.valid_number_min layout="control" %}
+                {% bootstrap_field form.valid_number_max layout="control" %}
+            </div>
         </div>
+        <div id="valid-date" class="panel panel-default">
+            <div class="panel-heading"><h4 class="panel-title">{% trans "Validation" %}</h4></div>
+            <div class="panel-body">
+                {% bootstrap_field form.valid_date_min layout="control" %}
+                {% bootstrap_field form.valid_date_max layout="control" %}
+            </div>
+        </div>
+        <div id="valid-datetime" class="panel panel-default">
+            <div class="panel-heading"><h4 class="panel-title">{% trans "Validation" %}</h4></div>
+            <div class="panel-body">
+                {% bootstrap_field form.valid_datetime_min layout="control" %}
+                {% bootstrap_field form.valid_datetime_max layout="control" %}
+            </div>
+        </div>
+        <div id="valid-string" class="panel panel-default">
+            <div class="panel-heading"><h4 class="panel-title">{% trans "Validation" %}</h4></div>
+            <div class="panel-body">
+                {% bootstrap_field form.valid_string_length_min layout="control" %}
+                {% bootstrap_field form.valid_string_length_max layout="control" %}
+            </div>
+        </div>
+        <div id="valid-file" class="panel panel-default">
+            <div class="panel-heading"><h4 class="panel-title">{% trans "Validation" %}</h4></div>
+            <div class="panel-body">
+                {% bootstrap_field form.valid_file_portrait layout="control" %}
+            </div>
+        </div>
+        <div id="answer-options" class="panel panel-default">
+            <div class="panel-heading">
+                <h4 class="panel-title">{% trans "Answer options" %}</h4>
+            </div>
+            <div class="panel-body">
+                <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>
+        </div>
+        {% bootstrap_field form.identifier layout="control" %}
+        {% if form.show_during_checkin %}
+            {% bootstrap_field form.show_during_checkin layout="control" %}
+        {% endif %}
+        {% if form.print_on_invoice %}
+            {% bootstrap_field form.print_on_invoice layout="control" %}
+            {% bootstrap_field form.print_on_invoice_label layout="control" %}
+        {% endif %}
+
+
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}

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

@@ -0,0 +1,64 @@
+{% 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 preferences or dietary requirements.
+        {% endblocktrans %}
+    </p>
+    <p>
+        {% blocktrans trimmed %}
+            Each questionnaire can be assigned to one or more products for which its questions are asked. It can appear
+            either during the checkout process, in the ticket details for each attendee individually, or at the check-in
+            at the venue.
+        {% endblocktrans %}
+    </p>
+    <p>
+        {% blocktrans trimmed %}
+            The answer to each question is stored either in a system-provided attendee data field (such as name, email,
+            or postal address), or in a user-defined data field attached to the order or the attendee.
+        {% endblocktrans %}
+        {% blocktrans trimmed %}
+            User-defined data fields can be created from the questionnaire editor below, and managed using the button to the right.
+        {% endblocktrans %}
+    </p>
+    <br>
+
+    {{ request.event.settings.locales|json_script:"event_locales" }}
+    {{ questionnaire_type_choices|json_script:"questionnaire_type_choices" }}
+    {{ question_type_choices|json_script:"question_type_choices" }}
+    {{ system_question_choices|json_script:"system_question_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" }}
+
+    {% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=0 as datafield_view_url %}
+    {{ datafield_view_url|json_script:"datafield_view_url" }}
+
+    {% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug as datafield_create_url %}
+    {{ datafield_create_url|json_script:"datafield_create_url" }}
+
+    <div id="questionnaires-editor">
+        <!-- Vue app mount point -->
+        <center><div class="big-load-indicator"><i class="fa fa-cog big-rotating-icon"></i></div></center>
+    </div>
+
+    {% vite_hmr %}
+    {% vite_asset "src/pretix/static/pretixcontrol/js/ui/questionnaires/index.ts" %}
+{% endblock %}

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

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

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

@@ -0,0 +1,11 @@
+{% extends "error.html" %}
+{% load i18n %}
+{% load eventurl %}
+{% load urlreplace %}
+{% load static %}
+
+{% block content %}
+    <h1>{% trans "Please wait..." %}</h1>
+    {{ notify_info|json_script:"notify_info" }}
+    <script type="text/javascript" src="{% static "pretixcontrol/js/notify_parent.js" %}"></script>
+{% endblock %}

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

@@ -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>

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

@@ -428,12 +428,23 @@
                             </dd>
                         {% endif %}
 
-                        {% if order.answers.all %}
+                        {% if order.rendered_questions or order.rendered_questions.leftovers %}
                             <hr>
                         {% endif %}
-                        {% for ans in order.answers.all %}
-                            <dt>{{ ans.question.internal_name|default:ans.question.question }}</dt>
-                            <dd>{% include "pretixcontrol/order/fragment_question_answer.html" with request=request question=ans.question answer=ans %}</dd>
+                        {% for q in order.rendered_questions %}
+                            <dt>{{ q.label }}</dt>
+                            <dd>{% include "pretixcontrol/order/fragment_question_answer.html" with request=request question=q answer=q.answer %}</dd>
+                        {% endfor %}
+                        {% for q in order.rendered_questions.leftovers %}
+                            <dt class="text-muted">
+                                {{ q.label }}
+                                <span class="fa fa-question-circle text-muted"
+                                        data-toggle="tooltip"
+                                        title="{% trans "This data field is not asked for this product, but an answer exists anyway." %}"
+                                ></span>
+                            </dt>
+                            <dd class="text-muted">{% include "pretixcontrol/order/fragment_question_answer.html" with request=request question=ans.question answer=ans %}</dd>
+                            <!-- add a edit or delete button? -->
                         {% endfor %}
                     </dl>
                 </div>
@@ -610,17 +621,44 @@
                                 {% 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 %}
+                                        {% for q in line.rendered_questions %}
+                                            {% if q.system_datafield == "@street" and line.rendered_questions.full_address_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>
+                                            {% elif q.system_datafield == "@zipcode" and line.rendered_questions.full_address_asked %}
+                                            {% elif q.system_datafield == "@city" and line.rendered_questions.full_address_asked %}
+                                            {% elif q.system_datafield == "@state" and line.rendered_questions.full_address_asked %}
+                                            {% elif q.system_datafield == "@country" and line.rendered_questions.full_address_asked %}
+                                            {% else %}
+                                                <dt>
+                                                    {{ q.label }}
+                                                    {% if q.questionnaire.ask_during_checkin %}
+                                                        <span class="fa fa-qrcode text-muted"
+                                                                data-toggle="tooltip"
+                                                                title="{% trans "This question will be asked during check-in." %}"
+                                                        ></span>
+                                                    {% endif %}
+                                                    {% if q.questionnaire.hidden %}
+                                                        <span class="fa fa-eye-slash text-muted"
+                                                                data-toggle="tooltip"
+                                                                title="{% trans "Hidden question" %}"
+                                                        ></span>
+                                                    {% endif %}
+                                                </dt>
+                                                <dd>
+                                                    {% 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 %}
@@ -633,50 +671,22 @@
                                                             </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" %}
+                                                </dd>
+                                            {% endif %}
+                                        {% endfor %}
+                                        {% for q in line.rendered_questions.leftovers %}
+                                            <dt class="text-muted">
+                                                {{ q.label }}
+                                                <span class="fa fa-question-circle text-muted"
+                                                        data-toggle="tooltip"
+                                                        title="{% trans "This data field is not asked for this product, but an answer exists anyway." %}"
+                                                ></span>
                                             </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 }}
-                                                {% if q.ask_during_checkin %}
-                                                    <span class="fa fa-qrcode text-muted"
-                                                            data-toggle="tooltip"
-                                                            title="{% trans "This question will be asked during check-in." %}"
-                                                    ></span>
-                                                {% endif %}
-                                            </dt>
-                                            <dd>
-                                                {% include "pretixcontrol/order/fragment_question_answer.html" with request=request question=q answer=q.answer %}
-                                            </dd>
+                                            <dd class="text-muted">{% include "pretixcontrol/order/fragment_question_answer.html" with request=request question=q answer=q.answer %}</dd>
+                                            <!-- add a edit or delete button? -->
                                         {% endfor %}
                                         {% for q in line.additional_fields %}
-                                            <dt>{{ q.question }}</dt>
+                                            <dt>{{ q.internal_name }}</dt>
                                             <dd>{% if q.answer %}{{ q.answer|linebreaksbr }}{% else %}
                                                 <em>{% trans "not answered" %}</em>{% endif %}</dd>
                                         {% endfor %}

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

@@ -99,7 +99,7 @@
         {% if filter_form.is_valid and filter_form.cleaned_data.question %}
             <p class="text-muted">
                 <span class="fa fa-filter"></span>
-                {% blocktrans trimmed with question=filter_form.cleaned_data.question.question %}
+                {% blocktrans trimmed with question=filter_form.cleaned_data.question.internal_name %}
                     List filtered by answers to question "{{ question }}".
                 {% endblocktrans %}
                 <a href="?{% url_replace request 'question' '' 'answer' '' %}" class="text-muted">

src/pretix/control/urls.py

@@ -343,7 +343,6 @@ urlpatterns = [
                 name='event.items.categories.edit'),
         re_path(r'^categories/add$', item.CategoryCreate.as_view(), name='event.items.categories.add'),
         re_path(r'^questions/$', item.QuestionList.as_view(), name='event.items.questions'),
-        re_path(r'^questions/reorder$', item.reorder_questions, name='event.items.questions.reorder'),
         re_path(r'^questions/(?P<question>\d+)/delete$', item.QuestionDelete.as_view(),
                 name='event.items.questions.delete'),
         re_path(r'^questions/(?P<question>\d+)/$', item.QuestionView.as_view(),
@@ -351,6 +350,7 @@ urlpatterns = [
         re_path(r'^questions/(?P<question>\d+)/change$', item.QuestionUpdate.as_view(),
                 name='event.items.questions.edit'),
         re_path(r'^questions/add$', item.QuestionCreate.as_view(), name='event.items.questions.add'),
+        re_path(r'^questionnaires/$', item.QuestionnairesEditor.as_view(), name='event.items.questionnaires'),
         re_path(r'^quotas/$', item.QuotaList.as_view(), name='event.items.quotas'),
         re_path(r'^quotas/bulk_action$', item.QuotaBulkAction.as_view(), name='event.items.quotas.bulkaction'),
         re_path(r'^quotas/bulk_edit$', item.QuotaBulkUpdateView.as_view(), name='event.items.quotas.bulkedit'),

src/pretix/control/views/__init__.py

@@ -22,9 +22,12 @@
 import collections.abc
 import warnings
 
+from django.contrib import messages
 from django.core.paginator import (
     EmptyPage, PageNotAnInteger, UnorderedObjectListWarning,
 )
+from django.http.response import HttpResponseRedirect
+from django.shortcuts import render
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import edit
 
@@ -203,3 +206,23 @@ class LargeResultSetPaginator(object):
                 UnorderedObjectListWarning,
                 stacklevel=3
             )
+
+
+class TellParentFormMixin:
+
+    def dispatch(self, request, *args, **kwargs):
+        response = super().dispatch(request, *args, **kwargs)
+        if response.get("X-Frame-Options") is None:
+            response["X-Frame-Options"] = "SAMEORIGIN"
+        return response
+
+    def form_valid(self, form):
+        result = super().form_valid(form)
+        if self.request.GET.get('notify_parent') and isinstance(result, HttpResponseRedirect):
+            message_store = messages.get_messages(self.request)
+            msgs = [{'level': msg.level_tag, 'message': msg.message} for msg in message_store]
+            return render(self.request, 'pretixcontrol/notify_parent.html', {
+                'notify_info': {'object': self.object.pk, 'object_str': str(self.object), 'redirect_url': result.url, 'messages': msgs},
+            })
+        else:
+            return result

src/pretix/control/views/event.py

@@ -1670,6 +1670,7 @@ class QuickSetupView(EventPermissionRequiredMixin, FormView):
                                 user=self.request.user)
 
         subevent = self.request.event.subevents.first()
+        questionnaire = self.request.event.questionnaires.first()
         for i, f in enumerate(self.formset):
             if f in self.formset.deleted_forms or not f.has_changed():
                 continue
@@ -1681,10 +1682,11 @@ class QuickSetupView(EventPermissionRequiredMixin, FormView):
                 default_price=f.cleaned_data['default_price'] or 0,
                 tax_rule=tax_rule,
                 admission=True,
-                personalized=True,
                 position=i,
                 all_sales_channels=True,
             )
+            if questionnaire:
+                item.questionnaires.add(questionnaire)
             item.log_action('pretix.event.item.added', user=self.request.user, data=dict(f.cleaned_data))
             if f.cleaned_data['quota'] or not form.cleaned_data['total_quota']:
                 quota = self.request.event.quotas.create(

src/pretix/control/views/item.py

@@ -39,7 +39,7 @@ from itertools import groupby
 from json.decoder import JSONDecodeError
 
 from django.contrib import messages
-from django.core.exceptions import PermissionDenied
+from django.core.exceptions import PermissionDenied, ValidationError
 from django.core.files import File
 from django.db import models, transaction
 from django.db.models import (
@@ -53,10 +53,12 @@ from django.http import (
 from django.shortcuts import redirect, render
 from django.urls import resolve, reverse
 from django.utils.functional import cached_property
+from django.utils.html import format_html_join
+from django.utils.safestring import mark_safe
 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,14 +67,15 @@ 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,
-    SeatCategoryMapping, Voucher,
+    OrderPosition, Question, QuestionAnswer, QuestionnaireRow, QuestionOption,
+    Quota, SeatCategoryMapping, Voucher,
 )
 from pretix.base.models.event import SubEvent
-from pretix.base.models.items import ItemAddOn, ItemBundle, ItemMetaValue
+from pretix.base.models.items import (
+    ItemAddOn, ItemBundle, ItemMetaValue, Questionnaire,
+)
 from pretix.base.services.quotas import QuotaAvailability
 from pretix.base.services.tickets import invalidate_cache
 from pretix.base.signals import quota_availability
@@ -94,7 +97,12 @@ from pretix.helpers.models import modelcopy
 
 from ...helpers import GroupConcat
 from ...helpers.compat import CompatDeleteView
-from . import ChartContainingView, CreateView, PaginationMixin, UpdateView
+from ...helpers.i18n import i18n_all_from_gettext
+from . import (
+    ChartContainingView, CreateView, PaginationMixin, TellParentFormMixin,
+    UpdateView,
+)
+from ...presale.views import prefetch_relevant_questionnaires
 
 
 def has_truthy_attr(cls, attr):
@@ -120,7 +128,10 @@ class ItemList(ListView):
         ).select_related("tax_rule").annotate(
             var_count=Count('variations'),
             requires_seat=requires_seat,
-        ).prefetch_related("category", "limit_sales_channels").order_by(
+        ).prefetch_related(
+            "category", "limit_sales_channels",
+            prefetch_relevant_questionnaires(self.request.event, None, None, questionnaire_lookup='questionnaires'),
+        ).order_by(
             F('category__position').asc(nulls_first=True),
             'category', 'position'
         )
@@ -128,6 +139,16 @@ class ItemList(ListView):
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
         ctx['sales_channels'] = self.request.organizer.sales_channels.all()
+        for item in ctx['items']:
+            qrows = [qc for qq in item.relevant_questionnaires for qc in qq.questionnairerowlist]
+            item.attendee_data_asked = any(row.system_datafield for row in qrows)
+            item.attendee_data_required = item.attendee_data_asked and any(row.system_datafield and row.required for row in qrows)
+            item.custom_questions_asked = any(row.user_datafield_id for row in qrows)
+            item.questionnaire_names_html = format_html_join('<br>', '• {} {}{}', ((
+                q.internal_name,
+                mark_safe("<i class='fa fa-check-square'></i>") if q.ask_during_checkin else '',
+                mark_safe("<i class='fa fa-eye-slash'></i>") if q.hidden else '',
+            ) for q in item.relevant_questionnaires))
         items_by_category = {cat: list(items) for cat, items in groupby(ctx['items'], lambda item: item.category)}
         ctx['cat_list'] = [(cat, items_by_category.get(cat, [])) for cat in [None, *self.request.event.categories.all()]]
         return ctx
@@ -251,7 +272,7 @@ class CategoryDelete(EventPermissionRequiredMixin, CompatDeleteView):
         })
 
 
-class CategoryUpdate(EventPermissionRequiredMixin, UpdateView):
+class CategoryUpdate(TellParentFormMixin, EventPermissionRequiredMixin, UpdateView):
     model = ItemCategory
     form_class = CategoryForm
     template_name = 'pretixcontrol/items/category.html'
@@ -289,7 +310,7 @@ class CategoryUpdate(EventPermissionRequiredMixin, UpdateView):
         return super().form_invalid(form)
 
 
-class CategoryCreate(EventPermissionRequiredMixin, CreateView):
+class CategoryCreate(TellParentFormMixin, EventPermissionRequiredMixin, CreateView):
     model = ItemCategory
     form_class = CategoryForm
     template_name = 'pretixcontrol/items/category.html'
@@ -437,66 +458,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.all()
 
 
 class QuestionDelete(EventPermissionRequiredMixin, CompatDeleteView):
@@ -515,7 +477,7 @@ class QuestionDelete(EventPermissionRequiredMixin, CompatDeleteView):
 
     def get_context_data(self, *args, **kwargs) -> dict:
         context = super().get_context_data(*args, **kwargs)
-        context['dependent'] = list(self.get_object().items.all())
+        # TODO(questionnaires)  context['dependent'] = list(self.get_object().items.all())
         context['edit_url'] = reverse('control:event.items.questions.edit', kwargs={
             'organizer': self.request.event.organizer.slug,
             'event': self.request.event.slug,
@@ -614,7 +576,7 @@ class QuestionView(EventPermissionRequiredMixin, ChartContainingView, DetailView
             question=self.object, orderposition__isnull=False,
         )
         qs = qs.filter(orderposition__in=opqs)
-        op_cnt = opqs.filter(item__in=self.object.items.all()).count()
+        op_cnt = 0  # TODO opqs.filter(item__in=self.object.items.all()).count()
 
         if self.object.type == Question.TYPE_FILE:
             qs = [
@@ -659,7 +621,7 @@ class QuestionView(EventPermissionRequiredMixin, ChartContainingView, DetailView
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data()
-        ctx['items'] = self.object.items.exists()
+        # TODO(questionnaires) ctx['items'] = self.object.items.exists()
         ctx['has_subevents'] = self.request.event.has_subevents
         stats = self.get_answer_statistics()
         ctx['stats'], ctx['total'] = stats
@@ -681,7 +643,7 @@ class QuestionView(EventPermissionRequiredMixin, ChartContainingView, DetailView
         })
 
 
-class QuestionUpdate(EventPermissionRequiredMixin, QuestionMixin, UpdateView):
+class QuestionUpdate(TellParentFormMixin, EventPermissionRequiredMixin, QuestionMixin, UpdateView):
     model = Question
     form_class = QuestionForm
     template_name = 'pretixcontrol/items/question_edit.html'
@@ -722,7 +684,7 @@ class QuestionUpdate(EventPermissionRequiredMixin, QuestionMixin, UpdateView):
         return super().form_invalid(form)
 
 
-class QuestionCreate(EventPermissionRequiredMixin, QuestionMixin, CreateView):
+class QuestionCreate(TellParentFormMixin, EventPermissionRequiredMixin, QuestionMixin, CreateView):
     model = Question
     form_class = QuestionForm
     template_name = 'pretixcontrol/items/question_edit.html'
@@ -766,6 +728,22 @@ class QuestionCreate(EventPermissionRequiredMixin, QuestionMixin, CreateView):
         return ret
 
 
+def textchoices_to_json(choices, event):
+    return [(c.name, c.value, i18n_all_from_gettext(c.label, event.settings.locales)) for c in choices]
+
+
+class QuestionnairesEditor(EventPermissionRequiredMixin, TemplateView):
+    permission = 'can_change_items'
+    template_name = 'pretixcontrol/items/questionnaires.html'
+
+    def get_context_data(self, **kwargs):
+        ctx = super().get_context_data(**kwargs)
+        ctx['questionnaire_type_choices'] = textchoices_to_json(Questionnaire.QuestionnaireType, self.request.event)
+        ctx['system_question_choices'] = textchoices_to_json(QuestionnaireRow.SystemDatafield, self.request.event)
+        ctx['question_type_choices'] = textchoices_to_json(Question.FieldType, self.request.event)
+        return ctx
+
+
 class QuotaQueryMixin:
 
     @cached_property
@@ -1371,9 +1349,10 @@ class ItemCreate(EventPermissionRequiredMixin, MetaDataEditorMixin, CreateView):
             initial['tax_rule'] = trs[0]
 
         if self.copy_from:
-            fields = ('name', 'internal_name', 'category', 'admission', 'personalized', 'default_price', 'tax_rule')
+            fields = ('name', 'internal_name', 'category', 'admission', 'default_price', 'tax_rule')
             for f in fields:
                 initial[f] = getattr(self.copy_from, f)
+            initial['questionnaires'] = self.copy_from.questionnaires.values_list('pk', flat=True)
             initial['copy_from'] = self.copy_from
             initial['has_variations'] = self.copy_from.variations.exists()
 
@@ -1407,7 +1386,7 @@ class ItemCreate(EventPermissionRequiredMixin, MetaDataEditorMixin, CreateView):
         return super().form_invalid(form)
 
     def get_context_data(self, **kwargs):
-        ctx = super().get_context_data()
+        ctx = super().get_context_data(**kwargs)
         ctx['meta_forms'] = self.meta_forms
         return ctx
 
@@ -1415,9 +1394,11 @@ class ItemCreate(EventPermissionRequiredMixin, MetaDataEditorMixin, CreateView):
         self.object = None
         form = self.get_form()
         if form.is_valid() and all([f.is_valid() for f in self.meta_forms]):
-            return self.form_valid(form)
-        else:
-            return self.form_invalid(form)
+            try:
+                return self.form_valid(form)
+            except ValidationError as e:
+                form.add_error(None, e)
+        return self.form_invalid(form)
 
 
 class ItemUpdateGeneral(ItemDetailMixin, EventPermissionRequiredMixin, MetaDataEditorMixin, UpdateView):
@@ -1481,9 +1462,11 @@ class ItemUpdateGeneral(ItemDetailMixin, EventPermissionRequiredMixin, MetaDataE
         self.get_object()
         form = self.get_form()
         if self.is_valid(form) and all([f.is_valid() for f in self.meta_forms]):
-            return self.form_valid(form)
-        else:
-            return self.form_invalid(form)
+            try:
+                return self.form_valid(form)
+            except ValidationError as exc:
+                form.add_error(None, exc)
+        return self.form_invalid(form)
 
     def save_formset(self, key, log_base, attr='item', order=True, serializer=None,
                      rm_verb='removed'):
@@ -1532,7 +1515,6 @@ class ItemUpdateGeneral(ItemDetailMixin, EventPermissionRequiredMixin, MetaDataE
     @transaction.atomic
     def form_valid(self, form):
         self.save_meta()
-        messages.success(self.request, _('Your changes have been saved.'))
 
         change_data = {
             k: form.cleaned_data.get(k)
@@ -1592,7 +1574,9 @@ class ItemUpdateGeneral(ItemDetailMixin, EventPermissionRequiredMixin, MetaDataE
             else:
                 v.save()
 
-        return super().form_valid(form)
+        response = super().form_valid(form)
+        messages.success(self.request, _('Your changes have been saved.'))
+        return response
 
     def form_invalid(self, form):
         messages.error(self.request, _('We could not save your changes. See below for details.'))
@@ -1605,7 +1589,7 @@ class ItemUpdateGeneral(ItemDetailMixin, EventPermissionRequiredMixin, MetaDataE
         return o
 
     def get_context_data(self, **kwargs):
-        ctx = super().get_context_data()
+        ctx = super().get_context_data(**kwargs)
         ctx['plugin_forms'] = self.plugin_forms
         ctx['meta_forms'] = self.meta_forms
         ctx['formsets'] = self.formsets

src/pretix/control/views/orders.py

@@ -85,7 +85,7 @@ from pretix.base.models import (
 )
 from pretix.base.models.orders import (
     CancellationRequest, OrderFee, OrderPayment, OrderPosition, OrderRefund,
-    PrintLog,
+    PrintLog, QuestionnaireRenderer,
 )
 from pretix.base.models.tax import ask_for_vat_id
 from pretix.base.payment import PaymentException
@@ -143,6 +143,7 @@ from pretix.helpers.iter import chunked_iterable
 from pretix.helpers.json import CustomJSONEncoder
 from pretix.helpers.safedownload import check_token
 from pretix.presale.signals import question_form_fields
+from pretix.presale.views import prefetch_relevant_questionnaires
 
 logger = logging.getLogger(__name__)
 
@@ -594,13 +595,15 @@ class OrderDetail(OrderView):
     def get_items(self):
         queryset = self.object.all_positions
 
-        cartpos = queryset.order_by(
+        orderpos = queryset.order_by(
             'item', 'variation'
         ).select_related(
             'item', 'variation', 'addon_to', 'tax_rule', 'used_membership', 'used_membership__membership_type',
             'discount',
         ).prefetch_related(
-            'item__questions', 'issued_gift_cards', 'owned_gift_cards', 'linked_media',
+            prefetch_relevant_questionnaires(self.request.event, None, None),
+            #'item__questionnaires',
+            'issued_gift_cards', 'owned_gift_cards', 'linked_media',  # TODO(questionnaires) : item__questions gibts nicht mehr
             Prefetch('answers', queryset=QuestionAnswer.objects.prefetch_related('options').select_related('question')),
             Prefetch('all_checkins', queryset=Checkin.all.select_related('list', 'gate').order_by('datetime')),
             Prefetch('print_logs', queryset=PrintLog.objects.select_related('device').order_by('datetime')),
@@ -608,7 +611,7 @@ class OrderDetail(OrderView):
         ).order_by('positionid')
 
         positions = []
-        for p in cartpos:
+        for p in orderpos:
             responses = question_form_fields.send(sender=self.request.event, position=p)
             p.additional_fields = []
             data = p.meta_info_data
@@ -620,13 +623,9 @@ class OrderDetail(OrderView):
                             'question': value.label
                         })
 
-            p.has_questions = (
-                p.additional_fields or
-                (p.item.ask_attendee_data and self.request.event.settings.attendee_names_asked) or
-                (p.item.ask_attendee_data and self.request.event.settings.attendee_emails_asked) or
-                p.item.questions.all()
-            )
-            p.cache_answers()
+            p.has_questions = p.additional_fields or p.item.questionnaires.all()
+            qrows = list(copy.copy(qc) for qq in p.item.relevant_questionnaires for qc in qq.questionnairerowlist)
+            p.rendered_questions = QuestionnaireRenderer(qrows=qrows, system_answers=p.system_answers, answerlist=p.answers.all())
             p.order = self.order
 
             positions.append(p)
@@ -635,7 +634,7 @@ class OrderDetail(OrderView):
 
         return {
             'positions': positions,
-            'raw': cartpos,
+            'raw': orderpos,
             'total': self.object.total,
             'fees': self.object.all_fees.all(),
             'net_total': self.object.net_total,

src/pretix/helpers/i18n.py

@@ -32,6 +32,7 @@ from django.conf import settings
 from django.utils import translation
 from django.utils.formats import get_format
 from django.utils.translation import to_locale
+from i18nfield.strings import LazyI18nString
 
 date_conversion_to_moment = {
     '%a': 'ddd',
@@ -244,3 +245,14 @@ def parse_date_localized(date_str) -> Optional[datetime]:
         except (ValueError, TypeError):
             continue
     return dt
+
+
+def i18n_all_from_gettext(gettext_str, locales):
+    return i18n_all(LazyI18nString.from_gettext(gettext_str).data, locales)
+
+
+def i18n_all(data, locales):
+    out = {}
+    for locale in locales:
+        out[locale] = data[locale]
+    return out

src/pretix/helpers/iter.py

@@ -29,3 +29,20 @@ def chunked_iterable(iterable, size):
         if not chunk:
             break
         yield chunk
+
+
+def sort_groupby(data, group_key, inner_sort_key=None):
+    """
+    Groups data by group_key, returns a list of (group_key, list). The outer list is
+    sorted by group_key, all inner lists are sorted by inner_sort_key.
+    """
+    sort_key = group_key if inner_sort_key is None else lambda d: (group_key(d), inner_sort_key(d))
+    return [(group, list(items)) for group, items in itertools.groupby(sorted(data, key=sort_key), group_key)]
+
+
+def sort_groupby_exp(data, group_key, inner_sort_key=None):
+    """
+    Same as sort_groupby, but items are passed into the key functions as *item, so tuples can be destructed easily.
+    """
+    sort_key = (lambda d: group_key(*d)) if inner_sort_key is None else lambda d: (group_key(*d), inner_sort_key(*d))
+    return [(group, list(items)) for group, items in itertools.groupby(sorted(data, key=sort_key), lambda d: group_key(*d))]

src/pretix/plugins/badges/exporters.py

@@ -509,7 +509,7 @@ class BadgeExporter(BaseExporter):
                          ('name:{}'.format(k), _('Attendee name: {part}').format(part=label))
                          for k, label, w in name_scheme['fields']
                      ] if len(name_scheme['fields']) > 1 else []) + ([
-                         ('question:{}'.format(q.identifier), _('Question: {question}').format(question=q.question))
+                         ('question:{}'.format(q.identifier), _('Data field: {question}').format(question=q.internal_name))
                          for q in self.event.questions.filter(type__in=(
                              # All except TYPE_FILE and future ones
                              Question.TYPE_TIME, Question.TYPE_TEXT, Question.TYPE_DATE, Question.TYPE_BOOLEAN,

src/pretix/plugins/checkinlists/exporters.py

@@ -382,7 +382,7 @@ class PDFCheckinList(ReportlabExportMixin, CheckInListMixin, BaseExporter):
         headrowstyle = self.get_style()
         headrowstyle.fontName = 'OpenSansBd'
         for q in questions:
-            txt = str(q.question)
+            txt = str(q.internal_name)
             p = PlainTextParagraph(txt, headrowstyle)
             while p.wrap(colwidths[len(tdata[0])], 5000)[1] > 30 * mm:
                 txt = txt[:len(txt) - 50] + "..."
@@ -519,7 +519,7 @@ class CSVCheckinList(CheckInListMixin, ListExporter):
             headers.append(_('End date'))
 
         for q in questions:
-            headers.append(str(q.question))
+            headers.append(str(q.internal_name))
 
         headers.append(_('Company'))
         headers.append(_('Voucher code'))

src/pretix/plugins/paypal2/views.py

@@ -71,7 +71,7 @@ from pretix.plugins.paypal2.models import ReferencedPayPalObject
 from pretix.plugins.paypal2.payment import (
     PaypalMethod, PaypalMethod as Paypal, PaypalWallet,
 )
-from pretix.presale.views import get_cart
+from pretix.presale.views import get_cart_positions
 from pretix.presale.views.cart import cart_session
 
 logger = logging.getLogger('pretix.plugins.paypal2')
@@ -130,7 +130,7 @@ class XHRView(View):
 
             cart_total = order.pending_sum + fee
         else:
-            cart = get_cart(request)
+            cart = get_cart_positions(request)
             cart_payments = cart_session(request).get('payments', [])
             multi_use_cart_payments = [p for p in cart_payments if p.get('multi_use_supported')]
             simulated_payments = multi_use_cart_payments + [{

src/pretix/plugins/ticketoutputpdf/exporters.py

@@ -99,7 +99,7 @@ class AllTicketsPDF(BaseExporter):
                          ('name:{}'.format(k), _('Attendee name: {part}').format(part=label))
                          for k, label, w in name_scheme['fields']
                      ] if name_scheme and len(name_scheme['fields']) > 1 else []) + ([
-                         ('question:{}'.format(q.identifier), _('Question: {question}').format(question=q.question))
+                         ('question:{}'.format(q.identifier), _('Data field: {question}').format(question=q.internal_name))
                          for q in self.event.questions.filter(type__in=(
                              # All except TYPE_FILE and future ones
                              Question.TYPE_TIME, Question.TYPE_TEXT, Question.TYPE_DATE, Question.TYPE_BOOLEAN,

src/pretix/presale/checkoutflow.py

@@ -63,7 +63,7 @@ from django_scopes import scopes_disabled
 from pretix.base.models import Customer, Membership, Order
 from pretix.base.models.items import Question
 from pretix.base.models.orders import (
-    InvoiceAddress, OrderPayment, QuestionAnswer,
+    InvoiceAddress, OrderPayment, QuestionAnswer, QuestionnaireRenderer,
 )
 from pretix.base.models.tax import TaxedPrice, TaxRule
 from pretix.base.services.cart import (
@@ -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
@@ -523,7 +525,7 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
     def is_completed(self, request, warn=False):
         if getattr(self, '_completed', None) is not None:
             return self._completed
-        for cartpos in get_cart(request).filter(addon_to__isnull=True).prefetch_related(
+        for cartpos in get_cart_positions(request).filter(addon_to__isnull=True).prefetch_related(
             'item__addons', 'item__addons__addon_category', 'addons', 'addons__item'
         ):
             a = cartpos.addons.all()
@@ -586,7 +588,7 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
         formset = []
         quota_cache = {}
         item_cache = {}
-        for cartpos in sorted(get_cart(self.request).filter(addon_to__isnull=True).prefetch_related(
+        for cartpos in sorted(get_cart_positions(self.request).filter(addon_to__isnull=True).prefetch_related(
             'item__addons', 'item__addons__addon_category', 'addons', 'addons__variation',
         ), key=lambda c: c.sort_key):
             formsetentry = {
@@ -1090,59 +1092,17 @@ 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
-            }
-
-            def question_is_visible(parentid, qvals):
-                if parentid not in question_cache:
-                    return False
-                parentq = question_cache[parentid]
-                if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
-                    return False
-                if 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))
-                )
-
-            def question_is_required(q):
-                return (
-                    q.required and
-                    (not q.dependency_question_id or question_is_visible(q.dependency_question_id, q.dependency_values))
-                )
-
+            renderer = cp.rendered_questions
             if not self.all_optional:
-                for q in cp.item.questions_to_ask:
-                    if question_is_required(q) and q.id not in answ:
+                for qc in renderer.qrows:
+                    if qc.user_datafield_id and renderer.row_is_required(qc) and qc.user_datafield_id not in renderer.answer_cache:
+                        if warn:
+                            messages.warning(request, _('Please fill in answers to all required questions.'))
+                        return False
+                    if qc.system_datafield and renderer.row_is_required(qc) and not renderer.get_system_answer(qc.system_datafield):
                         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
 
             responses = question_form_fields.send(sender=self.request.event, position=cp)
             form_data = cp.meta_info_data.get('question_form_data', {})
@@ -1310,7 +1270,7 @@ class PaymentStep(CartMixin, TemplateFlowStep):
 
     @cached_property
     def _total_order_value(self):
-        cart = get_cart(self.request)
+        cart = get_cart_positions(self.request)
         try:
             fees = get_fees(
                 event=self.request.event, request=self.request, invoice_address=self.invoice_address,
@@ -1502,7 +1462,7 @@ class PaymentStep(CartMixin, TemplateFlowStep):
                 messages.error(request, _('Please select a payment method to proceed.'))
             return False
 
-        cart = get_cart(self.request)
+        cart = get_cart_positions(self.request)
         try:
             fees = get_fees(
                 event=self.request.event,
@@ -1542,7 +1502,7 @@ class PaymentStep(CartMixin, TemplateFlowStep):
     def is_applicable(self, request):
         self.request = request
 
-        for cartpos in get_cart(self.request):
+        for cartpos in get_cart_positions(self.request):
             if cartpos.requires_approval(invoice_address=self.invoice_address):
                 if 'payments' in self.cart_session:
                     del self.cart_session['payments']

src/pretix/presale/forms/renderers.py

@@ -148,8 +148,8 @@ class CheckoutFieldRenderer(FieldRenderer):
             label_for = self.field.id_for_label
             label_id = ""
 
-        if hasattr(self.field.field, 'question') and self.field.field.question.identifier:
-            attrs["data-identifier"] = self.field.field.question.identifier
+        if hasattr(self.field.field, 'datafield') and self.field.field.datafield.identifier:
+            attrs["data-identifier"] = self.field.field.datafield.identifier
 
         html = render_label(
             label,

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

@@ -175,7 +175,7 @@
                         <div class="panel-body">
                             <dl class="dl-horizontal">
                                 {% for ans in checkout_session.answers.all %}
-                                    <dt>{{ ans.question.question }}</dt>
+                                    <dt>{{ ans.question.internal_name }}</dt>   TODO(questionnaires) - nicht internal_name, sondern QuestionnaireRow.label
                                     <dd>{% include "pretixpresale/event/fragment_question_answer.html" with request=request question=ans.question answer=ans %}</dd>
                                 {% endfor %}
                             </dl>

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

@@ -93,9 +93,6 @@
                     </summary>
                     <div>
                         <div class="panel-body questions-form" data-address-information-url="{% url "js_helpers.address_form" %}">
-                            {% if event.settings.attendee_data_explanation_text and pos.item.ask_attendee_data %}
-                                {{ event.settings.attendee_data_explanation_text|rich_text }}
-                            {% endif %}
                             {% if forloop.counter > 1 and event.settings.checkout_show_copy_answers_button %}
                                 <div class="form-group">
                                     <div class="col-md-9 col-md-offset-3">

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

@@ -156,55 +156,8 @@
                 {% endif %}
                 {% if line.has_questions %}
                     <dl class="dl-indented">
-                        {% if line.item.ask_attendee_data %}
-                            {% if event.settings.attendee_names_asked %}
-                                <dt class="sr-only">
-                                    {% trans "Attendee name" %}
-                                </dt>
-                                <dd class="toplevel{% if event.settings.attendee_addresses_asked and not event.settings.attendee_emails_asked %} blank-after{% endif %}">
-                                    <span data-toggle="tooltip" title="{% trans "Attendee name" %}">
-                                        {% if line.attendee_name %}{{ line.attendee_name }}{% else %}<em class="text-muted">{% trans "No attendee name provided" %}</em>{% endif %}
-                                    </span>
-                                </dd>
-                            {% endif %}
-                            {% if event.settings.attendee_emails_asked and line.attendee_email %}
-                                <dt class="sr-only">
-                                    {% trans "Attendee email" %}
-                                </dt>
-                                <dd class="toplevel{% if event.settings.attendee_addresses_asked %} blank-after{% endif %}">
-                                    <span data-toggle="tooltip" title="{% trans "Attendee email" %}">
-                                        {{ line.attendee_email }}
-                                    </span>
-                                </dd>
-                            {% endif %}
-                            {% if event.settings.attendee_company_asked and line.company %}
-                                <dt class="sr-only">
-                                    {% trans "Attendee company" %}
-                                </dt>
-                                <dd class="toplevel">
-                                    <span data-toggle="tooltip" title="{% trans "Attendee company" %}">
-                                        {{ line.company }}
-                                    </span>
-                                </dd>
-                            {% endif %}
-                            {% if event.settings.attendee_addresses_asked %}
-                                {% if line.street or line.zipcode or line.city %}
-                                    <dt class="sr-only">
-                                        {% trans "Attendee address" %}
-                                    </dt>
-                                    <dd class="toplevel">
-                                        <span data-toggle="tooltip" title="{% trans "Attendee address" %}">
-                                            {{ 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:"" }}
-                                        </span>
-                                    </dd>
-                                {% endif %}
-                            {% endif %}
-                        {% endif %}
-                        {% for q in line.questions %}
-                            <dt>{{ q.question }}</dt>
+                        {% for q in line.rendered_questions %}
+                            <dt>{{ q.label }}</dt>
                             <dd>
                                 {% include "pretixpresale/event/fragment_question_answer.html" with request=request question=q answer=q.answer %}
                             </dd>

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

@@ -1,7 +1,8 @@
 {% load safelink %}
 {% load i18n %}
 {% load rich_text %}
-{% if answer %}
+{% if not answer and not question %}
+{% elif answer %}
     {% if answer.file %}
         <span class="fa fa-file" aria-hidden="true"></span>
         <a href="{{ answer.frontend_file_url }}?token={% answer_token request answer %}">

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

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

src/pretix/presale/views/__init__.py

@@ -41,7 +41,7 @@ from itertools import groupby
 
 from django.conf import settings
 from django.contrib import messages
-from django.db.models import Exists, OuterRef, Prefetch, Sum
+from django.db.models import Exists, OuterRef, Prefetch, Q, Sum
 from django.utils import translation
 from django.utils.functional import cached_property
 from django.utils.timezone import now
@@ -52,9 +52,10 @@ from pretix.base.i18n import get_language_without_region, set_region
 from pretix.base.middleware import get_supported_language
 from pretix.base.models import (
     CartPosition, Customer, InvoiceAddress, ItemAddOn, OrderFee, Question,
-    QuestionAnswer, QuestionOption, TaxRule,
+    QuestionAnswer, Questionnaire, QuestionOption, TaxRule,
 )
-from pretix.base.models.orders import CheckoutSession
+from pretix.base.models.items import QuestionnaireRow
+from pretix.base.models.orders import CheckoutSession, QuestionnaireRenderer
 from pretix.base.services.cart import get_fees
 from pretix.base.services.pricing import apply_rounding
 from pretix.base.templatetags.money import money_filter
@@ -95,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):
@@ -109,7 +110,7 @@ class CartMixin:
         return CheckoutSession.objects.filter(
             event=self.request.event,
             cart_id=get_or_create_cart_id(self.request, create=False),
-        ).first()
+        ).prefetch_related('answers', 'answers__question').first()
 
     @cached_property
     def cart_customer(self):
@@ -135,7 +136,7 @@ class CartMixin:
         if queryset is not None:
             prefetch = []
             if answers:
-                prefetch.append('item__questions')
+                prefetch.append(prefetch_relevant_questionnaires(self.request.event, self.request.sales_channel, Questionnaire.QuestionnaireType.POSITION_PURCHASE))
                 prefetch.append(Prefetch('answers', queryset=QuestionAnswer.objects.prefetch_related('options')))
 
             cartpos = queryset.order_by(
@@ -199,20 +200,15 @@ class CartMixin:
         # We do this by list manipulations instead of a GROUP BY query, as
         # Django is unable to join related models in a .values() query
         def group_key(pos):  # only used for grouping, sorting is done before already
-            has_attendee_data = pos.item.ask_attendee_data and (
-                self.request.event.settings.attendee_names_asked
-                or self.request.event.settings.attendee_emails_asked
-                or self.request.event.settings.attendee_company_asked
-                or self.request.event.settings.attendee_addresses_asked
-                or pos_additional_fields.get(pos.pk)
-            )
+            has_attendee_data = pos_additional_fields.get(pos.pk)
             grouping_allowed = (
                 # Never group when we have per-ticket download buttons
                 not downloads and
                 # Never group if the position has add-ons
                 pos.pk not in has_addons and
                 # Never group if we have answers to show
-                (not answers or (not has_attendee_data and not bool(pos.item.questions.all()))) and  # do not use .exists() to re-use prefetch cache
+                # TODO(questionnaires)  --  filter questionnaires by type, and ignore ones that have only static help texts
+                (not answers or (not has_attendee_data and not bool(pos.item.questionnaires.all()))) and  # do not use .exists() to re-use prefetch cache
                 # Never group when we have a final order and a gift card code
                 (isinstance(pos, CartPosition) or not pos.item.issue_giftcard)
             )
@@ -250,7 +246,8 @@ class CartMixin:
             group.price_for_input_net = group.net_price_before_rounding + sum(a.net_price_before_rounding for a in has_addons[group.pk])
 
             if answers:
-                group.cache_answers(all=False)
+                qrows = list(copy.copy(qc) for qq in group.item.relevant_questionnaires for qc in qq.questionnairerowlist)
+                group.rendered_questions = QuestionnaireRenderer(qrows=qrows, system_answers=group.system_answers, answerlist=group.answers.all())
                 group.additional_answers = pos_additional_fields.get(group.pk)
             positions.append(group)
 
@@ -399,7 +396,36 @@ def cart_exists(request):
     return bool(request._cart_cache)
 
 
-def get_cart(request):
+def prefetch_relevant_questionnaires(event, sales_channel, questionnaire_type, questionnaire_lookup='item__questionnaires'):
+    qqs = event.questionnaires
+    if sales_channel:
+        qqs = qqs.filter(
+            Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=sales_channel),
+        )
+    if questionnaire_type:
+        qqs = qqs.filter(type=questionnaire_type)
+    else:
+        qqs = qqs.filter(type__startswith='position_')
+    dummy = 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'
+    )
+    return Prefetch(questionnaire_lookup,
+        qqs.prefetch_related(
+            Prefetch('rows', QuestionnaireRow.objects.prefetch_related(
+                Prefetch('user_datafield', Question.objects.prefetch_related(
+                    Prefetch('options', QuestionOption.objects.prefetch_related(dummy))
+                ))
+            ), to_attr='questionnairerowlist')
+        ),
+        to_attr='relevant_questionnaires')
+
+
+def get_cart_positions(request):
     from pretix.presale.views.cart import get_or_create_cart_id
 
     if not hasattr(request, '_cart_cache'):
@@ -407,8 +433,7 @@ 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)
+            from pretix.base.models import Questionnaire
             request._cart_cache = CartPosition.objects.filter(
                 cart_id=cart_id, event=request.event
             ).annotate(
@@ -429,18 +454,7 @@ def get_cart(request):
                 Prefetch('answers',
                          QuestionAnswer.objects.prefetch_related('options'),
                          to_attr='answerlist'),
-                Prefetch('item__questions',
-                         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_relevant_questionnaires(request.event, request.sales_channel.identifier, Questionnaire.QuestionnaireType.POSITION_PURCHASE),
             )
             by_id = {cp.pk: cp for cp in request._cart_cache}
             for cp in request._cart_cache:
@@ -448,9 +462,17 @@ def get_cart(request):
                 cp.event = request.event
                 if cp.addon_to_id:
                     cp.addon_to = by_id[cp.addon_to_id]
+                cp.rendered_questions = QuestionnaireRenderer(
+                    qrows=[qc for qq in cp.item.relevant_questionnaires for qc in qq.questionnairerowlist],
+                    system_answers=cp.system_answers,
+                    answerlist=cp.answerlist,
+                )
     return request._cart_cache
 
 
+get_cart = get_cart_positions  # legacy compatibility
+
+
 def get_cart_total(request):
     """
     Use the following pattern instead::
@@ -501,7 +523,7 @@ def get_cart_is_free(request):
 
     if not hasattr(request, '_cart_free_cache'):
         cs = cart_session(request)
-        pos = get_cart(request)
+        pos = get_cart_positions(request)
         ia = get_cart_invoice_address(request)
         try:
             fees = get_fees(event=request.event, request=request, invoice_address=ia,

src/pretix/presale/views/checkout.py

@@ -36,7 +36,7 @@ from pretix.helpers.http import redirect_to_url
 from pretix.multidomain.urlreverse import eventreverse
 from pretix.presale.checkoutflow import get_checkout_flow
 from pretix.presale.views import (
-    allow_frame_if_namespaced, cart_exists, get_cart,
+    allow_frame_if_namespaced, cart_exists, get_cart_positions,
     iframe_entry_view_wrapper,
 )
 
@@ -69,7 +69,7 @@ class CheckoutView(View):
 
         cart_error = None
         try:
-            validate_cart.send(sender=self.request.event, positions=get_cart(request))
+            validate_cart.send(sender=self.request.event, positions=get_cart_positions(request))
         except CartError as e:
             cart_error = e
 

src/pretix/presale/views/event.py

@@ -82,7 +82,7 @@ from pretix.presale.views.organizer import (
 )
 
 from . import (
-    CartMixin, EventViewMixin, allow_frame_if_namespaced, get_cart,
+    CartMixin, EventViewMixin, allow_frame_if_namespaced, get_cart_positions,
     iframe_entry_view_wrapper,
 )
 
@@ -244,7 +244,7 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
             context['display_add_to_cart'] = display_add_to_cart
 
         context['cart'] = self.get_cart()
-        context['has_addon_choices'] = any(cp.has_addon_choices for cp in get_cart(self.request))
+        context['has_addon_choices'] = any(cp.has_addon_choices for cp in get_cart_positions(self.request))
 
         templating_context = PlaceholderContext(event_or_subevent=self.subevent or self.request.event, event=self.request.event)
         if self.subevent:

src/pretix/presale/views/questions.py

@@ -36,7 +36,7 @@ from django.utils.functional import cached_property
 
 from pretix.base.views.mixins import BaseQuestionsViewMixin
 from pretix.presale.forms.checkout import CustomerAwareQuestionsForm
-from pretix.presale.views import get_cart
+from pretix.presale.views import get_cart_positions
 
 
 class CartQuestionsViewMixin(BaseQuestionsViewMixin):
@@ -49,7 +49,7 @@ class CartQuestionsViewMixin(BaseQuestionsViewMixin):
 
     @cached_property
     def _positions_for_questions(self):
-        cart = get_cart(self.request)
+        cart = get_cart_positions(self.request)
         return sorted(list(cart), key=lambda cp: cp.sort_key)
 
     def question_form_kwargs(self, cr):

src/pretix/static/pretixbase/scss/_dialogs.scss

@@ -87,6 +87,8 @@ dialog::backdrop {
   100% { transform: skewX(0deg); }
 }
 
+.modal-card.no-padding, .modal-card.no-padding .modal-card-content { padding: 0; }
+.modal-card.no-scroll { overflow: hidden; }
 
 
 /* Legacy dialogs (still used for #ajaxerr and #popupmodal) */

src/pretix/static/pretixbase/scss/_theme.scss

@@ -251,6 +251,8 @@ svg.svg-icon {
 .fa-stack-shifted {
   left: 0.5em;
 }
+.fa-stack-sm { font-size: 0.75em; }
+.fa-stack-shift-up { top: -0.4em; }
 
 .badge-primary { background: $brand-primary; }
 .badge-success { background: $brand-success; }

src/pretix/static/pretixcontrol/js/notify_parent.js

@@ -0,0 +1,8 @@
+try {
+	window.parent.postMessage({
+		type: 'pretix:notify-parent',
+		data: JSON.parse(document.getElementById('notify_info').textContent),
+	}, location.origin)
+} catch (e) {
+	console.error('Could not post message to parent.', e)
+}

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

@@ -72,6 +72,10 @@ $(document).ajaxError(function (event, jqXHR, settings, thrownError) {
 })
 
 let form_handlers = function (el) {
+	// Prevent running multiple times on the same elements
+	if (el.is('[data-formset-form-handlers-created]')) return
+	el.find('[data-formset-form]').attr('data-formset-form-handlers-created', 'true')
+
 	el.trigger('rescan.areYouSure')
 	el.find('[data-formset]').formset(
 		{
@@ -442,6 +446,15 @@ let form_handlers = function (el) {
 		})
 	})
 
+	function addClearButton($input) {
+		var $btn = $("<button class='clear-input-button'><span class='fa fa-times'></span></button>").insertAfter($input).on('click', function(e) {
+			$input.val('').trigger('input').trigger('change'); e.preventDefault()
+		}).toggle($input.val() !== '')
+		$input.on('input', function() {
+			$btn.toggle($input.val() !== '')
+		})
+	}
+
 	el.find('div.scrolling-choice:not(.no-search)').each(function () {
 		if ($(this).find('input[type=text]').length > 0) {
 			return
@@ -449,6 +462,7 @@ let form_handlers = function (el) {
 		let $menu = $('<div>').addClass('choice-options-menu')
 		let $inp_search = $('<input>').addClass('form-control').attr('type', 'text').attr('placeholder', gettext('Search query'))
 		$menu.append($inp_search)
+		addClearButton($inp_search)
 		$(this).prepend($menu)
 
 		$inp_search.on('keyup change', function (e) {
@@ -477,6 +491,7 @@ let form_handlers = function (el) {
 			$menu.append($lbl_tgl)
 		}
 		$(this).prepend($menu)
+		addClearButton($inp_search)
 
 		$(this).find('.choice-options-none').click(function (e) {
 			$(this).closest('.scrolling-multiple-choice').find('input[type=checkbox]:not(.menu-checkbox)').prop('checked', false)
@@ -736,6 +751,27 @@ let form_handlers = function (el) {
 	questions_toggle_dependent()
 	questions_init_photos(el)
 
+	el.find("[data-iframe-dialog]").on("click", function(e) {
+		let url;
+		if (this.tagName === "A" && !this.hasAttribute("data-iframe-dialog-url")) {
+			url = this.getAttribute("href")
+			url += (url.includes('?') ? '&' : '?') + 'notify_parent=true'
+		} else {
+			url = this.getAttribute("data-iframe-dialog-url")
+		}
+		show_iframe_dialog(url, (data) => {
+			if (this.getAttribute("data-iframe-dialog-target")) {
+				var $target = findDependency(this.getAttribute("data-iframe-dialog-target"), this)
+				if ($target.is('select')) {
+					$target.append(new Option(data.object_str, data.object, false, true)).trigger('change')
+				}
+			}
+		})
+		e.preventDefault()
+	})
+}
+
+function setup_placeholders() {
 	let lastFocusedInput
 	$(document).on('focusin', 'input, textarea', function (e) {
 		lastFocusedInput = e.target
@@ -1079,6 +1115,7 @@ $(function () {
 
 	setup_basics($('body'))
 	form_handlers($('body'))
+	setup_placeholders()
 	$(document).trigger('pretix:bind-forms')
 
 	$('#ajaxerr').on('click', '.ajaxerr-close', ajaxErrDialog.hide)
@@ -1121,3 +1158,65 @@ $(function () {
 		return $(this).find('button:not([type=button]), input[type=submit]').length > 0
 	}).areYouSure({ message: gettext('You have unsaved changes!') })
 })
+function show_iframe_dialog(url, callback) {
+	function messageEvent(e) {
+		if (e.origin === location.origin && e.data.type === 'pretix:dialog-loaded') {
+			$dlg.find("iframe").attr("height", Math.min(window.innerHeight - 120, e.data.contentHeight|0)).css("visibility", "visible")
+			$dlg.find("center").remove()
+		}
+		if (e.origin === location.origin && e.data.type === 'pretix:notify-parent') {
+			$dlg[0].close()
+			if (!callback(e.data.data)) {
+				if (e.data.data.messages?.length) {
+					alert(e.data.data.messages.map(m => m.message).join('\n\n'))
+				}
+			}
+		}
+	}
+	var $dlg = $('<dialog class="modal-card no-padding no-scroll" closedby="any"><center><i class="fa fa-cog big-rotating-icon"></i></center><iframe height="100" width="100%"></iframe></div>')
+		.css('max-width', '60em')
+	$dlg.find("iframe").attr("src", url).css("visibility", "hidden").css("border", "0")
+	window.addEventListener('message', messageEvent)
+	$dlg.appendTo("body")
+	$dlg.on('close', function() {
+		window.removeEventListener('message', messageEvent)
+		$dlg.remove()
+	})
+	$dlg[0].showModal()
+}
+function setup_dialog_frame_events() {
+	var dom_ready = false, parent_responded = false
+	function notify_dialog_loaded() {
+		window.parent.postMessage({
+			type: 'pretix:dialog-loaded',
+			contentHeight: $('#page-wrapper > .container-fluid').outerHeight() + 20,
+			title: document.title,
+		}, location.origin)
+	}
+	window.addEventListener('message', function(e) {
+		if (e.source === window) return  // don't handle messages from ourselves
+		if (e.origin !== location.origin) return  // only handle messages from same origin
+
+		if (e.data.type === 'pretix:dialog-handshake') {
+			// we are inside an iframe in a dialog
+			if (!parent_responded) {
+				window.document.documentElement.classList.add('in-iframe')
+				if (dom_ready) setTimeout(notify_dialog_loaded, 1)
+				parent_responded = true
+			}
+		} else if (e.data.type === 'pretix:dialog-loading') {
+			// we are parent to a dialog
+			e.source.postMessage({ type: 'pretix:dialog-handshake' })
+		}
+	})
+	$(function () {
+		if (parent_responded) setTimeout(notify_dialog_loaded, 1)
+		dom_ready = true
+	})
+	try {
+		window.parent.postMessage({
+			type: 'pretix:dialog-loading',
+		}, location.origin)
+	} catch {}
+}
+setup_dialog_frame_events()

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

@@ -0,0 +1,57 @@
+<script setup lang="ts">
+import Editor from './Editor.vue';
+import {provide, ref} from "vue";
+import * as api from "./api";
+import {sort, numericComp, groupBy} from './helper';
+import {Category, GroupedItems, Item, SalesChannel} from "./model";
+
+const sales_channels_list = ref<SalesChannel[]>();
+const all_items = ref<Record<string, Item>>()
+const grouped_items = ref<GroupedItems>()
+
+provide('pretix:env:organizer:sales_channels', sales_channels_list)
+provide('pretix:env:event:items', all_items)
+provide('pretix:env:event:grouped_items', grouped_items)
+
+async function loadEnvironmentData() {
+	sales_channels_list.value = await api.getSalesChannels();
+	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: gettext('Uncategorized'), name: null, id: null };
+	sort(items_list, numericComp(item => categories[item.category]?.position), numericComp(item => item.position));
+	grouped_items.value = [...groupBy(items_list, item => categories[item.category])]
+  all_items.value = Object.fromEntries(items_list.map(item => [item.id, item]));
+  console.log('all_items', all_items.value)
+}
+loadEnvironmentData()
+
+</script>
+
+<template>
+	<Suspense>
+		<Editor/>
+
+		<template #fallback>
+			<div class="big-load-indicator"><i class="fa fa-cog big-rotating-icon"></i></div>
+		</template>
+	</Suspense>
+</template>
+<style>
+.big-load-indicator { text-align: center; padding-bottom: 100px }
+
+.progressBar { position: fixed; top: 0; left: 0; right: 0; z-index:1000000; pointer-events: none; }
+.progressBar.local { position: absolute;  }
+.progressBar .progressBar_progress { height: 5px; background: #0091EA; border-bottom: #026099; }
+.progressBar .progressBar_progress.indeterminate {
+    width: 30%; animation: slide 5s forwards;
+}
+@keyframes slide {
+    0% { width: 20%; }
+    30% { width: 50%; }
+    100% { width: 60%; }
+}
+
+.drag-handle { cursor: grab }
+body:has(.drag-helper) { cursor: grabbing }
+</style>

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

@@ -0,0 +1,62 @@
+<script setup lang="ts">
+
+import {gettext} from "./gettextstub";
+import NativeDialog from "./NativeDialog.vue";
+import {computed, onMounted, onUnmounted, ref, watch} from "vue";
+
+const props = defineProps({
+	'defaultUrl': {type: String, default: null},
+	'maxWidth': {type: String, default: '43em'},
+})
+const emit = defineEmits(['confirm'])
+const dlgDjangoDialog = ref()
+const url = ref(props.defaultUrl)
+const frameHeight = ref(400)
+const frameLoading = ref(true)
+
+function messageEvent(e: MessageEvent) {
+	console.log('messageEvent', e.origin, e.source, e.data)
+	if (!dlgDjangoDialog.value.visible) return
+	if (e.origin === location.origin && e.data.type === 'pretix:dialog-loaded') {
+		frameHeight.value = Math.min(window.innerHeight - 120, e.data.contentHeight|0)
+		frameLoading.value = false
+	}
+	if (e.origin === location.origin && e.data.type === 'pretix:notify-parent') {
+		dlgDjangoDialog.value.close()
+		emit('confirm', e.data.data)
+		if (e.data.data.messages) {
+			alert(e.data.data.messages.map(m => m.message).join('\n\n'))
+		}
+	}
+}
+onMounted(() => {
+	window.addEventListener('message', messageEvent)
+})
+onUnmounted(() => {
+	window.removeEventListener('message', messageEvent)
+})
+
+defineExpose({
+  dialog: dlgDjangoDialog,
+	open: (newUrl) => {
+		frameLoading.value = true
+		frameHeight.value = 400
+		url.value = newUrl
+		dlgDjangoDialog.value.show()
+	},
+});
+</script>
+
+<template>
+    <NativeDialog ref="dlgDjangoDialog" class="modal-card" :no-padding="true" :no-scroll="true" :max-width="maxWidth">
+			<div :style="{'height': frameHeight + 'px'}">
+        <div class="frame-load-indicator" v-if="frameLoading"><i class="fa fa-cog big-rotating-icon"></i></div>
+				<iframe :src="url" v-if="dlgDjangoDialog.visible" :height="frameHeight" :style="{'opacity': frameLoading ? '0' : '1'}"></iframe>
+			</div>
+    </NativeDialog>
+</template>
+
+<style scoped>
+.frame-load-indicator { text-align: center; }
+iframe { width: 100%; border: 0;  }
+</style>

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

@@ -0,0 +1,258 @@
+<script setup lang="ts">
+import QuestionnaireElement from './QuestionnaireElement.vue';
+import * as api from './api';
+import {Datafield, Questionnaire} from './model';
+import {i18n_any, sort, numericComp, groupBy, SYSTEM_DATAFIELDS} from './helper';
+import { gettext } from './gettextstub';
+import {computed, inject, nextTick, onMounted, onUnmounted, ref} from 'vue';
+import { SlickList, SlickItem } from 'vue-slicksort';
+import { ProgressBar } from "./ProgressBar";
+
+const grouped_items = inject('pretix:env:event:grouped_items')
+const all_items = inject('pretix:env:event:items')
+
+type QuestionnaireMaybeUnsaved = Omit<Questionnaire, 'id'> & { _new_id?: number, id?: number };
+const order_questionnaires = ref<QuestionnaireMaybeUnsaved[]>();
+const position_questionnaires = ref<QuestionnaireMaybeUnsaved[]>();
+const order_datafields = ref<Datafield[]>();
+const position_datafields = ref<Datafield[]>();
+
+let lastDataRefresh = 0
+async function refreshQuestionnaireList () {
+	const all_questionnaires: QuestionnaireMaybeUnsaved[] = await api.getQuestionnaires();
+
+	order_questionnaires.value = all_questionnaires.filter(q => q.type.startsWith('order_'))
+	position_questionnaires.value = all_questionnaires.filter(q => q.type.startsWith('position_'))
+	lastDataRefresh = Date.now()
+}
+async function refreshDatafieldList () {
+	order_datafields.value = await api.getDatafields('order')
+	position_datafields.value = (await api.getDatafields('position')).concat(Object.values(SYSTEM_DATAFIELDS))
+	console.log('datafield list refreshed')
+}
+await Promise.all([refreshQuestionnaireList(), refreshDatafieldList()])
+
+function saveQuestionnaire(questionnaire) {
+	let result;
+	questionnaire._loading = true
+	if (questionnaire.id) {
+		result = api.updateQuestionnaire(questionnaire.id, questionnaire)
+	} else {
+		result = api.createQuestionnaire(questionnaire)
+	}
+	result = result.then(d => {
+		questionnaire.id = d.id
+		questionnaire.rows = d.rows
+		questionnaire._err_mes = null
+		questionnaire._loading = false
+		return d;
+	}, err => {
+		questionnaire._err_mes = err
+		questionnaire._loading = false
+		return err;
+	})
+	return result;
+}
+function addPositionQuestionnaire () {
+	position_questionnaires.value.push({
+		all_sales_channels: true, rows: [], limit_sales_channels: [], position: position_questionnaires.value.length,
+		items: [], internal_name: "Unnamed questionnaire", type: "position_purchase",
+		_new_id: Date.now(),
+	});
+}
+function addOrderQuestionnaire () {
+	order_questionnaires.value.push({
+		all_sales_channels: true, rows: [], limit_sales_channels: [], position: order_questionnaires.value.length,
+		items: [], internal_name: "Unnamed questionnaire", type: "order_purchase",
+		_new_id: Date.now(),
+	});
+}
+async function saveData () {
+	using pb = ProgressBar.show('saving questionnaires')
+	let promises = [];
+	let i = 0;
+	for (const questionnaire of order_questionnaires.value) {
+		questionnaire.position = i++;
+		promises.push(saveQuestionnaire(questionnaire))
+	}
+	i = 0;
+	for (const questionnaire of position_questionnaires.value) {
+		questionnaire.position = i++;
+		promises.push(saveQuestionnaire(questionnaire))
+	}
+	await Promise.all(promises)
+}
+
+function windowFocused() {
+	if (Date.now() - lastDataRefresh > 30000) {
+		if (document.querySelector("dialog[open]")) {
+			// TODO this should not be skipped completely but handled in a more robust way
+			// currently dialogs are very flaky if the whole questionnaires list gets replaced underneath
+			// them (they will stay open, but saving them will cause weird problems i don't fully understand yet)
+			console.log('skipping refresh because a dialog is open')
+			return
+		}
+		console.log('refreshing to avoid overwriting with older data on edit')
+		refreshQuestionnaireList()
+	}
+}
+onMounted(() => window.addEventListener('focus', windowFocused))
+onUnmounted(() => window.removeEventListener('focus', windowFocused))
+
+const selected_product = ref("")
+const selected_product_details = computed(() => selected_product.value ? all_items.value[selected_product.value] : null)
+const preview_mode = ref(false)
+</script>
+
+<style>
+.hidden-questionnaire { opacity: 0.3; }
+
+.questionnaires-list {
+	padding: 20px 190px 20px 0;
+	background: linear-gradient(to right, #fff 0, #fff calc(100% - 172px), #ddd calc(100% - 171px), #f6f2f8 calc(100% - 171px), #fff calc(100% - 100px), #fff 100%);
+}
+.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 .questionnaire-panel .questionnaire-panel-heading {}
+
+.questionnaires-editor:not(.preview-mode) .questionnaire-panel .questionnaire-panel-heading .editor-row { border-top: 1px solid rgb(175 175 175 / 0.3); 	 }
+.questionnaires-editor:not(.preview-mode) .questionnaire-panel[open] .questionnaire-panel-heading .editor-row { border-bottom: 1px solid rgb(216 216 216 / 0.3);  }
+
+.questionnaires-editor.preview-mode .questionnaire-panel .questionnaire-panel-heading { color: #888; margin-top: 5px; border-top: 1px dashed rgb(175 175 175 / 0.3); border-bottom: 1px dashed rgb(216 216 216 / 0.3); font-style: italic; padding: 0; }
+
+.questionnaires-editor .editor-row:not(:hover):not(:focus-within) .btn.btn-default,
+.questionnaires-editor .editor-action-row:not(:hover):not(:focus-within) .btn.btn-default{ box-shadow: 0 0 0 0 #eeeeee; background: transparent; color: #555; }
+
+.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; }
+
+.editor-row { display: flex; width: calc(100% + 190px); background: transparent; }
+.editor-row:hover { background: rgba(255,233,244,0.3); }
+.editor-preview-area { flex: 1; padding-left: 10px; padding-right: 40px; }
+.editor-action-area { width: 160px; padding-left: 20px; }
+.questionnaire-panel-heading .editor-preview-area { padding-block: 11px; }
+.questionnaire-panel-heading .editor-action-area { padding-block: 5px; }
+.questionnaire-panel-body .editor-preview-area, .questionnaire-panel-body .editor-action-area { padding-block: 10px; }
+.preview-mode .editor-preview-area { padding-right: 50px; }
+
+.questionnaires-editor.questionnaires-editor .form-group { margin-bottom: 0px; }
+
+.questionnaire-panel .questionnaire-panel-heading .editor-preview-area::before {
+    margin-top: -.5em;
+    content: "";
+    width: 1em;
+    height: 1em;
+    font: normal normal normal 14px/1 FontAwesome;
+    display: inline-block;
+    text-align: center;
+    transform: rotate(-90deg);
+    transition: transform 150ms ease-in 0s;
+}
+.questionnaire-panel[open] .questionnaire-panel-heading .editor-preview-area::before {
+    transform: rotate(0deg);
+}
+
+.editor-action-row { padding-top: 10px; width: calc(100% + 190px); padding-right: 170px }
+.questionnaires-list > .editor-action-row { border-top: 1px solid rgb(175 175 175 / 0.3); padding-top: 25px; padding-bottom: 10px }
+
+</style>
+<template>
+	<div class="questionnaires-editor" v-if="!preview_mode">
+		<div class="filter-row">
+			Order questionnaires
+		</div>
+		<div class="questionnaires-list">
+			<SlickList axis="y" v-model:list="order_questionnaires" useDragHandle helperClass="drag-helper" appendTo="#orderQuestionnaireListParent" id="orderQuestionnaireListParent" @update:list="saveData()">
+				<SlickItem v-for="(questionnaire, index) in order_questionnaires" :key="questionnaire.id || questionnaire._new_id" :index="index">
+					<QuestionnaireElement
+						:questionnaire="questionnaire"
+						:datafields="order_datafields"
+						:grouped_items="null"
+						:selected_product="null"
+						:preview_mode="false"
+						@update="saveQuestionnaire(questionnaire)"
+						@invalidate:datafields="refreshDatafieldList()"
+						@invalidate:questionnaires="refreshQuestionnaireList()"/>
+				</SlickItem>
+			</SlickList>
+			<div class="editor-action-row form-horizontal">
+				<div class="form-group">
+					<div class="col-md-9 col-md-push-3">
+						<button class="btn btn-default" @click="addOrderQuestionnaire()"><i class="fa fa-plus"></i> {{ gettext('New questionnaire') }}</button>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div :class="`questionnaires-editor ${selected_product ? 'product-selected':''} ${preview_mode ? 'preview-mode':''}`">
+		<div class="filter-row" v-if="preview_mode">
+			<button class="btn btn-default" @click="preview_mode = false"><span class="fa fa-chevron-left"></span> {{ gettext('Back') }}</button>
+			Preview of questionnaires for product <em>{{ selected_product_details?.internal_name || i18n_any(selected_product_details?.name) }}</em>
+		</div>
+		<div class="filter-row" v-else>
+			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>
+			&nbsp;
+			<button class="btn btn-default" @click="preview_mode = true" :disabled="!selected_product"> {{ gettext('Preview') }}</button>
+		</div>
+
+		<div class="questionnaires-list" v-if="preview_mode && selected_product">
+			<details class="panel panel-default details-open" open>
+				<summary class="panel-heading">
+					<h4 class="panel-title">
+						<strong>{{ selected_product_details?.internal_name || i18n_any(selected_product_details?.name) }}</strong>
+					</h4>
+				</summary>
+
+				<QuestionnaireElement v-for="(questionnaire, index) in position_questionnaires.filter(q => q.items.indexOf(selected_product as any) !== -1)"
+					:questionnaire="questionnaire"
+					:datafields="position_datafields"
+					:grouped_items="grouped_items"
+					:selected_product="selected_product"
+					:preview_mode="true"
+					@update="saveQuestionnaire(questionnaire)"
+					@invalidate:datafields="refreshDatafieldList()"
+					@invalidate:questionnaires="refreshQuestionnaireList()"/>
+			</details>
+		</div>
+
+		<div class="questionnaires-list" v-else>
+			<SlickList axis="y" v-model:list="position_questionnaires" useDragHandle appendTo="#questionnaireListParent" id="questionnaireListParent" @update:list="saveData()">
+				<SlickItem v-for="(questionnaire, index) in position_questionnaires" :key="questionnaire.id || questionnaire._new_id" :index="index">
+					<QuestionnaireElement
+						:questionnaire="questionnaire"
+						:datafields="position_datafields"
+						:grouped_items="grouped_items"
+						:selected_product="selected_product"
+						:preview_mode="false"
+						@update="saveQuestionnaire(questionnaire)"
+						@invalidate:datafields="refreshDatafieldList()"
+						@invalidate:questionnaires="refreshQuestionnaireList()"/>
+				</SlickItem>
+			</SlickList>
+			<div v-if="!preview_mode" class="editor-action-row form-horizontal">
+				<div class="form-group">
+					<div class="col-md-9 col-md-push-3">
+						<button class="btn btn-default" @click="addPositionQuestionnaire()"><i class="fa fa-plus"></i> {{ gettext('New questionnaire') }}</button>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>

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

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

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

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

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

@@ -0,0 +1,58 @@
+<script setup lang="ts">
+import { ref, useId } from 'vue';
+
+const dialog = ref<HTMLDialogElement>();
+
+const props = defineProps({
+  classes: {
+    type: String,
+    default: "",
+  },
+  title: {type: String, default: ''},
+	noPadding: {type: Boolean, default: false},
+	noScroll: {type: Boolean, default: true},
+	maxWidth: {type: String, default: '43em'},
+});
+
+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 ${props.noPadding ? 'no-padding' : ''} ${props.noPadding ? 'no-scroll' : ''}`"
+    @close="visible = false"
+    closedby="any"
+    :aria-labelledby="`${id}-title`"
+		:style="{maxWidth: props.maxWidth}"
+  >
+    <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" v-if="title">{{ title }}</h2>
+          <slot />
+      </div>
+    </form>
+  </dialog>
+</template>
+
+<style>
+.modal-card.no-padding, .modal-card.no-padding .modal-card-content { padding: 0; }
+.modal-card.no-scroll { overflow: hidden; }
+</style>

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

@@ -0,0 +1,50 @@
+export class ProgressBar {
+    private static container : HTMLDivElement = ProgressBar.createContainer();
+    private static indeterminateBar = null;
+    private static indeterminateCtr = 0;
+
+    private static createContainer() {
+        const el = document.createElement('div')
+        el.className = 'progressBar'
+        document.body.appendChild(el)
+        return el
+    }
+
+    static show(message?: string, max?: number) {
+        if (!max) return ProgressBar.showIndeterminate();
+        const bar = document.createElement('div')
+        bar.className = 'progressBar_progress'
+        ProgressBar.container.appendChild(bar);
+        return {
+            disposed: false,
+            [Symbol.dispose]() {
+                if (this.disposed) return;
+                bar.remove();
+                this.disposed = true;
+            },
+            set message(val: string) {
+            },
+            set progress(val: number) {
+                bar.style.width = `${val / max * 100}%`;
+            }
+        };
+    }
+
+    static showIndeterminate() {
+        if ((ProgressBar.indeterminateCtr++) === 0) {
+            const bar = ProgressBar.indeterminateBar = document.createElement('div')
+            bar.className = 'progressBar_progress indeterminate'
+            ProgressBar.container.appendChild(bar);
+        }
+        return {
+            disposed: false,
+            [Symbol.dispose]() {
+                if (this.disposed) return;
+                if (--ProgressBar.indeterminateCtr === 0) {
+                    ProgressBar.indeterminateBar.remove();
+                }
+                this.disposed = true;
+            },
+        };
+    }
+}

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

@@ -0,0 +1,80 @@
+<script setup lang="ts">
+import {gettext} from "./gettextstub";
+import {GroupedItems, Questionnaire, SalesChannel} from "./model";
+import {inject, Ref, useId} from "vue";
+import {i18n_any, QUESTIONNAIRE_TYPE, QUESTIONNAIRE_TYPE_LABEL, setListState} from "./helper";
+import SalesChannelIcon from "./SalesChannelIcon.vue";
+
+const sales_channels: Ref<SalesChannel[]> = inject('pretix:env:organizer:sales_channels')
+
+const id = useId()
+
+const props = defineProps<{
+	questionnaire: Questionnaire,
+	grouped_items: GroupedItems,
+}>()
+
+</script>
+
+<template>
+	<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">
+		<label class="col-md-3 control-label">
+			{{ gettext('When to ask') }}
+		</label>
+		<div class="col-md-9">
+			<select v-model="questionnaire.type" class="form-control">
+        <template v-for="(label, type) in QUESTIONNAIRE_TYPE_LABEL">
+				  <option v-if="QUESTIONNAIRE_TYPE[type][0] == questionnaire.type[0]" :value="QUESTIONNAIRE_TYPE[type]">{{ label }}</option>
+        </template>
+			</select>
+		</div>
+	</div>
+	<div class="form-group" v-if="questionnaire.type === 'order_purchase' || questionnaire.type === 'position_purchase'">
+		<label class="col-md-3 control-label">
+			{{ gettext('Sales channels') }}
+		</label>
+		<div class="col-md-9">
+			<div class="checkbox">
+				<label>
+					<input type="checkbox" v-model="questionnaire.all_sales_channels"> {{ gettext('All sales channels') }}
+				</label>
+			</div>
+			<div class="checkbox" v-for="channel in sales_channels">
+				<label>
+					<input type="checkbox" :checked="questionnaire.all_sales_channels || questionnaire.limit_sales_channels.indexOf(channel.identifier) !== -1"
+								 @change="e => setListState(questionnaire.limit_sales_channels, (e.target as HTMLInputElement).checked, channel.identifier)"
+								 :disabled="questionnaire.all_sales_channels">
+          <SalesChannelIcon :sales-channel="channel"/>
+					{{ i18n_any(channel.label) }}
+				</label>
+			</div>
+		</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" @change="e => setListState(questionnaire.items, (e.target as HTMLInputElement).checked, item.id)"> {{ item.internal_name || i18n_any(item.name) }}
+					</label>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<style scoped lang="sass">
+
+</style>

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

@@ -0,0 +1,302 @@
+<script setup lang="ts">
+import {useId, ref, computed, onMounted, watch, Ref, inject} from 'vue'
+import QuestionnaireRowElement from "./QuestionnaireRowElement.vue";
+import {
+  i18n_any,
+  QUESTION_TYPE,
+  QUESTION_TYPE_LABEL,
+  QUESTIONNAIRE_TYPE,
+  QUESTIONNAIRE_TYPE_LABEL, setListState,
+  SYSTEM_DATAFIELDS, TYPES_ALLOWED_AS_DEPENDENCIES
+} from "./helper";
+import { gettext } from './gettextstub';
+import I18nTextField from "./I18nTextField.vue";
+import NativeDialog from "./NativeDialog.vue";
+import { SlickList, SlickItem, DragHandle } from 'vue-slicksort';
+import {getDatafieldCreateUrl} from "./api";
+import DjangoDialog from "./DjangoDialog.vue";
+import * as api from './api';
+import QuestionnaireEditForm from "./QuestionnaireEditForm.vue";
+import SalesChannelIcon from "./SalesChannelIcon.vue";
+import {SalesChannel} from "./model";
+import I18nTextArea from "./I18nTextArea.vue";
+
+const dlgEditor = ref()
+const dlgAddExisting = ref()
+const dlgAddTextblock = ref()
+const dlgNewDatafield = ref()
+
+const newTextblockTitle = ref()
+const newTextblockText = ref()
+
+const id = useId();
+const props = defineProps(['questionnaire', 'datafields', 'selected_product', 'grouped_items', 'preview_mode', 'err_mes'])
+const emit = defineEmits(['update', 'invalidate:datafields', 'invalidate:questionnaires'])
+const sales_channels: Ref<SalesChannel[]> = inject('pretix:env:organizer:sales_channels')
+
+let nextId = 1;
+watch(() => props.questionnaire.rows, () => {
+	for (let qc of props.questionnaire.rows) {
+		if (!qc._cid) qc._cid = id + (++nextId);
+	}
+})
+
+function addExistingDatafield (...fields) {
+  for (const field of fields) {
+    if (askedDatafields.value.has(field.identifier)) continue;
+    props.questionnaire.rows.push({
+      _cid: useId(),
+      datafield: field.identifier,
+      required: false,
+      label: field.question ?? {en: field.internal_name},
+      help_text: {},
+      dependency_datafield: null,
+      dependency_values: [],
+    })
+  }
+	dlgAddExisting.value.close()
+	emit('update')
+}
+
+function showAddTextblockDialog () {
+	newTextblockTitle.value = {}
+	newTextblockText.value = {}
+	dlgAddTextblock.value.show()
+}
+
+function addTextblock () {
+	props.questionnaire.rows.push({
+		_cid: useId(),
+		datafield: null,
+		required: false,
+		label: newTextblockTitle.value,
+		help_text: newTextblockText.value,
+		dependency_datafield: null,
+		dependency_values: [],
+	})
+	dlgAddTextblock.value.close()
+	emit('update')
+}
+
+function newDatafield () {
+	dlgNewDatafield.value.open(getDatafieldCreateUrl(props.questionnaire.type.startsWith('order_') ? 'O' : 'P'))
+}
+
+async function onNewDatafieldCreated (data) {
+	watch(
+		() => props.datafields,
+		(newValue, oldValue) => {
+			console.log('datafields changed watcher called')
+			addExistingDatafield(newValue.find(f => f.id === data.object))
+		},
+		{ once: true }
+	)
+	emit('invalidate:datafields')
+}
+
+async function deleteQuestionnaire () {
+	if (confirm("Are you sure?")) {
+		try {
+			await api.deleteQuestionnaire(props.questionnaire.id)
+		} catch (e) {
+			console.error('Failed to delete questionnaire', e)
+			alert('Error while deleting questionnaire')
+		}
+		emit('invalidate:questionnaires')
+	}
+}
+
+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)
+const askedDatafields = computed(() => new Set(props.questionnaire.rows.map(row => row.datafield)))
+const addressFieldIdentifiers = new Set(['@street', '@city', '@zipcode', '@state', '@country'])
+const anyAddressFieldAsked = computed(() => addressFieldIdentifiers.intersection(askedDatafields.value).size > 0)
+const allAddressFieldsAsked = computed(() => addressFieldIdentifiers.isSubsetOf(askedDatafields.value))
+const allAddressFields = computed(() => props.datafields.filter(df => addressFieldIdentifiers.has(df.identifier)))
+
+</script>
+
+<style>
+.sales-channel-icons > * { margin-left: 4px; opacity: 0.8; }
+.list-group-item.exists, .list-group-item.exists:hover { color: #666; text-decoration: line-through; background: #fcfcfc; cursor: default; }
+details > summary.list-group-item { color: #666; padding: 5px 15px 5px 28px; }
+details .list-group-item { padding-left: 28px }
+details > summary.list-group-item:hover { color: #555; text-decoration: none; background-color: #f5f5f5; }
+details > summary.list-group-item::before {
+    position: absolute;
+    top: 50%;
+    left: 10px;
+    margin-top: -.5em;
+    content: "";
+    width: 1em;
+    height: 1em;
+    font: normal normal normal 14px/1 FontAwesome;
+    display: inline-block;
+    text-align: center;
+    transform: rotate(-90deg);
+    transition: transform 150ms ease-in 0s;
+}
+details[open] > summary.list-group-item::before {
+    transform: rotate(0deg);
+}
+details[open] > summary.list-group-item {
+    color: black;
+}
+</style>
+
+<template>
+
+  <details class="questionnaire-panel" :open="preview_mode"
+    :class="{ 'hidden-questionnaire': isHidden }">
+    <summary class="questionnaire-panel-heading">
+			<div class=" editor-row">
+				<div class="editor-preview-area">
+					<input type="checkbox" @change="e => {setListState(props.questionnaire.items, (e.target as HTMLInputElement).checked, selected_product); emit('update')}" v-if="selected_product && !preview_mode" :checked="!isHidden">
+					{{ props.questionnaire.internal_name }}
+          <span v-if="questionnaire.compat_personalization">
+            <span class="text-muted fa fa-fw fa-id-card-o" data-toggle="tooltip" :title="gettext('Default questionnaire for creating personalized items via legacy API')"></span>
+          </span>
+					<span class="fa fa-warning" v-if="questionnaire._err_mes"></span>
+					<span class="fa fa-cog fa-spin" v-if="questionnaire._loading"></span>
+
+          <span class="pull-right" v-if="questionnaire.type === 'position_checkin'">
+            <span class="label label-default" data-toggle="tooltip" :title="gettext('Ask during check-in')">
+              <span class="fa fa-check-square"></span>
+              {{ gettext('Check-in') }}</span>
+          </span>
+          <span class="pull-right" v-else-if="questionnaire.type === 'position_attendee'">
+            <span class="label label-default">{{ gettext('Attendee link') }}</span>
+          </span>
+          <span class="pull-right" v-else-if="questionnaire.type === 'position_hidden'">
+            <span class="label label-default" data-toggle="tooltip" :title="gettext('Hidden question')">
+              <span class="fa fa-eye-slash"></span>
+              {{ gettext('Hidden') }}
+            </span>
+          </span>
+          <span class="pull-right sales-channel-icons" v-else>
+            <template v-for="sc in sales_channels">
+              <SalesChannelIcon
+                  v-if="props.questionnaire.all_sales_channels || props.questionnaire.limit_sales_channels.indexOf(sc.identifier) !== -1"
+                  :sales-channel="sc" :tooltip="true" />
+            </template>
+          </span>
+				</div>
+
+				<aside class="editor-action-area"><div class="btn-group">
+					<a v-drag-handle class="btn btn-default drag-handle" v-if="!preview_mode" :title="gettext('Click and drag this button to reorder.')"><i class="fa fa-arrows"></i></a>
+					<button class="btn btn-default" @click="dlgEditor.show()" :title="`#${questionnaire.id}`"><i class="fa fa-wrench"></i></button>
+				</div></aside>
+			</div>
+    </summary>
+    <div class="questionnaire-panel-body" v-if="!isHidden">
+			<div class="alert alert-warning" v-if="questionnaire._err_mes">
+        <dl v-if="questionnaire._err_mes.api_error">
+          <template v-for="(messages, key) in questionnaire._err_mes.api_error">
+            <dt>{{ key }}</dt>
+            <dd><ul><li v-for="message in messages">{{ message }}</li></ul></dd>
+          </template>
+        </dl>
+        <p v-else>{{ questionnaire._err_mes }}</p>
+      </div>
+      <div class="form-horizontal" :id="`questionListParent${props.questionnaire.id}`">
+				<SlickList axis="y" v-model:list="props.questionnaire.rows" useDragHandle helperClass="drag-helper" :appendTo="`#questionListParent${props.questionnaire.id}`" @update:list="emit('update')">
+					<SlickItem v-for="(child, index) in props.questionnaire.rows" :key="child._cid" :index="index">
+						<QuestionnaireRowElement
+										:datafields="props.datafields"
+										:question="child"
+										:editable="true"
+										:possible_dependencies="props.questionnaire.rows.slice(0, index).filter(row => TYPES_ALLOWED_AS_DEPENDENCIES.has(props.datafields.find(el => el.identifier === row.datafield)?.type))"
+										@remove-self="questionnaire.rows.splice(index, 1); emit('update')"
+										@update="emit('update')"
+										@invalidate:datafields="emit('invalidate:datafields')"/>
+					</SlickItem>
+				</SlickList>
+      </div>
+			<div class="editor-action-row form-horizontal">
+				<div class="form-group">
+					<div class="col-md-9 col-md-push-3">
+						<p 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>
+				</div>
+			</div>
+    </div>
+  </details>
+
+  <Teleport to="body">
+    <NativeDialog ref="dlgEditor" class="modal-card"
+                  :title="gettext('Edit questionnaire')">
+			<QuestionnaireEditForm :questionnaire="questionnaire" :grouped_items="grouped_items"/>
+
+			<button @click="dlgEditor.close(); emit('update')" class="btn btn-primary pull-right"><span class="fa fa-check"></span> {{ gettext('Save and close') }}</button>
+			<button @click="deleteQuestionnaire" class="btn btn-default">{{ gettext('Delete') }}</button>
+    </NativeDialog>
+
+    <NativeDialog ref="dlgAddExisting" class="modal-card"
+                  :title="gettext('Add existing data field')">
+
+        <h4>{{ gettext('System fields') }}</h4>
+				<div class="list-group">
+          <template v-for="field in datafields">
+					  <a v-if="field.identifier.startsWith('@') && !addressFieldIdentifiers.has(field.identifier)"
+               href="javascript:" @click="addExistingDatafield(field)"
+               :class="`list-group-item ${askedDatafields.has(field.identifier) ? 'exists' : ''}`">{{ i18n_any(field.question) }}</a>
+          </template>
+
+          <a v-if="allAddressFields.length"
+              href="javascript:" @click="addExistingDatafield(...allAddressFields)"
+             :class="`list-group-item ${anyAddressFieldAsked ? 'exists' : ''}`">{{ gettext('Attendee address') }}</a>
+          <details v-if="allAddressFields.length" :open="anyAddressFieldAsked && !allAddressFieldsAsked">
+            <summary class="list-group-item">{{ gettext('Individual address fields ...') }}</summary>
+
+            <template v-for="field in datafields">
+              <a v-if="addressFieldIdentifiers.has(field.identifier)"
+                 href="javascript:" @click="addExistingDatafield(field)"
+                 :class="`list-group-item ${askedDatafields.has(field.identifier) ? 'exists' : ''}`">{{ i18n_any(field.question) }}</a>
+            </template>
+          </details>
+				</div>
+
+        <h4>{{ gettext('User-defined data fields') }}</h4>
+				<div class="list-group">
+          <template v-for="field in datafields">
+					  <a v-if="!field.identifier.startsWith('@')"
+               href="javascript:" @click="addExistingDatafield(field)"
+               :class="`list-group-item ${askedDatafields.has(field.identifier) ? 'exists' : ''}`">{{ field.internal_name }}</a>
+          </template>
+        </div>
+
+        <button @click="dlgAddExisting.close()" class="btn btn-default pull-right">{{ gettext('Cancel') }}</button>
+    </NativeDialog>
+
+    <NativeDialog ref="dlgAddTextblock" class="modal-card"
+                  :title="gettext('Add text block')">
+
+        <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">
+            <I18nTextArea :value="newTextblockText"/>
+          </div>
+        </div>
+
+        <button @click="addTextblock()" class="btn btn-primary pull-right"><span class="fa fa-check"></span> {{ gettext('OK') }}</button>
+        <button @click="dlgAddTextblock.close()" class="btn btn-default">{{ gettext('Cancel') }}</button>
+
+    </NativeDialog>
+
+		<DjangoDialog ref="dlgNewDatafield" @confirm="onNewDatafieldCreated" max-width="60em"></DjangoDialog>
+  </Teleport>
+</template>

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

@@ -0,0 +1,185 @@
+<script setup lang="ts">
+import {
+  i18n_any,
+  QUESTION_TYPE,
+  QUESTION_TYPE_LABEL,
+  QUESTION_TYPE_LABEL_FROM_VALUE,
+  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 {getDatafieldCreateUrl, getDatafieldEditUrl, getDatafieldViewUrl} from "./api";
+import I18nTextArea from "./I18nTextArea.vue";
+import DjangoDialog from "./DjangoDialog.vue";
+
+const id = useId();
+const props = defineProps(['question', 'datafields', 'editable', 'possible_dependencies'])
+const emit = defineEmits(['removeSelf', 'update', 'invalidate:datafields']);
+const gettext = (window as any).gettext;
+const question = ref(props.question);
+
+const dlgEditDatafield = ref()
+
+const df = computed(() => question.value.datafield === null ?
+    null :
+    question.value.datafield.startsWith('@') ?
+		SYSTEM_DATAFIELDS[question.value.datafield] :
+		props.datafields.find(el => el.identifier === question.value.datafield)
+);
+
+const dependency_values_options = computed(() => {
+  const dependency = props.datafields.find(el => el.identifier === question.value.dependency_datafield)
+  if (dependency?.type === 'B') return [{identifier: 'True', answer: {_: gettext('Yes')}}, {identifier: 'False', answer: {_: gettext('No')}}]
+  else return dependency?.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="editor-row">
+		<div class="editor-preview-area">
+			<div class="form-group">
+
+				<template v-if="df">
+					<div v-if="question.dependency_datafield" class="dependency-info debuginfo">
+						<span><span class="fa fa-link"></span> {{ question.dependency_datafield }} = {{ 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" v-html="question.rendered_help_text" v-if="question.rendered_help_text"></div>
+					</div>
+				</template>
+				<div v-else class="col-md-9 col-md-push-3">
+					<h4>{{ i18n_any(question.label) }}</h4>
+					<p v-html="question.rendered_help_text" v-if="question.rendered_help_text"></p>
+				</div>
+			</div>
+		</div>
+		<aside class="editor-action-area">
+			<div class="btn-group" v-if="editable">
+				<a v-drag-handle class="btn btn-default drag-handle" :title="gettext('Click and drag this button to reorder.')"><i class="fa fa-arrows"></i></a>
+				<button class="btn btn-default" @click="editor.show()"><i class="fa fa-edit"></i></button>
+			</div>
+		</aside>
+	</div>
+
+  <Teleport to="body">
+    <NativeDialog ref="editor" class="modal-card"
+                  :title="df ? gettext('Edit question') : gettext('Edit text block')">
+        <div class="form-group">
+          <label class="col-md-3 control-label">
+            {{ df ? gettext('Question') : gettext('Headline') }}
+          </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">
+            <I18nTextArea :value="question.help_text"/>
+            <div class="help-block">{{ gettext('If the question needs to be explained or clarified, do it here!') }}</div>
+          </div>
+        </div>
+        <div class="form-group" v-if="df">
+          <label class="col-md-3 control-label">
+            Data field
+          </label>
+          <div class="col-md-9">
+            <div class="form-control-static">
+							<template v-if="question.datafield.startsWith('@')">
+								{{ i18n_any(df.question) }} <span class="label label-default pull-right">{{gettext('System-defined field')}}</span>
+							</template>
+							<template v-else>
+								{{ df.internal_name }}
+							</template>
+              <div class="text-muted"><small>{{ gettext('Internal reference') }}: <code>{{ df.identifier }}</code> &middot; {{ gettext('Question type') }}: {{ QUESTION_TYPE_LABEL_FROM_VALUE[df.type] }}
+              </small></div>
+              <div v-if="!question.datafield.startsWith('@')">
+                <a class="btn btn-sm btn-default" href="javascript:" @click="dlgEditDatafield.open(getDatafieldEditUrl(df.id))"><span class="fa fa-wrench"></span> Manage data field details</a>
+                <a class="btn btn-sm btn-default" :href="getDatafieldViewUrl(df.id)" target="_blank"><span class="fa fa-external-link"></span> View answers</a>
+              </div>
+						</div>
+          </div>
+        </div>
+        <div class="form-group" v-if="df">
+        	<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 class="help-block" v-if="(question.datafield == '@street' || question.datafield == '@zipcode' || question.datafield == '@city') && question.required">
+                {{ gettext('Always optional if a country is selected where street addresses are not guaranteed to have this field.') }}
+              </div>
+						</div>
+          </div>
+        </div>
+
+        <div class="form-group" v-if="question.datafield != '@state'">
+          <label class="col-md-3 control-label">
+            {{ gettext('Only visible if...') }}
+          </label>
+          <div class="col-md-9">
+            <select v-model="question.dependency_datafield" class="form-control">
+              <option :value="null">{{ gettext('(none)') }}</option>
+              <option v-for="(qc, index) in possible_dependencies" :value="qc.datafield">{{ 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_datafield">
+							<p><span class="debuginfo">depends on {{ question.dependency_datafield }} = {{ dependency_values_resolved }}</span></p>
+						</div>
+          </div>
+        </div>
+        <div class="form-group" v-else>
+          <label class="col-md-3 control-label">
+            {{ gettext('Only visible if...') }}
+          </label>
+          <div class="col-md-9">
+            <div class="help-block">
+              {{ gettext('the user selects a country where street addresses usually contain a state.') }}
+            </div>
+          </div>
+        </div>
+
+        <button @click="editor.close(); emit('update')" class="btn btn-primary pull-right"><span class="fa fa-check"></span> {{ gettext('Save and close') }}</button>
+        <button @click="emit('removeSelf')" class="btn btn-default">{{ gettext('Remove from questionnaire') }}</button>
+    </NativeDialog>
+
+		<DjangoDialog ref="dlgEditDatafield" @confirm="emit('invalidate:datafields')" max-width="60em"></DjangoDialog>
+  </Teleport>
+</template>

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

@@ -0,0 +1,16 @@
+<script setup lang="ts">
+
+import {SalesChannel} from "./model";
+import {i18n_any} from "./helper";
+
+const props = defineProps<{ salesChannel: SalesChannel, tooltip?: boolean }>();
+</script>
+
+<template>
+  <template v-if="salesChannel.icon_url">
+    <img :src="salesChannel.icon_url" class="fa-like-image" :alt="i18n_any(salesChannel.label)" :data-toggle="tooltip ? 'tooltip' : ''" :title="tooltip ? i18n_any(salesChannel.label) : ''">
+  </template>
+  <template v-else>
+    <span :class="`fa fa-${salesChannel.icon} fa-fw text-muted`" :data-toggle="tooltip ? 'tooltip' : ''" :title="tooltip ? i18n_any(salesChannel.label) : ''"></span>
+  </template>
+</template>

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

@@ -0,0 +1,98 @@
+import {ApiListResponse, Datafield, Questionnaire, Item, Category, SalesChannel} from './model'
+import { ProgressBar } from "./ProgressBar";
+import {fromJsonScript} from "./helper";
+
+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
+}
+
+class APIError extends Error {
+	api_error: string;
+	constructor(json) {
+		super('' + Object.values(json)[0]);
+		this.api_error = json;
+	}
+}
+async function api_json_request(resource, method, json_body) {
+	const response = await fetch(`/api/v1/${resource}`, {
+		body: JSON.stringify(json_body),
+		method: method,
+		headers: {
+			'Content-Type': 'application/json',
+			'X-CSRFToken': $('[name=csrfmiddlewaretoken]').val() as string,
+		},
+	});
+	if (response.status === 204)
+		return {}
+	else if (response.status >= 400)
+		throw new APIError(await response.json());
+	else
+		return await response.json()
+}
+
+export async function getDatafields(container_type) {
+	using pb = ProgressBar.show('loading data fields')
+	return await api_get_all<Datafield>(`organizers/${organizer_slug}/events/${event_slug}/datafields/${container_type}/`);
+}
+
+export async function getQuestionnaires() {
+	using pb = ProgressBar.show('loading questionnaires')
+	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 deleteQuestionnaire(id) {
+	return await api_json_request(`organizers/${organizer_slug}/events/${event_slug}/questionnaires/${id}/`, 'DELETE', {});
+}
+
+export async function getItems() {
+	using pb = ProgressBar.show('loading product list')
+	return await api_get_all<Item>(`organizers/${organizer_slug}/events/${event_slug}/items/`);
+}
+
+export async function getCategories() {
+	using pb = ProgressBar.show('loading category list')
+	return await api_get_all<Category>(`organizers/${organizer_slug}/events/${event_slug}/categories/`);
+}
+
+export async function getSalesChannels() {
+	return await api_get_all<SalesChannel>(`organizers/${organizer_slug}/saleschannels/`);
+}
+
+export function getEventLocales() {
+	return fromJsonScript('event_locales');
+}
+
+export function getDatafieldViewUrl(datafield_id) {
+	return fromJsonScript('datafield_view_url').replace('/0/', `/${datafield_id}/`);
+}
+
+export function getDatafieldEditUrl(datafield_id) {
+	return fromJsonScript('datafield_edit_url').replace('/0/', `/${datafield_id}/`) + '?notify_parent=true&';
+}
+
+export function getDatafieldCreateUrl(container_type) {
+	return fromJsonScript('datafield_create_url') + '?notify_parent=true&container_type=' + container_type;
+}

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

@@ -0,0 +1,29 @@
+// The actual gettext implementation is loaded asynchronously with the translation
+export function gettext (msgid) {
+	if (typeof django !== 'undefined' && typeof django.gettext !== 'undefined') {
+		return django.gettext(msgid)
+	}
+	return msgid
+}
+
+export function ngettext (singular, plural, count) {
+	if (typeof django !== 'undefined' && typeof django.ngettext !== 'undefined') {
+		return django.ngettext(singular, plural, count)
+	}
+	return plural
+}
+
+export function pgettext (context, msgid) {
+	if (typeof django !== 'undefined' && typeof django.pgettext !== 'undefined') {
+		return django.pgettext(context, msgid)
+	}
+	return msgid
+}
+
+export function interpolate (fmt, object, named) {
+	if (named) {
+		return fmt.replace(/%\(\w+\)s/g, function (match) { return String(object[match.slice(2, -2)]) })
+	} else {
+		return fmt.replace(/%s/g, function (match) { return String(object.shift()) })
+	}
+}

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

@@ -0,0 +1,82 @@
+/* global gettext, pgettext */
+
+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<K,V> (array: V[], key: (v: V) => K): Generator<[K, V[]]> {
+	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 function setListState(list, state, identifier) {
+	const i = list.indexOf(identifier)
+	if (i === -1) {
+		if (state) list.push(identifier)
+	} else {
+		if (!state) list.splice(i, 1)
+	}
+}
+
+export function fromJsonScript (id) {
+	return JSON.parse(document.getElementById(id).textContent)
+}
+
+export const QUESTION_TYPE = Object.fromEntries(fromJsonScript('question_type_choices').map(([name, value, label]) => [name, value]))
+export const QUESTION_TYPE_LABEL = Object.fromEntries(fromJsonScript('question_type_choices').map(([name, value, label]) => [name, i18n_any(label)]))
+export const QUESTION_TYPE_LABEL_FROM_VALUE = Object.fromEntries(fromJsonScript('question_type_choices').map(([name, value, label]) => [value, i18n_any(label)]))
+
+export const SYSTEM_DATAFIELDS = freezeRec(Object.fromEntries(fromJsonScript('system_question_choices').map(([name, value, label]) => [
+	value, { id: value, identifier: value, question: label, type: value === 'country' ? QUESTION_TYPE.COUNTRYCODE : QUESTION_TYPE.STRING }
+])))
+
+export const QUESTIONNAIRE_TYPE = Object.fromEntries(fromJsonScript('questionnaire_type_choices').map(([name, value, label]) => [name, value]))
+export const QUESTIONNAIRE_TYPE_LABEL = Object.fromEntries(fromJsonScript('questionnaire_type_choices').map(([name, value, label]) => [name, i18n_any(label)]))
+
+export const TYPES_ALLOWED_AS_DEPENDENCIES = new Set([QUESTION_TYPE.BOOLEAN, QUESTION_TYPE.CHOICE, QUESTION_TYPE.CHOICE_MULTIPLE]);

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

@@ -0,0 +1,7 @@
+import { createApp } from 'vue'
+import App from './App.vue'
+import { plugin as slicksortPlugin } from 'vue-slicksort'
+
+createApp(App)
+    .use(slicksortPlugin)
+    .mount('#questionnaires-editor')

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

@@ -0,0 +1,84 @@
+
+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[],
+	compat_personalization: boolean,
+	rows: QuestionnaireRow[],
+}
+
+export type QuestionnaireRow = {
+	datafield: string | null,
+	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,
+}
+
+export type Category = {
+	id: number,
+	position: number,
+	name: I18nString,
+	internal_name: string | null,
+}
+
+export type SalesChannel = {
+	identifier: string,
+	type: string,
+	label: I18nString,
+	position: number,
+	icon: string,
+	icon_url: string | null,
+}
+
+export type GroupedItems = [Category, Item[]][];

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

@@ -417,6 +417,8 @@ div.scrolling-multiple-choice, div.scrolling-choice {
     }
   }
 }
+.clear-input-button { width: 2em; margin-left: -3em; margin-right: 1em; height: 2em; background: transparent; border: 0; color: #aaa; }
+.clear-input-button:hover { color: #777; }
 .team-permission-groups {
   border: 1px solid $input-border;
   border-radius: $input-border-radius;
@@ -780,6 +782,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 +806,7 @@ fieldset.accordion-panel > legend {
   padding-bottom: 5px;
 }
 
+
 .batch-select-label {
   display: block;
   width: 100%;

src/pretix/static/pretixcontrol/scss/main.scss

@@ -898,6 +898,11 @@ tbody th {
     height: auto;
 }
 
+/* For pages displayed inside iframe dialog. The class is set by setup_dialog_frame_events */
+html.in-iframe body { background: white }
+.in-iframe #wrapper > nav.navbar, .in-iframe #page-wrapper > div > footer { display: none; }
+.in-iframe #page-wrapper { padding: 0 15px; min-height: 568px; border-left: 0; margin: 0; }
+
 @import "../../pretixbase/scss/_rtl.scss";
 @import "../../bootstrap/scss/_rtl.scss";
 @import "_rtl.scss";