formatting

handle mixed line endings in import
Fix multi-product order edit with seats (#6063 )
2026-07-20 07:38:38 +00:00 · 2026-04-08 12:33:02 +02:00 · 2026-04-08 12:30:34 +02:00 · 2026-04-08 11:02:58 +02:00 · 2026-04-07 14:39:33 +02:00 · 2026-04-07 14:39:33 +02:00
237 changed files with 28144 additions and 31725 deletions
@@ -1,6 +1,5 @@
 doc/
 env/
-node_modules/
 res/
 local/
 .git/
@@ -1,5 +0,0 @@
-[*.{js,jsx,ts,tsx,vue}]
-indent_style = tab
-indent_size = 2
-trim_trailing_whitespace = true
-insert_final_newline = true
@@ -24,7 +24,7 @@ jobs:
    name: Packaging
    strategy:
      matrix:
-        python-version: ["3.11"]
+        python-version: ["3.13"]
    steps:
      - uses: actions/checkout@v4
      - name: Set up Python ${{ matrix.python-version }}
@@ -46,7 +46,4 @@ jobs:
      - name: Run build
        run: python -m build
      - name: Check files
-        run: |
-          for pat in 'static.dist/vite/widget/widget.js' 'static.dist/vite/control/assets/checkinrules/main-' 'static.dist/vite/control/assets/webcheckin/main-'; do
-            unzip -l dist/pretix*whl | grep -q "$pat" || { echo "Missing: $pat"; exit 1; }
-          done
+        run: unzip -l dist/pretix*whl | grep node_modules || exit 1
@@ -24,10 +24,10 @@ jobs:
    name: Check gettext syntax
    steps:
      - uses: actions/checkout@v4
-      - name: Set up Python 3.11
+      - name: Set up Python 3.13
        uses: actions/setup-python@v5
        with:
-          python-version: 3.11
+          python-version: 3.13
      - uses: actions/cache@v4
        with:
          path: ~/.cache/pip
@@ -49,10 +49,10 @@ jobs:
    name: Spellcheck
    steps:
      - uses: actions/checkout@v4
-      - name: Set up Python 3.11
+      - name: Set up Python 3.13
        uses: actions/setup-python@v5
        with:
-          python-version: 3.11
+          python-version: 3.13
      - uses: actions/cache@v4
        with:
          path: ~/.cache/pip
@@ -24,10 +24,10 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - uses: actions/checkout@v4
-      - name: Set up Python 3.11
+      - name: Set up Python 3.13
        uses: actions/setup-python@v5
        with:
-          python-version: 3.11
+          python-version: 3.13
      - uses: actions/cache@v4
        with:
          path: ~/.cache/pip
@@ -44,10 +44,10 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - uses: actions/checkout@v4
-      - name: Set up Python 3.11
+      - name: Set up Python 3.13
        uses: actions/setup-python@v5
        with:
-          python-version: 3.11
+          python-version: 3.13
      - uses: actions/cache@v4
        with:
          path: ~/.cache/pip
@@ -64,10 +64,10 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - uses: actions/checkout@v4
-      - name: Set up Python 3.11
+      - name: Set up Python 3.13
        uses: actions/setup-python@v5
        with:
-          python-version: 3.11
+          python-version: 3.13
      - name: Install Dependencies
        run: pip3 install licenseheaders
      - name: Run licenseheaders
@@ -23,13 +23,15 @@ jobs:
    name: Tests
    strategy:
      matrix:
-        python-version: ["3.10", "3.11", "3.13"]
+        python-version: ["3.11", "3.13", "3.14"]
        database: [sqlite, postgres]
        exclude:
          - database: sqlite
            python-version: "3.10"
          - database: sqlite
            python-version: "3.11"
+          - database: sqlite
+            python-version: "3.12"
    services:
      postgres:
        image: postgres:15
@@ -70,7 +72,7 @@ jobs:
        run: make all compress
      - name: Run tests
        working-directory: ./src
-        run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test -n 3 -p no:sugar --cov=./ --cov-report=xml tests --ignore=tests/e2e --maxfail=100
+        run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test -n 3 -p no:sugar --cov=./ --cov-report=xml tests --maxfail=100
      - name: Run concurrency tests
        working-directory: ./src
        run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test tests/concurrency_tests/ --reuse-db
@@ -81,47 +83,4 @@ jobs:
          file: src/coverage.xml
          token: ${{ secrets.CODECOV_TOKEN }}
          fail_ci_if_error: false
-        if: matrix.database == 'postgres' && matrix.python-version == '3.11'
-  e2e:
-    runs-on: ubuntu-22.04
-    name: E2E Tests
-    services:
-      postgres:
-        image: postgres:15
-        env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: pretix
-        options: >-
-          --health-cmd "pg_isready -U postgres -d pretix"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-      - uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - name: Install system dependencies
-        run: sudo apt update && sudo apt install -y gettext
-      - name: Install Python dependencies
-        run: pip3 install uv && uv pip install --system -e ".[dev]" psycopg2-binary
-      - name: Install JS dependencies
-        working-directory: ./src
-        run: make npminstall
-      - name: Compile
-        working-directory: ./src
-        run: make all compress
-      - name: Install Playwright browsers
-        run: npx playwright install
-      - name: Run E2E tests
-        working-directory: ./src
-        run: PRETIX_CONFIG_FILE=tests/ci_postgres.cfg py.test tests/e2e/ -v --maxfail=10
+        if: matrix.database == 'postgres' && matrix.python-version == '3.13'
@@ -24,6 +24,5 @@ local/
 .project
 .pydevproject
 .DS_Store
-node_modules/


@@ -1 +0,0 @@
-/*
@@ -1,4 +1,4 @@
-FROM python:3.11-bookworm
+FROM python:3.13-trixie

 RUN apt-get update && \
    apt-get install -y --no-install-recommends \
@@ -20,11 +20,11 @@ RUN apt-get update && \
            supervisor \
            libmaxminddb0 \
            libmaxminddb-dev \
-            zlib1g-dev && \
+            zlib1g-dev \
+            nodejs  \
+            npm && \
    apt-get clean && \
    rm -rf /var/lib/apt/lists/* && \
-    curl -fsSL https://deb.nodesource.com/setup_22.x | sudo bash - && \
-    apt-get install -y nodejs && \
    dpkg-reconfigure locales &&  \
    locale-gen C.UTF-8 &&  \
    /usr/sbin/update-locale LANG=C.UTF-8 && \
@@ -49,10 +49,6 @@ COPY deployment/docker/production_settings.py /pretix/src/production_settings.py
 COPY pyproject.toml /pretix/pyproject.toml
 COPY _build /pretix/_build
 COPY src /pretix/src
-COPY package.json /pretix/package.json
-COPY package-lock.json /pretix/package-lock.json
-COPY tsconfig.json /pretix/tsconfig.json
-COPY vite.config.ts /pretix/vite.config.ts

 RUN pip3 install -U \
        pip \
@@ -48,8 +48,3 @@ recursive-include src Makefile
 recursive-exclude doc *
 recursive-exclude deployment *
 recursive-exclude res *
-
-include package.json
-include package-lock.json
-include tsconfig.json
-include vite.config.ts
@@ -1,108 +0,0 @@
-import { defineConfig, globalIgnores } from 'eslint/config'
-import globals from 'globals'
-import js from '@eslint/js'
-import ts from 'typescript-eslint'
-import stylistic from '@stylistic/eslint-plugin'
-import vue from 'eslint-plugin-vue'
-import vuePug from 'eslint-plugin-vue-pug'
-
-const ignores = globalIgnores([
-	'**/node_modules',
-	'**/dist'
-])
-
-export default defineConfig([
-	ignores,
-	...ts.config(
-		js.configs.recommended,
-		ts.configs.recommended
-	),
-	stylistic.configs.customize({
-		indent: 'tab',
-		braceStyle: '1tbs',
-		quoteProps: 'as-needed'
-	}),
-	...vue.configs['flat/recommended'],
-	...vuePug.configs['flat/recommended'],
-	{
-		languageOptions: {
-			globals: {
-				...globals.browser,
-				...globals.node,
-				localStorage: false,
-				$: 'readonly',
-				$$: 'readonly',
-				$ref: 'readonly',
-				$computed: 'readonly',
-			},
-			parserOptions: {
-				parser: '@typescript-eslint/parser'
-			}
-		},
-
-		rules: {
-			'no-debugger': 'off',
-			curly: 0,
-			'no-return-assign': 0,
-			'no-console': 'off',
-			'vue/require-default-prop': 0,
-			'vue/require-v-for-key': 0,
-			'vue/valid-v-for': 'warn',
-			'vue/no-reserved-keys': 0,
-			'vue/no-setup-props-destructure': 0,
-			'vue/multi-word-component-names': 0,
-			'vue/max-attributes-per-line': 0,
-			'vue/attribute-hyphenation': ['warn', 'never'],
-			'vue/v-on-event-hyphenation': ['warn', 'never'],
-			'import/first': 0,
-			'@typescript-eslint/ban-ts-comment': 0,
-			'@typescript-eslint/no-explicit-any': 0,
-			'no-use-before-define': 'off',
-			'no-var': 'error',
-
-			'@typescript-eslint/no-use-before-define': ['error', {
-				typedefs: false,
-				functions: false,
-			}],
-
-			'@typescript-eslint/no-unused-vars': ['error', {
-				args: 'all',
-				argsIgnorePattern: '^_',
-				caughtErrors: 'all',
-				caughtErrorsIgnorePattern: '^_',
-				destructuredArrayIgnorePattern: '^_',
-				varsIgnorePattern: '^_',
-				ignoreRestSiblings: true
-			}],
-
-			'@stylistic/comma-dangle': 0,
-			'@stylistic/space-before-function-paren': ['error', 'always'],
-			'@stylistic/max-statements-per-line': ['error', { max: 1, ignoredNodes: ['BreakStatement'] }],
-			'@stylistic/member-delimiter-style': 0,
-			'@stylistic/arrow-parens': 0,
-			'@stylistic/generator-star-spacing': 0,
-			'@stylistic/yield-star-spacing': ['error', 'after'],
-		},
-	},
-	{
-		files: [
-			'src/pretix/static/pretixcontrol/js/ui/checkinrules/**/*.vue',
-			'src/pretix/plugins/webcheckin/**/*.vue',
-		],
-		languageOptions: {
-			globals: {
-				moment: 'readonly',
-			},
-		},
-	},
-	{
-		files: [
-			'src/pretix/static/pretixpresale/widget/**/*.{ts,vue}',
-		],
-		languageOptions: {
-			globals: {
-				LANG: 'readonly',
-			},
-		},
-	},
-])
@@ -1,52 +0,0 @@
-{
-  "name": "pretix",
-  "version": "1.0.0",
-  "description": "",
-  "homepage": "https://github.com/pretix/pretix#readme",
-  "bugs": {
-    "url": "https://github.com/pretix/pretix/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/pretix/pretix.git"
-  },
-  "license": "SEE LICENSE IN LICENSE",
-  "author": "",
-  "type": "module",
-  "main": "index.js",
-  "directories": {
-    "doc": "doc"
-  },
-  "scripts": {
-    "dev:control": "vite",
-    "dev:widget": "vite src/pretix/static/pretixpresale/widget",
-    "build": "npm run build:control -s && npm run build:widget -s",
-    "build:control": "vite build",
-    "build:widget": "vite build src/pretix/static/pretixpresale/widget",
-    "lint:eslint": "eslint src/pretix/static/pretixpresale/widget src/pretix/static/pretixcontrol/js/ui/checkinrules src/pretix/plugins/webcheckin",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "dependencies": {
-    "vue": "^3.5.30",
-    "vue-slicksort": "^2.0.5"
-  },
-  "devDependencies": {
-    "@eslint/js": "^10.0.1",
-    "@stylistic/eslint-plugin": "^5.10.0",
-    "@types/jquery": "^3.5.33",
-    "@types/moment": "^2.11.29",
-    "@types/node": "^25.5.0",
-    "@vitejs/plugin-vue": "^6.0.5",
-    "@vue/eslint-config-typescript": "^14.7.0",
-    "@vue/language-plugin-pug": "^3.2.5",
-    "eslint": "^10.0.3",
-    "eslint-plugin-vue": "^10.8.0",
-    "eslint-plugin-vue-pug": "^1.0.0-alpha.5",
-    "globals": "^17.4.0",
-    "pug": "^3.0.3",
-    "sass-embedded": "^1.98.0",
-    "stylus": "^0.64.0",
-    "typescript-eslint": "^8.57.0",
-    "vite": "^8.0.0"
-  }
-}
@@ -3,7 +3,7 @@ name = "pretix"
 dynamic = ["version"]
 description = "Reinventing presales, one ticket at a time"
 readme = "README.rst"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 license = {file = "LICENSE"}
 keywords = ["tickets", "web", "shop", "ecommerce"]
 authors = [
@@ -19,10 +19,11 @@ classifiers = [
  "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
  "Environment :: Web Environment",
  "License :: OSI Approved :: GNU Affero General Public License v3",
-  "Programming Language :: Python :: 3.9",
-  "Programming Language :: Python :: 3.10",
  "Programming Language :: Python :: 3.11",
-  "Framework :: Django :: 4.2",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
+  "Framework :: Django :: 5.2",
 ]

 dependencies = [
@@ -36,7 +37,7 @@ dependencies = [
  "css-inline==0.20.*",
  "defusedcsv>=1.1.0",
  "dnspython==2.*",
-  "Django[argon2]==4.2.*,>=4.2.26",
+  "Django[argon2]==5.2.*",
  "django-bootstrap3==26.1",
  "django-compressor==4.6.0",
  "django-countries==8.2.*",
@@ -59,7 +60,7 @@ dependencies = [
  "dnspython==2.8.*",
  "drf_ujson2==1.7.*",
  "geoip2==5.*",
-  "importlib_metadata==8.*",  # Polyfill, we can probably drop this once we require Python 3.10+
+  "importlib_metadata==9.*",  # Polyfill, we can probably drop this once we require Python 3.10+
  "isoweek",
  "jsonschema",
  "kombu==5.6.*",
@@ -75,7 +76,7 @@ dependencies = [
  "paypal-checkout-serversdk==1.0.*",
  "PyJWT==2.12.*",
  "phonenumberslite==9.0.*",
-  "Pillow==12.1.*",
+  "Pillow==12.2.*",
  "pretix-plugin-build",
  "protobuf==7.34.*",
  "psycopg2-binary",
@@ -89,10 +90,10 @@ dependencies = [
  "pytz-deprecation-shim==0.1.*",
  "pyuca",
  "qrcode==8.2",
-  "redis==7.1.*",
+  "redis==7.4.*",
  "reportlab==4.4.*",
  "requests==2.32.*",
-  "sentry-sdk==2.54.*",
+  "sentry-sdk==2.57.*",
  "sepaxml==2.7.*",
  "stripe==7.9.*",
  "text-unidecode==1.*",
@@ -123,7 +124,6 @@ dev = [
  "pytest-mock==3.15.*",
  "pytest-sugar",
  "pytest-xdist==3.8.*",
-  "pytest-playwright",
  "pytest==9.0.*",
  "responses",
 ]
@@ -37,9 +37,4 @@ ignore =
    CONTRIBUTING.md
    Dockerfile
    SECURITY.md
-    eslint.config.mjs
-    package-lock.json
-    package.json
-    tsconfig.json
-    vite.config.js

@@ -9,10 +9,10 @@ localegen:
 	./manage.py makemessages --keep-pot --ignore "pretix/static/npm_dir/*" $(LNGS)
 	./manage.py makemessages --keep-pot -d djangojs --ignore "pretix/static/npm_dir/*" --ignore "pretix/helpers/*" --ignore "pretix/static/jsi18n/*" --ignore "pretix/static/jsi18n/*" --ignore "pretix/static.dist/*" --ignore "data/*" --ignore "pretix/static/rrule/*" --ignore "build/*" $(LNGS)

-staticfiles: npminstall npmbuild jsi18n
+staticfiles: jsi18n
 	./manage.py collectstatic --noinput

-compress:
+compress: npminstall
 	./manage.py compress

 jsi18n: localecompile
@@ -25,8 +25,8 @@ coverage:
 	coverage run -m py.test

 npminstall:
-	npm ci
-
-npmbuild:
-	npm run build
+	# keep this in sync with pretix/_build.py!
+	mkdir -p pretix/static.dist/node_prefix/
+	cp -r pretix/static/npm_dir/* pretix/static.dist/node_prefix/
+	npm ci --prefix=pretix/static.dist/node_prefix

@@ -19,4 +19,4 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-__version__ = "2026.3.0.dev0"
+__version__ = "2026.4.0.dev0"
@@ -37,11 +37,9 @@ INSTALLED_APPS = [
    'django.contrib.contenttypes',
    'django.contrib.sessions',
    'django.contrib.messages',
-    'django.contrib.humanize',
-    # pretix needs to go before staticfiles
-    # so we can override the runserver command
-    'pretix.base',
    'django.contrib.staticfiles',
+    'django.contrib.humanize',
+    'pretix.base',
    'pretix.control',
    'pretix.presale',
    'pretix.multidomain',
@@ -245,6 +243,7 @@ STORAGES = {

 COMPRESS_PRECOMPILERS = (
    ('text/x-scss', 'django_libsass.SassCompiler'),
+    ('text/vue', 'pretix.helpers.compressor.VueCompiler'),
 )

 COMPRESS_OFFLINE_CONTEXT = {
@@ -21,13 +21,13 @@
 #

 import os
+import shutil
 import subprocess

 from setuptools.command.build import build
 from setuptools.command.build_ext import build_ext

 here = os.path.abspath(os.path.dirname(__file__))
-project_root = os.path.abspath(os.path.join(here, '..', '..'))
 npm_installed = False


@@ -35,14 +35,14 @@ def npm_install():
    global npm_installed

    if not npm_installed:
-        subprocess.check_call('npm ci', shell=True, cwd=project_root)
+        # keep this in sync with Makefile!
+        node_prefix = os.path.join(here, 'static.dist', 'node_prefix')
+        os.makedirs(node_prefix, exist_ok=True)
+        shutil.copytree(os.path.join(here, 'static', 'npm_dir'), node_prefix, dirs_exist_ok=True)
+        subprocess.check_call('npm ci', shell=True, cwd=node_prefix)
        npm_installed = True


-def npm_build():
-    subprocess.check_call('npm run build', shell=True, cwd=project_root)
-
-
 class CustomBuild(build):
    def run(self):
        if "src" not in os.listdir(".") or "pretix" not in os.listdir("src"):
@@ -62,7 +62,6 @@ class CustomBuild(build):
        settings.COMPRESS_OFFLINE = True

        npm_install()
-        npm_build()
        management.call_command('compilemessages', verbosity=1)
        management.call_command('compilejsi18n', verbosity=1)
        management.call_command('collectstatic', verbosity=1, interactive=False)
@@ -47,5 +47,3 @@ HAS_MEMCACHED = False
 HAS_CELERY = False
 HAS_GEOIP = False
 SENTRY_ENABLED = False
-VITE_DEV_MODE = False
-VITE_IGNORE = False
@@ -51,7 +51,6 @@ from pretix.base.models import (
    ItemVariation, ItemVariationMetaValue, Question, QuestionOption, Quota,
    SalesChannel,
 )
-from pretix.base.models.items import Questionnaire, QuestionnaireChild


 class InlineItemVariationSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
@@ -541,7 +540,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:
@@ -550,7 +548,7 @@ class QuestionSerializer(I18nAwareModelSerializer):
                  'ask_during_checkin', 'show_during_checkin', 'identifier', 'dependency_question', 'dependency_values',
                  'hidden', 'dependency_value', 'print_on_invoice', 'help_text', 'valid_number_min',
                  'valid_number_max', 'valid_date_min', 'valid_date_max', 'valid_datetime_min', 'valid_datetime_max',
-                  'valid_string_length_max', 'valid_file_portrait', 'internal_name',)
+                  'valid_string_length_max', 'valid_file_portrait')

    def validate_identifier(self, value):
        Question._clean_identifier(self.context['event'], value, self.instance)
@@ -626,160 +624,6 @@ class QuestionSerializer(I18nAwareModelSerializer):
        return question


-class QuestionRefField(serializers.PrimaryKeyRelatedField):
-    def to_representation(self, qc):
-        if not qc:
-            return None
-        elif qc.system_question:
-            return qc.system_question
-        elif qc.user_question_id:
-            return qc.user_question_id
-        else:
-            return None
-
-    def to_internal_value(self, data):
-        if type(data) == int:
-            return {'user_question': super().to_internal_value(data), 'system_question': None}
-        elif type(data) == str or data is None:
-            return {'user_question': None, 'system_question': data}
-        else:
-            self.fail('incorrect_type', data_type=type(data).__name__)
-
-    def use_pk_only_optimization(self):
-        return self.source == '*'
-
-
-class InlineQuestionnaireChildSerializer(I18nAwareModelSerializer):
-    question = QuestionRefField(source='*', queryset=Question.objects.none())
-    dependency_question = QuestionRefField(allow_null=True, required=False, queryset=Question.objects.none())
-
-    class Meta:
-        model = QuestionnaireChild
-        fields = ('question', 'required', 'label', 'help_text', 'dependency_question', 'dependency_values')
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields["question"].queryset = self.context["event"].questions.all()
-        self.fields["dependency_question"].queryset = self.context["event"].questions.all()
-
-    def validate(self, data):
-        data = super().validate(data)
-        event = self.context['event']
-
-        full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
-        full_data.update(data)
-
-        if full_data.get('ask_during_checkin') and full_data.get('dependency_question'):
-            raise ValidationError('Dependencies are not supported during check-in.')
-
-        dep = full_data.get('dependency_question')
-        if dep:
-            if dep.ask_during_checkin:
-                raise ValidationError(_('Question cannot depend on a question asked during check-in.'))
-
-            seen_ids = {self.instance.pk} if self.instance else set()
-            while dep:
-                if dep.pk in seen_ids:
-                    raise ValidationError(_('Circular dependency between questions detected.'))
-                seen_ids.add(dep.pk)
-                dep = dep.dependency_question
-
-        return data
-
-    def validate_dependency_question(self, value):
-        if value:
-            if value.type not in (Question.TYPE_CHOICE, Question.TYPE_BOOLEAN, Question.TYPE_CHOICE_MULTIPLE):
-                raise ValidationError('Question dependencies can only be set to boolean or choice questions.')
-            if value == self.instance:
-                raise ValidationError('A question cannot depend on itself.')
-        return value
-
-
-class QuestionnaireSerializer(I18nAwareModelSerializer):
-    limit_sales_channels = serializers.SlugRelatedField(
-        slug_field="identifier",
-        queryset=SalesChannel.objects.none(),
-        required=False,
-        allow_empty=True,
-        many=True,
-    )
-
-    class Meta:
-        model = Questionnaire
-        fields = ('id', 'type', 'internal_name', 'items', 'position', 'all_sales_channels', 'limit_sales_channels', 'children')
-
-    def __init__(self, *args, **kwargs):
-        self.fields['children'] = InlineQuestionnaireChildSerializer(many=True, required=True, context=kwargs['context'], partial=False)
-        super().__init__(*args, **kwargs)
-
-    def validate(self, data):
-        data = super().validate(data)
-        event = self.context['event']
-
-        #full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
-        #full_data.update(data)
-
-        #if full_data.get('ask_during_checkin') and full_data.get('dependency_question'):
-        #    raise ValidationError('Dependencies are not supported during check-in.')
-
-        #if full_data.get('ask_during_checkin') and full_data.get('type') in Question.ASK_DURING_CHECKIN_UNSUPPORTED:
-        #    raise ValidationError(_('This type of question cannot be asked during check-in.'))
-
-        #if full_data.get('show_during_checkin') and full_data.get('type') in Question.SHOW_DURING_CHECKIN_UNSUPPORTED:
-        #    raise ValidationError(_('This type of question cannot be shown during check-in.'))
-
-        #Question.clean_items(event, full_data.get('items') or [])
-        return data
-
-    def validate_children(self, value):
-        prev_questions = {}
-        for child in value:
-            if child.get('dependency_question'):
-                if (child['dependency_question']['user_question'] or child['dependency_question']['system_question']) not in prev_questions:
-                    raise ValidationError('A question can only depend on a previous question from the same questionnaire.')
-
-            if child['user_question']:
-                prev_questions[child['user_question']] = child
-            if child['system_question']:
-                prev_questions[child['system_question']] = child
-        return value
-
-    @transaction.atomic
-    def create(self, validated_data):
-        children_data = validated_data.pop('children') if 'children' in validated_data else []
-        questionnaire = super().create(validated_data)
-        self.set_children(questionnaire, children_data)
-        return questionnaire
-
-    @transaction.atomic
-    def update(self, instance, validated_data):
-        children_data = validated_data.pop('children', None)
-        questionnaire = super().update(instance, validated_data)
-        if children_data is not None:
-            self.set_children(questionnaire, children_data)
-        return questionnaire
-
-    def set_children(self, questionnaire, new_data):
-        result = []
-        child_serializer = self.fields['children'].child
-        existing = questionnaire.children.all()
-        for i, d in enumerate(new_data):
-            d['questionnaire'] = questionnaire
-            d['position'] = i + 1
-            d.setdefault('required', False)
-            d.setdefault('help_text', None)
-            d.setdefault('dependency_question', None)
-            d.setdefault('dependency_values', None)
-        updatable = min(len(existing), len(new_data))
-        for i in range(0, updatable):
-            result.append(child_serializer.update(existing[i], new_data[i]))
-        for i in range(updatable, len(new_data)):
-            result.append(child_serializer.create(new_data[i]))
-        for i in range(updatable, len(existing)):
-            existing[i].delete()
-        return result
-
-
 class QuotaSerializer(I18nAwareModelSerializer):
    available = serializers.BooleanField(read_only=True)
    available_number = serializers.IntegerField(read_only=True)
@@ -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)
@@ -47,14 +47,13 @@ from pretix.api.pagination import TotalOrderingFilter
 from pretix.api.serializers.item import (
    ItemAddOnSerializer, ItemBundleSerializer, ItemCategorySerializer,
    ItemProgramTimeSerializer, ItemSerializer, ItemVariationSerializer,
-    QuestionOptionSerializer, QuestionSerializer, QuestionnaireSerializer, 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
@@ -539,51 +538,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

@@ -47,6 +47,7 @@ from django.utils.formats import localize
 from django.utils.translation import gettext, gettext_lazy as _

 from pretix.base.models import Event
+from pretix.base.models.auth import PermissionHolder
 from pretix.helpers.safe_openpyxl import (  # NOQA: backwards compatibility for plugins using excel_safe
    SafeWorkbook, remove_invalid_excel_chars as excel_safe,
 )
@@ -59,11 +60,20 @@ class BaseExporter:
    This is the base class for all data exporters
    """

-    def __init__(self, event, organizer, progress_callback=lambda v: None):
+    def __init__(self, event, organizer, permission_holder: PermissionHolder=None, progress_callback=lambda v: None):
+        """
+        :param event: Event context, can also be a queryset of events for multi-event exports
+        :param organizer: Organizer context
+        :param user: The user who triggered the export (or None).
+        :param token: The API token that triggered the export (or None).
+        :param device: The device that triggered the export (or None)
+        :param progress_callback: Callback function with progress
+        """
        self.event = event
        self.organizer = organizer
        self.progress_callback = progress_callback
        self.is_multievent = isinstance(event, QuerySet)
+        self.permission_holder = permission_holder
        if isinstance(event, QuerySet):
            self.events = event
            self.event = None
@@ -180,7 +190,7 @@ class BaseExporter:
        return True

    @classmethod
-    def get_required_event_permission(cls) -> str:
+    def get_required_event_permission(cls) -> Optional[str]:
        """
        The permission level required to use this exporter for events. For multi-event-exports, this will be used
        to limit the selection of events. Will be ignored if the ``OrganizerLevelExportMixin`` mixin is used.
@@ -195,7 +205,7 @@ class OrganizerLevelExportMixin:
        raise TypeError("required_event_permission may not be called on OrganizerLevelExportMixin")

    @classmethod
-    def get_required_organizer_permission(cls) -> str:
+    def get_required_organizer_permission(cls) -> Optional[str]:
        """
        The permission level required to use this exporter. Must be set for organizer-level exports. Set to `None` to
        allow everyone with any access to the organizer.
@@ -196,8 +196,7 @@ class RegistrationForm(forms.Form):
    def clean_password(self):
        password1 = self.cleaned_data.get('password', '')
        user = User(email=self.cleaned_data.get('email'))
-        if validate_password(password1, user=user) is not None:
-            raise forms.ValidationError(_(password_validators_help_texts()), code='pw_invalid')
+        validate_password(password1, user=user)
        return password1

    def clean_email(self):
@@ -45,7 +45,6 @@ import pycountry
 from django import forms
 from django.conf import settings
 from django.contrib import messages
-from django.contrib.gis.geoip2 import GeoIP2
 from django.core.exceptions import ValidationError
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.validators import (
@@ -102,6 +101,7 @@ from pretix.helpers.countries import (
 from pretix.helpers.escapejson import escapejson_attr
 from pretix.helpers.http import get_client_ip
 from pretix.helpers.i18n import get_format_without_seconds
+from pretix.helpers.security import get_geoip
 from pretix.presale.signals import question_form_fields

 logger = logging.getLogger(__name__)
@@ -393,7 +393,7 @@ class WrappedPhoneNumberPrefixWidget(PhoneNumberPrefixWidget):

 def guess_country_from_request(request, event):
    if settings.HAS_GEOIP:
-        g = GeoIP2()
+        g = get_geoip()
        try:
            res = g.country(get_client_ip(request))
            if res['country_code'] and len(res['country_code']) == 2:
@@ -36,8 +36,9 @@ from django.core.management.commands.makemigrations import Command as Parent

 from ._migrations import monkeypatch_migrations

-monkeypatch_migrations()
-

 class Command(Parent):
-    pass
+
+    def handle(self, *args, **kwargs):
+        monkeypatch_migrations()
+        return super().handle(*args, **kwargs)
@@ -64,7 +64,7 @@ class Command(BaseCommand):
        if not periodic_task.receivers or periodic_task.sender_receivers_cache.get(self) is NO_RECEIVERS:
            return

-        for receiver in periodic_task._live_receivers(self):
+        for receiver in periodic_task._live_receivers(self)[0]:
            name = f'{receiver.__module__}.{receiver.__name__}'
            if options['list_tasks']:
                print(name)
@@ -1,59 +0,0 @@
-#
-# This file is part of pretix (Community Edition).
-#
-# Copyright (C) 2014-2020  Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
-# Public License as published by the Free Software Foundation in version 3 of the License.
-#
-# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
-# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
-# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
-# this file, see <https://pretix.eu/about/en/license>.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
-# <https://www.gnu.org/licenses/>.
-#
-
-"""This command supersedes the Django-inbuilt runserver command.
-
-It runs the local frontend server, if node is installed and the setting
-is set.
-"""
-import atexit
-import os
-import subprocess
-from pathlib import Path
-
-from django.conf import settings
-from django.contrib.staticfiles.management.commands.runserver import (
-    Command as Parent,
-)
-from django.utils.autoreload import DJANGO_AUTORELOAD_ENV
-
-
-class Command(Parent):
-    def handle(self, *args, **options):
-        # Only start Vite in the non-main process of the autoreloader
-        if settings.VITE_DEV_MODE and os.environ.get(DJANGO_AUTORELOAD_ENV) != "true":
-            # Start the vite server in the background
-            vite_server = subprocess.Popen(
-                ["npm", "run", "dev:control"],
-                cwd=Path(__file__).parent.parent.parent.parent.parent
-            )
-
-            def cleanup():
-                vite_server.terminate()
-                try:
-                    vite_server.wait(timeout=5)
-                except subprocess.TimeoutExpired:
-                    vite_server.kill()
-
-            atexit.register(cleanup)
-
-        super().handle(*args, **options)
@@ -280,11 +280,11 @@ class SecurityMiddleware(MiddlewareMixin):

        h = {
            'default-src': ["{static}"],
-            'script-src': ["{static}"] + (["http://localhost:5173", "ws://localhost:5173"] if settings.VITE_DEV_MODE else []),
+            'script-src': ['{static}'],
            'object-src': ["'none'"],
            'frame-src': ['{static}'],
-            'style-src': ["{static}", "{media}"] + (["'unsafe-inline'"] if settings.VITE_DEV_MODE else []),
-            'connect-src': ["{dynamic}", "{media}"] + (["http://localhost:5173", "ws://localhost:5173"] if settings.VITE_DEV_MODE else []),
+            'style-src': ["{static}", "{media}"],
+            'connect-src': ["{dynamic}", "{media}"],
            'img-src': ["{static}", "{media}", "data:"] + img_src,
            'font-src': ["{static}"] + list(font_src),
            'media-src': ["{static}", "data:"],
@@ -41,16 +41,20 @@ class Migration(migrations.Migration):
            name='datetime',
            field=models.DateTimeField(),
        ),
-        migrations.AlterIndexTogether(
-            name='logentry',
-            index_together={('datetime', 'id')},
+        migrations.AddIndex(
+            'logentry',
+            models.Index(fields=('datetime', 'id'), name="pretixbase__datetim_b1fe5a_idx"),
        ),
-        migrations.AlterIndexTogether(
-            name='order',
-            index_together={('datetime', 'id'), ('last_modified', 'id')},
+        migrations.AddIndex(
+            'order',
+            models.Index(fields=["datetime", "id"], name="pretixbase__datetim_66aff0_idx"),
        ),
-        migrations.AlterIndexTogether(
-            name='transaction',
-            index_together={('datetime', 'id')},
+        migrations.AddIndex(
+            'order',
+            models.Index(fields=["last_modified", "id"], name="pretixbase__last_mo_4ebf8b_idx"),
+        ),
+        migrations.AddIndex(
+            'transaction',
+            models.Index(fields=('datetime', 'id'), name="pretixbase__datetim_b20405_idx"),
        ),
    ]
@@ -61,7 +61,10 @@ class Migration(migrations.Migration):
            options={
                'ordering': ('identifier', 'type', 'organizer'),
                'unique_together': {('identifier', 'type', 'organizer')},
-                'index_together': {('identifier', 'type', 'organizer'), ('updated', 'id')},
+                'indexes': [
+                    models.Index(fields=('identifier', 'type', 'organizer'), name='reusable_medium_organizer_index'),
+                    models.Index(fields=('updated', 'id'), name="pretixbase__updated_093277_idx")
+                ],
            },
            bases=(models.Model, pretix.base.models.base.LoggingMixin),
        ),
@@ -9,31 +9,6 @@ class Migration(migrations.Migration):
    ]

    operations = [
-        migrations.RenameIndex(
-            model_name="logentry",
-            new_name="pretixbase__datetim_b1fe5a_idx",
-            old_fields=("datetime", "id"),
-        ),
-        migrations.RenameIndex(
-            model_name="order",
-            new_name="pretixbase__datetim_66aff0_idx",
-            old_fields=("datetime", "id"),
-        ),
-        migrations.RenameIndex(
-            model_name="order",
-            new_name="pretixbase__last_mo_4ebf8b_idx",
-            old_fields=("last_modified", "id"),
-        ),
-        migrations.RenameIndex(
-            model_name="reusablemedium",
-            new_name="pretixbase__updated_093277_idx",
-            old_fields=("updated", "id"),
-        ),
-        migrations.RenameIndex(
-            model_name="transaction",
-            new_name="pretixbase__datetim_b20405_idx",
-            old_fields=("datetime", "id"),
-        ),
        migrations.AlterField(
            model_name="attendeeprofile",
            name="id",
@@ -1,6 +1,6 @@
 # Generated by Django 4.2.10 on 2024-04-02 15:16

-from django.db import migrations
+from django.db import migrations, models


 class Migration(migrations.Migration):
@@ -10,8 +10,8 @@ class Migration(migrations.Migration):
    ]

    operations = [
-        migrations.AlterIndexTogether(
-            name="reusablemedium",
-            index_together=set(),
+        migrations.RemoveIndex(
+            "reusablemedium",
+            'reusable_medium_organizer_index',
        ),
    ]
@@ -1,162 +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')
-
-    for event in Event.objects.iterator():
-        # get relevant settings
-        settings = {
-            setting.key: setting.value for setting in EventSettingsStore.objects.filter(object_id=event.id, key__in=(
-                'system_question_order', 'attendee_names_asked', 'attendee_names_required', 'attendee_emails_asked', 'attendee_emails_required',
-                'attendee_company_asked', 'attendee_company_required', 'attendee_addresses_asked', 'attendee_addresses_required',
-            ))
-        }
-
-        # get all questions (user-defined and system provided), along with the products for which they're asked
-        questions = event.questions.all()
-        children = sorted(chain((
-            (item, q.position, q.id, q)
-            for q in questions
-            for item in q.items.values_list('id', 'internal_name', 'name')
-        ), (
-            (item, q.position, None, q)
-            for q in get_fake_questions(settings)
-            for item in event.items.filter(personalized=True).values_list('id', 'internal_name', 'name')
-        )), key=lambda t: (t[0], t[1], t[2]))
-
-        # 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='PS', position=0, all_sales_channels=True,
-                internal_name=', '.join(str(iname or name) for (id, iname, name) in items)
-            )
-            questionnaire.items.set([id for (id, iname, name) in items])
-            deps = {}
-            for position, child in enumerate(children):
-                if isinstance(child, FakeQuestion):
-                    QuestionnaireChild.objects.create(
-                        questionnaire=questionnaire,
-                        position=position + 1,
-                        system_question=child.id,
-                        required=child.required,
-                        label=child.question,
-                    )
-                else:
-                    deps[child.id] = QuestionnaireChild.objects.create(
-                        questionnaire=questionnaire,
-                        position=position + 1,
-                        user_question=child,
-                        required=child.required,
-                        label=child.question,
-                        help_text=child.help_text,
-                        dependency_question=deps[child.dependency_question.id] if child.dependency_question else None,
-                        dependency_values=child.dependency_values,
-                    )
-
-
-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', '0298_pluggable_permissions'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Questionnaire',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
-                ('internal_name', models.CharField(max_length=255)),
-                ('type', models.CharField(max_length=5)),
-                ('position', models.PositiveIntegerField(default=0)),
-                ('all_sales_channels', models.BooleanField(default=True)),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='questionnaires', to='pretixbase.event')),
-                ('items', models.ManyToManyField(related_name='questionnaires', to='pretixbase.item')),
-                ('limit_sales_channels', models.ManyToManyField(to='pretixbase.saleschannel')),
-            ],
-            options={
-                'abstract': False,
-            },
-            bases=(models.Model, pretix.base.models.base.LoggingMixin),
-        ),
-        migrations.CreateModel(
-            name='QuestionnaireChild',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
-                ('position', models.PositiveIntegerField(default=0)),
-                ('system_question', models.CharField(max_length=25, null=True)),
-                ('required', models.BooleanField(default=False)),
-                ('label', i18nfield.fields.I18nTextField()),
-                ('help_text', i18nfield.fields.I18nTextField(null=True)),
-                ('dependency_values', pretix.base.models.fields.MultiStringField(default=[])),
-                ('dependency_question', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='dependent_questions', to='pretixbase.questionnairechild')),
-                ('questionnaire', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='children', to='pretixbase.questionnaire')),
-                ('user_question', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='references', to='pretixbase.question')),
-            ],
-            options={
-                'abstract': False,
-            },
-            bases=(models.Model, pretix.base.models.base.LoggingMixin),
-        ),
-        migrations.RunPython(
-            migrate_questions_forward,
-            migrate_questions_backward,
-        ),
-        # TODO remove old columns from Question model
-    ]
@@ -70,6 +70,10 @@ def parse_csv(file, length=None, mode="strict", charset=None):
        except ImportError:
            charset = file.charset
    data = data.decode(charset or "utf-8", mode)
+
+    # remove stray linebreaks from the end of the file
+    data = data.rstrip("\n")
+
    # If the file was modified on a Mac, it only contains \r as line breaks
    if '\r' in data and '\n' not in data:
        data = data.replace('\r', '\n')
@@ -29,7 +29,9 @@ import inspect
 import logging
 import os
 import threading
+from pathlib import Path

+import django
 from django.conf import settings
 from django.db import transaction

@@ -74,10 +76,14 @@ def _transactions_mark_order_dirty(order_id, using=None):
    if "PYTEST_CURRENT_TEST" in os.environ:
        # We don't care about Order.objects.create() calls in test code so let's try to figure out if this is test code
        # or not.
-        for frame in inspect.stack():
-            if 'pretix/base/models/orders' in frame.filename:
+        for frame in inspect.stack()[1:]:
+            if (
+                'pretix/base/models/orders' in frame.filename
+                or Path(frame.filename).is_relative_to(Path(django.__file__).parent)
+            ):
+                # Ignore model- and django-internal code
                continue
-            elif 'test_' in frame.filename or 'conftest.py in frame.filename':
+            elif 'test_' in frame.filename or 'conftest.py' in frame.filename:
                return
            elif 'pretix/' in frame.filename or 'pretix_' in frame.filename:
                # This went through non-test code, let's consider it non-test
@@ -38,6 +38,7 @@ import operator
 import secrets
 from datetime import timedelta
 from functools import reduce
+from typing import Protocol

 from django.conf import settings
 from django.contrib.auth.models import (
@@ -67,6 +68,14 @@ class EmailAddressTakenError(IntegrityError):
    pass


+class PermissionHolder(Protocol):
+    def has_event_permission(self, organizer, event, perm_name=None, request=None, session_key=None) -> bool:
+        ...
+
+    def has_organizer_permission(self, organizer, perm_name=None, request=None):
+        ...
+
+
 class UserManager(BaseUserManager):
    """
    This is the user manager for our custom user model. See the User
@@ -696,6 +705,18 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
        return self.teams.exists()


+class UserWithStaffSession:
+    # Wrapper around a User object with a staff session, implementing the PermissionHolder Protocol
+    def __init__(self, user):
+        self.user = user
+
+    def has_event_permission(self, organizer, event, perm_name=None, request=None, session_key=None) -> bool:
+        return True
+
+    def has_organizer_permission(self, organizer, perm_name=None, request=None):
+        return True
+
+
 class UserKnownLoginSource(models.Model):
    user = models.ForeignKey('User', on_delete=models.CASCADE, related_name="known_login_sources")
    agent_type = models.CharField(max_length=255, null=True, blank=True)
@@ -229,7 +229,7 @@ class Device(LoggedModel):
        """
        return self._organizer_permission_set() if self.organizer == organizer else set()

-    def has_event_permission(self, organizer, event, perm_name=None, request=None) -> bool:
+    def has_event_permission(self, organizer, event, perm_name=None, request=None, session_key=None) -> bool:
        """
        Checks if this token is part of a team that grants access of type ``perm_name``
        to the event ``event``.
@@ -238,6 +238,7 @@ class Device(LoggedModel):
        :param event: The event to check
        :param perm_name: The permission, e.g. ``event.orders:read``
        :param request: This parameter is ignored and only defined for compatibility reasons.
+        :param session_key: This parameter is ignored and only defined for compatibility reasons.
        :return: bool
        """
        has_event_access = (self.all_events and organizer == self.organizer) or (
@@ -1595,12 +1595,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``)
@@ -1669,7 +1667,7 @@ class Question(LoggedModel):
        related_name="questions",
        on_delete=models.CASCADE
    )
-    question = I18nTextField(  # to be renamed to 'internal_name'
+    question = I18nTextField(
        verbose_name=_("Question")
    )
    identifier = models.CharField(
@@ -1684,7 +1682,7 @@ class Question(LoggedModel):
            ),
        ],
    )
-    help_text = I18nTextField(  # to be removed
+    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,
@@ -1694,22 +1692,22 @@ class Question(LoggedModel):
        choices=TYPE_CHOICES,
        verbose_name=_("Question type")
    )
-    required = models.BooleanField(  # to be removed, -> QuestionnaireChild
+    required = models.BooleanField(
        default=False,
        verbose_name=_("Required question")
    )
-    items = models.ManyToManyField(  # 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(  # to be removed, -> Questionnaire + QuestionnaireChild
+    position = models.PositiveIntegerField(
        default=0,
        verbose_name=_("Position")
    )
-    ask_during_checkin = models.BooleanField(  # 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
@@ -1719,7 +1717,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
@@ -1728,10 +1726,10 @@ class Question(LoggedModel):
        verbose_name=_('Print answer on invoices'),
        default=False
    )
-    dependency_question = models.ForeignKey(  # 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=[])  # 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'))
@@ -1765,9 +1763,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):
@@ -1992,103 +1990,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_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")),
-    )
-    event = models.ForeignKey(
-        Event,
-        related_name="questionnaires",
-        on_delete=models.CASCADE
-    )
-    internal_name = models.CharField(
-        verbose_name=_("Internal name"),
-        max_length=255,
-    )
-    type = models.CharField(
-        max_length=5,
-        choices=TYPE_CHOICES,
-        verbose_name=_("Questionnaire type")
-    )
-    items = models.ManyToManyField(
-        Item,
-        related_name='questionnaires',
-        verbose_name=_("Products"),
-        blank=True,
-        help_text=_('This questionnaire will be asked to buyers of the selected products')
-    )
-    position = models.PositiveIntegerField(
-        default=0,
-        verbose_name=_("Position")
-    )
-    all_sales_channels = models.BooleanField(
-        verbose_name=_("Sell on all sales channels the product is sold on"),
-        default=True,
-    )
-    limit_sales_channels = models.ManyToManyField(
-        "SalesChannel",
-        verbose_name=_("Restrict to specific sales channels"),
-        help_text=_('The sales channel selection for the product as a whole takes precedence, so if a sales channel is '
-                    'selected here but not on product level, the variation will not be available.'),
-        blank=True,
-    )
-
-
-class QuestionnaireChild(LoggedModel):
-    SYSTEM_QUESTION_CHOICES = (
-        ('attendee_name_parts', _('Attendee name')),
-        ('attendee_email', _('Attendee email')),
-        ('company', _('Company')),
-        ('street', _('Street')),
-        ('zipcode', _('ZIP code')),
-        ('city', _('City')),
-        ('country', _('Country')),
-    )
-    questionnaire = models.ForeignKey(
-        Questionnaire,
-        related_name="children",
-        on_delete=models.CASCADE
-    )
-    position = models.PositiveIntegerField(
-        default=0,
-        verbose_name=_("Position")
-    )
-    user_question = models.ForeignKey(
-        Question,
-        related_name="references",
-        on_delete=models.CASCADE,
-        null=True, blank=True,
-    )
-    system_question = models.CharField(
-        max_length=25,
-        choices=SYSTEM_QUESTION_CHOICES,
-        null=True, blank=True,
-    )
-    required = models.BooleanField(
-        default=False,
-        verbose_name=_("Required question")
-    )
-    label = I18nTextField(
-        verbose_name=_("Question")
-    )
-    help_text = I18nTextField(
-        verbose_name=_("Help text"),
-        help_text=_("If the question needs to be explained or clarified, do it here!"),
-        null=True, blank=True,
-    )
-    dependency_question = models.ForeignKey(
-        'QuestionnaireChild', null=True, blank=True, on_delete=models.SET_NULL, related_name='dependent_questions'
-    )
-    dependency_values = MultiStringField(default=[])
-
-
 class Quota(LoggedModel):
    """
    A quota is a "pool of tickets". It is there to limit the number of items
@@ -88,7 +88,7 @@ class LogEntry(models.Model):

    class Meta:
        ordering = ('-datetime', '-id')
-        indexes = [models.Index(fields=["datetime", "id"])]
+        indexes = [models.Index(fields=["datetime", "id"], name="pretixbase__datetim_b1fe5a_idx")]

    def display(self):
        from pretix.base.logentrytype_registry import log_entry_types
@@ -122,7 +122,7 @@ class ReusableMedium(LoggedModel):
    class Meta:
        unique_together = (("identifier", "type", "organizer"),)
        indexes = [
-            models.Index(fields=("updated", "id")),
+            models.Index(fields=("updated", "id"), name="pretixbase__updated_093277_idx"),
        ]
        ordering = "identifier", "type", "organizer"

@@ -336,8 +336,8 @@ class Order(LockModel, LoggedModel):
        verbose_name_plural = _("Orders")
        ordering = ("-datetime", "-pk")
        indexes = [
-            models.Index(fields=["datetime", "id"]),
-            models.Index(fields=["last_modified", "id"]),
+            models.Index(fields=["datetime", "id"], name="pretixbase__datetim_66aff0_idx"),
+            models.Index(fields=["last_modified", "id"], name="pretixbase__last_mo_4ebf8b_idx"),
        ]
        constraints = [
            models.UniqueConstraint(fields=["organizer", "code"], name="order_organizer_code_uniq"),
@@ -590,7 +590,7 @@ class Order(LockModel, LoggedModel):
            not kwargs.get('force_save_with_deferred_fields', None) and
            (not update_fields or ('require_approval' not in update_fields and 'status' not in update_fields))
        ):
-            _fail("It is unsafe to call save() on an OrderFee with deferred fields since we can't check if you missed "
+            _fail("It is unsafe to call save() on an Order with deferred fields since we can't check if you missed "
                  "creating a transaction. Call save(force_save_with_deferred_fields=True) if you really want to do "
                  "this.")

@@ -2841,7 +2841,7 @@ class OrderPosition(AbstractPosition):
            if Transaction.key(self) != self.__initial_transaction_key or self.canceled != self.__initial_canceled or not self.pk:
                _transactions_mark_order_dirty(self.order_id, using=kwargs.get('using', None))
        elif not kwargs.get('force_save_with_deferred_fields', None):
-            _fail("It is unsafe to call save() on an OrderFee with deferred fields since we can't check if you missed "
+            _fail("It is unsafe to call save() on an OrderPosition with deferred fields since we can't check if you missed "
                  "creating a transaction. Call save(force_save_with_deferred_fields=True) if you really want to do "
                  "this.")

@@ -3080,7 +3080,7 @@ class Transaction(models.Model):
    class Meta:
        ordering = 'datetime', 'pk'
        indexes = [
-            models.Index(fields=['datetime', 'id'])
+            models.Index(fields=['datetime', 'id'], name="pretixbase__datetim_b20405_idx")
        ]

    def save(self, *args, **kwargs):
@@ -319,6 +319,9 @@ class TeamQuerySet(models.QuerySet):
    def event_permission_q(cls, perm_name):
        from ..permissions import assert_valid_event_permission

+        if perm_name is None:
+            return Q()
+
        if perm_name.startswith('can_') and perm_name in OLD_TO_NEW_EVENT_COMPAT:  # legacy
            return reduce(operator.and_, [cls.event_permission_q(p) for p in OLD_TO_NEW_EVENT_COMPAT[perm_name]])
        assert_valid_event_permission(perm_name, allow_legacy=False)
@@ -331,6 +334,9 @@ class TeamQuerySet(models.QuerySet):
    def organizer_permission_q(cls, perm_name):
        from ..permissions import assert_valid_organizer_permission

+        if perm_name is None:
+            return Q()
+
        if perm_name.startswith('can_') and perm_name in OLD_TO_NEW_ORGANIZER_COMPAT:  # legacy
            return reduce(operator.and_, [cls.organizer_permission_q(p) for p in OLD_TO_NEW_ORGANIZER_COMPAT[perm_name]])
        assert_valid_organizer_permission(perm_name, allow_legacy=False)
@@ -550,7 +556,7 @@ class TeamAPIToken(models.Model):
        """
        return self.team.organizer_permission_set() if self.team.organizer == organizer else set()

-    def has_event_permission(self, organizer, event, perm_name=None, request=None) -> bool:
+    def has_event_permission(self, organizer, event, perm_name=None, request=None, session_key=None) -> bool:
        """
        Checks if this token is part of a team that grants access of type ``perm_name``
        to the event ``event``.
@@ -559,6 +565,7 @@ class TeamAPIToken(models.Model):
        :param event: The event to check
        :param perm_name: The permission, e.g. ``event.orders:read``
        :param request: This parameter is ignored and only defined for compatibility reasons.
+        :param session_key: This parameter is ignored and only defined for compatibility reasons.
        :return: bool
        """
        has_event_access = (self.team.all_events and organizer == self.team.organizer) or (
@@ -54,7 +54,7 @@ from bidi import get_display
 from django.conf import settings
 from django.contrib.staticfiles import finders
 from django.core.exceptions import ValidationError
-from django.db.models import Max, Min
+from django.db.models import Exists, Max, Min, OuterRef
 from django.db.models.fields.files import FieldFile
 from django.dispatch import receiver
 from django.utils.deconstruct import deconstructible
@@ -76,7 +76,7 @@ from reportlab.pdfgen.canvas import Canvas
 from reportlab.platypus import Paragraph

 from pretix.base.i18n import language
-from pretix.base.models import Event, Order, OrderPosition, Question
+from pretix.base.models import Checkin, Event, Order, OrderPosition, Question
 from pretix.base.settings import PERSON_NAME_SCHEMES
 from pretix.base.signals import layout_image_variables, layout_text_variables
 from pretix.base.templatetags.money import money_filter
@@ -379,6 +379,13 @@ DEFAULT_VARIABLES = OrderedDict((
            str(p) for p in generate_compressed_addon_list(op, order, ev)
        ])
    }),
+    ("checked_in_addons", {
+        "label": _("List of Checked-In Add-Ons"),
+        "editor_sample": _("Add-on 1\n2x Add-on 2"),
+        "evaluate": lambda op, order, ev: "\n".join([
+            str(p) for p in generate_compressed_addon_list(op, order, ev, only_checked_in=True)
+        ])
+    }),
    ("organizer", {
        "label": _("Organizer name"),
        "editor_sample": _("Event organizer company"),
@@ -750,12 +757,16 @@ def get_program_times(op: OrderPosition, ev: Event):
    ])


-def generate_compressed_addon_list(op, order, event):
+def generate_compressed_addon_list(op, order, event, only_checked_in=False):
    itemcount = defaultdict(int)
-    addons = [p for p in (
+    addon_qs = (
        op.addons.all() if 'addons' in getattr(op, '_prefetched_objects_cache', {})
        else op.addons.select_related('item', 'variation')
-    ) if not p.canceled]
+    )
+    if only_checked_in:
+        addon_qs = addon_qs.filter(Exists(Checkin.objects.filter(position=OuterRef('pk'))), canceled=False)
+    addons = [p for p in addon_qs if not p.canceled]
+
    for pos in addons:
        itemcount[pos.item, pos.variation] += 1

@@ -40,6 +40,7 @@ from pretix.base.models import (
    CachedFile, Device, Event, Organizer, ScheduledEventExport, TeamAPIToken,
    User, cachedfile_name,
 )
+from pretix.base.models.auth import UserWithStaffSession
 from pretix.base.models.exports import ScheduledOrganizerExport
 from pretix.base.services.mail import mail
 from pretix.base.services.tasks import (
@@ -211,7 +212,12 @@ def init_event_exporters(event, user=None, token=None, device=None, request=None
        if not perm_holder.has_event_permission(event.organizer, event, permission_name, request) and not staff_session:
            continue

-        exporter: BaseExporter = response(event=event, organizer=event.organizer, **kwargs)
+        exporter: BaseExporter = response(
+            event=event,
+            organizer=event.organizer,
+            permission_holder=token or device or (UserWithStaffSession(user) if staff_session else user),
+            **kwargs
+        )

        if not exporter.available_for_user(user if user and user.is_authenticated else None):
            continue
@@ -243,7 +249,12 @@ def init_organizer_exporters(
            continue

        if issubclass(response, OrganizerLevelExportMixin):
-            exporter: BaseExporter = response(event=Event.objects.none(), organizer=organizer, **kwargs)
+            exporter: BaseExporter = response(
+                event=Event.objects.none(),
+                organizer=organizer,
+                permission_holder=token or device or (UserWithStaffSession(user) if staff_session else user),
+                **kwargs,
+            )

            try:
                if not perm_holder.has_organizer_permission(organizer, response.get_required_organizer_permission(), request) and not staff_session:
@@ -295,7 +306,12 @@ def init_organizer_exporters(
            if not _has_permission_on_any_team_cache[permission_name] and not staff_session:
                continue

-            exporter: BaseExporter = response(event=_event_list_cache[permission_name], organizer=organizer, **kwargs)
+            exporter: BaseExporter = response(
+                event=_event_list_cache[permission_name],
+                organizer=organizer,
+                permission_holder=token or device or (UserWithStaffSession(user) if staff_session else user),
+                **kwargs,
+            )

        if not exporter.available_for_user(user if user and user.is_authenticated else None):
            continue
@@ -411,7 +411,7 @@ def mail_send_task(self, **kwargs) -> bool:
        try:
            outgoing_mail = OutgoingMail.objects.select_for_update(of=OF_SELF).get(pk=outgoing_mail)
        except OutgoingMail.DoesNotExist:
-            logger.info(f"Ignoring job for non existing email {outgoing_mail.guid}")
+            logger.info(f"Ignoring job for non existing email {outgoing_mail}")
            return False
        if outgoing_mail.status == OutgoingMail.STATUS_INFLIGHT:
            logger.info(f"Ignoring job for inflight email {outgoing_mail.guid}")
@@ -67,9 +67,9 @@ from pretix.base.email import get_email_context
 from pretix.base.i18n import get_language_without_region, language
 from pretix.base.media import MEDIA_TYPES
 from pretix.base.models import (
-    CartPosition, Device, Event, GiftCard, Item, ItemVariation, Membership,
-    Order, OrderPayment, OrderPosition, Quota, Seat, SeatCategoryMapping, User,
-    Voucher,
+    CartPosition, Device, Event, GiftCard, Item, ItemVariation, LogEntry,
+    Membership, Order, OrderPayment, OrderPosition, Quota, Seat,
+    SeatCategoryMapping, User, Voucher,
 )
 from pretix.base.models.event import SubEvent
 from pretix.base.models.orders import (
@@ -1618,7 +1618,7 @@ class OrderChangeManager:
    MembershipOperation = namedtuple('MembershipOperation', ('position', 'membership'))
    CancelOperation = namedtuple('CancelOperation', ('position', 'price_diff'))
    AddOperation = namedtuple('AddOperation', ('item', 'variation', 'price', 'addon_to', 'subevent', 'seat', 'membership',
-                                               'valid_from', 'valid_until', 'is_bundled', 'result'))
+                                               'valid_from', 'valid_until', 'is_bundled', 'result', 'count'))
    SplitOperation = namedtuple('SplitOperation', ('position',))
    FeeValueOperation = namedtuple('FeeValueOperation', ('fee', 'value', 'price_diff'))
    AddFeeOperation = namedtuple('AddFeeOperation', ('fee', 'price_diff'))
@@ -1632,16 +1632,24 @@ class OrderChangeManager:
    ForceRecomputeOperation = namedtuple('ForceRecomputeOperation', tuple())

    class AddPositionResult:
-        _position: Optional[OrderPosition]
+        _positions: Optional[List[OrderPosition]]

        def __init__(self):
-            self._position = None
+            self._positions = None

        @property
        def position(self) -> OrderPosition:
-            if self._position is None:
+            if self._positions is None:
                raise RuntimeError("Order position has not been created yet. Call commit() first on OrderChangeManager.")
-            return self._position
+            if len(self._positions) != 1:
+                raise RuntimeError("More than one position created.")
+            return self._positions[0]
+
+        @property
+        def positions(self) -> List[OrderPosition]:
+            if self._positions is None:
+                raise RuntimeError("Order position has not been created yet. Call commit() first on OrderChangeManager.")
+            return self._positions

    def __init__(self, order: Order, user=None, auth=None, notify=True, reissue_invoice=True, allow_blocked_seats=False):
        self.order = order
@@ -1848,8 +1856,12 @@ class OrderChangeManager:

    def add_position(self, item: Item, variation: ItemVariation, price: Decimal, addon_to: OrderPosition = None,
                     subevent: SubEvent = None, seat: Seat = None, membership: Membership = None,
-                     valid_from: datetime = None, valid_until: datetime = None) -> 'OrderChangeManager.AddPositionResult':
+                     valid_from: datetime = None, valid_until: datetime = None, count: int = 1) -> 'OrderChangeManager.AddPositionResult':
+        if count < 1:
+            raise ValueError("Count must be positive")
        if isinstance(seat, str):
+            if count > 1:
+                raise ValueError("Cannot combine count > 1 with seat")
            if not seat:
                seat = None
            else:
@@ -1903,14 +1915,14 @@ class OrderChangeManager:
        if self.order.event.settings.invoice_include_free or price.gross != Decimal('0.00'):
            self._invoice_dirty = True

-        self._totaldiff_guesstimate += price.gross
-        self._quotadiff.update(new_quotas)
+        self._totaldiff_guesstimate += price.gross * count
+        self._quotadiff.update({q: count for q in new_quotas})
        if seat:
            self._seatdiff.update([seat])

        result = self.AddPositionResult()
        self._operations.append(self.AddOperation(item, variation, price, addon_to, subevent, seat, membership,
-                                                  valid_from, valid_until, is_bundled, result))
+                                                  valid_from, valid_until, is_bundled, result, count))
        return result

    def split(self, position: OrderPosition):
@@ -2530,29 +2542,35 @@ class OrderChangeManager:
                    secret_dirty.remove(position)
                position.save(update_fields=['canceled', 'secret'])
            elif isinstance(op, self.AddOperation):
-                pos = OrderPosition.objects.create(
-                    item=op.item, variation=op.variation, addon_to=op.addon_to,
-                    price=op.price.gross, order=self.order, tax_rate=op.price.rate, tax_code=op.price.code,
-                    tax_value=op.price.tax, tax_rule=op.item.tax_rule,
-                    positionid=nextposid, subevent=op.subevent, seat=op.seat,
-                    used_membership=op.membership, valid_from=op.valid_from, valid_until=op.valid_until,
-                    is_bundled=op.is_bundled,
-                )
-                nextposid += 1
-                self.order.log_action('pretix.event.order.changed.add', user=self.user, auth=self.auth, data={
-                    'position': pos.pk,
-                    'item': op.item.pk,
-                    'variation': op.variation.pk if op.variation else None,
-                    'addon_to': op.addon_to.pk if op.addon_to else None,
-                    'price': op.price.gross,
-                    'positionid': pos.positionid,
-                    'membership': pos.used_membership_id,
-                    'subevent': op.subevent.pk if op.subevent else None,
-                    'seat': op.seat.pk if op.seat else None,
-                    'valid_from': op.valid_from.isoformat() if op.valid_from else None,
-                    'valid_until': op.valid_until.isoformat() if op.valid_until else None,
-                })
-                op.result._position = pos
+                new_pos = []
+                new_logs = []
+                for i in range(op.count):
+                    pos = OrderPosition.objects.create(
+                        item=op.item, variation=op.variation, addon_to=op.addon_to,
+                        price=op.price.gross, order=self.order, tax_rate=op.price.rate, tax_code=op.price.code,
+                        tax_value=op.price.tax, tax_rule=op.item.tax_rule,
+                        positionid=nextposid, subevent=op.subevent, seat=op.seat,
+                        used_membership=op.membership, valid_from=op.valid_from, valid_until=op.valid_until,
+                        is_bundled=op.is_bundled,
+                    )
+                    nextposid += 1
+                    new_pos.append(pos)
+                    new_logs.append(self.order.log_action('pretix.event.order.changed.add', user=self.user, auth=self.auth, data={
+                        'position': pos.pk,
+                        'item': op.item.pk,
+                        'variation': op.variation.pk if op.variation else None,
+                        'addon_to': op.addon_to.pk if op.addon_to else None,
+                        'price': op.price.gross,
+                        'positionid': pos.positionid,
+                        'membership': pos.used_membership_id,
+                        'subevent': op.subevent.pk if op.subevent else None,
+                        'seat': op.seat.pk if op.seat else None,
+                        'valid_from': op.valid_from.isoformat() if op.valid_from else None,
+                        'valid_until': op.valid_until.isoformat() if op.valid_until else None,
+                    }, save=False))
+
+                op.result._positions = new_pos
+                LogEntry.bulk_create_and_postprocess(new_logs)
            elif isinstance(op, self.SplitOperation):
                position = position_cache.setdefault(op.position.pk, op.position)
                split_positions.append(position)
@@ -2877,7 +2895,7 @@ class OrderChangeManager:
        return total

    def _check_order_size(self):
-        if (len(self.order.positions.all()) + len([op for op in self._operations if isinstance(op, self.AddOperation)])) > settings.PRETIX_MAX_ORDER_SIZE:
+        if (len(self.order.positions.all()) + sum([op.count for op in self._operations if isinstance(op, self.AddOperation)])) > settings.PRETIX_MAX_ORDER_SIZE:
            raise OrderError(
                self.error_messages['max_order_size'] % {
                    'max': settings.PRETIX_MAX_ORDER_SIZE,
@@ -2938,7 +2956,7 @@ class OrderChangeManager:
        ]) + len([
            o for o in self._operations if isinstance(o, self.SplitOperation)
        ])
-        adds = len([o for o in self._operations if isinstance(o, self.AddOperation)])
+        adds = sum([o.count for o in self._operations if isinstance(o, self.AddOperation)])
        if current > 0 and current - cancels + adds < 1:
            raise OrderError(self.error_messages['complete_cancel'])

@@ -2985,17 +3003,18 @@ class OrderChangeManager:
            elif isinstance(op, self.CancelOperation) and op.position in positions_to_fake_cart:
                fake_cart.remove(positions_to_fake_cart[op.position])
            elif isinstance(op, self.AddOperation):
-                cp = CartPosition(
-                    event=self.event,
-                    item=op.item,
-                    variation=op.variation,
-                    used_membership=op.membership,
-                    subevent=op.subevent,
-                    seat=op.seat,
-                )
-                cp.override_valid_from = op.valid_from
-                cp.override_valid_until = op.valid_until
-                fake_cart.append(cp)
+                for i in range(op.count):
+                    cp = CartPosition(
+                        event=self.event,
+                        item=op.item,
+                        variation=op.variation,
+                        used_membership=op.membership,
+                        subevent=op.subevent,
+                        seat=op.seat,
+                    )
+                    cp.override_valid_from = op.valid_from
+                    cp.override_valid_until = op.valid_until
+                    fake_cart.append(cp)
        try:
            validate_memberships_in_order(self.order.customer, fake_cart, self.event, lock=True, ignored_order=self.order, testmode=self.order.testmode)
        except ValidationError as e:
@@ -32,6 +32,7 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.

+import logging
 import warnings
 from typing import Any, Callable, Generic, List, Tuple, TypeVar

@@ -48,6 +49,8 @@ from .plugins import (
    PLUGIN_LEVEL_ORGANIZER,
 )

+logger = logging.getLogger(__name__)
+
 app_cache = {}
 T = TypeVar('T')

@@ -60,23 +63,25 @@ def _populate_app_cache():

 def get_defining_app(o):
    # If sentry packed this in a wrapper, unpack that
-    if "sentry" in o.__module__:
+    module = getattr(o, "__module__", None)
+    if module and "sentry" in module:
        o = o.__wrapped__

    if hasattr(o, "__mocked_app"):
        return o.__mocked_app

    # Find the Django application this belongs to
-    searchpath = o.__module__
+    searchpath = module or getattr(o.__class__, "__module__", None) or ""

    # Core modules are always active
-    if any(searchpath.startswith(cm) for cm in settings.CORE_MODULES):
+    if searchpath and any(searchpath.startswith(cm) for cm in settings.CORE_MODULES):
        return 'CORE'

    if not app_cache:
        _populate_app_cache()

-    while True:
+    app = None
+    while searchpath:
        app = app_cache.get(searchpath)
        if "." not in searchpath or app:
            break
@@ -157,7 +162,7 @@ class PluginSignal(Generic[T], django.dispatch.Signal):
        if not app_cache:
            _populate_app_cache()

-        for receiver in self._sorted_receivers(sender):
+        for receiver in self._live_receivers(sender)[0]:
            if self._is_receiver_active(sender, receiver):
                response = receiver(signal=self, sender=sender, **named)
                responses.append((receiver, response))
@@ -179,7 +184,7 @@ class PluginSignal(Generic[T], django.dispatch.Signal):
        if not app_cache:
            _populate_app_cache()

-        for receiver in self._sorted_receivers(sender):
+        for receiver in self._live_receivers(sender)[0]:
            if self._is_receiver_active(sender, receiver):
                named[chain_kwarg_name] = response
                response = receiver(signal=self, sender=sender, **named)
@@ -204,7 +209,7 @@ class PluginSignal(Generic[T], django.dispatch.Signal):
        if not app_cache:
            _populate_app_cache()

-        for receiver in self._sorted_receivers(sender):
+        for receiver in self._live_receivers(sender)[0]:
            if self._is_receiver_active(sender, receiver):
                try:
                    response = receiver(signal=self, sender=sender, **named)
@@ -214,17 +219,35 @@ class PluginSignal(Generic[T], django.dispatch.Signal):
                    responses.append((receiver, response))
        return responses

-    def _sorted_receivers(self, sender):
-        orig_list = self._live_receivers(sender)
+    def asend(self, sender: T, **named):
+        raise NotImplementedError()  # NOQA
+
+    def asend_robust(self, sender: T, **named):
+        raise NotImplementedError()  # NOQA
+
+    def _live_receivers(self, sender):
+        orig_list, orig_async_list = super()._live_receivers(sender)
+
+        if orig_async_list:
+            logger.error('Async receivers are not supported.')
+            raise NotImplementedError
+
+        def _getattr_fallback_to_class(obj, key):
+            return getattr(obj, key, getattr(obj.__class__, key))
+
+        def _is_core_module(receiver):
+            m = _getattr_fallback_to_class(receiver, "__module__")
+            return any(m.startswith(c) for c in settings.CORE_MODULES)
+
        sorted_list = sorted(
            orig_list,
            key=lambda receiver: (
-                0 if any(receiver.__module__.startswith(m) for m in settings.CORE_MODULES) else 1,
-                receiver.__module__,
-                receiver.__name__,
+                0 if _is_core_module(receiver) else 1,
+                _getattr_fallback_to_class(receiver, "__module__"),
+                _getattr_fallback_to_class(receiver, "__name__"),
            )
        )
-        return sorted_list
+        return sorted_list, []


 class EventPluginSignal(PluginSignal[Event]):
@@ -300,23 +323,41 @@ class GlobalSignal(django.dispatch.Signal):
        if not self.receivers or self.sender_receivers_cache.get(sender) is NO_RECEIVERS:
            return response

-        for receiver in self._live_receivers(sender):
+        for receiver in self._live_receivers(sender)[0]:
            named[chain_kwarg_name] = response
            response = receiver(signal=self, sender=sender, **named)
        return response

+    def asend(self, sender: T, **named):
+        raise NotImplementedError()  # NOQA
+
+    def asend_robust(self, sender: T, **named):
+        raise NotImplementedError()  # NOQA
+
    def _live_receivers(self, sender):
        # Ensure consistent sorting of receivers
-        orig_list = super()._live_receivers(sender)
+        orig_list, orig_async_list = super()._live_receivers(sender)
+
+        if orig_async_list:
+            logger.error('Async receivers are not supported.')
+            raise NotImplementedError
+
+        def _getattr_fallback_to_class(obj, key):
+            return getattr(obj, key, getattr(obj.__class__, key))
+
+        def _is_core_module(receiver):
+            m = _getattr_fallback_to_class(receiver, "__module__")
+            return any(m.startswith(c) for c in settings.CORE_MODULES)
+
        sorted_list = sorted(
            orig_list,
            key=lambda receiver: (
-                0 if any(receiver.__module__.startswith(m) for m in settings.CORE_MODULES) else 1,
-                receiver.__module__,
-                receiver.__name__,
+                0 if _is_core_module(receiver) else 1,
+                _getattr_fallback_to_class(receiver, "__module__"),
+                _getattr_fallback_to_class(receiver, "__name__"),
            )
        )
-        return sorted_list
+        return sorted_list, []


 class DeprecatedSignal(GlobalSignal):
@@ -1,113 +0,0 @@
-#
-# This file is part of pretix (Community Edition).
-#
-# Copyright (C) 2014-2020  Raphael Michel and contributors
-# Copyright (C) 2020-today pretix GmbH and contributors
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
-# Public License as published by the Free Software Foundation in version 3 of the License.
-#
-# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
-# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
-# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
-# this file, see <https://pretix.eu/about/en/license>.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
-# <https://www.gnu.org/licenses/>.
-#
-
-import json
-import logging
-from urllib.parse import urljoin
-
-from django import template
-from django.conf import settings
-from django.utils.safestring import mark_safe
-
-register = template.Library()
-LOGGER = logging.getLogger(__name__)
-_MANIFEST = {}
-# TODO more os.path.join ?
-MANIFEST_PATH = settings.STATIC_ROOT + "/vite/control/.vite/manifest.json"
-MANIFEST_BASE = "vite/control/"
-
-# We're building the manifest if we don't have a dev server running AND if we're
-# not currently running `rebuild` (which creates the manifest in the first place).
-if not settings.VITE_DEV_MODE and not settings.VITE_IGNORE:
-    try:
-        with open(MANIFEST_PATH) as fp:
-            _MANIFEST = json.load(fp)
-    except Exception as e:
-        LOGGER.warning(f"Error reading vite manifest at {MANIFEST_PATH}: {str(e)}")
-
-
-def generate_script_tag(path, attrs):
-    all_attrs = " ".join(f'{key}="{value}"' for key, value in attrs.items())
-    if settings.VITE_DEV_MODE:
-        src = urljoin(settings.VITE_DEV_SERVER, path)
-    else:
-        src = urljoin(settings.STATIC_URL, path)
-    return f'<script {all_attrs} src="{src}"></script>'
-
-
-def generate_css_tags(asset, already_processed=None):
-    """Recursively builds all CSS tags used in a given asset.
-
-    Ignore the side effects."""
-    tags = []
-    manifest_entry = _MANIFEST[asset]
-    if already_processed is None:
-        already_processed = []
-
-    # Put our own CSS file first for specificity
-    if "css" in manifest_entry:
-        for css_path in manifest_entry["css"]:
-            if css_path not in already_processed:
-                full_path = urljoin(settings.STATIC_URL, MANIFEST_BASE + css_path)
-                tags.append(f'<link rel="stylesheet" href="{full_path}" />')
-            already_processed.append(css_path)
-
-    # Import each file only one by way of side effects in already_processed
-    if "imports" in manifest_entry:
-        for import_path in manifest_entry["imports"]:
-            tags += generate_css_tags(import_path, already_processed)
-
-    return tags
-
-
-@register.simple_tag
-@mark_safe
-def vite_asset(path):
-    """
-    Generates one <script> tag and <link> tags for each of the CSS dependencies.
-    """
-
-    if not path:
-        return ""
-
-    if settings.VITE_DEV_MODE:
-        return generate_script_tag(path, {"type": "module"})
-
-    manifest_entry = _MANIFEST.get(path)
-    if not manifest_entry:
-        raise RuntimeError(f"Cannot find {path} in Vite manifest at {MANIFEST_PATH}")
-
-    tags = generate_css_tags(path)
-    tags.append(
-        generate_script_tag(
-            MANIFEST_BASE + manifest_entry["file"], {"type": "module", "crossorigin": ""}
-        )
-    )
-    return "".join(tags)
-
-
-@register.simple_tag
-@mark_safe
-def vite_hmr():
-    if not settings.VITE_DEV_MODE:
-        return ""
-    return generate_script_tag("@vite/client", {"type": "module"})
@@ -34,6 +34,7 @@

 import datetime
 import os
+from dataclasses import dataclass

 from django import forms
 from django.conf import settings
@@ -420,6 +421,11 @@ class SplitDateTimeField(forms.SplitDateTimeField):
 class FontSelect(forms.RadioSelect):
    option_template_name = 'pretixcontrol/font_option.html'

+    @dataclass
+    class FontOption:
+        title: str
+        data: str
+

 class ItemMultipleChoiceField(SafeModelMultipleChoiceField):
    def label_from_instance(self, obj):
@@ -63,7 +63,7 @@ from pretix.base.forms import (
 from pretix.base.models import Event, Organizer, TaxRule, Team
 from pretix.base.models.event import EventFooterLink, EventMetaValue, SubEvent
 from pretix.base.models.organizer import TeamQuerySet
-from pretix.base.models.tax import TAX_CODE_LISTS
+from pretix.base.models.tax import TAX_CODE_LISTS, VAT_ID_COUNTRIES
 from pretix.base.reldate import RelativeDateField, RelativeDateTimeField
 from pretix.base.services.placeholders import FormPlaceholderMixin
 from pretix.base.settings import (
@@ -73,8 +73,8 @@ from pretix.base.settings import (
 )
 from pretix.base.validators import multimail_validate
 from pretix.control.forms import (
-    MultipleLanguagesWidget, SalesChannelCheckboxSelectMultiple, SlugWidget,
-    SplitDateTimeField, SplitDateTimePickerWidget,
+    FontSelect, MultipleLanguagesWidget, SalesChannelCheckboxSelectMultiple,
+    SlugWidget, SplitDateTimeField, SplitDateTimePickerWidget,
 )
 from pretix.control.forms.widgets import Select2
 from pretix.helpers.countries import CachedCountries
@@ -531,6 +531,13 @@ class EventUpdateForm(I18nModelForm):

 class EventSettingsValidationMixin:

+    def clean_invoice_address_from_vat_id(self):
+        value = self.cleaned_data.get('invoice_address_from_vat_id')
+        country = self.cleaned_data.get('invoice_address_from_country')
+        if value and country and country not in VAT_ID_COUNTRIES:
+            return None
+        return value
+
    def clean(self):
        data = super().clean()
        settings_dict = self.obj.settings.freeze()
@@ -722,7 +729,7 @@ class EventSettingsForm(EventSettingsValidationMixin, FormPlaceholderMixin, Sett
            del self.fields['event_list_filters']
            del self.fields['event_calendar_future_only']
        self.fields['primary_font'].choices = [('Open Sans', 'Open Sans')] + sorted([
-            (a, {"title": a, "data": v}) for a, v in get_fonts(self.event, pdf_support_required=False).items()
+            (a, FontSelect.FontOption(title=a, data=v)) for a, v in get_fonts(self.event, pdf_support_required=False).items()
        ], key=lambda a: a[0])

        # create "virtual" fields for better UX when editing <name>_asked and <name>_required fields
@@ -104,12 +104,6 @@ class GlobalSettingsForm(SettingsForm):
                help_text=_("Will be served at {domain}/.well-known/apple-developer-merchantid-domain-association").format(
                    domain=settings.SITE_URL
                )
-            )),
-            ('widget_vite_origins', forms.CharField(
-                widget=forms.Textarea(attrs={'rows': '3'}),
-                required=False,
-                label=_("Vite widget origins"),
-                help_text=_("One origin per line (e.g. https://example.com). Requests from these origins will be served the new vite-based widget."),
            ))
        ])
        responses = register_global_settings.send(self)
@@ -331,6 +331,10 @@ class OtherOperationsForm(forms.Form):


 class OrderPositionAddForm(forms.Form):
+    count = forms.IntegerField(
+        label=_('Number of products to add'),
+        initial=1,
+    )
    itemvar = forms.ChoiceField(
        label=_('Product')
    )
@@ -432,6 +436,10 @@ class OrderPositionAddForm(forms.Form):
            d['used_membership'] = [m for m in self.memberships if str(m.pk) == d['used_membership']][0]
        else:
            d['used_membership'] = None
+        if d.get("count", 1) > 1 and d.get("seat"):
+            raise ValidationError({
+                "seat": _("You can not choose a seat when adding multiple products at once.")
+            })
        return d


@@ -850,9 +850,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.'),
@@ -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'),
@@ -3,7 +3,6 @@
 {% load bootstrap3 %}
 {% load static %}
 {% load compress %}
-{% load vite %}
 {% block title %}
    {% if checkinlist %}
        {% blocktrans with name=checkinlist.name %}Check-in list: {{ name }}{% endblocktrans %}
@@ -75,8 +74,45 @@
                {% bootstrap_field form.ignore_in_statistics layout="control" %}

                <h3>{% trans "Custom check-in rule" %}</h3>
-                <div id="rules-editor">
-                    <!-- Vue app mount point -->
+                <div id="rules-editor" class="form-inline">
+                    <div>
+                        <ul class="nav nav-tabs" role="tablist">
+                            <li role="presentation" class="active">
+                                <a href="#rules-edit" role="tab" data-toggle="tab">
+                                    <span class="fa fa-edit"></span>
+                                    {% trans "Edit" %}
+                                </a>
+                            </li>
+                            <li role="presentation">
+                                <a href="#rules-viz" role="tab" data-toggle="tab">
+                                    <span class="fa fa-eye"></span>
+                                    {% trans "Visualize" %}
+                                </a>
+                            </li>
+                        </ul>
+
+                        <!-- Tab panes -->
+                        <div class="tab-content">
+                            <div role="tabpanel" class="tab-pane active" id="rules-edit">
+                                <checkin-rules-editor></checkin-rules-editor>
+                            </div>
+                            <div role="tabpanel" class="tab-pane" id="rules-viz">
+                                <checkin-rules-visualization></checkin-rules-visualization>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="alert alert-info" v-if="missingItems.length">
+                        <p>
+                            {% trans "Your rule always filters by product or variation, but the following products or variations are not contained in any of your rule parts so people with these tickets will not get in:" %}
+                        </p>
+                        <ul>
+                            <li v-for="h in missingItems">{{ "{" }}{h}{{ "}" }}</li>
+                        </ul>
+                        <p>
+                            {% trans "Please double-check if this was intentional." %}
+                        </p>
+                    </div>
                </div>
                <div class="disabled-withoutjs sr-only">
                    {{ form.rules }}
@@ -91,6 +127,11 @@
    </form>
    {{ items|json_script:"items" }}

+    {% if DEBUG %}
+        <script type="text/javascript" src="{% static "vuejs/vue.js" %}"></script>
+    {% else %}
+        <script type="text/javascript" src="{% static "vuejs/vue.min.js" %}"></script>
+    {% endif %}
    {% compress js %}
        <script type="text/javascript" src="{% static "d3/d3.v6.js" %}"></script>
        <script type="text/javascript" src="{% static "d3/d3-color.v2.js" %}"></script>
@@ -103,6 +144,15 @@
        <script type="text/javascript" src="{% static "d3/d3-drag.v2.js" %}"></script>
        <script type="text/javascript" src="{% static "d3/d3-zoom.v2.js" %}"></script>
    {% endcompress %}
-    {% vite_hmr %}
-    {% vite_asset "src/pretix/static/pretixcontrol/js/ui/checkinrules/index.ts" %}
+    {% compress js %}
+        <script type="text/javascript" src="{% static "pretixcontrol/js/ui/checkinrules/jsonlogic-boolalg.js" %}"></script>
+        <script type="text/vue" src="{% static 'pretixcontrol/js/ui/checkinrules/datetimefield.vue' %}"></script>
+        <script type="text/vue" src="{% static 'pretixcontrol/js/ui/checkinrules/timefield.vue' %}"></script>
+        <script type="text/vue" src="{% static 'pretixcontrol/js/ui/checkinrules/lookup-select2.vue' %}"></script>
+        <script type="text/vue" src="{% static 'pretixcontrol/js/ui/checkinrules/checkin-rule.vue' %}"></script>
+        <script type="text/vue" src="{% static 'pretixcontrol/js/ui/checkinrules/checkin-rules-editor.vue' %}"></script>
+        <script type="text/vue" src="{% static 'pretixcontrol/js/ui/checkinrules/viz-node.vue' %}"></script>
+        <script type="text/vue" src="{% static 'pretixcontrol/js/ui/checkinrules/checkin-rules-visualization.vue' %}"></script>
+        <script type="text/javascript" src="{% static "pretixcontrol/js/ui/checkinrules.js" %}"></script>
+    {% endcompress %}
 {% endblock %}
@@ -5,7 +5,6 @@
 {% load getitem %}
 {% load static %}
 {% load compress %}
-{% load vite %}
 {% block title %}{% trans "Check-in simulator" %}{% endblock %}
 {% block inside %}
    <h1>
@@ -125,9 +124,11 @@
                {% endif %}
                {% if result.rule_graph %}
                    <div id="rules-editor" class="form-inline">
-                        <!-- Vue app mount point -->
+                        <div role="tabpanel" class="tab-pane" id="rules-viz">
+                            <checkin-rules-visualization></checkin-rules-visualization>
+                        </div>
+                        <textarea id="id_rules" class="sr-only">{{ result.rule_graph|attr_escapejson_dumps }}</textarea>
                    </div>
-                    <textarea id="id_rules" class="sr-only">{{ result.rule_graph|attr_escapejson_dumps }}</textarea>
                {% endif %}
            </div>
        </div>
@@ -151,6 +152,10 @@
        <script type="text/javascript" src="{% static "d3/d3-drag.v2.js" %}"></script>
        <script type="text/javascript" src="{% static "d3/d3-zoom.v2.js" %}"></script>
    {% endcompress %}
-    {% vite_hmr %}
-    {% vite_asset "src/pretix/static/pretixcontrol/js/ui/checkinrules/index.ts" %}
+    {% compress js %}
+        <script type="text/javascript" src="{% static "pretixcontrol/js/ui/checkinrules/jsonlogic-boolalg.js" %}"></script>
+        <script type="text/vue" src="{% static 'pretixcontrol/js/ui/checkinrules/viz-node.vue' %}"></script>
+        <script type="text/vue" src="{% static 'pretixcontrol/js/ui/checkinrules/checkin-rules-visualization.vue' %}"></script>
+        <script type="text/javascript" src="{% static "pretixcontrol/js/ui/checkinrules.js" %}"></script>
+    {% endcompress %}
 {% endblock %}
@@ -12,113 +12,142 @@
 {% 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_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" %}
+                {% bootstrap_field form.items layout="control" %}
+                {% bootstrap_field form.required layout="control" %}
+                <div class="alert alert-info alert-required-boolean">
+                    {% blocktrans trimmed %}
+                        If you mark a Yes/No question as required, it means that the user has to select Yes and No is not
+                        accepted. If you want to allow both options, do not make this field required.
+                    {% endblocktrans %}
                </div>
-                <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_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" %}
+                {% bootstrap_field form.ask_during_checkin layout="control" %}
+                {% bootstrap_field form.show_during_checkin layout="control" %}
+                {% bootstrap_field form.hidden layout="control" %}
+                {% bootstrap_field form.print_on_invoice layout="control" %}
+
+                <div class="form-group">
+                    <label class="col-md-3 control-label" for="id_dependency_question">
+                        {% trans "Question dependency" %}
+                        <br><span class="optional">{% trans "Optional" context "form" %}</span>
+                    </label>
+                    <div class="col-md-4">
+                        {% bootstrap_field form.dependency_question layout="inline" form_group_class="inner" %}
+                    </div>
+                    <div class="col-md-5">
+                        <script type="text/plain" id="dependency_value_val">{{ form.instance.dependency_values|escapejson_dumps }}</script>
+                        {% bootstrap_field form.dependency_values layout="inline" form_group_class="inner" %}
+                    </div>
+                </div>
+            </fieldset>
        </div>
-        {% bootstrap_field form.identifier layout="control" %}
-        {% bootstrap_field form.ask_during_checkin layout="control" %}
-        {% bootstrap_field form.show_during_checkin layout="control" %}
-        {% bootstrap_field form.hidden layout="control" %}
-        {% bootstrap_field form.print_on_invoice layout="control" %}
-
-
        <div class="form-group submit-group">
            <button type="submit" class="btn btn-primary btn-save">
                {% trans "Save" %}
@@ -1,34 +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 %}
-            Questions 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>
-
-    {{ request.event.settings.locales|json_script:"event_locales" }}
-
-    <div id="questionnaires-editor">
-        <!-- Vue app mount point -->
-    </div>
-
-    {% vite_hmr %}
-    {% vite_asset "src/pretix/static/pretixcontrol/js/ui/questionnaires/index.ts" %}
-{% endblock %}
@@ -1,8 +1,8 @@
 {% extends "pretixcontrol/items/base.html" %}
 {% load i18n %}
-{% block title %}{% trans "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
@@ -12,7 +12,7 @@
    {% csrf_token %}
    {% if 'event.items:write' in request.eventpermset %}
        <p>
-            <a href="{% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new data field" %}
+            <a href="{% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new question" %}
            </a>
        </p>
    {% endif %}
@@ -20,27 +20,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 %}">
            {% for q in questions %}
-                <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 %}
@@ -51,17 +63,42 @@
                        {% if q.pk and q.ask_during_checkin %}
                            <span class="fa fa-check-square text-muted" data-toggle="tooltip" title="{% trans "Ask during check-in" %}"></span>
                        {% endif %}
+
                    </td>
                    <td>
                        {% if q.pk and q.hidden %}
                            <span class="fa fa-eye-slash text-muted" data-toggle="tooltip" title="{% trans "Hidden question" %}"></span>
                        {% endif %}
                    </td>
+                    <td>
+                        {% if q.pk %}
+                            <ul>
+                                {% for item in q.items.all %}
+                                    <li>
+                                        <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.id %}">{{ item }}</a>
+                                    </li>
+                                {% endfor %}
+                            </ul>
+                        {% else %}
+                            <small>{% trans "All personalized products" %}</small>
+                        {% endif %}
+                    </td>
+                    {% if 'event.items:write' in request.eventpermset %}
+                        <td class="dnd-container">
+                        </td>
+                    {% endif %}
                    <td class="text-right flip">
-                        <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>
@@ -329,6 +329,7 @@
                                        {{ add_form.custom_error }}
                                    </div>
                                {% endif %}
+                                {% bootstrap_field add_form.count layout="control" %}
                                {% bootstrap_field add_form.itemvar layout="control" %}
                                {% bootstrap_field add_form.price addon_after=request.event.currency layout="control" %}
                                {% if add_form.addon_to %}
@@ -364,6 +365,7 @@
                        </div>
                        <div class="panel-body">
                            <div class="form-horizontal">
+                                {% bootstrap_field add_position_formset.empty_form.count layout="control" %}
                                {% bootstrap_field add_position_formset.empty_form.itemvar layout="control" %}
                                {% bootstrap_field add_position_formset.empty_form.price addon_after=request.event.currency layout="control" %}
                                {% if add_position_formset.empty_form.addon_to %}
@@ -8,7 +8,7 @@
            {% if page_obj.has_previous %}
                {% if page_obj.previous_page_number > 1 %}
                    <li>
-                        <a href="?{% url_replace request 'page' page_obj.num_pages %}" title="{% trans "Go to page 1" %}">
+                        <a href="?{% url_replace request 'page' 1 %}" title="{% trans "Go to page 1" %}">
                            <span class="fa fa-angle-double-left"></span>
                        </a>
                    </li>
@@ -8,7 +8,45 @@
        {% csrf_token %}
        {% bootstrap_form_errors form %}
        {% bootstrap_field form.name layout='horizontal' %}
-        {% bootstrap_field form.devicetype layout='horizontal' %}
+
+        <div class="form-group{% if form.devicetype.errors %} has-error{% endif %}">
+            <label class="col-md-3 control-label">{% trans "Device type" %}</label>
+            <div class="col-md-9">
+                <div>
+                    <div class="big-radio radio">
+                        <label>
+                            <input type="radio" required value="totp" name="{{ form.devicetype.html_name }}" {% if form.devicetype.value == "totp" %}checked{% endif %}>
+                            <strong>{% trans "Smartphone with Authenticator app" %}</strong><br>
+                            <div class="help-block">
+                                {% blocktrans trimmed %}
+                                    Use your smartphone with any Time-based One-Time-Password app like freeOTP, Google Authenticator or Proton Authenticator.
+                                {% endblocktrans %}
+                            </div>
+                        </label>
+                    </div>
+                    <div class="big-radio radio">
+                        <label>
+                            <input type="radio" required value="webauthn" name="{{ form.devicetype.html_name }}" {% if form.devicetype.value == "webauthn" %}checked{% endif %}>
+                            <strong>{% trans "WebAuthn-compatible hardware token" %}</strong><br>
+                            <div class="help-block">
+                                {% blocktrans trimmed %}
+                                    Use a hardware token like the Yubikey, or other biometric authentication like fingerprint or face recognition.
+                                {% endblocktrans %}
+                            </div>
+                        </label>
+                    </div>
+                </div>
+
+                {% if form.devicetype.errors %}
+                    <div class="help-block">
+                    {% for error in form.devicetype.errors %}
+                        <p>{{ error|escape }}</p>
+                    {% endfor %}
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+
        <div class="form-group submit-group">
            <button type="submit" class="btn btn-primary btn-save">
                {% trans "Continue" %}
@@ -28,11 +28,6 @@
                        {% trans "iOS (iTunes)" %}
                    </a>
                </li>
-                <li>
-                    <a href="https://m.google.com/authenticator">
-                        {% trans "Blackberry (Link via Google)" %}
-                    </a>
-                </li>
            </ul>
        </li>
        <li>
@@ -348,7 +348,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/(?P<quota>\d+)/$', item.QuotaView.as_view(), name='event.items.quotas.show'),
        re_path(r'^quotas/select$', typeahead.quotas_select2, name='event.items.quotas.select2'),
@@ -55,7 +55,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 ListView, TemplateView
+from django.views.generic import ListView
 from django.views.generic.detail import DetailView, SingleObjectMixin
 from django_countries.fields import Country

@@ -435,7 +435,87 @@ class QuestionList(ListView):

    def get_context_data(self, **kwargs):
        ctx = super().get_context_data(**kwargs)
-        questions = list(ctx['questions'])
+        questions = []
+
+        if self.request.event.settings.attendee_names_asked:
+            questions.append(
+                FakeQuestion(
+                    id='attendee_name_parts',
+                    question=_('Attendee name'),
+                    position=self.request.event.settings.system_question_order.get(
+                        'attendee_name_parts', 0
+                    ),
+                    required=self.request.event.settings.attendee_names_required,
+                )
+            )
+
+        if self.request.event.settings.attendee_emails_asked:
+            questions.append(
+                FakeQuestion(
+                    id='attendee_email',
+                    question=_('Attendee email'),
+                    position=self.request.event.settings.system_question_order.get(
+                        'attendee_email', 0
+                    ),
+                    required=self.request.event.settings.attendee_emails_required,
+                )
+            )
+
+        if self.request.event.settings.attendee_company_asked:
+            questions.append(
+                FakeQuestion(
+                    id='company',
+                    question=_('Company'),
+                    position=self.request.event.settings.system_question_order.get(
+                        'company', 0
+                    ),
+                    required=self.request.event.settings.attendee_company_required,
+                )
+            )
+
+        if self.request.event.settings.attendee_addresses_asked:
+            questions.append(
+                FakeQuestion(
+                    id='street',
+                    question=_('Street'),
+                    position=self.request.event.settings.system_question_order.get(
+                        'street', 0
+                    ),
+                    required=self.request.event.settings.attendee_addresses_required,
+                )
+            )
+            questions.append(
+                FakeQuestion(
+                    id='zipcode',
+                    question=_('ZIP code'),
+                    position=self.request.event.settings.system_question_order.get(
+                        'zipcode', 0
+                    ),
+                    required=self.request.event.settings.attendee_addresses_required,
+                )
+            )
+            questions.append(
+                FakeQuestion(
+                    id='city',
+                    question=_('City'),
+                    position=self.request.event.settings.system_question_order.get(
+                        'city', 0
+                    ),
+                    required=self.request.event.settings.attendee_addresses_required,
+                )
+            )
+            questions.append(
+                FakeQuestion(
+                    id='country',
+                    question=_('Country'),
+                    position=self.request.event.settings.system_question_order.get(
+                        'country', 0
+                    ),
+                    required=self.request.event.settings.attendee_addresses_required,
+                )
+            )
+
+        questions += list(ctx['questions'])
        questions.sort(key=lambda q: q.position)
        ctx['questions'] = questions
        return ctx
@@ -751,11 +831,6 @@ class QuestionCreate(EventPermissionRequiredMixin, QuestionMixin, CreateView):
        return ret


-class QuestionnairesEditor(EventPermissionRequiredMixin, TemplateView):
-    permission = 'can_change_items'
-    template_name = 'pretixcontrol/items/questionnaires.html'
-
-
 class QuotaList(PaginationMixin, ListView):
    model = Quota
    context_object_name = 'quotas'
@@ -2059,12 +2059,13 @@ class OrderChange(OrderView):
                else:
                    variation = None
                try:
-                    ocm.add_position(item, variation,
-                                     f.cleaned_data['price'],
-                                     f.cleaned_data.get('addon_to'),
-                                     f.cleaned_data.get('subevent'),
-                                     f.cleaned_data.get('seat'),
-                                     f.cleaned_data.get('used_membership'))
+                    for i in range(f.cleaned_data.get("count", 1)):
+                        ocm.add_position(item, variation,
+                                         f.cleaned_data['price'],
+                                         f.cleaned_data.get('addon_to'),
+                                         f.cleaned_data.get('subevent'),
+                                         f.cleaned_data.get('seat'),
+                                         f.cleaned_data.get('used_membership'))
                except OrderError as e:
                    f.custom_error = str(e)
                    return False
@@ -1322,7 +1322,7 @@ class DeviceUpdateView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixi
    def form_valid(self, form):
        if form.has_changed():
            self.object.log_action('pretix.device.changed', user=self.request.user, data={
-                k: getattr(self.object, k) if k != 'limit_events' else [e.id for e in getattr(self.object, k).all()]
+                k: form.cleaned_data[k] if k != 'limit_events' else [e.id for e in form.cleaned_data[k]]
                for k in form.changed_data
            })

@@ -0,0 +1,63 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020  Raphael Michel and contributors
+# Copyright (C) 2020-today pretix GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+import os
+import re
+import shlex
+
+from compressor.exceptions import FilterError
+from compressor.filters import CompilerFilter
+from django.conf import settings
+
+
+class VueCompiler(CompilerFilter):
+    # Based on work (c) Laura Klünder in https://github.com/codingcatgirl/django-vue-rollup
+    # Released under Apache License 2.0
+
+    def __init__(self, content, attrs, **kwargs):
+        config_dir = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'static', 'npm_dir')
+        node_path = os.path.join(settings.STATIC_ROOT, 'node_prefix', 'node_modules')
+        self.rollup_bin = os.path.join(node_path, 'rollup', 'dist', 'bin', 'rollup')
+        rollup_config = os.path.join(config_dir, 'rollup.config.js')
+        if not os.path.exists(self.rollup_bin) and not settings.DEBUG:
+            raise FilterError("Rollup not installed or pretix not built properly, please run 'make npminstall' in source root.")
+        command = (
+            ' '.join((
+                'NODE_PATH=' + shlex.quote(node_path),
+                shlex.quote(self.rollup_bin),
+                '-c',
+                shlex.quote(rollup_config))
+            ) +
+            ' --input {infile} -n {export_name} --file {outfile}'
+        )
+        super().__init__(content, command=command, **kwargs)
+
+    def input(self, **kwargs):
+        if self.filename is None:
+            raise FilterError('VueCompiler can only compile files, not inline code.')
+        if not os.path.exists(self.rollup_bin):
+            raise FilterError("Rollup not installed, please run 'make npminstall' in source root.")
+        self.options += (('export_name', re.sub(
+            r'^([a-z])|[^a-z0-9A-Z]+([a-zA-Z0-9])?',
+            lambda s: s.group(0)[-1].upper(),
+            os.path.basename(self.filename).split('.')[0]
+        )),)
+        return super().input(**kwargs)
@@ -25,7 +25,7 @@ import time

 from django.conf import settings
 from django.contrib.auth import login as auth_login
-from django.contrib.gis.geoip2 import GeoIP2
+from django.contrib.gis import geoip2
 from django.core.cache import cache
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
@@ -63,14 +63,20 @@ def get_user_agent_hash(request):
 _geoip = None


-def _get_country(request):
+def get_geoip() -> geoip2.GeoIP2:
+    # See https://code.djangoproject.com/ticket/36988#ticket
    global _geoip

-    if not _geoip:
-        _geoip = GeoIP2()
+    geoip2.SUPPORTED_DATABASE_TYPES.add("Geoacumen-Country")

+    if not _geoip:
+        _geoip = geoip2.GeoIP2()
+    return _geoip
+
+
+def _get_country(request):
    try:
-        res = _geoip.country(get_client_ip(request))
+        res = get_geoip().country(get_client_ip(request))
    except AddressNotFoundError:
        return None
    return res['country_code']
@@ -32,6 +32,7 @@ ausgecheckt
 ausgeklappt
 auswahl
 Authentication
+Authenticator
 Authenticator-App
 Autorisierungscode
 Autorisierungs-Endpunktes
@@ -130,6 +131,7 @@ Eingangsscan
 Einlassbuchung
 Einlassdatum
 Einlasskontrolle
+Einmalpasswörter
 einzuchecken
 email
 E-Mail-Renderer
@@ -163,6 +165,7 @@ Explorer
 FA
 Favicon
 F-Droid
+freeOTP
 Footer
 Footer-Link
 Footer-Text
@@ -557,6 +560,7 @@ Zahlungs-ID
 Zahlungspflichtig
 Zehnerkarten
 Zeitbasiert
+zeitbasierte
 Zeitslotbuchung
 Zimpler
 ZIP-Datei
@@ -32,6 +32,7 @@ ausgecheckt
 ausgeklappt
 auswahl
 Authentication
+Authenticator
 Authenticator-App
 Autorisierungscode
 Autorisierungs-Endpunktes
@@ -130,6 +131,7 @@ Eingangsscan
 Einlassbuchung
 Einlassdatum
 Einlasskontrolle
+Einmalpasswörter
 einzuchecken
 email
 E-Mail-Renderer
@@ -163,6 +165,7 @@ Explorer
 FA
 Favicon
 F-Droid
+freeOTP
 Footer
 Footer-Link
 Footer-Text
@@ -557,6 +560,7 @@ Zahlungs-ID
 Zahlungspflichtig
 Zehnerkarten
 Zeitbasiert
+zeitbasierte
 Zeitslotbuchung
 Zimpler
 ZIP-Datei
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-03-17 14:06+0000\n"
+"POT-Creation-Date: 2026-03-30 11:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-03-17 14:06+0000\n"
-"PO-Revision-Date: 2026-01-27 14:51+0000\n"
+"PO-Revision-Date: 2026-03-30 03:00+0000\n"
 "Last-Translator: CVZ-es <damien.bremont@casadevelazquez.org>\n"
 "Language-Team: Spanish <https://translate.pretix.eu/projects/pretix/pretix-"
 "js/es/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.15.2\n"
+"X-Generator: Weblate 5.16.2\n"

 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -60,7 +60,7 @@ msgstr "PayPal Paga Después"

 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:41
 msgid "iDEAL | Wero"
-msgstr ""
+msgstr "iDEAL | Wero"

 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:42
 msgid "SEPA Direct Debit"
@@ -329,7 +329,7 @@ msgstr "Pedido no aprobado"

 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:68
 msgid "Checked-in Tickets"
-msgstr "Registro de código QR"
+msgstr "Billetes registrados"

 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:69
 msgid "Valid Tickets"
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: French\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-03-17 14:06+0000\n"
-"PO-Revision-Date: 2026-01-27 14:51+0000\n"
+"PO-Revision-Date: 2026-03-18 12:23+0000\n"
 "Last-Translator: CVZ-es <damien.bremont@casadevelazquez.org>\n"
 "Language-Team: French <https://translate.pretix.eu/projects/pretix/pretix-js/"
 "fr/>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.15.2\n"
+"X-Generator: Weblate 5.16.2\n"

 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -59,7 +59,7 @@ msgstr "PayPal Pay Later"

 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:41
 msgid "iDEAL | Wero"
-msgstr ""
+msgstr "iDEAL | Wero"

 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:42
 msgid "SEPA Direct Debit"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lukas Bockstaller	a7388aa0a0	formatting	2026-04-08 12:33:02 +02:00
Lukas Bockstaller	166aa33b1b	handle mixed line endings in import	2026-04-08 12:30:34 +02:00
Richard SchreiberandGitHub	c037fd865b	Fix multi-product order edit with seats (#6063 )	2026-04-08 11:02:58 +02:00
Kara Engelhardtandpajowu	12171e0665	Fix copy-and-paste errors	2026-04-07 14:39:33 +02:00
Kara Engelhardtandpajowu	444963e952	tests: Remove on_commit monkeypatch	2026-04-07 14:39:33 +02:00
Kara Engelhardtandpajowu	a57810cf41	tests: replace broken monkeypatching with TransactionTestCase	2026-04-07 14:39:33 +02:00
Kara Engelhardtandpajowu	2e2e57d231	Fix typo in test detection, improve check A non-empty string is truthy, making the the for-loop useless, as the first item in inspect.stack() is always the for-loop itself, which then lead to the function returning immediately. This commit * fixes this typo * changes the loop to ignore the first element of instpect.stack() (which is the loop itself) * ignores django-internal code This should create something similar to what I suspect the code was intended to do originally.	2026-04-07 14:39:33 +02:00
Kara Engelhardtandpajowu	fc7e8ea67a	Log new properties when changing device	2026-04-07 13:28:38 +02:00
Raphael Michel	23d1673403	Fix typo	2026-04-02 21:43:36 +02:00
Raphael Michel	92d1830f3b	Exporters: Pass state about staff_session	2026-04-02 21:03:42 +02:00
Raphael MichelandGitHub	d411c36414	Exporters: Give access to authentication infos and allow empty permissions (#5979 ) * Exporters: Give access to authentication infos * Allow exporters to have empty permission * Use a protocol	2026-04-02 15:44:36 +02:00
Raphael MichelandGitHub	84e12fea32	Dockerfile: Use Python 3.13 (#6028 )	2026-04-02 13:18:04 +02:00
Kara Engelhardtandpajowu	b6518449d6	Add placeholder for checked in addons (Z#23230009)	2026-04-02 12:06:00 +02:00
Ruud HendrickxandRaphael Michel	50c99e1239	Translations: Update Dutch (Belgium) Currently translated at 82.8% (5210 of 6287 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/nl_BE/ powered by weblate	2026-04-02 12:01:26 +02:00
dependabot[bot]andRaphael Michel	e70452ee47	Update pillow requirement from ==12.1.* to ==12.2.* Updates the requirements on [pillow](https://github.com/python-pillow/Pillow) to permit the latest version. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/12.1.0...12.2.0) --- updated-dependencies: - dependency-name: pillow dependency-version: 12.2.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-02 12:01:19 +02:00
Raphael MichelandGitHub	666b496ab4	Allow to configure a readonly DB connection (#5978 )	2026-04-01 13:46:52 +02:00
Richard SchreiberandGitHub	8bd0665f37	Fix password-manager username not saved on customer account creation (#6043 ) * Fix password-manager username not saved on customer account creation * Fix tests/make email not required	2026-04-01 12:00:03 +02:00
Raphael MichelandGitHub	ed1459b1dd	Order change form: Allow to add multiple identical positions (Z#23227479) (#6044 ) * Order change form: Allow to add multiple identical positions (Z#23227479) * New implementation	2026-04-01 11:54:48 +02:00
Raphael MichelandGitHub	8c251029b9	Fix useless cart sessions being created (#6045 ) * Do not create useless cart session accessing invoice address * Skip useless code paths in CartMixin * Do not create cart session on view with active session * Create regression tests	2026-04-01 09:29:14 +02:00
dependabot[bot]andRaphael Michel	531f697b9a	Update redis requirement from ==7.1.* to ==7.4.* Updates the requirements on [redis](https://github.com/redis/redis-py) to permit the latest version. - [Release notes](https://github.com/redis/redis-py/releases) - [Changelog](https://github.com/redis/redis-py/blob/master/CHANGES) - [Commits](https://github.com/redis/redis-py/compare/v7.1.0...v7.4.0) --- updated-dependencies: - dependency-name: redis dependency-version: 7.4.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-01 09:20:14 +02:00
Ruud HendrickxandRaphael Michel	719ad7104d	Translations: Update Dutch (Belgium) Currently translated at 82.1% (5164 of 6287 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/nl_BE/ powered by weblate	2026-04-01 09:19:49 +02:00
Ruud HendrickxandRaphael Michel	dcb0eb765f	Translations: Update Dutch (informal) (nl_Informal) Currently translated at 100.0% (6287 of 6287 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/nl_Informal/ powered by weblate	2026-04-01 09:19:49 +02:00
CVZ-esandRaphael Michel	86b5191e8b	Translations: Update Spanish Currently translated at 100.0% (6287 of 6287 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/es/ powered by weblate	2026-04-01 09:19:49 +02:00
Ruud HendrickxandRaphael Michel	b0714886bc	Translations: Update Dutch Currently translated at 100.0% (6287 of 6287 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/nl/ powered by weblate	2026-04-01 09:19:49 +02:00
CVZ-esandRaphael Michel	438f70c730	Translations: Update French Currently translated at 100.0% (6287 of 6287 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/fr/ powered by weblate	2026-04-01 09:19:49 +02:00
Ruud HendrickxandRaphael Michel	608b150bf8	Translations: Update Dutch (Belgium) Currently translated at 79.6% (5007 of 6287 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/nl_BE/ powered by weblate	2026-04-01 09:19:49 +02:00
Renne RochaandRaphael Michel	c0df7c6142	Translations: Update Portuguese (Brazil) Currently translated at 95.1% (5980 of 6287 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/pt_BR/ powered by weblate	2026-04-01 09:19:49 +02:00
dependabot[bot]andRaphael Michel	b2ea172a60	Update sentry-sdk requirement from ==2.56.* to ==2.57.* Updates the requirements on [sentry-sdk](https://github.com/getsentry/sentry-python) to permit the latest version. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-python/compare/2.56.0...2.57.0) --- updated-dependencies: - dependency-name: sentry-sdk dependency-version: 2.57.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-01 09:19:35 +02:00
Raphael Michel	a2cef22ea8	Bump version to 2026.4.0.dev0	2026-03-30 15:01:39 +02:00
Raphael Michel	3843448812	Bump version to 2026.3.0	2026-03-30 15:01:30 +02:00
Kara Engelhardtandpajowu	49893ca9df	Fix crash in mail_send_task for nonexistant mails	2026-03-30 14:57:56 +02:00
Raphael MichelandRaphael Michel	4eade5070e	Translations: Update German (informal) (de_Informal) Currently translated at 100.0% (6287 of 6287 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/de_Informal/ powered by weblate	2026-03-30 14:01:13 +02:00
Raphael MichelandRaphael Michel	32b1997208	Translations: Update German Currently translated at 100.0% (6287 of 6287 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/de/ powered by weblate	2026-03-30 14:01:13 +02:00
Raphael Michel	eaf4a310f6	Translations: Update wordlist	2026-03-30 13:59:37 +02:00
Raphael Michel	8dc0f7c1b2	Update po files [CI skip] Signed-off-by: Raphael Michel <michel@rami.io>	2026-03-30 13:26:02 +02:00
CVZ-esandRaphael Michel	dd3e6c4692	Translations: Update Spanish Currently translated at 100.0% (256 of 256 strings) Translation: pretix/pretix (JavaScript parts) Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/es/ powered by weblate	2026-03-30 13:21:45 +02:00
Kara Engelhardtandpajowu	c7437336b4	Add length help text to customer password forms Also cleans up dead code, as `validate_password` always returns None or raises a ValidationError.	2026-03-30 11:25:14 +02:00
luelistaandGitHub	4c0c775baa	Improve 2fa type selection UI (#6031 )	2026-03-27 13:47:10 +01:00
Linnea ThelanderandMartin Gross	394652a5ff	Translations: Update Swedish Currently translated at 88.0% (5530 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/sv/ powered by weblate	2026-03-27 10:05:21 +01:00
Ivano VogheraandMartin Gross	3f50d065ec	Translations: Update Italian Currently translated at 40.0% (2515 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/it/ powered by weblate	2026-03-27 10:05:21 +01:00
Ivano VogheraandMartin Gross	4121061267	Translations: Update Italian Currently translated at 40.0% (2515 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/it/ powered by weblate	2026-03-26 18:50:24 +01:00
Linnea ThelanderandMartin Gross	aed2220139	Translations: Update Swedish Currently translated at 76.9% (197 of 256 strings) Translation: pretix/pretix (JavaScript parts) Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/sv/ powered by weblate	2026-03-26 18:50:24 +01:00
Linnea ThelanderandMartin Gross	4b2c54d38e	Translations: Update Swedish Currently translated at 88.0% (5530 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/sv/ powered by weblate	2026-03-26 18:50:24 +01:00
Ivano VogheraandMartin Gross	0113a3dc1f	Translations: Update Italian Currently translated at 39.9% (2507 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/it/ powered by weblate	2026-03-26 18:50:24 +01:00
Linnea ThelanderandMartin Gross	c12a8935f1	Translations: Update Swedish Currently translated at 87.9% (5529 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/sv/ powered by weblate	2026-03-26 11:48:45 +01:00
Pietro IsottiandMartin Gross	a86a6cc2c7	Translations: Update Italian Currently translated at 39.5% (2486 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/it/ powered by weblate	2026-03-26 11:48:45 +01:00
Pietro IsottiandMartin Gross	fec2b9a2fc	Translations: Update Italian Currently translated at 68.3% (175 of 256 strings) Translation: pretix/pretix (JavaScript parts) Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/it/ powered by weblate	2026-03-26 11:48:45 +01:00
Pietro IsottiandMartin Gross	d847a7e8f8	Translations: Update Italian Currently translated at 39.2% (2463 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/it/ powered by weblate	2026-03-26 11:48:45 +01:00
Ruud HendrickxandMartin Gross	c58a968196	Translations: Update Dutch (Belgium) Currently translated at 79.1% (4970 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/nl_BE/ powered by weblate	2026-03-26 11:48:45 +01:00
Renne RochaandMartin Gross	81cbaca162	Translations: Update Portuguese (Brazil) Currently translated at 100.0% (256 of 256 strings) Translation: pretix/pretix (JavaScript parts) Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/pt_BR/ powered by weblate	2026-03-26 11:48:45 +01:00
Renne RochaandMartin Gross	218df7a49f	Translations: Update Portuguese (Brazil) Currently translated at 95.1% (5979 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/pt_BR/ powered by weblate	2026-03-26 11:48:45 +01:00
Ruud HendrickxandMartin Gross	f64343d977	Translations: Update Dutch (Belgium) Currently translated at 78.7% (4948 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/nl_BE/ powered by weblate	2026-03-26 11:48:45 +01:00
Hijiri UmemotoandMartin Gross	b36c7cbef3	Translations: Update Japanese Currently translated at 100.0% (256 of 256 strings) Translation: pretix/pretix (JavaScript parts) Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/ja/ powered by weblate	2026-03-26 11:48:45 +01:00
Hijiri UmemotoandMartin Gross	18b39ba7cd	Translations: Update Japanese Currently translated at 100.0% (6283 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/ja/ powered by weblate	2026-03-26 11:48:45 +01:00
Raphael Michel	1383e967df	Hotfix font select in organizer	2026-03-25 15:14:20 +01:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	c743e9fd3f	Update sentry-sdk requirement from ==2.54.* to ==2.56.* (#6023 ) Updates the requirements on [sentry-sdk](https://github.com/getsentry/sentry-python) to permit the latest version. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-python/compare/2.54.0...2.56.0) --- updated-dependencies: - dependency-name: sentry-sdk dependency-version: 2.56.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-03-25 13:41:13 +01:00
Raphael MichelandGitHub	a71efa6747	Event settings: Workaround for Django 5.2 change (#6025 )	2026-03-24 22:00:05 +01:00
Richard Schreiber	4fed47fb9b	Fix live_receivers for django 5	2026-03-24 17:14:05 +01:00
Phin WolkwitzandGitHub	c143d50290	Update django to 5.2	2026-03-24 16:33:28 +01:00
luelistaandGitHub	88cd715ece	Always show Organizers and Events menu entries for staff (#6011 )	2026-03-24 11:26:54 +01:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3513de6a45	Update importlib-metadata requirement from ==8.* to ==9.* (#6016 ) Updates the requirements on [importlib-metadata](https://github.com/python/importlib_metadata) to permit the latest version. - [Release notes](https://github.com/python/importlib_metadata/releases) - [Changelog](https://github.com/python/importlib_metadata/blob/main/NEWS.rst) - [Commits](https://github.com/python/importlib_metadata/compare/v8.0.0...v9.0.0) --- updated-dependencies: - dependency-name: importlib-metadata dependency-version: 9.0.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-03-24 09:09:07 +01:00
Richard SchreiberandGitHub	fd6d3934c0	Remove invoice_address_from_vat_id on save if it is not used	2026-03-23 14:33:17 +01:00
Ruud HendrickxandRaphael Michel	222b453b43	Translations: Update Dutch (Belgium) Currently translated at 77.4% (4869 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/nl_BE/ powered by weblate	2026-03-19 17:54:41 +01:00
Ruud HendrickxandRaphael Michel	617a0f5dc7	Translations: Update Dutch (Belgium) Currently translated at 100.0% (256 of 256 strings) Translation: pretix/pretix (JavaScript parts) Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/nl_BE/ powered by weblate	2026-03-19 17:54:41 +01:00
Ruud HendrickxandRaphael Michel	12f53ec2c3	Translations: Update Dutch (Belgium) Currently translated at 77.3% (4857 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/nl_BE/ powered by weblate	2026-03-19 17:54:41 +01:00
Ruud HendrickxandRaphael Michel	5449285624	Translations: Update Dutch (informal) (nl_Informal) Currently translated at 100.0% (256 of 256 strings) Translation: pretix/pretix (JavaScript parts) Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/nl_Informal/ powered by weblate	2026-03-19 17:54:41 +01:00
Ruud HendrickxandRaphael Michel	68bf7d44f2	Translations: Update Dutch (informal) (nl_Informal) Currently translated at 100.0% (6283 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/nl_Informal/ powered by weblate	2026-03-19 17:54:41 +01:00
CVZ-esandRaphael Michel	a31db20804	Translations: Update Spanish Currently translated at 100.0% (256 of 256 strings) Translation: pretix/pretix (JavaScript parts) Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/es/ powered by weblate	2026-03-19 17:54:41 +01:00
CVZ-esandRaphael Michel	1bd08cf3aa	Translations: Update Spanish Currently translated at 100.0% (6283 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/es/ powered by weblate	2026-03-19 17:54:41 +01:00
CVZ-esandRaphael Michel	fbea13227f	Translations: Update French Currently translated at 100.0% (256 of 256 strings) Translation: pretix/pretix (JavaScript parts) Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/fr/ powered by weblate	2026-03-19 17:54:41 +01:00
Ruud HendrickxandRaphael Michel	b3ff32d345	Translations: Update Dutch Currently translated at 100.0% (256 of 256 strings) Translation: pretix/pretix (JavaScript parts) Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/nl/ powered by weblate	2026-03-19 17:54:41 +01:00
Ruud HendrickxandRaphael Michel	ed0611253e	Translations: Update Dutch Currently translated at 100.0% (6283 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/nl/ powered by weblate	2026-03-19 17:54:41 +01:00
CVZ-esandRaphael Michel	41af5fae17	Translations: Update French Currently translated at 100.0% (6283 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/fr/ powered by weblate	2026-03-19 17:54:41 +01:00
Raphael MichelandRaphael Michel	42f61d74fa	Translations: Update German (informal) (de_Informal) Currently translated at 100.0% (6283 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/de_Informal/ powered by weblate	2026-03-19 17:54:41 +01:00
Raphael MichelandRaphael Michel	4923e0be31	Translations: Update German Currently translated at 100.0% (6283 of 6283 strings) Translation: pretix/pretix Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/de/ powered by weblate	2026-03-19 17:54:41 +01:00
Kara Engelhardtandpajowu	e63bc09216	Use correct first page number in control pagination This worked accidentally because page_obj.num_pages does not exists (page_obj.paginator.num_pages does) which made url_replace remove the page parameter	2026-03-19 13:19:10 +01:00
Kara Engelhardtandpajowu	f8bbb3d3bb	Fix crash in CheckinList export (PRETIXEU-D59)	2026-03-19 11:08:11 +01:00