Update EventCalendarCell.vue

Offset refund: Do not allow to offset to order without access to

See merge request pretix/pretix!52

package-lock.json

@@ -9,8 +9,7 @@
       "version": "1.0.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "vue": "^3.5.30",
-        "vue-slicksort": "^2.0.5"
+        "vue": "^3.5.30"
       },
       "devDependencies": {
         "@eslint/js": "^10.0.1",
@@ -295,29 +294,43 @@
       }
     },
     "node_modules/@humanfs/core": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
-      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz",
+      "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==",
       "dev": true,
       "license": "Apache-2.0",
+      "dependencies": {
+        "@humanfs/types": "^0.15.0"
+      },
       "engines": {
         "node": ">=18.18.0"
       }
     },
     "node_modules/@humanfs/node": {
-      "version": "0.16.7",
-      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
-      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
+      "version": "0.16.8",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz",
+      "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@humanfs/core": "^0.19.1",
+        "@humanfs/core": "^0.19.2",
+        "@humanfs/types": "^0.15.0",
         "@humanwhocodes/retry": "^0.4.0"
       },
       "engines": {
         "node": ">=18.18.0"
       }
     },
+    "node_modules/@humanfs/types": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz",
+      "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -3381,9 +3394,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
-      "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==",
+      "version": "7.1.5",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.5.tgz",
+      "integrity": "sha512-KvvtD7SrlBP7dlgkBghEE3r84CABm5SmV2aNcG4oCA+qDnJ/tvKonFVvwWAyyWUEwxuNawdfEAZKP9zM3oZ2Uw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4636,15 +4649,6 @@
         "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,8 +27,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "vue": "^3.5.30",
-    "vue-slicksort": "^2.0.5"
+    "vue": "^3.5.30"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",

pyproject.toml

@@ -33,14 +33,14 @@ dependencies = [
   "bleach==6.4.*",
   "celery==5.6.*",
   "chardet==5.2.*",
-  "cryptography>=50.0.0",
+  "cryptography>=50.0.1",
   "css-inline==0.21.*",
   "defusedcsv>=3.0.0",
   "dnspython==2.*",
   "Django[argon2]==5.2.*,>=5.2.17",
   "django-bootstrap3==26.2",
   "django-compressor==4.6.0",
-  "django-countries==9.0.*",
+  "django-countries==9.1.*",
   "django-filter==26.1",
   "django-formset-js-improved==0.5.0.5",
   "django-formtools==2.7",
@@ -75,7 +75,7 @@ dependencies = [
   "packaging",
   "paypalrestsdk==1.13.*",
   "paypal-checkout-serversdk==1.0.*",
-  "PyJWT==2.13.*",
+  "PyJWT==2.14.*",
   "phonenumberslite==9.0.*",
   "Pillow==12.3.*",
   "pretix-plugin-build",
@@ -84,7 +84,7 @@ dependencies = [
   "pycountry",
   "pycparser==3.0",
   "pycryptodome==3.23.*",
-  "pypdf==6.11.*",
+  "pypdf==6.19.*",
   "python-bidi==0.6.*",  # Support for Arabic in reportlab
   "python-dateutil==2.9.*",
   "pytz",
@@ -94,7 +94,7 @@ dependencies = [
   "redis==7.4.*",
   "reportlab==5.0.*",
   "requests==2.34.*",
-  "sentry-sdk==2.68.*",
+  "sentry-sdk==2.69.*",
   "sepaxml==2.7.*",
   "stripe==7.9.*",
   "text-unidecode==1.*",
@@ -112,10 +112,10 @@ dev = [
   "aiohttp==3.14.*",
   "coverage",
   "coveralls",
-  "fakeredis==2.37.*",
+  "fakeredis==2.38.*",
   "flake8==7.3.*",
   "freezegun",
-  "isort==8.0.*",
+  "isort==9.0.*",
   "pep8-naming==0.15.*",
   "potypo",
   "pytest-asyncio>=1.4.0",

src/pretix/api/serializers/event.py

@@ -979,7 +979,7 @@ class DeviceEventSettingsSerializer(EventSettingsSerializer):
         'reusable_media_type_nfc_mf0aes',
         'reusable_media_type_nfc_mf0aes_random_uid',
         'reusable_media_usage_enforced',
-        'system_question_order',  # TODO(questionnaires) - remove or replace
+        'system_question_order',
         'tax_rule_payment',
         'tax_rule_cancellation',
     ]

src/pretix/api/serializers/item.py

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

src/pretix/api/urls.py

@@ -79,8 +79,7 @@ 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'datafields', item.QuestionViewSet)
-event_router.register(r'questionnaires', item.QuestionnaireViewSet)
+event_router.register(r'questions', item.QuestionViewSet)
 event_router.register(r'discounts', discount.DiscountViewSet)
 event_router.register(r'quotas', item.QuotaViewSet)
 event_router.register(r'vouchers', voucher.VoucherViewSet)

src/pretix/api/views/item.py

@@ -48,15 +48,13 @@ from pretix.api.pagination import TotalOrderingFilter
 from pretix.api.serializers.item import (
     ItemAddOnSerializer, ItemBundleSerializer, ItemCategorySerializer,
     ItemProgramTimeSerializer, ItemSerializer, ItemVariationSerializer,
-    QuestionnaireSerializer, QuestionOptionSerializer, QuestionSerializer,
-    QuotaSerializer,
+    QuestionOptionSerializer, QuestionSerializer, QuotaSerializer,
 )
 from pretix.api.views import ConditionalListView
 from pretix.base.models import (
     CartPosition, Item, ItemAddOn, ItemBundle, ItemCategory, ItemProgramTime,
     ItemVariation, Question, QuestionOption, Quota,
 )
-from pretix.base.models.items import Questionnaire
 from pretix.base.services.quotas import QuotaAvailability
 from pretix.helpers.dicts import merge_dicts
 from pretix.helpers.i18n import i18ncomp
@@ -568,51 +566,6 @@ class QuestionOptionViewSet(viewsets.ModelViewSet):
         super().perform_destroy(instance)
 
 
-class QuestionnaireViewSet(ConditionalListView, viewsets.ModelViewSet):
-    serializer_class = QuestionnaireSerializer
-    queryset = Questionnaire.objects.none()
-    #filter_backends = (DjangoFilterBackend, TotalOrderingFilter)
-    #filterset_class = QuestionFilter
-    ordering_fields = ('id', 'position')
-    ordering = ('position', 'id')
-    permission = None
-    write_permission = 'event.items:write'
-
-    def get_queryset(self):
-        return self.request.event.questionnaires.prefetch_related('children').all()
-
-    def perform_create(self, serializer):
-        serializer.save(event=self.request.event)
-        serializer.instance.log_action(
-            'pretix.event.questionnaire.added',
-            user=self.request.user,
-            auth=self.request.auth,
-            data=self.request.data
-        )
-
-    def get_serializer_context(self):
-        ctx = super().get_serializer_context()
-        ctx['event'] = self.request.event
-        return ctx
-
-    def perform_update(self, serializer):
-        serializer.save(event=self.request.event)
-        serializer.instance.log_action(
-            'pretix.event.questionnaire.changed',
-            user=self.request.user,
-            auth=self.request.auth,
-            data=self.request.data
-        )
-
-    def perform_destroy(self, instance):
-        instance.log_action(
-            'pretix.event.questionnaire.deleted',
-            user=self.request.user,
-            auth=self.request.auth,
-        )
-        super().perform_destroy(instance)
-
-
 class NumberInFilter(django_filters.BaseInFilter, django_filters.NumberFilter):
     pass
 

src/pretix/base/exporters/invoices.py

@@ -54,6 +54,7 @@ from ...control.forms.filter import get_all_payment_providers
 from ...helpers import GroupConcat
 from ...helpers.iter import chunked_iterable
 from ..exporter import BaseExporter, MultiSheetListExporter
+from ..invoicing.transmission import get_transmission_types
 from ..services.export import ExportError
 from ..services.invoices import invoice_pdf_task
 from ..signals import (
@@ -197,7 +198,7 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
     def iterate_sheet(self, form_data, sheet):
         _ = gettext
         if sheet == 'invoices':
-            yield [
+            headers = [
                 _('Invoice number'),
                 _('Date'),
                 _('Order code'),
@@ -230,8 +231,18 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
                 _('Total value (without taxes)'),
                 _('Payment matching IDs'),
                 _('Payment providers'),
+                _('Transmission type'),
+                _('Transmission status'),
+                _('Transmission date'),
             ]
 
+            transmission_types = get_transmission_types()
+            for tt in transmission_types:
+                for c in tt.describe_info_columns():
+                    headers.append(str(tt.verbose_name) + ': ' + str(c))
+
+            yield headers
+
             p_providers = OrderPayment.objects.filter(
                 order=OuterRef('order'),
                 state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED,
@@ -242,7 +253,7 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
                 'm'
             ).order_by()
 
-            base_qs = self.invoices_queryset(form_data)\
+            base_qs = self.invoices_queryset(form_data)
 
             qs = base_qs.select_related(
                 'order', 'refers'
@@ -280,7 +291,7 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
                                 if mid:
                                     pmis.append(mid)
                     pmi = '\n'.join(pmis)
-                    yield [
+                    line = [
                         i.full_invoice_no,
                         date_format(i.date, "SHORT_DATE_FORMAT"),
                         i.order.code,
@@ -315,8 +326,20 @@ class InvoiceDataExporter(InvoiceExporterMixin, MultiSheetListExporter):
                         ', '.join([
                             str(self.providers.get(p, p)) for p in sorted(set((i.payment_providers or '').split(',')))
                             if p and p != 'free'
-                        ])
+                        ]),
+                        i.transmission_type_instance.verbose_name,
+                        i.get_transmission_status_display(),
+                        date_format(i.transmission_date, "SHORT_DATETIME_FORMAT") if i.transmission_date else "",
                     ]
+                    for tt in transmission_types:
+                        if tt.identifier == i.transmission_type:
+                            described = dict(tt.describe_info(i.invoice_to_transmission_info, i.invoice_to_country, i.invoice_to_is_business))
+                            for c in tt.describe_info_columns():
+                                line.append(described.get(c, ""))
+                        else:
+                            for c in tt.describe_info_columns():
+                                line.append("")
+                    yield line
         elif sheet == 'lines':
             yield [
                 _('Invoice number'),

src/pretix/base/forms/questions.py

@@ -36,6 +36,7 @@ import copy
 import json
 import logging
 import re
+from collections import namedtuple
 from datetime import timedelta
 from decimal import Decimal
 from io import BytesIO
@@ -642,22 +643,49 @@ 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, qc, datafield):
+    def build_user_question_field(self, request, event, answerlist, q):
         # Do we already have an answer? Provide it as the initial value
-        answers = [a for a in answerlist if a.question_id == datafield.id]
+        answers = [a for a in answerlist if a.question_id == q.id]
         if answers:
             initial = answers[0]
         else:
             initial = None
         tz = ZoneInfo(event.settings.timezone)
-        required = qc.required and not self.all_optional
-        if datafield.type == Question.TYPE_BOOLEAN:
+        required = q.required and not self.all_optional
+        if q.type == Question.TYPE_BOOLEAN:
             if required:
                 # For some reason, django-bootstrap3 does not set the required attribute
                 # itself.
@@ -671,105 +699,107 @@ class BaseQuestionsForm(forms.Form):
                 initialbool = False
 
             field = forms.BooleanField(
-                label=escape(qc.label), required=required,
-                help_text=rich_text(qc.help_text),
+                label=escape(q.question), required=required,
+                help_text=rich_text(q.help_text),
                 initial=initialbool, widget=widget,
             )
-        elif datafield.type == Question.TYPE_NUMBER:
+        elif q.type == Question.TYPE_NUMBER:
             field = forms.DecimalField(
-                label=escape(qc.label), required=required,
-                min_value=datafield.valid_number_min or Decimal('0.00'),
-                max_value=datafield.valid_number_max,
-                help_text=rich_text(qc.help_text),
+                label=escape(q.question), required=required,
+                min_value=q.valid_number_min or Decimal('0.00'),
+                max_value=q.valid_number_max,
+                help_text=rich_text(q.help_text),
                 initial=initial.answer if initial else None,
             )
-        elif datafield.type == Question.TYPE_STRING:
+        elif q.type == Question.TYPE_STRING:
             field = forms.CharField(
-                label=escape(qc.label), required=required,
-                min_length=datafield.valid_string_length_min,
-                max_length=datafield.valid_string_length_max,
-                help_text=rich_text(qc.help_text),
+                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),
                 initial=initial.answer if initial else None,
             )
-        elif datafield.type == Question.TYPE_TEXT:
+        elif q.type == Question.TYPE_TEXT:
             field = forms.CharField(
-                label=escape(qc.label), required=required,
-                min_length=datafield.valid_string_length_min,
-                max_length=datafield.valid_string_length_max,
-                help_text=rich_text(qc.help_text),
+                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),
                 widget=forms.Textarea,
                 initial=initial.answer if initial else None,
             )
-        elif datafield.type == Question.TYPE_COUNTRYCODE:
+        elif q.type == Question.TYPE_COUNTRYCODE:
             field = CountryField(
                 countries=CachedCountries,
                 blank=True, null=True, blank_label=' ',
             ).formfield(
-                label=escape(qc.label), required=required,
-                help_text=rich_text(qc.help_text),
+                label=escape(q.question), required=required,
+                help_text=rich_text(q.help_text),
                 widget=forms.Select,
                 empty_label=' ',
-                initial=initial.answer if initial else (guess_country_from_request(request, event) if required else None),
+                initial=initial.answer if initial else (
+                    guess_country_from_request(request, event) if required else None),
             )
-        elif datafield.type == Question.TYPE_CHOICE:
+        elif q.type == Question.TYPE_CHOICE:
             field = forms.ModelChoiceField(
-                queryset=datafield.options,
-                label=escape(qc.label), required=required,
-                help_text=rich_text(qc.help_text),
+                queryset=q.options,
+                label=escape(q.question), required=required,
+                help_text=rich_text(q.help_text),
                 widget=forms.Select,
                 to_field_name='identifier',
                 empty_label='',
                 initial=initial.options.first() if initial else None,
             )
-        elif datafield.type == Question.TYPE_CHOICE_MULTIPLE:
+        elif q.type == Question.TYPE_CHOICE_MULTIPLE:
             field = forms.ModelMultipleChoiceField(
-                queryset=datafield.options,
-                label=escape(qc.label), required=required,
-                help_text=rich_text(qc.help_text),
+                queryset=q.options,
+                label=escape(q.question), required=required,
+                help_text=rich_text(q.help_text),
                 to_field_name='identifier',
                 widget=QuestionCheckboxSelectMultiple,
                 initial=initial.options.all() if initial else None,
             )
-        elif datafield.type == Question.TYPE_FILE:
-            if datafield.valid_file_portrait:
+        elif q.type == Question.TYPE_FILE:
+            if q.valid_file_portrait:
                 field = PortraitImageField(
-                    label=escape(qc.label), required=required,
-                    help_text=rich_text(qc.help_text),
+                    label=escape(q.question), required=required,
+                    help_text=rich_text(q.help_text),
                     initial=initial.file if initial else None,
-                    widget=PortraitImageWidget(answer=initial, request=request, attrs={'data-portrait-photo': 'true'}),
+                    widget=PortraitImageWidget(answer=initial, request=request,
+                                               attrs={'data-portrait-photo': 'true'}),
                 )
             else:
                 field = ExtFileField(
-                    label=escape(qc.label), required=required,
-                    help_text=rich_text(qc.help_text),
+                    label=escape(q.question), required=required,
+                    help_text=rich_text(q.help_text),
                     initial=initial.file if initial else None,
                     widget=UploadedFileWidget(answer=initial, request=request),
                     ext_whitelist=settings.FILE_UPLOAD_EXTENSIONS_OTHER,
                     max_size=settings.FILE_UPLOAD_MAX_SIZE_OTHER,
                 )
-        elif datafield.type == Question.TYPE_DATE:
+        elif q.type == Question.TYPE_DATE:
             attrs = {}
-            if datafield.valid_date_min:
-                attrs['data-min'] = datafield.valid_date_min.isoformat()
-            if datafield.valid_date_max:
-                attrs['data-max'] = datafield.valid_date_max.isoformat()
-            help_text = qc.help_text
+            if q.valid_date_min:
+                attrs['data-min'] = q.valid_date_min.isoformat()
+            if q.valid_date_max:
+                attrs['data-max'] = q.valid_date_max.isoformat()
+            help_text = q.help_text
             if not help_text:
-                if datafield.valid_date_min and datafield.valid_date_max:
+                if q.valid_date_min and q.valid_date_max:
                     help_text = format_lazy(
                         _('Please enter a date between {min} and {max}.'),
-                        min=date_format(datafield.valid_date_min, "SHORT_DATE_FORMAT"),
-                        max=date_format(datafield.valid_date_max, "SHORT_DATE_FORMAT"),
+                        min=date_format(q.valid_date_min, "SHORT_DATE_FORMAT"),
+                        max=date_format(q.valid_date_max, "SHORT_DATE_FORMAT"),
                     )
-                elif datafield.valid_date_min:
+                elif q.valid_date_min:
                     help_text = format_lazy(
                         _('Please enter a date no earlier than {min}.'),
-                        min=date_format(datafield.valid_date_min, "SHORT_DATE_FORMAT"),
+                        min=date_format(q.valid_date_min, "SHORT_DATE_FORMAT"),
                     )
-                elif datafield.valid_date_max:
+                elif q.valid_date_max:
                     help_text = format_lazy(
                         _('Please enter a date no later than {max}.'),
-                        max=date_format(datafield.valid_date_max, "SHORT_DATE_FORMAT"),
+                        max=date_format(q.valid_date_max, "SHORT_DATE_FORMAT"),
                     )
             if initial and initial.answer:
                 try:
@@ -779,16 +809,16 @@ class BaseQuestionsForm(forms.Form):
             else:
                 _initial = None
             field = forms.DateField(
-                label=escape(qc.label), required=required,
+                label=escape(q.question), required=required,
                 help_text=rich_text(help_text),
                 initial=_initial,
                 widget=DatePickerWidget(attrs),
             )
-            if datafield.valid_date_min:
-                field.validators.append(MinDateValidator(datafield.valid_date_min))
-            if datafield.valid_date_max:
-                field.validators.append(MaxDateValidator(datafield.valid_date_max))
-        elif datafield.type == Question.TYPE_TIME:
+            if q.valid_date_min:
+                field.validators.append(MinDateValidator(q.valid_date_min))
+            if q.valid_date_max:
+                field.validators.append(MaxDateValidator(q.valid_date_max))
+        elif q.type == Question.TYPE_TIME:
             if initial and initial.answer:
                 try:
                     _initial = dateutil.parser.parse(initial.answer).time()
@@ -797,29 +827,29 @@ class BaseQuestionsForm(forms.Form):
             else:
                 _initial = None
             field = forms.TimeField(
-                label=escape(qc.label), required=required,
-                help_text=rich_text(qc.help_text),
+                label=escape(q.question), required=required,
+                help_text=rich_text(q.help_text),
                 initial=_initial,
                 widget=TimePickerWidget(without_seconds=True),
             )
-        elif datafield.type == Question.TYPE_DATETIME:
-            help_text = qc.help_text
+        elif q.type == Question.TYPE_DATETIME:
+            help_text = q.help_text
             if not help_text:
-                if datafield.valid_datetime_min and datafield.valid_datetime_max:
+                if q.valid_datetime_min and q.valid_datetime_max:
                     help_text = format_lazy(
                         _('Please enter a date and time between {min} and {max}.'),
-                        min=date_format(datafield.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
-                        max=date_format(datafield.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
+                        min=date_format(q.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
+                        max=date_format(q.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
                     )
-                elif datafield.valid_datetime_min:
+                elif q.valid_datetime_min:
                     help_text = format_lazy(
                         _('Please enter a date and time no earlier than {min}.'),
-                        min=date_format(datafield.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
+                        min=date_format(q.valid_datetime_min, "SHORT_DATETIME_FORMAT"),
                     )
-                elif datafield.valid_datetime_max:
+                elif q.valid_datetime_max:
                     help_text = format_lazy(
                         _('Please enter a date and time no later than {max}.'),
-                        max=date_format(datafield.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
+                        max=date_format(q.valid_datetime_max, "SHORT_DATETIME_FORMAT"),
                     )
 
             if initial and initial.answer:
@@ -831,20 +861,20 @@ class BaseQuestionsForm(forms.Form):
                 _initial = None
 
             field = SplitDateTimeField(
-                label=escape(qc.label), required=required,
+                label=escape(q.question), required=required,
                 help_text=rich_text(help_text),
                 initial=_initial,
                 widget=SplitDateTimePickerWidget(
                     time_format=get_format_without_seconds('TIME_INPUT_FORMATS'),
-                    min_date=datafield.valid_datetime_min,
-                    max_date=datafield.valid_datetime_max
+                    min_date=q.valid_datetime_min,
+                    max_date=q.valid_datetime_max
                 ),
             )
-            if datafield.valid_datetime_min:
-                field.validators.append(MinDateTimeValidator(datafield.valid_datetime_min))
-            if datafield.valid_datetime_max:
-                field.validators.append(MaxDateTimeValidator(datafield.valid_datetime_max))
-        elif datafield.type == Question.TYPE_PHONENUMBER:
+            if q.valid_datetime_min:
+                field.validators.append(MinDateTimeValidator(q.valid_datetime_min))
+            if q.valid_datetime_max:
+                field.validators.append(MaxDateTimeValidator(q.valid_datetime_max))
+        elif q.type == Question.TYPE_PHONENUMBER:
             if initial:
                 try:
                     initial = PhoneNumber().from_string(initial.answer)
@@ -857,27 +887,26 @@ class BaseQuestionsForm(forms.Form):
                     initial = "+{}.".format(phone_prefix)
 
             field = PhoneNumberField(
-                label=escape(qc.label), required=required,
-                help_text=rich_text(qc.help_text),
+                label=escape(q.question), required=required,
+                help_text=rich_text(q.help_text),
                 # We now exploit an implementation detail in PhoneNumberPrefixWidget to allow us to pass just
                 # a country code but no number as an initial value. It's a bit hacky, but should be stable for
                 # the future.
                 initial=initial,
                 widget=WrappedPhoneNumberPrefixWidget()
             )
-        field.datafield = datafield
+        field.question = q
         if answers:
             # Cache the answer object for later use
             field.answer = answers[0]
 
-        if qc.dependency_question_id:
-            field.widget.attrs['data-question-dependency'] = qc.dependency_question_id
-            field.widget.attrs['data-question-dependency-values'] = escapejson_attr(json.dumps(qc.dependency_values))
-            if datafield.type != 'M':
-                field.widget.attrs['required'] = qc.required and not self.all_optional
-            field._required = qc.required and not self.all_optional
+        if q.dependency_question_id:
+            field.widget.attrs['data-question-dependency'] = q.dependency_question_id
+            field.widget.attrs['data-question-dependency-values'] = escapejson_attr(json.dumps(q.dependency_values))
+            if q.type != 'M':
+                field.widget.attrs['required'] = q.required and not self.all_optional
+            field._required = q.required and not self.all_optional
             field.required = False
-
         return field
 
     def check_user_questions(self, d):
@@ -941,7 +970,6 @@ class OrderLevelQuestionsForm(BaseQuestionsForm):
 
         super().__init__(*args, **kwargs)
 
-        # TODO(questionnaires) - switch olq's to questionnaires !
         questions = Question.objects.filter(
             event=event, container_type=Question.ContainerType.ORDER,
             ask_during_checkin=False, hidden=False,
@@ -976,7 +1004,6 @@ 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
@@ -986,13 +1013,18 @@ 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)
 
-        for questionnaire in questionnaires:
-            for child in getattr(questionnaire, 'childlist', questionnaire.children.all()):
-                if child.user_datafield:
-                    df = child.user_datafield
-                    self.fields['question_%s' % df.id] = self.build_user_question_field(request, event, pos.answerlist, child, df)
-                elif child.system_datafield:
-                    self.fields[child.system_datafield] = self.build_system_question_field(request, event, pos, child)
+        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)
 
         responses = question_form_fields.send(sender=event, position=pos)
         data = pos.meta_info_data
@@ -1057,21 +1089,21 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
             )
 
     def build_system_question_field(self, request, event, pos, qc):
-        field_name = qc.system_datafield
+        field_name = qc.id
         if field_name == 'attendee_name_parts':
             return NamePartsFormField(
                 max_length=255,
                 required=qc.required and not self.all_optional,
                 scheme=event.settings.name_scheme,
                 titles=event.settings.name_scheme_titles,
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 initial=pos.attendee_name_parts,
             )
         if field_name == 'attendee_email':
             return forms.EmailField(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 initial=pos.attendee_email,
                 widget=forms.EmailInput(
@@ -1083,7 +1115,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
         if field_name == 'company':
             return forms.CharField(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 max_length=255,
                 initial=pos.company,
@@ -1092,7 +1124,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
         if field_name == 'street':
             return forms.CharField(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 widget=forms.Textarea(attrs={
                     'rows': 2,
@@ -1105,7 +1137,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
             return forms.CharField(
                 required=False,
                 max_length=30,
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 initial=pos.zipcode,
                 widget=forms.TextInput(attrs={
@@ -1115,7 +1147,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
         if field_name == 'city':
             return forms.CharField(
                 required=False,
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 max_length=255,
                 initial=pos.city,
@@ -1129,7 +1161,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
                 countries=CachedCountries
             ).formfield(
                 required=qc.required and not self.all_optional,
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 initial=country,
                 widget=forms.Select(attrs={
@@ -1157,7 +1189,7 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
                 del self.data[fprefix + 'state']
 
             field = forms.ChoiceField(
-                label=escape(qc.label),
+                label=escape(qc.question),
                 help_text=rich_text(qc.help_text),
                 required=False,
                 choices=c,
@@ -1170,8 +1202,9 @@ class TicketLevelQuestionsForm(BaseQuestionsForm):
             return field
 
     def clean(self):
-        from pretix.base.addressvalidation import \
-            validate_address  # local import to prevent impact on startup time
+        from pretix.base.addressvalidation import (  # local import to prevent impact on startup time
+            validate_address,
+        )
 
         d = super().clean()
 
@@ -1412,8 +1445,9 @@ class BaseInvoiceAddressForm(forms.ModelForm):
         self.fields['transmission_type'].widget.attrs['data-trigger-address-info'] = 'on'
 
     def clean(self):
-        from pretix.base.addressvalidation import \
-            validate_address  # local import to prevent impact on startup time
+        from pretix.base.addressvalidation import (  # local import to prevent impact on startup time
+            validate_address,
+        )
 
         data = self.cleaned_data
 
@@ -1467,7 +1501,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
                 "vat_id": _("This field is required.")
             })
 
-        if self.validate_vat_id and self.instance.vat_id_validated and 'vat_id' not in self.changed_data:
+        if self.validate_vat_id and self.instance.vat_id_validated and not any(v in self.changed_data for v in ('is_business', 'vat_id', 'country')):
             pass  # Skip re-validation if it is validated
         elif self.validate_vat_id and vat_id_applicable:
             try:

src/pretix/base/invoicing/transmission.py

@@ -107,6 +107,9 @@ class TransmissionType:
     def transmission_info_to_form_data(self, transmission_info: dict) -> dict:
         return transmission_info
 
+    def describe_info_columns(self):
+        return [f.label for f in self.invoice_address_form_fields.values()]
+
     def describe_info(self, transmission_info: dict, country: Country, is_business: bool):
         form_data = self.transmission_info_to_form_data(transmission_info)
         data = []

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

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

src/pretix/base/migrations/0311_fix_unshredded_invoices.py

@@ -0,0 +1,49 @@
+# Generated by Django 5.2.17 on 2026-09-21 11:30
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+def fix_unshredded_invoices(apps, _):
+    Invoice = apps.get_model("pretixbase", "Invoice")
+    InvoiceLine = apps.get_model("pretixbase", "InvoiceLine")
+    ignore_fields = (
+        # bool/int fields are not listed and skipped automatically
+        'prefix', 'invoice_no', 'full_invoice_no', 'invoice_from', 'invoice_from_name', 'invoice_from_zipcode',
+        'invoice_from_city', 'invoice_from_state', 'invoice_from_country', 'invoice_from_tax_id',
+        'invoice_from_vat_id', 'locale', 'payment_provider_stamp', 'footer_text', 'foreign_currency_display',
+        'foreign_currency_source', 'transmission_type', 'transmission_provider', 'transmission_status',
+    )
+
+    for i in Invoice.objects.filter(shredded=True):
+        for f in Invoice._meta.fields:
+            if f.name in ignore_fields:
+                continue
+            val = getattr(i, f.name, None)
+            if val and isinstance(val, str):
+                setattr(i, f.name, "█")
+            elif val and isinstance(val, list):  # jsonfield
+                setattr(i, f.name, [])
+            elif val and isinstance(val, dict):  # jsonfield
+                setattr(i, f.name, {"_shredded": True})
+        i.save()
+
+    InvoiceLine.objects.filter(
+        attendee_name__isnull=False,
+        invoice__shredded=True
+    ).update(attendee_name="█")
+
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("pretixbase", "0310_question_valid_string_length_min"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            fix_unshredded_invoices,
+            migrations.RunPython.noop,
+        ),
+    ]

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

src/pretix/base/models/devices.py

@@ -166,6 +166,7 @@ class Device(LoggedModel):
     )
     security_profile = models.CharField(
         max_length=190,
+        verbose_name=_('Security profile'),
         default='full',
         null=True,
         blank=False

src/pretix/base/models/items.py

@@ -1569,12 +1569,10 @@ class ItemBundle(models.Model):
 
 class Question(LoggedModel):
     """
-    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 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 number (``TYPE_NUMBER``)
     * a one-line string (``TYPE_STRING``)
@@ -1594,7 +1592,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: TO BE REMOVED
+    :param items: A set of ``Items`` objects that this question should be applied to
     :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.
@@ -1653,7 +1651,6 @@ class Question(LoggedModel):
         default=ContainerType.ORDERPOSITION,
     )
     question = I18nTextField(
-        # TODO(questionnaires) : to be renamed to 'internal_name'
         verbose_name=_("Question")
     )
     identifier = models.CharField(
@@ -1669,7 +1666,6 @@ class Question(LoggedModel):
         ],
     )
     help_text = I18nTextField(
-        # TODO(questionnaires) : to be removed
         verbose_name=_("Help text"),
         help_text=_("If the question needs to be explained or clarified, do it here!"),
         null=True, blank=True,
@@ -1679,22 +1675,22 @@ class Question(LoggedModel):
         choices=TYPE_CHOICES,
         verbose_name=_("Question type")
     )
-    required = models.BooleanField(  # TODO(questionnaires) : to be removed, -> QuestionnaireChild
+    required = models.BooleanField(
         default=False,
         verbose_name=_("Required question")
     )
-    items = models.ManyToManyField(  # TODO(questionnaires) : to be removed, -> Questionnaire
+    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(  # TODO(questionnaires) : to be removed, -> Questionnaire + QuestionnaireChild
+    position = models.PositiveIntegerField(
         default=0,
         verbose_name=_("Position")
     )
-    ask_during_checkin = models.BooleanField(  # TODO(questionnaires) : to be removed
+    ask_during_checkin = models.BooleanField(
         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
@@ -1704,7 +1700,7 @@ class Question(LoggedModel):
         help_text=_('Not supported by all check-in apps for all question types.'),
         default=False
     )
-    hidden = models.BooleanField(  # to be removed
+    hidden = models.BooleanField(
         verbose_name=_('Hidden question'),
         help_text=_('This question will only show up in the backend.'),
         default=False
@@ -1713,10 +1709,10 @@ class Question(LoggedModel):
         verbose_name=_('Print answer on invoices'),
         default=False
     )
-    dependency_question = models.ForeignKey(  # TODO(questionnaires) : to be removed, -> QuestionnaireChild
+    dependency_question = models.ForeignKey(
         'Question', null=True, blank=True, on_delete=models.SET_NULL, related_name='dependent_questions'
     )
-    dependency_values = MultiStringField(default=[])  # TODO(questionnaires) : to be removed, -> QuestionnaireChild
+    dependency_values = MultiStringField(default=[])
     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'))
@@ -1755,9 +1751,9 @@ class Question(LoggedModel):
     objects = ScopedManager(organizer='event__organizer')
 
     class Meta:
-        verbose_name = _("Data field")
-        verbose_name_plural = _("Data fields")
-        ordering = ('question', 'id')
+        verbose_name = _("Question")
+        verbose_name_plural = _("Questions")
+        ordering = ('position', 'id')
         unique_together = (('event', 'identifier'),)
 
     def __str__(self):
@@ -1908,7 +1904,7 @@ class Question(LoggedModel):
         return answer
 
     @staticmethod
-    def clean_items(event, items):  # TODO(questionnaires) : remove method / move to qc
+    def clean_items(event, items):
         for item in items:
             if event != item.event:
                 raise ValidationError(_('One or more items do not belong to this event.'))
@@ -1989,105 +1985,6 @@ class QuestionOption(models.Model):
         ordering = ('position', 'id')
 
 
-class Questionnaire(LoggedModel):
-    TYPE_ORDER_SALE = "OS"
-    TYPE_ORDER_POSITION_SALE = "PS"
-    TYPE_ORDER_POSITION_ATTENDEE_ONLY = "PA"
-    TYPE_ORDER_POSITION_CHECKIN = "PC"
-    TYPE_ORDER_POSITION_HIDDEN = "PH"
-    TYPE_CHOICES = (
-        (TYPE_ORDER_SALE, _("Order-wide, before purchase")),
-        (TYPE_ORDER_POSITION_SALE, _("Per product, before purchase")),
-        (TYPE_ORDER_POSITION_ATTENDEE_ONLY, _("Per product, via attendee link")),
-        (TYPE_ORDER_POSITION_CHECKIN, _("Per product, at check-in")),
-        (TYPE_ORDER_POSITION_HIDDEN, _("Per product, hidden")),
-    )
-    event = models.ForeignKey(
-        Event,
-        related_name="questionnaires",
-        on_delete=models.CASCADE
-    )
-    internal_name = models.CharField(
-        verbose_name=_("Internal name"),
-        max_length=255,
-    )
-    type = models.CharField(
-        max_length=5,
-        choices=TYPE_CHOICES,
-        verbose_name=_("Questionnaire type")
-    )
-    items = models.ManyToManyField(
-        Item,
-        related_name='questionnaires',
-        verbose_name=_("Products"),
-        blank=True,
-        help_text=_('This questionnaire will be asked to buyers of the selected products')
-    )
-    position = models.PositiveIntegerField(
-        default=0,
-        verbose_name=_("Position")
-    )
-    all_sales_channels = models.BooleanField(
-        verbose_name=_("Sell on all sales channels the product is sold on"),
-        default=True,
-    )
-    limit_sales_channels = models.ManyToManyField(
-        "SalesChannel",
-        verbose_name=_("Restrict to specific sales channels"),
-        help_text=_('The sales channel selection for the product as a whole takes precedence, so if a sales channel is '
-                    'selected here but not on product level, the variation will not be available.'),
-        blank=True,
-    )
-
-
-class QuestionnaireChild(LoggedModel):
-    SYSTEM_QUESTION_CHOICES = (
-        ('attendee_name_parts', _('Attendee name')),
-        ('attendee_email', _('Attendee email')),
-        ('company', _('Company')),
-        ('street', _('Street')),
-        ('zipcode', _('ZIP code')),
-        ('city', _('City')),
-        ('country', _('Country')),
-    )
-    questionnaire = models.ForeignKey(
-        Questionnaire,
-        related_name="children",
-        on_delete=models.CASCADE
-    )
-    position = models.PositiveIntegerField(
-        default=0,
-        verbose_name=_("Position")
-    )
-    user_datafield = models.ForeignKey(
-        Question,
-        related_name="references",
-        on_delete=models.CASCADE,
-        null=True, blank=True,
-    )
-    system_datafield = models.CharField(
-        max_length=25,
-        choices=SYSTEM_QUESTION_CHOICES,
-        null=True, blank=True,
-    )
-    required = models.BooleanField(
-        default=False,
-        verbose_name=_("Required question")
-    )
-    label = I18nTextField(
-        verbose_name=_("Question")
-    )
-    help_text = I18nTextField(
-        verbose_name=_("Help text"),
-        help_text=_("If the question needs to be explained or clarified, do it here!"),
-        null=True, blank=True,
-    )
-    dependency_question = models.ForeignKey(
-        'QuestionnaireChild', null=True, blank=True, on_delete=models.SET_NULL, related_name='dependent_questions'
-    )
-    dependency_values = MultiStringField(default=[])
-
-
 class Quota(LoggedModel):
     """
     A quota is a "pool of tickets". It is there to limit the number of items

src/pretix/base/models/orders.py

@@ -1449,12 +1449,6 @@ 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.')
@@ -1599,80 +1593,53 @@ class AbstractPosition(RoundingCorrectionMixin, models.Model):
 
     def cache_answers(self, all=True):
         """
-        Creates a new property on the object:
-        questions: a list of Question objects, extended by an 'answer' property
+        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
         """
+        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, 'relevant_questionnaires'):
-                children = list(copy.copy(qc) for qq in self.item.relevant_questionnaires for qc in qq.childlist)
+            if hasattr(self.item, 'questions_to_ask'):
+                questions = list(copy.copy(q) for q in self.item.questions_to_ask)
             else:
-                children = list(copy.copy(qc) for qq in self.item.questionnaires.filter(type='PS') for qc in qq.children.all())
+                questions = list(copy.copy(q) for q in self.item.questions.filter(ask_during_checkin=False,
+                                                                                  hidden=False))
         else:
-            children = list(copy.copy(qc) for qq in self.item.questionnaires.filter(type__startswith='P') for qc in qq.children.all())
+            questions = list(copy.copy(q) for q in self.item.questions.all())
 
-        qc_cache = {
-            q.pk: q for q in children
+        question_cache = {
+            q.pk: q for q in questions
         }
 
-        def qc_is_visible(parentid, qvals):
-            if parentid not in qc_cache:
+        def question_is_visible(parentid, qvals):
+            if parentid not in question_cache:
                 return False
-            parentqc = qc_cache[parentid]
-            if parentqc.dependency_question_id and not qc_is_visible(parentqc.dependency_question_id, parentqc.dependency_values):
+            parentq = question_cache[parentid]
+            if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
                 return False
-            answer_values = self.get_dependency_answer_values(parentqc)
-            return any(qval in answer_values for qval in qvals)
+            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 qc in children:
-            if qc.user_datafield_id and qc.user_datafield_id in self.answer_cache:
-                qc.answer = self.answer_cache[qc.user_datafield_id]
-                #qc.answer.question = qc  # cache object
-            elif qc.system_datafield:
-                qc.answer = self.get_system_answer(qc.system_datafield)
-                #qc.answer.question = qc  # cache object
+        for q in questions:
+            if q.id in self.answ:
+                q.answer = self.answ[q.id]
+                q.answer.question = q  # cache object
             else:
-                qc.answer = ""
-            if not qc.dependency_question_id or qc_is_visible(qc.dependency_question_id, qc.dependency_values):
-                self.questions.append(qc)
-
-    @cached_property
-    def answer_cache(self):
-        return {
-            aw.question_id: aw for aw in getattr(self, 'answerlist', self.answers.all())
-        }
-
-    def get_dependency_answer_values(self, qc):
-        if qc.user_datafield_id:
-            if qc.user_datafield_id not in self.answer_cache:
-                return None
-            answer = self.answer_cache[qc.user_datafield_id]
-            return answer.to_dependency_values()
-        elif qc.system_datafield:
-            return [self.get_system_answer(qc.system_datafield)]
-        else:
-            raise ValueError('Questionnaire child without datafield has no answer')
-
-    def get_system_answer(self, system_datafield_name):
-        if system_datafield_name == 'attendee_name_parts':
-            return self.attendee_name_parts
-        elif system_datafield_name == 'attendee_email':
-            return self.attendee_email
-        elif system_datafield_name == 'street':
-            return self.street
-        elif system_datafield_name == 'zipcode':
-            return self.zipcode
-        elif system_datafield_name == 'city':
-            return self.city
-        elif system_datafield_name == 'state':
-            return self.state
-        elif system_datafield_name == 'country':
-            return self.country
-        else:
-            raise ValueError('Unknown system question name')
+                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):

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_positions
+from pretix.presale.views import get_cart
 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_positions(request)
+        cart = get_cart(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_positions(request)
+            positions = get_cart(request)
             testmode = self.event.testmode
         else:
             used_cards = []

src/pretix/base/pdf.py

@@ -801,6 +801,18 @@ def generate_compressed_addon_list(op, order, event, only_checked_in=False):
     return addonlist
 
 
+def get_sizebox(page: pypdf.PageObject):
+    mediabox = page.mediabox
+    cropbox = page.cropbox
+
+    return pypdf.generic.RectangleObject((
+        max(mediabox[0], cropbox[0]),
+        max(mediabox[1], cropbox[1]),
+        min(mediabox[2], cropbox[2]),
+        min(mediabox[3], cropbox[3]),
+    ))
+
+
 class Renderer:
 
     def __init__(self, event, layout, background_file):
@@ -1153,11 +1165,10 @@ class Renderer:
                 elif o['type'] == "poweredby":
                     self._draw_poweredby(canvas, op, o)
                 if self.bg_pdf:
-                    page_size = (
-                        self.bg_pdf.pages[0].mediabox[2] - self.bg_pdf.pages[0].mediabox[0],
-                        self.bg_pdf.pages[0].mediabox[3] - self.bg_pdf.pages[0].mediabox[1]
-                    )
-                    if self.bg_pdf.pages[0].get('/Rotate') in (90, 270):
+                    first_page = self.bg_pdf.pages[0]
+                    sizebox = get_sizebox(first_page)
+                    page_size = (sizebox.width, sizebox.height)
+                    if first_page.rotation in (90, 270):
                         # swap dimensions due to pdf being rotated
                         page_size = page_size[::-1]
                     canvas.setPageSize(page_size)
@@ -1312,14 +1323,18 @@ def merge_background(fg_pdf: PdfWriter, bg_pdf: PdfWriter, out_file, compress):
 
 
 def _merge_with_correct_page_media_box(output: pypdf.PdfWriter, fg_page: pypdf.PageObject, bg_page: pypdf.PageObject):
-    if bg_page.rotation != 0:
-        bg_page.transfer_rotation_to_content()
-    media_box = bg_page.mediabox
+    """
+    Adds fg_page to output, merging bg_page behind it.
+
+    If bg_page has a non-zero mergebox/cropbox or is rotated via /Rotate, a transformation is applied to fix this."""
     trsf = pypdf.Transformation()
-    if media_box.bottom != 0:
-        trsf = trsf.translate(0, -media_box.bottom)
-    if media_box.left != 0:
-        trsf = trsf.translate(-media_box.left, 0)
+    if bg_page.rotation != 0:
+        trsf = trsf.rotate(-bg_page.rotation)
+
+    mb = get_sizebox(bg_page)
+    pt1 = trsf.apply_on(mb.lower_left)
+    pt2 = trsf.apply_on(mb.upper_right)
+    trsf = trsf.translate(-min(pt1[0], pt2[0]), -min(pt1[1], pt2[1]))
 
     fg_page = output.add_page(fg_page)
     fg_page.merge_transformed_page(bg_page, trsf, over=False, expand=False)

src/pretix/base/settings.py

@@ -379,7 +379,7 @@ DEFAULTS = {
 
         )
     },
-    'system_question_order': {  # TODO(questionnaires) - remove this
+    'system_question_order': {
         'default': {},
         'type': dict,
         'serializer_class': serializers.DictField,

src/pretix/base/shredder.py

@@ -50,8 +50,8 @@ from pretix.api.serializers.order import (
 from pretix.api.serializers.waitinglist import WaitingListSerializer
 from pretix.base.i18n import LazyLocaleException
 from pretix.base.models import (
-    CachedCombinedTicket, CachedTicket, Event, InvoiceAddress, OrderPayment,
-    OrderPosition, OrderRefund, OutgoingMail, QuestionAnswer,
+    CachedCombinedTicket, CachedTicket, Event, Invoice, InvoiceAddress,
+    OrderPayment, OrderPosition, OrderRefund, OutgoingMail, QuestionAnswer,
 )
 from pretix.base.services.invoices import invoice_pdf_task
 from pretix.base.signals import register_data_shredders
@@ -598,18 +598,30 @@ class InvoiceShredder(BaseDataShredder):
     def shred_data(self, progress_callback=None):
         qs_i = self.event.invoices.filter(shredded=False)
         total = qs_i.count()
+        ignore_fields = (
+            'prefix', 'invoice_no', 'full_invoice_no', 'invoice_from', 'invoice_from_name', 'invoice_from_zipcode',
+            'invoice_from_city', 'invoice_from_state', 'invoice_from_country', 'invoice_from_tax_id',
+            'invoice_from_vat_id', 'locale', 'payment_provider_stamp', 'footer_text', 'foreign_currency_display',
+            'foreign_currency_source', 'transmission_type', 'transmission_provider', 'transmission_status',
+        )
 
         for i in _progress_helper(qs_i, progress_callback, 0, total):
             if i.file:
                 i.file.delete()
-                i.shredded = True
-                i.introductory_text = "█"
-                i.additional_text = "█"
-                i.invoice_to = "█"
-                i.payment_provider_text = "█"
-                i.transmission_info = {"_shredded": True}
-                i.save()
-                i.lines.update(description="█")
+            i.shredded = True
+
+            for f in Invoice._meta.fields:
+                if f.name in ignore_fields:
+                    continue
+                val = getattr(i, f.name, None)
+                if val and isinstance(val, str):
+                    setattr(i, f.name, "█")
+                elif val and isinstance(val, list):  # jsonfield
+                    setattr(i, f.name, [])
+                elif val and isinstance(val, dict):  # jsonfield
+                    setattr(i, f.name, {"_shredded": True})
+            i.save()
+            i.lines.update(description="█", attendee_name="█")
 
 
 class CachedTicketShredder(BaseDataShredder):

src/pretix/base/templatetags/money.py

@@ -20,6 +20,7 @@
 # <https://www.gnu.org/licenses/>.
 #
 from decimal import ROUND_HALF_UP, Decimal
+from typing import Optional
 
 from babel import Locale, UnknownLocaleError
 from babel.numbers import format_currency
@@ -35,32 +36,32 @@ register = template.Library()
 
 
 @register.filter("money")
-def money_filter(value: Decimal, arg='', hide_currency=False):
-    if isinstance(value, (float, int)):
+def money_filter(value: Optional[Decimal | float | int | str], arg='', hide_currency=False):
+    if isinstance(value, (float, int, str)):
+        if value == '':
+            return value
         value = Decimal(value)
     if value is None:
         value = Decimal('0.00')
     if not isinstance(value, Decimal):
-        if value == '':
-            return value
         raise TypeError("Invalid data type passed to money filter: %r" % type(value))
     if not arg:
         raise ValueError("No currency passed.")
     arg = arg.upper()
 
-    places = settings.CURRENCY_PLACES.get(arg, 2)
-    rounded = value.quantize(Decimal('1') / 10 ** places, ROUND_HALF_UP)
-    if places < 2 and rounded != value:
-        # We display decimal places even if we shouldn't for this currency if rounding
-        # would make the numbers incorrect. If this branch executes, it's likely a bug in
-        # pretix, but we won't show wrong numbers!
-        if hide_currency:
-            return floatformat(value, "2g")
-        else:
-            return '{} {}'.format(arg, floatformat(value, "2g"))
+    if value.normalize().as_tuple().exponent < -9:
+        # Heuristic: It's unlikely we'll ever see values of less than 0.000000001 in any currency. Therefore, if we
+        # do see them, we very likely deal with a floating point error. This happens mostly in dev mode when computations
+        # are made in SQLite, which uses REAL precision, but it can also happen when we naively pass a float from Python
+        # land to this filter (even though it should not happen).
+        value = value.quantize(Decimal('1e-9'), ROUND_HALF_UP).normalize()
+
+    currency_places = settings.CURRENCY_PLACES.get(arg, 2)
+    required_places = -value.normalize().as_tuple().exponent
+    render_places = max(currency_places, required_places)
 
     if hide_currency:
-        return floatformat(value, f"{places}g")
+        return floatformat(value, f"{render_places}g")
 
     try:
         locale = Locale(get_babel_locale())
@@ -68,14 +69,29 @@ def money_filter(value: Decimal, arg='', hide_currency=False):
         locale = "en"
 
     try:
-        return format_currency(value, arg, locale=locale)
+        return format_currency(
+            value,
+            arg,
+            locale=locale,
+            # We only allow Babel to restrict the digits to the digits defined by the currency if this does not remove any
+            # precision in case we have sub-currency precision (which we shouldn't have in most places, but it's still
+            # better than showing wrong data). Note: Weird precision effects can occur after in-database arithmetic
+            # on SQLite, since SQLite does not have fixed-decimal computation.
+            currency_digits=currency_places >= required_places,
+            decimal_quantization=currency_places >= required_places,
+        )
     except:
-        return '{} {}'.format(arg, floatformat(value, f"{places}g"))
+        return '{} {}'.format(arg, floatformat(value, f"{render_places}g"))
+
+
+@register.filter("money_without_currency")
+def money_filter_without_currency(value: Optional[Decimal | float | int | str], arg=''):
+    return money_filter(value, arg, hide_currency=True)
 
 
 @register.filter("money_numberfield")
-def money_numberfield_filter(value: Decimal, arg=''):
-    if isinstance(value, (float, int)):
+def money_numberfield_filter(value: Optional[Decimal | float | int | str], arg=''):
+    if isinstance(value, (float, int, str)):
         value = Decimal(value)
     if not isinstance(value, Decimal):
         raise TypeError("Invalid data type passed to money filter: %r" % type(value))
@@ -87,15 +103,28 @@ def money_numberfield_filter(value: Decimal, arg=''):
 
 
 @register.filter(is_safe=True)
-def tax_rate_format(number):
+def tax_rate_format(number: Optional[Decimal | float | int | str]):
     """
     Display a Decimal to its significant decimal places, used for tax rates.
     """
-    assert isinstance(number, Decimal)
+    if isinstance(number, (float, int, str)):
+        if number == '':
+            return number
+        number = Decimal(number)
+    if number is None:
+        number = Decimal('0.00')
+    if not isinstance(number, Decimal):
+        raise TypeError("Invalid data type passed to tax rate format filter: %r" % type(number))
+    if number.normalize().as_tuple().exponent < -9:
+        # Heuristic: It's unlikely we'll ever see values of less than 0.000000001 in any currency. Therefore, if we
+        # do see them, we very likely deal with a floating point error. This happens mostly in dev mode when computations
+        # are made in SQLite, which uses REAL precision, but it can also happen when we naively pass a float from Python
+        # land to this filter (even though it should not happen).
+        number = number.quantize(Decimal('1e-9'), ROUND_HALF_UP).normalize()
     return mark_safe(
         formats.number_format(
-            number.normalize(),
-            -number.as_tuple().exponent,
+            number,
+            -number.normalize().as_tuple().exponent,
             use_l10n=True,
             force_grouping=False,
         )

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, Q, QuerySet
+from django.db.models import Prefetch, QuerySet
 from django.utils.functional import cached_property
 from django.utils.timezone import make_aware
 
@@ -37,7 +37,7 @@ from pretix.base.forms.questions import (
 )
 from pretix.base.models import (
     CartPosition, InvoiceAddress, OrderPosition, Question, QuestionAnswer,
-    QuestionnaireChild, QuestionOption,
+    QuestionOption,
 )
 from pretix.base.models.customers import AttendeeProfile
 from pretix.base.models.orders import CheckoutSession, Order
@@ -348,37 +348,27 @@ class OrderQuestionsViewMixin(BaseQuestionsViewMixin):
 
     @cached_property
     def positions(self):
-        qqs = self.request.event.questionnaires.all()
+        qqs = self.request.event.questions.all()
         if self.only_user_visible:
-            qqs = qqs.filter(type='PS')
-        else:
-            qqs = qqs.filter(type__startswith='P')
-        qqs = qqs.filter(
-            Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=self.order.sales_channel.identifier)
-        )
+            qqs = qqs.filter(ask_during_checkin=False, hidden=False, container_type=Question.ContainerType.ORDERPOSITION)
         return list(self.order.positions.select_related(
             'item', 'variation'
         ).prefetch_related(
             Prefetch('answers',
                      QuestionAnswer.objects.prefetch_related('options'),
                      to_attr='answerlist'),
-            Prefetch('item__questionnaires',
+            Prefetch('item__questions',
                      qqs.prefetch_related(
-                         Prefetch('children', QuestionnaireChild.objects.prefetch_related(
-                             Prefetch('user_datafield', Question.objects.prefetch_related(
-                                 Prefetch('options', QuestionOption.objects.prefetch_related(Prefetch(
-                                     # This prefetch statement is utter bullshit, but it actually prevents Django from doing
-                                     # a lot of queries since ModelChoiceIterator stops trying to be clever once we have
-                                     # a prefetch lookup on this query...
-                                     'question',
-                                     Question.objects.none(),
-                                     to_attr='dummy'
-                                 )))
-                             ))
-                         ),
-                         to_attr='childlist')
-                     ),
-                     to_attr='relevant_questionnaires')
+                         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')
         ))
 
     @cached_property

src/pretix/base/views/redirect.py

@@ -26,7 +26,6 @@ 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__)
 
@@ -61,7 +60,6 @@ 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

@@ -400,10 +400,10 @@ class EventMetaValueForm(forms.ModelForm):
         if self.disabled:
             self.fields['value'].widget.attrs['readonly'] = 'readonly'
 
-    def clean_slug(self):
+    def clean_value(self):
         if self.disabled:
             return self.instance.value if self.instance else None
-        return self.cleaned_data['slug']
+        return self.cleaned_data['value']
 
     class Meta:
         model = EventMetaValue

src/pretix/control/forms/subevents.py

@@ -435,10 +435,10 @@ class SubEventMetaValueForm(forms.ModelForm):
         if self.disabled:
             self.fields['value'].widget.attrs['readonly'] = 'readonly'
 
-    def clean_slug(self):
+    def clean_value(self):
         if self.disabled:
             return self.instance.value if self.instance else None
-        return self.cleaned_data['slug']
+        return self.cleaned_data['value']
 
     class Meta:
         model = SubEventMetaValue

src/pretix/control/logdisplay.py

@@ -861,9 +861,6 @@ 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': _('Questionnaires'),
-                'url': reverse('control:event.items.questionnaires', kwargs={
+                'label': _('Questions'),
+                'url': reverse('control:event.items.questions', kwargs={
                     'event': request.event.slug,
                     'organizer': request.event.organizer.slug,
                 }),
-                'active': 'event.items.questionnaires' in url.url_name or 'event.items.questions' in url.url_name,
+                'active': 'event.items.questions' in url.url_name,
             },
             {
                 'label': _('Discounts'),

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

@@ -12,120 +12,151 @@
 {% endblock %}
 {% block inside %}
     {% if question %}
-        <h1>{% blocktrans with name=question.question %}Data field: {{ name }}{% endblocktrans %}</h1>
+        <h1>{% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}</h1>
     {% else %}
-        <h1>{% trans "Data field" %}</h1>
+        <h1>{% trans "Question" %}</h1>
     {% endif %}
     <form action="" method="post" class="form-horizontal">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
-        {% bootstrap_field form.question layout="control" %}
-        {% bootstrap_field form.type layout="control" %}
-        <div id="valid-number">
-            {% bootstrap_field form.valid_number_min layout="control" %}
-            {% bootstrap_field form.valid_number_max layout="control" %}
-        </div>
-        <div id="valid-date">
-            {% bootstrap_field form.valid_date_min layout="control" %}
-            {% bootstrap_field form.valid_date_max layout="control" %}
-        </div>
-        <div id="valid-datetime">
-            {% bootstrap_field form.valid_datetime_min layout="control" %}
-            {% bootstrap_field form.valid_datetime_max layout="control" %}
-        </div>
-        <div id="valid-string">
-            {% bootstrap_field form.valid_string_length_min layout="control" %}
-            {% bootstrap_field form.valid_string_length_max layout="control" %}
-        </div>
-        <div id="valid-file">
-            {% bootstrap_field form.valid_file_portrait layout="control" %}
-        </div>
-        <div id="answer-options">
-            <h3>{% trans "Answer options" %}</h3>
-            <noscript>
-                <p>{% trans "Only applicable if you choose 'Choose one/multiple from a list' above." %}</p>
-            </noscript>
-            <div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}" data-formset-delete-confirm-text="{% trans "If you delete an answer option, you will no longer be able to see statistical data on customers who previously selected this option, and when such customers edit their answers, they need to select a different option." %}">
-                {{ formset.management_form }}
-                {% bootstrap_formset_errors formset %}
-                <div data-formset-body>
-                    {% for form in formset %}
-                        <div data-formset-form>
-                            <div class="sr-only">
-                                {{ form.id }}
-                                {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
-                                {% bootstrap_field form.ORDER form_group_class="" layout="inline" %}
-                            </div>
-                            <div class="row question-option-row">
-                                <div class="col-xs-10">
-                            <span class="text-muted">
-                                {% blocktrans trimmed with id=form.instance.identifier %}
-                                    Answer option {{ id }}
-                                {% endblocktrans %}
-                            </span>
-                                    {% bootstrap_form_errors form %}
-                                    {% bootstrap_field form.answer layout='inline' form_group_class="" %}
-                                </div>
-                                <div class="col-xs-2 text-right flip">
-                                    <span>&nbsp;</span><br>
-                                    <button type="button" class="btn btn-default" data-formset-move-up-button>
-                                        <i class="fa fa-arrow-up"></i></button>
-                                    <button type="button" class="btn btn-default" data-formset-move-down-button>
-                                        <i class="fa fa-arrow-down"></i></button>
-                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                        <i class="fa fa-trash"></i></button>
-                                </div>
-                            </div>
-                        </div>
-                    {% endfor %}
+        <div 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>
-                <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 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>
-                                <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>
+                            {% endfor %}
                         </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>
+                        <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>
         </div>
-        {% bootstrap_field form.identifier layout="control" %}
-        {% if form.ask_during_checkin %}
-            {% bootstrap_field form.ask_during_checkin layout="control" %}
-        {% endif %}
-        {% if form.show_during_checkin %}
-            {% bootstrap_field form.show_during_checkin layout="control" %}
-        {% endif %}
-        {% bootstrap_field form.hidden layout="control" %}
-        {% if form.print_on_invoice %}
-            {% bootstrap_field form.print_on_invoice layout="control" %}
-        {% endif %}
-
-
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}

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

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

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

@@ -1,8 +1,8 @@
 {% extends "pretixcontrol/items/base.html" %}
 {% load i18n %}
-{% block title %}{% trans "Data fields" %}{% endblock %}
+{% block title %}{% trans "Questions" %}{% endblock %}
 {% block inside %}
-    <h1>{% trans "Data fields" %}</h1>
+    <h1>{% trans "Questions" %}</h1>
     <p>
         {% blocktrans trimmed %}
             Questions allow your attendees to fill in additional data about their ticket. If you provide food, one
@@ -14,19 +14,19 @@
     {% if request.event.settings.feature_flag_order_level_questions %}
         {% if 'event.items:write' in request.eventpermset %}
             <p>
-                <a href="{% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug %}?container_type=P" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new per-ticket data field" %}
+                <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 data field" %}
+                <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 data fields" %}</h2>
-        <p>{% trans "These data field can be used on individual tickets." %}</p>
+        <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 data field" %}
+                <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 %}
@@ -35,27 +35,39 @@
         <table class="table table-hover table-quotas">
             <thead>
             <tr>
-                <th>{% trans "Internal name" %}</th>
+                <th>{% trans "Question" %}</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>
+            <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>
+                <tr data-dnd-id="{{ q.id }}">
                     <td>
                         <strong>
-                            <a href="{% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}">
-                                {{ q.question }}
-                            </a>
+                            {% 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 %}
                         </strong><br>
                         <small class="text-muted">{{ q.identifier }}</small>
                     </td>
                     <td>
-                        {{ q.get_type_display }}
+                        {% if q.pk %}
+                            {{ q.get_type_display }}
+                        {% else %}
+                            {% trans "System question" %}
+                        {% endif %}
                     </td>
                     <td>
                         {% if q.required %}
@@ -72,11 +84,35 @@
                             <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">
-                        <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>
+                        {% if q.pk %}
+                            <a href="{% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm"><i class="fa fa-bar-chart"></i></a>
+                            {% if 'event.items:write' in request.eventpermset %}
+                                <a href="{% url "control:event.items.questions.edit" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
+                                <a href="{% url "control:event.items.questions.delete" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
+                            {% endif %}
+                        {% else %}
+                            {% if 'event.settings.general:write' in request.eventpermset %}
+                                <a href="{% url "control:event.settings" organizer=request.event.organizer.slug event=request.event.slug %}#tab-0-2-open"
+                                        class="btn btn-default btn-sm"><i class="fa fa-wrench"></i></a>
+                            {% endif %}
                         {% endif %}
                     </td>
                 </tr>
@@ -87,31 +123,34 @@
 
     {% if request.event.settings.feature_flag_order_level_questions %}
         <h2>
-            {% trans "Per-order data fields" %}
+            {% 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 "In pretixPOS, per-order data fields are currently not supported and will not be displayed." %}
+                {% 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 data fields are asked once per order." %}</p>
+        <p>{% trans "These questions are asked once per order." %}</p>
         <div class="table-responsive">
             <table class="table table-hover table-quotas">
                 <thead>
                 <tr>
-                    <th>{% trans "Internal name" %}</th>
+                    <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>
+                <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>
+                    <tr data-dnd-id="{{ q.id }}">
                         <td>
                             <strong>
                                 {{ q.question }}
@@ -119,7 +158,11 @@
                             <small class="text-muted">{{ q.identifier }}</small>
                         </td>
                         <td>
-                            {{ q.get_type_display }}
+                            {% if q.pk %}
+                                {{ q.get_type_display }}
+                            {% else %}
+                                {% trans "System question" %}
+                            {% endif %}
                         </td>
                         <td>
                             {% if q.required %}
@@ -136,6 +179,10 @@
                                 <span class="fa fa-eye-slash text-muted" data-toggle="tooltip" title="{% trans "Hidden question" %}"></span>
                             {% endif %}
                         </td>
+                        {% if 'event.items:write' in request.eventpermset %}
+                            <td class="dnd-container">
+                            </td>
+                        {% endif %}
                         <td class="text-right flip">
                             {% if q.pk %}
                                 {% if 'event.items:write' in request.eventpermset %}

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

@@ -20,10 +20,8 @@
         {% endif %}
     {% elif question.type == "M" %}
         {{ answer.to_string_i18n|rich_text_snippet }}
-    {% elif question.type %}
-        {{ answer.to_string_i18n|rich_text_snippet }}
     {% else %}
-        {{ answer|linebreaksbr }}
+        {{ answer.to_string_i18n|linebreaksbr }}
     {% endif %}
 {% else %}
     <em>{% trans "not answered" %}</em>

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

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

src/pretix/control/urls.py

@@ -350,7 +350,6 @@ 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/auth.py

@@ -35,6 +35,7 @@
 import base64
 import json
 import logging
+import math
 import time
 from urllib.parse import quote, urljoin, urlparse
 
@@ -50,11 +51,12 @@ from django.shortcuts import redirect, render
 from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.http import url_has_allowed_host_and_scheme
-from django.utils.translation import gettext_lazy as _
+from django.utils.timezone import now
+from django.utils.translation import gettext_lazy as _, ngettext
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
 from django.views.generic import TemplateView
-from django_otp import match_token
+from django_otp import devices_for_user
 from django_otp.plugins.otp_static.models import StaticDevice
 from webauthn.helpers import generate_challenge
 
@@ -463,6 +465,7 @@ class Login2FAView(TemplateView):
         token = request.POST.get('token', '').strip().replace(' ', '')
 
         valid = False
+        retry_after = None
         if 'webauthn_challenge' in self.request.session and token.startswith('{'):
             challenge = self.request.session['webauthn_challenge']
 
@@ -518,12 +521,28 @@ class Login2FAView(TemplateView):
                     valid = True
                     break
         else:
-            valid = match_token(self.user, token)
-            if isinstance(valid, StaticDevice):
+            with transaction.atomic():
+                for device in devices_for_user(self.user, for_verify=True):
+                    if isinstance(device, StaticDevice) and len(token) < 12:
+                        # If we enter a wrong TOTP token (which is 6 characters), do not even try if it is a valid
+                        # emergency token, which will only "lock up" the StaticDevice due to the throttling plugin
+                        # and just locks people out without security gain.
+                        continue
+                    if device.verify_token(token):
+                        valid = True
+                        break
+                    elif hasattr(device, 'verify_is_allowed'):
+                        verify_allowed, reason_dict = device.verify_is_allowed()
+                        if not verify_allowed:
+                            if not retry_after or reason_dict['locked_until'] > retry_after:
+                                retry_after = reason_dict['locked_until']
+                else:
+                    device = None
+
+            if isinstance(device, StaticDevice):
                 self.user.send_security_notice([
                     _("A recovery code for two-factor authentification was used to log in.")
                 ])
-
         if valid:
             logger.info(f"Backend login successful for user {self.user.pk} with 2FA.")
             pretix_successful_logins.inc(1)
@@ -536,7 +555,23 @@ class Login2FAView(TemplateView):
             return redirect('control:index')
         else:
             pretix_failed_logins.inc(1, reason="2fa")
-            messages.error(request, _('Invalid code, please try again.'))
+            msg = _('Invalid code, please try again.')
+            if retry_after:
+                seconds = (retry_after - now()).total_seconds()
+                minutes = seconds / 60
+                if minutes >= 1:
+                    msg = ngettext(
+                        'Invalid code. Please try again after waiting {value} minute.',
+                        'Invalid code. Please try again after waiting {value} minutes.',
+                        minutes,
+                    ).format(value=math.ceil(minutes))
+                elif seconds >= 1:
+                    msg = ngettext(
+                        'Invalid code. Please try again after waiting {value} second.',
+                        'Invalid code. Please try again after waiting {value} seconds.',
+                        seconds,
+                    ).format(value=math.ceil(seconds))
+            messages.error(request, msg)
             return redirect('control:auth.login.2fa')
 
     def get_context_data(self, **kwargs):

src/pretix/control/views/item.py

@@ -56,7 +56,7 @@ from django.utils.functional import cached_property
 from django.utils.timezone import now
 from django.utils.translation import gettext, gettext_lazy as _
 from django.views.decorators.http import require_http_methods
-from django.views.generic import FormView, ListView, TemplateView, View
+from django.views.generic import FormView, ListView, View
 from django.views.generic.detail import DetailView, SingleObjectMixin
 from django_countries.fields import Country
 
@@ -65,6 +65,7 @@ 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,
@@ -436,7 +437,66 @@ class QuestionList(ListView):
     template_name = 'pretixcontrol/items/questions.html'
 
     def get_queryset(self):
-        return self.request.event.questions
+        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()
 
 
 class QuestionDelete(EventPermissionRequiredMixin, CompatDeleteView):
@@ -706,11 +766,6 @@ class QuestionCreate(EventPermissionRequiredMixin, QuestionMixin, CreateView):
         return ret
 
 
-class QuestionnairesEditor(EventPermissionRequiredMixin, TemplateView):
-    permission = 'can_change_items'
-    template_name = 'pretixcontrol/items/questionnaires.html'
-
-
 class QuotaQueryMixin:
 
     @cached_property

src/pretix/control/views/orders.py

@@ -1177,6 +1177,8 @@ class OrderRefundView(OrderView):
         manual_value = formats.sanitize_separators(manual_value)
         try:
             manual_value = Decimal(manual_value)
+            if manual_value < Decimal("0.00"):
+                raise TypeError("Please do not use negative numbers")
         except (DecimalException, TypeError):
             messages.error(self.request, _('You entered an invalid number.'))
             is_valid = False
@@ -1206,6 +1208,8 @@ class OrderRefundView(OrderView):
         giftcard_value = formats.sanitize_separators(giftcard_value)
         try:
             giftcard_value = Decimal(giftcard_value)
+            if giftcard_value < Decimal("0.00"):
+                raise TypeError("Please do not use negative numbers")
         except (DecimalException, TypeError):
             messages.error(self.request, _('You entered an invalid number.'))
             is_valid = False
@@ -1255,6 +1259,8 @@ class OrderRefundView(OrderView):
         offsetting_value = formats.sanitize_separators(offsetting_value)
         try:
             offsetting_value = Decimal(offsetting_value)
+            if offsetting_value < Decimal("0.00"):
+                raise TypeError("Please do not use negative numbers")
         except (DecimalException, TypeError):
             messages.error(self.request, _('You entered an invalid number.'))
             is_valid = False
@@ -1271,6 +1277,9 @@ class OrderRefundView(OrderView):
                     if offset_order.event.currency != self.request.event.currency:
                         messages.error(self.request, _('You entered an order in an event with a different currency.'))
                         is_valid = False
+                    if not self.request.user.has_event_permission(self.request.organizer, offset_order.event, 'event.orders:write', request=self.request):
+                        messages.error(self.request, _('You entered an order in an event that you do not have access to.'))
+                        is_valid = False
                     refunds.append(OrderRefund(
                         order=order,
                         payment=None,
@@ -1286,10 +1295,13 @@ class OrderRefundView(OrderView):
                     ))
 
         for identifier, prov in self.request.event.get_payment_providers().items():
+            # prof = process form, not a typo for prov(ider)
             prof_value = self.request.POST.get(f'newrefund-{identifier}', '0') or '0'
             prof_value = formats.sanitize_separators(prof_value)
             try:
                 prof_value = Decimal(prof_value)
+                if prof_value < Decimal("0.00"):
+                    raise TypeError("Please do not use negative numbers")
             except (DecimalException, TypeError):
                 messages.error(self.request, _('You entered an invalid number.'))
                 is_valid = False
@@ -1313,6 +1325,8 @@ class OrderRefundView(OrderView):
             value = formats.sanitize_separators(value)
             try:
                 value = Decimal(value)
+                if value < Decimal("0.00"):
+                    raise TypeError("Please do not use negative numbers")
             except (DecimalException, TypeError):
                 messages.error(self.request, _('You entered an invalid number.'))
                 is_valid = False
@@ -1342,7 +1356,12 @@ class OrderRefundView(OrderView):
                     ))
 
         any_success = False
-        if refund_selected == full_refund and is_valid:
+        if refund_selected != full_refund:
+            messages.error(self.request, _('The refunds you selected do not match the selected total refund '
+                                           'amount.'))
+            is_valid = False
+
+        if is_valid:
             for r in refunds:
                 r.save()
                 order.log_action('pretix.event.order.refund.created', {
@@ -1414,9 +1433,6 @@ class OrderRefundView(OrderView):
                             )
                         }))
             return redirect(self.get_order_url())
-        else:
-            messages.error(self.request, _('The refunds you selected do not match the selected total refund '
-                                           'amount.'))
 
     def post(self, *args, **kwargs):
         if self.start_form.is_valid():

src/pretix/control/views/organizer.py

@@ -778,9 +778,9 @@ class OrganizerPluginEvents(OrganizerDetailViewMixin, OrganizerPermissionRequire
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs["events"] = self.request.user.get_events_with_permission(
-            "event.settings.general:write", request=self.request
-        ).filter(organizer=self.request.organizer)
+        # Assumption: Who has access to modify organizer settings may see all events and disable/enable plugins
+        # for them. Otherwise, inconsistent situations occur.
+        kwargs["events"] = self.request.organizer.events.all()
         kwargs["initial"] = {
             "events": self.request.organizer.events.filter(plugins__regex='(^|,)' + self.plugin.module + '(,|$)')
         }

src/pretix/control/views/subevents.py

@@ -1276,6 +1276,11 @@ class SubEventBulkEdit(SubEventQueryMixin, EventPermissionRequiredMixin, FormVie
             self._default_meta = self.request.event.meta_data
 
         for p in self.request.organizer.meta_properties.all():
+            if p.protected and not self.request.user.has_organizer_permission(
+                    self.request.organizer, 'organizer.settings.general:write', request=self.request
+            ):
+                continue
+
             inst = SubEventMetaValue(property=p)
             if len(matches[p.id]) == 1 and matches[p.id][0]['c'] == total:
                 inst.value = matches[p.id][0]['value']

src/pretix/locale/ca/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-08-24 15:35+0000\n"
-"PO-Revision-Date: 2026-06-25 14:00+0000\n"
-"Last-Translator: Kim Lozano <joaquim.lozano@upc.edu>\n"
+"PO-Revision-Date: 2026-09-20 14:00+0000\n"
+"Last-Translator: Rita Gimenez <barcelonamusictech@gmail.com>\n"
 "Language-Team: Catalan <https://translate.pretix.eu/projects/pretix/pretix/"
 "ca/>\n"
 "Language: ca\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2026.6.1\n"
+"X-Generator: Weblate 2026.9.1\n"
 
 #: pretix/_base_settings.py
 msgid "English"
@@ -37,11 +37,11 @@ msgstr "Àrab"
 
 #: pretix/_base_settings.py
 msgid "Basque"
-msgstr ""
+msgstr "Basc"
 
 #: pretix/_base_settings.py
 msgid "Catalan"
-msgstr ""
+msgstr "Català"
 
 #: pretix/_base_settings.py
 msgid "Chinese (simplified)"
@@ -49,11 +49,11 @@ msgstr "Xinès (simplificat)"
 
 #: pretix/_base_settings.py
 msgid "Chinese (traditional)"
-msgstr ""
+msgstr "Xinès (tradicional)"
 
 #: pretix/_base_settings.py
 msgid "Czech"
-msgstr ""
+msgstr "Txec"
 
 #: pretix/_base_settings.py
 msgid "Croatian"
@@ -81,7 +81,7 @@ msgstr "Finlandès"
 
 #: pretix/_base_settings.py
 msgid "Galician"
-msgstr ""
+msgstr "Gallec"
 
 #: pretix/_base_settings.py
 msgid "Greek"
@@ -89,15 +89,15 @@ msgstr "Grec"
 
 #: pretix/_base_settings.py
 msgid "Hebrew"
-msgstr ""
+msgstr "Hebreu"
 
 #: pretix/_base_settings.py
 msgid "Hungarian"
-msgstr ""
+msgstr "Hongarès"
 
 #: pretix/_base_settings.py
 msgid "Indonesian"
-msgstr ""
+msgstr "Indonesi"
 
 #: pretix/_base_settings.py
 msgid "Italian"
@@ -105,7 +105,7 @@ msgstr "Italià"
 
 #: pretix/_base_settings.py
 msgid "Japanese"
-msgstr ""
+msgstr "Japonès"
 
 #: pretix/_base_settings.py
 msgid "Latvian"
@@ -113,7 +113,7 @@ msgstr "Letó"
 
 #: pretix/_base_settings.py
 msgid "Norwegian Bokmål"
-msgstr ""
+msgstr "Noruec"
 
 #: pretix/_base_settings.py
 msgid "Polish"
@@ -129,7 +129,7 @@ msgstr "Portuguès (Brasil)"
 
 #: pretix/_base_settings.py
 msgid "Romanian"
-msgstr ""
+msgstr "Romanès"
 
 #: pretix/_base_settings.py
 msgid "Russian"
@@ -137,11 +137,11 @@ msgstr "Rus"
 
 #: pretix/_base_settings.py
 msgid "Slovak"
-msgstr ""
+msgstr "Eslovac"
 
 #: pretix/_base_settings.py
 msgid "Swedish"
-msgstr ""
+msgstr "Suec"
 
 #: pretix/_base_settings.py
 msgid "Spanish"
@@ -149,11 +149,11 @@ msgstr "Espanyol"
 
 #: pretix/_base_settings.py
 msgid "Spanish (Latin America)"
-msgstr ""
+msgstr "Espanyol (Llatinoamèrica)"
 
 #: pretix/_base_settings.py
 msgid "Thai"
-msgstr ""
+msgstr "Tailandès"
 
 #: pretix/_base_settings.py
 msgid "Turkish"
@@ -161,13 +161,15 @@ msgstr "Turc"
 
 #: pretix/_base_settings.py
 msgid "Ukrainian"
-msgstr ""
+msgstr "Ucraïnès"
 
 #: pretix/api/auth/devicesecurity.py
 msgid ""
 "Full device access (reading and changing orders and gift cards, reading of "
 "products and settings)"
 msgstr ""
+"Accés total al dispositiu (lectura i modificació de comandes i targetes "
+"regal, lectura de productes i configuració)"
 
 #: pretix/api/auth/devicesecurity.py
 msgid "pretixSCAN"
@@ -309,7 +311,7 @@ msgstr "La cistella és buida."
 
 #: pretix/api/serializers/item.py
 msgid "The program end must not be empty."
-msgstr ""
+msgstr "El final del programa no ha de ser buit."
 
 #: pretix/api/serializers/item.py pretix/base/models/items.py
 #, fuzzy
@@ -339,7 +341,7 @@ msgstr ""
 
 #: pretix/api/serializers/item.py
 msgid "Only admission products can currently be personalized."
-msgstr ""
+msgstr "Actualment, només es poden personalitzar els productes d'accés."
 
 #: pretix/api/serializers/item.py
 msgid ""
@@ -434,7 +436,7 @@ msgstr ""
 #: pretix/api/serializers/organizer.py pretix/control/views/organizer.py
 #, python-format
 msgid "You've been invited to join %(organizer)s"
-msgstr ""
+msgstr "Has estat convidat/da a unir-te a %(organizer)s"
 
 #: pretix/api/serializers/organizer.py pretix/control/views/organizer.py
 msgid "This user already has been invited for this team."
@@ -456,7 +458,7 @@ msgstr ""
 
 #: pretix/api/views/checkin.py
 msgid "Medium connected to other event"
-msgstr ""
+msgstr "Mitjà connectat a un altre esdeveniment"
 
 #: pretix/api/views/checkin.py
 #, fuzzy
@@ -642,6 +644,8 @@ msgid ""
 "This includes product added or deleted and changes to nested objects like "
 "variations or bundles."
 msgstr ""
+"Això inclou productes afegits o eliminats i canvis en objectes imbricats, "
+"com ara variacions o lots."
 
 #: pretix/api/webhooks.py
 #, fuzzy
@@ -654,6 +658,9 @@ msgid ""
 "This includes related events like creation, deletion, opening or closing of "
 "quotas. No webhook is sent for changes to the resulting availability."
 msgstr ""
+"Això inclou esdeveniments relacionats, com ara la creació, l'eliminació, "
+"l'obertura o el tancament de quotes. No s'envia cap webhook per als canvis "
+"en la disponibilitat resultant."
 
 #: pretix/api/webhooks.py
 #, fuzzy

src/pretix/locale/de/LC_MESSAGES/django.po

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-08-24 15:35+0000\n"
-"PO-Revision-Date: 2026-08-25 00:00+0000\n"
+"PO-Revision-Date: 2026-09-14 23:00+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix/"
 "de/>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2026.8.1\n"
+"X-Generator: Weblate 2026.9.1\n"
 "X-Poedit-Bookmarks: -1,-1,904,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: pretix/_base_settings.py
@@ -11708,7 +11708,7 @@ msgid ""
 msgstr ""
 "Hallo,\n"
 "\n"
-"Sie erhalten diese Nachricht weil Sie einen neuen Link zu Ihrer Bestellung "
+"Sie erhalten diese Nachricht, weil Sie einen neuen Link zu Ihrer Bestellung "
 "für\n"
 "{event} angefordert haben.\n"
 "\n"
@@ -11738,8 +11738,8 @@ msgid ""
 msgstr ""
 "Hallo,\n"
 "\n"
-"Sie erhalten diese Nachricht weil Sie einen neuen Link zu Ihren Bestellungen "
-"für\n"
+"Sie erhalten diese Nachricht, weil Sie einen neuen Link zu Ihren "
+"Bestellungen für\n"
 "{event} angefordert haben. Sie finden Ihre Bestellungen unter folgenden "
 "Links:\n"
 "\n"

src/pretix/locale/th/LC_MESSAGES/django.po

@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-08-24 15:35+0000\n"
-"PO-Revision-Date: 2026-05-20 10:58+0000\n"
-"Last-Translator: Phumraphee Sae-tang <phumraphee@gmail.com>\n"
-"Language-Team: Thai <https://translate.pretix.eu/projects/pretix/pretix/th/"
-">\n"
+"PO-Revision-Date: 2026-09-19 13:00+0000\n"
+"Last-Translator: Nate Horst <nate@agcthailand.org>\n"
+"Language-Team: Thai <https://translate.pretix.eu/projects/pretix/pretix/th/>"
+"\n"
 "Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2026.5\n"
+"X-Generator: Weblate 2026.9.1\n"
 
 #: pretix/_base_settings.py
 msgid "English"
@@ -17264,7 +17264,7 @@ msgstr ""
 #: pretix/control/navigation.py
 #: pretix/control/templates/pretixcontrol/dashboard.html
 msgid "Dashboard"
-msgstr ""
+msgstr "แผงควบคุม"
 
 #: pretix/control/navigation.py
 #: pretix/control/templates/pretixcontrol/checkin/list_edit.html
@@ -17278,7 +17278,7 @@ msgstr ""
 #: pretix/control/templates/pretixcontrol/organizers/mail.html
 #: pretix/control/templates/pretixcontrol/organizers/property_edit.html
 msgid "General"
-msgstr ""
+msgstr "ทั่วไป"
 
 #: pretix/control/navigation.py
 #: pretix/control/templates/pretixcontrol/event/quick_setup.html
@@ -17290,7 +17290,7 @@ msgstr ""
 #: pretix/presale/templates/pretixpresale/event/checkout_payment.html
 #: pretix/presale/templates/pretixpresale/event/order.html
 msgid "Payment"
-msgstr ""
+msgstr "การชำระเงิน"
 
 #: pretix/control/navigation.py pretix/control/views/event.py
 #: pretix/control/views/subevents.py
@@ -17300,18 +17300,18 @@ msgstr ""
 #: pretix/presale/templates/pretixpresale/event/fragment_subevent_list.html
 #: pretix/presale/templates/pretixpresale/organizers/index.html
 msgid "Tickets"
-msgstr ""
+msgstr "ตั๋ว"
 
 #: pretix/control/navigation.py
 #: pretix/control/templates/pretixcontrol/event/tax.html
 #: pretix/control/templates/pretixcontrol/order/index.html
 #: pretix/presale/templates/pretixpresale/event/fragment_cart.html
 msgid "Taxes"
-msgstr ""
+msgstr "ภาษี"
 
 #: pretix/control/navigation.py
 msgid "Invoicing"
-msgstr ""
+msgstr "การออกใบแจ้งหนี้"
 
 #: pretix/control/navigation.py
 msgctxt "action"
@@ -21506,19 +21506,19 @@ msgstr ""
 
 #: pretix/control/templates/pretixcontrol/oauth/authorized.html
 msgid "Permissions"
-msgstr ""
+msgstr "สิทธิ์การใช้งาน"
 
 #: pretix/control/templates/pretixcontrol/oauth/authorized.html
 msgid "No applications have access to your pretix account."
-msgstr ""
+msgstr "ไม่มีแอปพลิเคชันใดเข้าถึงบัญชี pretix ของคุณ"
 
 #: pretix/control/templates/pretixcontrol/order/approve.html
 msgid "Approve order"
-msgstr ""
+msgstr "อนุมัติคำสั่งซื้อ"
 
 #: pretix/control/templates/pretixcontrol/order/approve.html
 msgid "Do you really want to approve this order?"
-msgstr ""
+msgstr "คุณแน่ใจหรือไม่ว่าต้องการอนุมัติคำสั่งซื้อนี้?"
 
 #: pretix/control/templates/pretixcontrol/order/approve.html
 #: pretix/control/templates/pretixcontrol/order/cancel.html
@@ -21529,29 +21529,32 @@ msgstr ""
 #: pretix/control/templates/pretixcontrol/order/refund_cancel.html
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 msgid "No, take me back"
-msgstr ""
+msgstr "ไม่, ย้อนกลับ"
 
 #: pretix/control/templates/pretixcontrol/order/approve.html
 msgid "Yes, approve order"
-msgstr ""
+msgstr "ใช่, อนุมัติคำสั่งซื้อ"
 
 #: pretix/control/templates/pretixcontrol/order/cancel.html
 #: pretix/control/templates/pretixcontrol/order/index.html
 #: pretix/presale/templates/pretixpresale/event/order.html
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 msgid "Cancel order"
-msgstr ""
+msgstr "ยกเลิกคำสั่งซื้อ"
 
 #: pretix/control/templates/pretixcontrol/order/cancel.html
 #: pretix/control/templates/pretixcontrol/order/deny.html
 msgid "Do you really want to cancel this order? You cannot revert this action."
 msgstr ""
+"คุณแน่ใจหรือไม่ว่าต้องการยกเลิกคำสั่งซื้อนี้? การดำเนินการนี้ไม่สามารถย้อนกลับได้"
 
 #: pretix/control/templates/pretixcontrol/order/cancel.html
 msgid ""
 "This will <strong>not</strong> automatically transfer the money back, but "
 "you will be offered options to refund the payment afterwards."
 msgstr ""
+"การดำเนินการนี้จะ <strong>ไม่</strong>คืนเงินโดยอัตโนมัติ แต่คุณจะมีตัวเลือกในการคืนเงินหลังจา"
+"กนี้"
 
 #: pretix/control/templates/pretixcontrol/order/cancel.html
 #, python-format
@@ -21560,15 +21563,17 @@ msgid ""
 "%(fee)s for this order, but for a cancellation performed by you, you need to "
 "set the cancellation fee here:"
 msgstr ""
+"ค่าธรรมเนียมการยกเลิกที่ตั้งค่าไว้สำหรับการยกเลิกด้วยตนเองจะอยู่ที่ %(fee)s สำหรับคำสั่งซื้อนี้ แต่สำ"
+"หรับการยกเลิกที่ดำเนินการโดยคุณ คุณจะต้องกำหนดค่าธรรมเนียมการยกเลิกที่นี่:"
 
 #: pretix/control/templates/pretixcontrol/order/cancel.html
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 msgid "Yes, cancel order"
-msgstr ""
+msgstr "ใช่, ยกเลิกคำสั่งซื้อ"
 
 #: pretix/control/templates/pretixcontrol/order/cancellation_request_delete.html
 msgid "Ignore cancellation request"
-msgstr ""
+msgstr "เพิกเฉยต่อคำขอยกเลิก"
 
 #: pretix/control/templates/pretixcontrol/order/cancellation_request_delete.html
 msgid ""
@@ -21576,6 +21581,8 @@ msgid ""
 "informed automatically, but you will have the option to email them "
 "individually in the next step."
 msgstr ""
+"คุณแน่ใจหรือไม่ว่าต้องการลบคำขอยกเลิกนี้? ผู้ใช้จะไม่ได้รับการแจ้งเตือนโดยอัตโนมัติ แต่คุณจะมีตัวเลือก"
+"ในการส่งอีเมลถึงพวกเขาโดยตรงในขั้นตอนถัดไป"
 
 #: pretix/control/templates/pretixcontrol/order/cancellation_request_delete.html
 msgid "Yes, delete request"
@@ -21753,24 +21760,24 @@ msgstr ""
 #: pretix/presale/templates/pretixpresale/event/order_change_confirm.html
 #: pretix/presale/templates/pretixpresale/event/position_change_confirm.html
 msgid "Perform changes"
-msgstr ""
+msgstr "ดำเนินการเปลี่ยนแปลง"
 
 #: pretix/control/templates/pretixcontrol/order/change_contact.html
 #: pretix/control/templates/pretixcontrol/order/change_questions.html
 msgid "Change contact information"
-msgstr ""
+msgstr "เปลี่ยนแปลงข้อมูลการติดต่อ"
 
 #: pretix/control/templates/pretixcontrol/order/change_locale.html
 msgid "Change locale information"
-msgstr ""
+msgstr "เปลี่ยนแปลงข้อมูลภาษาและภูมิภาค"
 
 #: pretix/control/templates/pretixcontrol/order/change_locale.html
 msgid "This language will be used whenever emails are sent to the users."
-msgstr ""
+msgstr "ภาษานี้จะถูกใช้เมื่อใดก็ตามที่มีการส่งอีเมลไปยังผู้ใช้"
 
 #: pretix/control/templates/pretixcontrol/order/change_questions.html
 msgid "Change order information"
-msgstr ""
+msgstr "เปลี่ยนแปลงข้อมูลคำสั่งซื้อ"
 
 #: pretix/control/templates/pretixcontrol/order/change_questions.html
 #: pretix/control/templates/pretixcontrol/order/index.html
@@ -21778,13 +21785,13 @@ msgstr ""
 #: pretix/presale/templates/pretixpresale/event/checkout_questions.html
 #: pretix/presale/templates/pretixpresale/event/order_modify.html
 msgid "Invoice information"
-msgstr ""
+msgstr "ข้อมูลใบแจ้งหนี้"
 
 #: pretix/control/templates/pretixcontrol/order/change_questions.html
 #: pretix/presale/templates/pretixpresale/event/checkout_questions.html
 #: pretix/presale/templates/pretixpresale/event/order_modify.html
 msgid "(optional)"
-msgstr ""
+msgstr "(ระบุหรือไม่ก็ได้)"
 
 #: pretix/control/templates/pretixcontrol/order/change_questions.html
 #: pretix/presale/templates/pretixpresale/event/checkout_confirm.html
@@ -21797,17 +21804,19 @@ msgstr "ต้องการข้อมูลเพิ่มเติม"
 
 #: pretix/control/templates/pretixcontrol/order/delete.html
 msgid "Delete order"
-msgstr ""
+msgstr "ลบคำสั่งซื้อ"
 
 #: pretix/control/templates/pretixcontrol/order/delete.html
 msgid ""
 "Do you really want to delete this order? <strong>You really cannot revert "
 "this action and we can't either.</strong>"
 msgstr ""
+"คุณแน่ใจหรือไม่ว่าต้องการลบคำสั่งซื้อนี้? <strong>คุณจะไม่สามารถย้อนกลับการดำเนินการนี้ได้จริงๆ แล"
+"ะเราก็ไม่สามารถย้อนกลับได้เช่นกัน</strong>"
 
 #: pretix/control/templates/pretixcontrol/order/delete.html
 msgid "Yes, delete order"
-msgstr ""
+msgstr "ใช่, ลบคำสั่งซื้อ"
 
 #: pretix/control/templates/pretixcontrol/order/deny.html
 msgid "Deny order"
@@ -22256,12 +22265,13 @@ msgstr ""
 
 #: pretix/control/templates/pretixcontrol/order/refund_cancel.html
 msgid "Cancel refund"
-msgstr ""
+msgstr "ยกเลิกการคืนเงิน"
 
 #: pretix/control/templates/pretixcontrol/order/refund_cancel.html
 msgid ""
 "Do you really want to cancel this refund? You cannot revert this action."
 msgstr ""
+"คุณแน่ใจหรือไม่ว่าต้องการยกเลิกการคืนเงินนี้? การดำเนินการนี้ไม่สามารถย้อนกลับได้"
 
 #: pretix/control/templates/pretixcontrol/order/refund_cancel.html
 msgid ""
@@ -22269,19 +22279,22 @@ msgid ""
 "will just mark this transfer as aborted in pretix. This will also not "
 "reactivate the order, it will just allow you to choose a new refund method."
 msgstr ""
+"หากอยู่ในระหว่างการโอนเงินคืนแล้ว การดำเนินการนี้จะไม่สามารถระงับการโอนเงินได้ แต่จะเป็นเพียง"
+"การทำเครื่องหมายว่ารายการโอนนี้ถูกยกเลิกใน pretix เท่านั้น ทั้งนี้ จะไม่เป็นการเปิดใช้งานคำสั่งซื้อ"
+"อีกครั้ง แต่จะเปิดโอกาสให้คุณเลือกวิธีการคืนเงินรูปแบบใหม่ได้"
 
 #: pretix/control/templates/pretixcontrol/order/refund_cancel.html
 msgid "Yes, cancel refund"
-msgstr ""
+msgstr "ใช่, ยกเลิกการคืนเงิน"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html
 #: pretix/control/templates/pretixcontrol/order/refund_start.html
 msgid "Refund order"
-msgstr ""
+msgstr "คืนเงินคำสั่งซื้อ"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html
 msgid "How should the refund be sent?"
-msgstr ""
+msgstr "ต้องการส่งเงินคืนด้วยวิธีใด?"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html
 msgid ""
@@ -22290,38 +22303,41 @@ msgid ""
 "created as pending refunds, which you can later mark as done once you have "
 "actually transferred the money back to the customer."
 msgstr ""
+"รายการชำระเงินใดที่คุณเลือกเป็นการคืนเงินอัตโนมัติ คำขอคืนเงินจะถูกส่งไปยังผู้ให้บริการชำระเงินที่เกี่"
+"ยวข้องทันที ส่วนการคืนเงินด้วยตนเองจะถูกสร้างเป็นรายการคืนเงินที่รอดำเนินการ ซึ่งคุณสามารถทำเครื่"
+"องหมายว่าเสร็จสิ้นได้ในภายหลัง หลังจากที่ได้โอนเงินคืนให้ลูกค้าเรียบร้อยแล้ว"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html
 msgid "Refund to original payment method"
-msgstr ""
+msgstr "คืนเงินไปยังช่องทางชำระเงินเดิม"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html
 msgid "Amount not refunded"
-msgstr ""
+msgstr "จำนวนเงินที่ไม่ได้รับการคืน"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html
 msgid "Refund amount"
-msgstr ""
+msgstr "จำนวนเงินที่คืน"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html
 msgid "Full amount"
-msgstr ""
+msgstr "จำนวนเงินเต็ม"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html
 msgid "This payment method does not support automatic refunds."
-msgstr ""
+msgstr "วิธีการชำระเงินนี้ไม่รองรับการคืนเงินอัตโนมัติ"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html
 msgid "Refund to a different payment method"
-msgstr ""
+msgstr "คืนเงินไปยังช่องทางชำระเงินอื่น"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html
 msgid "Recipient / options"
-msgstr ""
+msgstr "ผู้รับ / ตัวเลือก"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html
 msgid "Transfer to other order"
-msgstr ""
+msgstr "โอนไปยังคำสั่งซื้ออื่น"
 
 #: pretix/control/templates/pretixcontrol/order/refund_choose.html
 #: pretix/control/templates/pretixcontrol/organizers/giftcard_create.html
@@ -31172,48 +31188,48 @@ msgstr ""
 #: pretix/presale/forms/renderers.py
 msgctxt "form"
 msgid "is valid"
-msgstr ""
+msgstr "ใช้ได้"
 
 #: pretix/presale/forms/renderers.py
 msgctxt "form"
 msgid "has errors"
-msgstr ""
+msgstr "มีข้อผิดพลาด"
 
 #: pretix/presale/forms/renderers.py
 #: pretix/presale/templates/pretixpresale/event/fragment_voucher_form.html
 msgctxt "form"
 msgid "required"
-msgstr ""
+msgstr "จำเป็นต้องระบุ"
 
 #: pretix/presale/ical.py
 #, python-brace-format
 msgid "Tickets: {url}"
-msgstr ""
+msgstr "ตั๋ว: {url}"
 
 #: pretix/presale/ical.py
 #, python-brace-format
 msgid "Admission: {datetime}"
-msgstr ""
+msgstr "เวลาประตูเปิด: {datetime}"
 
 #: pretix/presale/ical.py
 #, python-brace-format
 msgid "Organizer: {organizer}"
-msgstr ""
+msgstr "ผู้จัดงาน: {organizer}"
 
 #: pretix/presale/ical.py
 #, python-brace-format
 msgid "{event} - {item}"
-msgstr ""
+msgstr "{event} - {item}"
 
 #: pretix/presale/ical.py
 #, python-brace-format
 msgid "Start: {datetime}"
-msgstr ""
+msgstr "เริ่มต้น: {datetime}"
 
 #: pretix/presale/ical.py
 #, python-brace-format
 msgid "End: {datetime}"
-msgstr ""
+msgstr "สิ้นสุด: {datetime}"
 
 #: pretix/presale/templates/pretixpresale/base.html
 msgctxt "skip-to-main-nav"
@@ -31355,23 +31371,23 @@ msgstr ""
 #: pretix/presale/templates/pretixpresale/organizers/customer_address_delete.html
 #: pretix/presale/templates/pretixpresale/organizers/customer_profile_delete.html
 msgid "Go back"
-msgstr ""
+msgstr "ย้อนกลับ"
 
 #: pretix/presale/templates/pretixpresale/event/checkout_base.html
 #, python-format
 msgid "Step %(current)s of %(total)s: %(label)s"
-msgstr ""
+msgstr "ขั้นตอนที่ %(current)s จาก %(total)s: %(label)s"
 
 #: pretix/presale/templates/pretixpresale/event/checkout_base.html
 msgid "Checkout"
-msgstr ""
+msgstr "ชำระเงิน"
 
 #: pretix/presale/templates/pretixpresale/event/checkout_base.html
 #: pretix/presale/templates/pretixpresale/event/checkout_confirm.html
 #: pretix/presale/templates/pretixpresale/event/fragment_cart.html
 #: pretix/presale/templates/pretixpresale/event/fragment_cart_box.html
 msgid "Your cart"
-msgstr ""
+msgstr "ตระกร้าของคุณ"
 
 #: pretix/presale/templates/pretixpresale/event/checkout_base.html
 #: pretix/presale/templates/pretixpresale/event/checkout_confirm.html
@@ -31381,36 +31397,36 @@ msgstr "ตะกร้าสินค้าหมดเวลาแล้ว"
 
 #: pretix/presale/templates/pretixpresale/event/checkout_base.html
 msgid "Show full cart"
-msgstr ""
+msgstr "แสดงตะกร้าสินค้าทั้งหมด"
 
 #: pretix/presale/templates/pretixpresale/event/checkout_base.html
 #: pretix/presale/templates/pretixpresale/event/index.html
 msgid "Add tickets for a different date"
-msgstr ""
+msgstr "เพิ่มตั๋วสำหรับวันที่อื่น"
 
 #: pretix/presale/templates/pretixpresale/event/checkout_confirm.html
 msgid "Review order"
-msgstr ""
+msgstr "ตรวจสอบคำสั่งซื้อ"
 
 #: pretix/presale/templates/pretixpresale/event/checkout_confirm.html
 msgid "Please review the details below and confirm your order."
-msgstr ""
+msgstr "โปรดตรวจสอบรายละเอียดด้านล่างและยืนยันคำสั่งซื้อของคุณ"
 
 #: pretix/presale/templates/pretixpresale/event/checkout_confirm.html
 msgid "Add or remove tickets"
-msgstr ""
+msgstr "เพิ่มหรือลบตั๋ว"
 
 #: pretix/presale/templates/pretixpresale/event/checkout_confirm.html
 msgid "Please hang tight, we're finalizing your order!"
-msgstr ""
+msgstr "โปรดรอสักครู่ ระบบกำลังดำเนินการสรุปคำสั่งซื้อของคุณ!"
 
 #: pretix/presale/templates/pretixpresale/event/checkout_confirm.html
 msgid "Modify payment"
-msgstr ""
+msgstr "แก้ไขการชำระเงิน"
 
 #: pretix/presale/templates/pretixpresale/event/checkout_confirm.html
 msgid "Modify"
-msgstr ""
+msgstr "แก้ไข"
 
 #: pretix/presale/templates/pretixpresale/event/checkout_confirm.html
 msgid "Modify invoice information"
@@ -31901,8 +31917,7 @@ msgstr ""
 #, python-format
 msgid "One product"
 msgid_plural "%(num)s products"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(num)s รายการสินค้า"
 
 #: pretix/presale/templates/pretixpresale/event/fragment_cart.html
 #, python-format
@@ -32442,31 +32457,35 @@ msgid ""
 "your order later. We also sent you an email to the address you specified "
 "containing the link to this page."
 msgstr ""
+"โปรดบุ๊กมาร์กหรือบันทึกลิงก์ของหน้านี้ไว้ หากคุณต้องการเข้าถึงคำสั่งซื้อของคุณในภายหลัง นอกจากนี้ เรา"
+"ได้ส่งอีเมลพร้อมลิงก์สำหรับเข้าถึงหน้านี้ไปยังที่อยู่อีเมลที่คุณระบุไว้แล้ว"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 msgid ""
 "Please save the following link if you want to access your order later. We "
 "also sent you an email to the address you specified containing the link."
 msgstr ""
+"โปรดบันทึกลิงก์ต่อไปนี้ไว้ หากคุณต้องการเข้าถึงคำสั่งซื้อของคุณในภายหลัง นอกจากนี้ เราได้ส่งอีเมลพร้อ"
+"มลิงก์ไปยังที่อยู่อีเมลที่คุณระบุไว้แล้ว"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 #: pretix/presale/templates/pretixpresale/event/position.html
 msgid "View in backend"
-msgstr ""
+msgstr "ดูในระบบหลังบ้าน"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 #, python-format
 msgid "A payment of %(total)s is still pending for this order."
-msgstr ""
+msgstr "คำสั่งซื้อนี้ยังมียอดคงค้างชำระอยู่อีก %(total)s"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 #, python-format
 msgid "Please complete your payment before %(date)s"
-msgstr ""
+msgstr "โปรดชำระเงินให้เสร็จสิ้นก่อนวันที่ %(date)s"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 msgid "Re-try payment or choose another payment method"
-msgstr ""
+msgstr "ลองชำระเงินอีกครั้ง หรือเลือกวิธีชำระเงินอื่น"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 msgid ""
@@ -32510,22 +32529,22 @@ msgstr ""
 #: pretix/presale/templates/pretixpresale/event/order.html
 #: pretix/presale/templates/pretixpresale/event/position.html
 msgid "Change ordered items"
-msgstr ""
+msgstr "เปลี่ยนแปลงรายการสินค้าที่สั่งซื้อ"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 #: pretix/presale/templates/pretixpresale/event/position.html
 msgid "Change details"
-msgstr ""
+msgstr "เปลี่ยนแปลงรายละเอียด"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 msgid ""
 "You need to select a payment method above before you can request an invoice."
-msgstr ""
+msgstr "คุณต้องเลือกวิธีการชำระเงินด้านบนก่อน จึงจะสามารถขอใบแจ้งหนี้ได้"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 #: pretix/presale/templates/pretixpresale/event/order_modify.html
 msgid "Request invoice"
-msgstr ""
+msgstr "ขอใบแจ้งหนี้"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 msgid "Your information"
@@ -32533,41 +32552,42 @@ msgstr "ข้อมูลของคุณ"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 msgid "Change your information"
-msgstr ""
+msgstr "เปลี่ยนแปลงข้อมูลของคุณ"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 msgid "Internal Reference"
-msgstr ""
+msgstr "รหัสอ้างอิงภายใน"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 msgctxt "action"
 msgid "Change or cancel your order"
-msgstr ""
+msgstr "เปลี่ยนแปลงหรือยกเลิกคำสั่งซื้อของคุณ"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 msgctxt "action"
 msgid "Change your order"
-msgstr ""
+msgstr "เปลี่ยนแปลงคำสั่งซื้อของคุณ"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 msgctxt "action"
 msgid "Cancel your order"
-msgstr ""
+msgstr "ยกเลิกคำสั่งซื้อของคุณ"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 msgid ""
 "If you want to make changes to the products you bought, you can click on the "
 "button to change your order."
 msgstr ""
+"หากคุณต้องการเปลี่ยนแปลงสินค้าที่ซื้อไว้ คุณสามารถคลิกที่ปุ่มเพื่อเปลี่ยนแปลงคำสั่งซื้อของคุณได้"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 msgid "Change order"
-msgstr ""
+msgstr "เปลี่ยนแปลงคำสั่งซื้อ"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 msgid "You can request to cancel this order."
-msgstr ""
+msgstr "คุณสามารถยื่นขอยกเลิกคำสั่งซื้อนี้ได้"
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
@@ -32635,17 +32655,17 @@ msgstr ""
 
 #: pretix/presale/templates/pretixpresale/event/order.html
 msgid "You can cancel this order using the following button."
-msgstr ""
+msgstr "คุณสามารถยกเลิกคำสั่งซื้อนี้ได้โดยใช้ปุ่มต่อไปนี้"
 
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 #, python-format
 msgid "Request cancellation: %(code)s"
-msgstr ""
+msgstr "ยื่นขอยกเลิก: %(code)s"
 
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 #, python-format
 msgid "Cancel order: %(code)s"
-msgstr ""
+msgstr "ยกเลิกคำสั่งซื้อ: %(code)s"
 
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 msgid ""
@@ -32653,12 +32673,16 @@ msgid ""
 "organizer will then decide on your request. If they approve, your order will "
 "be canceled and all tickets will be invalidated."
 msgstr ""
+"คุณสามารถยื่นขอยกเลิกคำสั่งซื้อของคุณได้ในหน้านี้ โดยผู้จัดงานจะพิจารณาคำขอของคุณ หากคำขอได้รับกา"
+"รอนุมัติ คำสั่งซื้อของคุณจะถูกยกเลิก และตั๋วทั้งหมดจะถูกยกเลิกใช้งาน"
 
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 msgid ""
 "If you cancel this order, all tickets will be invalidated and you can no "
 "longer use them. You cannot revert this action."
 msgstr ""
+"หากคุณยกเลิกคำสั่งซื้อนี้ ตั๋วทั้งหมดจะถูกยกเลิกใช้งาน และคุณจะไม่สามารถใช้งานตั๋วได้อีกต่อไป การดำเ"
+"นินการนี้ไม่สามารถย้อนกลับได้"
 
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 #, python-format
@@ -32666,97 +32690,102 @@ msgid ""
 "If you want, you can request a refund for the full amount minus a "
 "cancellation fee of %(fee)s."
 msgstr ""
+"หากคุณต้องการ คุณสามารถยื่นขอคืนเงินเต็มจำนวนโดยหักค่าธรรมเนียมการยกเลิก %(fee)s"
 
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 msgid "If you want, you can request a full refund."
-msgstr ""
+msgstr "หากคุณต้องการ คุณสามารถยื่นขอคืนเงินเต็มจำนวนได้"
 
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 msgid "Enter custom amount"
-msgstr ""
+msgstr "ระบุจำนวนเงินเอง"
 
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 msgid "Refund amount:"
-msgstr ""
+msgstr "จำนวนเงินที่คืน:"
 
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 #, python-format
 msgid "Your gift card will be valid until %(expiry_date)s."
-msgstr ""
+msgstr "บัตรของขวัญของคุณจะสามารถใช้งานได้จนถึงวันที่ %(expiry_date)s"
 
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 msgid "I want the refund as a gift card for later purchases"
-msgstr ""
+msgstr "ฉันต้องการรับเงินคืนเป็นบัตรของขวัญสำหรับการซื้อในครั้งถัดไป"
 
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 msgid "I want the refund to be sent to my original payment method"
-msgstr ""
+msgstr "ฉันต้องการรับเงินคืนผ่านช่องทางชำระเงินเดิม"
 
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 msgid "The following payment methods will be used to refund the money to you:"
-msgstr ""
+msgstr "ช่องทางการชำระเงินต่อไปนี้จะถูกใช้เพื่อคืนเงินให้กับคุณ:"
 
 #: pretix/presale/templates/pretixpresale/event/order_cancel.html
 msgid "Yes, request cancellation"
-msgstr ""
+msgstr "ใช่, ยื่นขอยกเลิก"
 
 #: pretix/presale/templates/pretixpresale/event/order_change_confirm.html
 msgid "Please confirm the following changes to your order."
-msgstr ""
+msgstr "โปรดยืนยันการเปลี่ยนแปลงคำสั่งซื้อของคุณดังต่อไปนี้"
 
 #: pretix/presale/templates/pretixpresale/event/order_giftcard.html
 #: pretix/presale/templates/pretixpresale/event/position_giftcard.html
 #, python-format
 msgid "Gift card: %(code)s"
-msgstr ""
+msgstr "บัตรของขวัญ: %(code)s"
 
 #: pretix/presale/templates/pretixpresale/event/order_modify.html
 msgid "Modify order"
-msgstr ""
+msgstr "แก้ไขคำสั่งซื้อ"
 
 #: pretix/presale/templates/pretixpresale/event/order_modify.html
 #, python-format
 msgid "Modify order: %(code)s"
-msgstr ""
+msgstr "แก้ไขคำสั่งซื้อ: %(code)s"
 
 #: pretix/presale/templates/pretixpresale/event/order_modify.html
 msgid ""
 "Modifying your invoice address will not automatically generate a new "
 "invoice. Please contact us if you need a new invoice."
 msgstr ""
+"การแก้ไขที่อยู่สำหรับออกใบแจ้งหนี้จะไม่สร้างใบแจ้งหนี้ใหม่โดยอัตโนมัติ โปรดติดต่อเราหากคุณต้องการใบ"
+"แจ้งหนี้ใหม่"
 
 #: pretix/presale/templates/pretixpresale/event/order_modify.html
 #: pretix/presale/templates/pretixpresale/event/position_modify.html
 msgid "Save changes"
-msgstr ""
+msgstr "บันทึกการเปลี่ยนแปลง"
 
 #: pretix/presale/templates/pretixpresale/event/order_pay_change.html
 msgid "Change payment method"
-msgstr ""
+msgstr "เปลี่ยนแปลงวิธีการชำระเงิน"
 
 #: pretix/presale/templates/pretixpresale/event/order_pay_change.html
 #, python-format
 msgid "Choose payment method: %(code)s"
-msgstr ""
+msgstr "เลือกวิธีการชำระเงิน: %(code)s"
 
 #: pretix/presale/templates/pretixpresale/event/order_pay_change.html
 msgid ""
 "Please note: If you change your payment method, your order total will change "
 "by the amount displayed to the right of each method."
 msgstr ""
+"ข้อควรจำ: หากคุณเปลี่ยนแปลงวิธีการชำระเงิน ยอดรวมคำสั่งซื้อของคุณจะเปลี่ยนแปลงตามจำนวนที่แสดง"
+"ด้านขวาของแต่ละวิธี"
 
 #: pretix/presale/templates/pretixpresale/event/order_pay_change.html
 msgid "There are no alternative payment providers available for this order."
-msgstr ""
+msgstr "ไม่มีผู้ให้บริการชำระเงินอื่นที่สามารถใช้งานได้สำหรับคำสั่งซื้อนี้"
 
 #: pretix/presale/templates/pretixpresale/event/order_pay_confirm.html
 msgid "Please confirm the following payment details."
-msgstr ""
+msgstr "โปรดยืนยันรายละเอียดการชำระเงินดังต่อไปนี้"
 
 #: pretix/presale/templates/pretixpresale/event/order_pay_confirm.html
 #, python-format
 msgid "Total: %(total)s"
-msgstr ""
+msgstr "ยอดรวม: %(total)s"
 
 #: pretix/presale/templates/pretixpresale/event/payment_qr_codes.html
 msgid ""

src/pretix/presale/checkoutflow.py

@@ -98,9 +98,7 @@ from pretix.presale.signals import (
     question_form_fields_overrides,
 )
 from pretix.presale.utils import customer_login
-from pretix.presale.views import (
-    CartMixin, get_cart_is_free, get_cart_positions,
-)
+from pretix.presale.views import CartMixin, get_cart, get_cart_is_free
 from pretix.presale.views.cart import (
     _items_from_post_data, cart_session, create_empty_cart_id,
     get_or_create_cart_id,
@@ -499,7 +497,7 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
         self.request = request
 
         # check whether addons are applicable
-        if get_cart_positions(request).filter(item__addons__isnull=False).exists():
+        if get_cart(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
@@ -1092,18 +1090,26 @@ class QuestionsStep(CartQuestionsViewMixin, CartMixin, TemplateFlowStep):
                 return False
 
         for cp in self._positions_for_questions:
-            qc_cache = {
-                qc.pk: qc for qq in cp.item.relevant_questionnaires for qc in qq.childlist
+            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 qc_cache:
+                if parentid not in question_cache:
                     return False
-                parentqc = qc_cache[parentid]
-                if parentqc.dependency_question_id and not question_is_visible(parentqc.dependency_question_id, parentqc.dependency_values):
+                parentq = question_cache[parentid]
+                if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
                     return False
-                answer_values = cp.get_dependency_answer_values(parentqc)
-                return any(qval in answer_values for qval in qvals)
+                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 (
@@ -1112,16 +1118,31 @@ class QuestionsStep(CartQuestionsViewMixin, CartMixin, TemplateFlowStep):
                 )
 
             if not self.all_optional:
-                for qq in cp.item.relevant_questionnaires:
-                    for qc in qq.childlist:
-                        if qc.user_datafield_id and question_is_required(qc) and qc.user_datafield_id not in cp.answer_cache:
-                            if warn:
-                                messages.warning(request, _('Please fill in answers to all required questions.'))
-                            return False
-                        if qc.system_datafield and question_is_required(qc) and not cp.get_system_answer(qc.system_datafield):
-                            if warn:
-                                messages.warning(request, _('Please fill in answers to all required questions.'))
-                            return False
+                for q in cp.item.questions_to_ask:
+                    if question_is_required(q) and q.id not in answ:
+                        if warn:
+                            messages.warning(request, _('Please fill in answers to all required questions.'))
+                        return False
+                if cp.item.ask_attendee_data and self.request.event.settings.get('attendee_names_required', as_type=bool) \
+                        and not cp.attendee_name_parts:
+                    if warn:
+                        messages.warning(request, _('Please fill in answers to all required questions.'))
+                    return False
+                if cp.item.ask_attendee_data and self.request.event.settings.get('attendee_emails_required', as_type=bool) \
+                        and cp.attendee_email is None:
+                    if warn:
+                        messages.warning(request, _('Please fill in answers to all required questions.'))
+                    return False
+                if cp.item.ask_attendee_data and self.request.event.settings.get('attendee_company_required', as_type=bool) \
+                        and cp.company is None:
+                    if warn:
+                        messages.warning(request, _('Please fill in answers to all required questions.'))
+                    return False
+                if cp.item.ask_attendee_data and self.request.event.settings.get('attendee_addresses_required', as_type=bool) \
+                        and (cp.street is None and cp.city is None and cp.country is None):
+                    if warn:
+                        messages.warning(request, _('Please fill in answers to all required questions.'))
+                    return False
 
             responses = question_form_fields.send(sender=self.request.event, position=cp)
             form_data = cp.meta_info_data.get('question_form_data', {})

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

@@ -204,7 +204,7 @@
                             {% endif %}
                         {% endif %}
                         {% for q in line.questions %}
-                            <dt>{{ q.label }}</dt>
+                            <dt>{{ q.question }}</dt>
                             <dd>
                                 {% include "pretixpresale/event/fragment_question_answer.html" with request=request question=q answer=q.answer %}
                             </dd>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -780,8 +780,6 @@ 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;
@@ -804,7 +802,6 @@ fieldset.accordion-panel > legend {
   padding-bottom: 5px;
 }
 
-
 .batch-select-label {
   display: block;
   width: 100%;

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

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

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

@@ -114,7 +114,7 @@ td(
 )
 	.pretix-widget-event-calendar-day(v-if="day", :aria-label="dateStr") {{ daynum }}
 	.pretix-widget-event-calendar-events(v-if="day")
-		EventCalendarEvent(v-for="e in day.events", :key="e.event_url", :event="e")
+		EventCalendarEvent(v-for="e in day.events", :key="e.event_url+'-'+(e.subevent||'')", :event="e")
 </template>
 <style lang="sass">
 </style>

src/tests/base/test_shredders.py

@@ -342,8 +342,11 @@ def test_invoice_shredder(event, order):
     s.shred_data()
     inv.refresh_from_db()
 
-    assert "Acme" not in inv.invoice_to
-    assert "icket" not in inv.lines.first().description
+    assert inv.invoice_to == "█"
+    assert inv.invoice_to_company == "█"
+    l = inv.lines.first()
+    assert l.description == "█"
+    assert l.attendee_name == "█"
     assert not inv.file
     assert not os.path.exists(fname)
 

src/tests/base/test_templatetag.py

@@ -26,7 +26,7 @@ from django.template import Context, Template
 from django.test import RequestFactory
 from django.utils import translation
 
-from pretix.base.templatetags.money import money_filter
+from pretix.base.templatetags.money import money_filter, tax_rate_format
 
 TEMPLATE_REPLACE_PAGE = Template(
     "{% load urlreplace %}{% url_replace request 'page' 3 %}"
@@ -60,7 +60,9 @@ def test_urlreplace_replace_parameter():
     "locale,amount,currency,expected",
     [
         ("en", None, "USD", "$0.00"),
+        ("en", "", "USD", ""),
         ("en", 1000000, "USD", "$1,000,000.00"),
+        ("en", 2.23, "USD", "$2.23"),
         ("en", Decimal("1000.00"), "USD", "$1,000.00"),
         ("de", Decimal("1.23"), "EUR", "1,23" + NBSP + "€"),
         ("de", Decimal("1000.00"), "EUR", "1.000,00" + NBSP + "€"),
@@ -70,11 +72,14 @@ def test_urlreplace_replace_parameter():
 
         # unknown currency
         ("de", Decimal("1234.56"), "FOO", "1.234,56" + NBSP + "FOO"),
-        ("de", Decimal("1234.567"), "FOO", "1.234,57" + NBSP + "FOO"),
+        ("de", Decimal("1234.567"), "FOO", "1.234,567" + NBSP + "FOO"),
 
-        # rounding errors
-        ("de", Decimal("1.234"), "EUR", "1,23" + NBSP + "€"),
-        ("de", Decimal("1023.1"), "JPY", "JPY 1.023,10"),
+        # deal with precision that is higher than the currency
+        ("de", Decimal("1.234"), "EUR", "1,234" + NBSP + "€"),
+        ("de", 1.234, "EUR", "1,234" + NBSP + "€"),
+        ("de", Decimal("1.2340"), "EUR", "1,234" + NBSP + "€"),
+        ("de", Decimal("1.2300"), "EUR", "1,23" + NBSP + "€"),
+        ("de", Decimal("1023.1"), "JPY", "1.023,10" + NBSP + "¥"),
     ]
 )
 def test_money_filter(locale, amount, currency, expected):
@@ -98,9 +103,31 @@ def test_money_filter(locale, amount, currency, expected):
     [
         ("de", Decimal("1000.00"), "EUR", "1.000,00"),
         ("en", Decimal("1000.00"), "EUR", "1,000.00"),
-        ("de", Decimal("1023.1"), "JPY", "1.023,10"),
+        ("de", Decimal("1023.1"), "JPY", "1.023,1"),
     ]
 )
 def test_money_filter_hidecurrency(locale, amount, currency, expected):
     translation.activate(locale)
     assert money_filter(amount, currency, hide_currency=True) == expected
+
+
+@pytest.mark.parametrize(
+    "locale,rate,expected",
+    [
+        ("de", Decimal("2.00"), "2"),
+        ("de", Decimal("2.50"), "2,5"),
+        ("de", Decimal("2.2340"), "2,234"),
+        ("en", Decimal("2.00"), "2"),
+        ("en", Decimal("2.50"), "2.5"),
+        ("en", Decimal("4.3e7"), "43000000"),
+        ("en", Decimal("2.2340"), "2.234"),
+        ("en", "2.23", "2.23"),
+        ("en", 2.23, "2.23"),
+        ("en", 2, "2"),
+        ("en", "", ""),
+        ("en", None, "0"),
+    ]
+)
+def test_tax_rate_format(locale, rate, expected):
+    translation.activate(locale)
+    assert tax_rate_format(rate) == expected

src/tests/control/test_orders.py

@@ -2438,6 +2438,47 @@ def test_refund_paid_order_offsetting_to_wrong_currency(client, env):
     assert b'different currency' in r.content
 
 
+@pytest.mark.django_db
+def test_refund_paid_order_offsetting_to_wrong_permissions(client, env):
+    with scopes_disabled():
+        p = env[2].payments.last()
+        p.confirm()
+        t = env[0].organizer.teams.get()
+        t.all_events = False
+        t.save()
+        t.limit_events.set([env[0]])
+        client.login(email='dummy@dummy.dummy', password='dummy')
+        event2 = Event.objects.create(
+            organizer=env[0].organizer, name='Dummy', slug='dummy2',
+            date_from=now(), plugins='pretix.plugins.banktransfer,pretix.plugins.stripe,tests.testdummy',
+            currency='EUR',
+        )
+        ticket2 = Item.objects.create(event=event2, name='Early-bird ticket',
+                                      category=None, default_price=23,
+                                      admission=True, personalized=True)
+        o = Order.objects.create(
+            code='BAZ', event=event2, email='dummy@dummy.test',
+            status=Order.STATUS_PENDING,
+            datetime=now(), expires=now() + timedelta(days=10),
+            sales_channel=event2.organizer.sales_channels.get(identifier="web"),
+            total=5, locale='en'
+        )
+        o.positions.create(price=5, item=ticket2)
+
+    r = client.post('/control/event/dummy/dummy/orders/ABC32/refund', {
+        'start-partial_amount': '5.00',
+        'start-mode': 'partial',
+        'start-action': 'mark_pending',
+        'refund-offsetting': '5.00',
+        'order-offsetting': 'BAZ',
+        'manual_state': 'pending',
+        'last_known_refund_id': 0,
+        'perform': 'on'
+    }, follow=True)
+    assert b'alert-danger' in r.content
+    assert b'do not have access' in r.content
+
+
 @pytest.mark.django_db
 def test_refund_paid_order_offsetting(client, env):
     with scopes_disabled():

src/tests/presale/test_checkout.py

@@ -478,6 +478,58 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
         assert ia.vat_id == "AT123456"
         assert not ia.vat_id_validated
 
+    def test_vat_id_revalidated_after_country_change(self):
+        self.tr19.eu_reverse_charge = True
+        self.tr19.keep_gross_if_rate_changes = True
+        self.tr19.home_country = Country('DE')
+        self.tr19.save()
+        self.event.settings.invoice_address_vatid = True
+
+        with scopes_disabled():
+            cr1 = CartPosition.objects.create(
+                event=self.event, cart_id=self.session_key, item=self.ticket,
+                price=23, expires=now() + timedelta(minutes=10)
+            )
+
+        with mock.patch('pretix.base.services.tax._validate_vat_id_EU') as mock_validate:
+            mock_validate.return_value = 'AT123456'
+            self.client.post('/%s/%s/checkout/questions/' % (self.orga.slug, self.event.slug), {
+                'is_business': 'business',
+                'company': 'Foo',
+                'name': 'Bar',
+                'street': 'Baz',
+                'zipcode': '1234',
+                'city': 'Here',
+                'country': 'AT',
+                'vat_id': 'AT123456',
+                'email': 'admin@localhost',
+                'transmission_type': 'email',
+            }, follow=True)
+
+        cr1.refresh_from_db()
+        assert cr1.price == Decimal('23.00')
+        assert cr1.tax_rate == Decimal('0.00')
+        assert cr1.tax_value == Decimal('0.00')
+
+        with mock.patch('pretix.base.services.tax._validate_vat_id_EU') as mock_validate:
+            def raiser(*args, **kwargs):
+                raise VATIDFinalError('country mismatch')
+
+            mock_validate.side_effect = raiser
+            r = self.client.post('/%s/%s/checkout/questions/' % (self.orga.slug, self.event.slug), {
+                'is_business': 'business',
+                'company': 'Foo',
+                'name': 'Bar',
+                'street': 'Baz',
+                'zipcode': '1012 WX',
+                'city': 'Here',
+                'country': 'NL',
+                'vat_id': 'AT123456',
+                'email': 'admin@localhost',
+                'transmission_type': 'email',
+            }, follow=True)
+            assert b'alert-danger' in r.content
+
     def test_reverse_charge_keep_gross(self):
         self.tr19.eu_reverse_charge = True
         self.tr19.keep_gross_if_rate_changes = True

vite.config.ts

@@ -50,7 +50,7 @@ export default defineConfig({
 	},
 	optimizeDeps: {
 		exclude: ['moment', 'jquery']
-	},
+	}
 })
 
 // Virtual module plugin: generates re-export entries for each shared dep