From ea613bf27128af47c1148d495df45a3aa33140de Mon Sep 17 00:00:00 2001
From: Mira Weller <weller@rami.io>
Date: Fri, 7 Aug 2026 21:21:35 +0200
Subject: [PATCH] wip

---
 src/pretix/base/views/mixins.py               |  14 +++
 .../pretixcontrol/items/questionnaires.html   |   5 +-
 .../event/checkout_questions.html             |  12 +++
 .../js/ui/questionnaires/App.vue              | 100 ++++++++++--------
 .../questionnaires/QuestionnaireElement.vue   |   4 +-
 5 files changed, 86 insertions(+), 49 deletions(-)

diff --git a/src/pretix/base/views/mixins.py b/src/pretix/base/views/mixins.py
index 8bde275fc7..9dec514553 100644
--- a/src/pretix/base/views/mixins.py
+++ b/src/pretix/base/views/mixins.py
@@ -56,6 +56,20 @@ class BaseQuestionsViewMixin:
     def question_form_kwargs(self, cr):
         return {}
 
+    @cached_property
+    def order_questions_form(self):
+        kwargs = {}  # self.question_form_kwargs(cr)
+        form = self.form_class(event=self.request.event,
+                               prefix='order',
+                               request=self.request,
+                               cartpos=None,
+                               orderpos=None,
+                               all_optional=self.all_optional,
+                               data=(self.request.POST if self.request.method == 'POST' else None),
+                               files=(self.request.FILES if self.request.method == 'POST' else None),
+                               **kwargs)
+        return form
+
     @cached_property
     def forms(self):
         """
diff --git a/src/pretix/control/templates/pretixcontrol/items/questionnaires.html b/src/pretix/control/templates/pretixcontrol/items/questionnaires.html
index 61b26276eb..46f3e814b9 100644
--- a/src/pretix/control/templates/pretixcontrol/items/questionnaires.html
+++ b/src/pretix/control/templates/pretixcontrol/items/questionnaires.html
@@ -18,10 +18,13 @@
     </h1>
     <p>
         {% blocktrans trimmed %}
-            Questions allow your attendees to fill in additional data about their ticket. If you provide food, one
+            Questionaires allow your attendees to fill in additional data about their ticket. If you provide food, one
             example might be to ask your users about dietary requirements.
         {% endblocktrans %}
     </p>
+    <p>
+        TODO: add more specific explanation of the questionnaire concept.
+    </p>
 
     {{ request.event.settings.locales|json_script:"event_locales" }}
     {{ questionnaire_type_choices|json_script:"questionnaire_type_choices" }}
diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
index d69c6bea44..d16cb107bc 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
@@ -68,6 +68,18 @@
                     </div>
                 </details>
             {% endif %}
+            {% if order_questions_form %}
+                <details class="panel panel-default" open id="invoice-details">
+                    <summary class="panel-heading">
+                        <h3 class="panel-title">
+                            <strong>{% trans "Additional order questions" %}</strong>
+                        </h3>
+                    </summary>
+                    <div class="panel-body">
+                        {% bootstrap_form order_questions_form layout="checkout" %}
+                    </div>
+                </details>
+            {% endif %}
 
             {% for pos, forms in formgroups %}
                 <details class="panel panel-default" open>
diff --git a/src/pretix/static/pretixcontrol/js/ui/questionnaires/App.vue b/src/pretix/static/pretixcontrol/js/ui/questionnaires/App.vue
index 60eab68c8c..9500a284f4 100644
--- a/src/pretix/static/pretixcontrol/js/ui/questionnaires/App.vue
+++ b/src/pretix/static/pretixcontrol/js/ui/questionnaires/App.vue
@@ -72,16 +72,20 @@ export default {
 </script>
 
 <style>
-.hidden-question { opacity: 0.3; }
-.hidden-question label { text-decoration: line-through; }
+.hidden-questionnaire { opacity: 0.3; }
 
-.question-editor { margin-right: 180px; }
+.questionnaires-list { margin-right: 180px; }
 .question-edit-buttons { float:right; }
 .question-edit-buttons div { position: absolute; margin-left: 10px; min-width: 100px; }
 .question-edit-buttons button {  }
 .form-group { margin-bottom: 30px }
 
-.filter-row { background: #fffee6; border: 1px solid #ecead5; padding: 10px; }
+.questionnaires-editor.product-selected .panel .panel-heading {}
+
+.questionnaires-editor.product-selected .panel { margin-bottom: 0; border: 0 none; border-bottom: 1px solid #ddd; box-shadow: none; border-radius: 0; }
+.questionnaires-editor.product-selected .panel .panel-heading { font-style: italic; background: white; border: 0 none; }
+
+.filter-row { background: #f8e6ff; border: 1px solid #e3cbed; padding: 10px; }
 
 .debuginfo { font-size: 70%; background: rgba(200, 200, 200, 0.5); }
 .dependency-info { position: absolute;  }
@@ -90,49 +94,53 @@ export default {
 .category-header { margin: 8px 0 -5px 0; font-weight: bold; color: #737373; }
 </style>
 <template>
-	<p class="filter-row">
-		Order questionnaires
-	</p>
-	<div class="question-editor">
-		<SlickList axis="y" v-model:list="order_questionnaires" useDragHandle appendTo="#orderQuestionnaireListParent" id="orderQuestionnaireListParent">
-			<SlickItem v-for="(questionnaire, index) in order_questionnaires" :key="questionnaire.id || questionnaire._new_id" :index="index">
-        <QuestionnaireElement
-          :questionnaire="questionnaire"
-          :datafields="datafields"
-          :grouped_items="null"
-          :selected_product="null" />
-			</SlickItem>
-		</SlickList>
+	<div class="questionnaires-editor">
+		<p class="filter-row">
+			Order questionnaires
+		</p>
+		<div class="questionnaires-list">
+			<SlickList axis="y" v-model:list="order_questionnaires" useDragHandle appendTo="#orderQuestionnaireListParent" id="orderQuestionnaireListParent">
+				<SlickItem v-for="(questionnaire, index) in order_questionnaires" :key="questionnaire.id || questionnaire._new_id" :index="index">
+					<QuestionnaireElement
+						:questionnaire="questionnaire"
+						:datafields="datafields"
+						:grouped_items="null"
+						:selected_product="null" />
+				</SlickItem>
+			</SlickList>
+		</div>
+		<p>
+			<button class="btn btn-default" @click="addOrderQuestionnaire()"><i class="fa fa-plus"></i> Neuen Fragebogen erstellen</button>
+			<button class="btn btn-default" @click="saveData()"><i class="fa fa-save"></i> Speichern</button>
+		</p>
 	</div>
-  <p>
-		<button class="btn btn-default" @click="addOrderQuestionnaire()"><i class="fa fa-plus"></i> Neuen Fragebogen erstellen</button>
-		<button class="btn btn-default" @click="saveData()"><i class="fa fa-save"></i> Speichern</button>
-  </p>
 
-	<p class="filter-row">
-		Questionnaires for product:
-		<select v-model="selected_product">
-			<option value="">(all)</option>
-			<optgroup v-for="[category, items] in grouped_items" :label="category.internal_name || i18n_any(category.name)">
-				<option v-for="item in items" :value="item.id">
-					{{ item.internal_name || i18n_any(item.name) }}
-				</option>
-			</optgroup>
-		</select>
-	</p>
-	<div class="question-editor">
-		<SlickList axis="y" v-model:list="position_questionnaires" useDragHandle appendTo="#questionnaireListParent" id="questionnaireListParent">
-			<SlickItem v-for="(questionnaire, index) in position_questionnaires" :key="questionnaire.id || questionnaire._new_id" :index="index">
-        <QuestionnaireElement
-          :questionnaire="questionnaire"
-          :datafields="datafields"
-          :grouped_items="grouped_items"
-          :selected_product="selected_product" />
-			</SlickItem>
-		</SlickList>
+	<div :class="`questionnaires-editor ${selected_product ? 'product-selected':''}`">
+		<p class="filter-row">
+			Questionnaires for product:
+			<select v-model="selected_product">
+				<option value="">(all)</option>
+				<optgroup v-for="[category, items] in grouped_items" :label="category.internal_name || i18n_any(category.name)">
+					<option v-for="item in items" :value="item.id">
+						{{ item.internal_name || i18n_any(item.name) }}
+					</option>
+				</optgroup>
+			</select>
+		</p>
+		<div class="questionnaires-list">
+			<SlickList axis="y" v-model:list="position_questionnaires" useDragHandle appendTo="#questionnaireListParent" id="questionnaireListParent">
+				<SlickItem v-for="(questionnaire, index) in position_questionnaires" :key="questionnaire.id || questionnaire._new_id" :index="index">
+					<QuestionnaireElement
+						:questionnaire="questionnaire"
+						:datafields="datafields"
+						:grouped_items="grouped_items"
+						:selected_product="selected_product" />
+				</SlickItem>
+			</SlickList>
+		</div>
+		<p>
+			<button class="btn btn-default" @click="addPositionQuestionnaire()"><i class="fa fa-plus"></i> Neuen Fragebogen erstellen</button>
+			<button class="btn btn-default" @click="saveData()"><i class="fa fa-save"></i> Speichern</button>
+		</p>
 	</div>
-  <p>
-		<button class="btn btn-default" @click="addPositionQuestionnaire()"><i class="fa fa-plus"></i> Neuen Fragebogen erstellen</button>
-		<button class="btn btn-default" @click="saveData()"><i class="fa fa-save"></i> Speichern</button>
-  </p>
 </template>
diff --git a/src/pretix/static/pretixcontrol/js/ui/questionnaires/QuestionnaireElement.vue b/src/pretix/static/pretixcontrol/js/ui/questionnaires/QuestionnaireElement.vue
index 9b9bb91182..a057c014d0 100644
--- a/src/pretix/static/pretixcontrol/js/ui/questionnaires/QuestionnaireElement.vue
+++ b/src/pretix/static/pretixcontrol/js/ui/questionnaires/QuestionnaireElement.vue
@@ -66,12 +66,12 @@ const isEditable = computed(() => props.selected_product && props.questionnaire.
 	<div class="question-edit-buttons"><div class="btn-group">
 		<DragHandle tag="button" class="btn btn-default"><i class="fa fa-arrows"></i></DragHandle>
 		<button class="btn btn-default" @click="dlgEditor.show()"><i class="fa fa-edit"></i></button>
-		<button class="btn btn-default" @click="toggleItem()" v-if="selected_product"><i :class="`fa fa-eye${isHidden ? '-slash':''}`"></i></button>
 	</div></div>
 
   <details class="panel panel-default " :open="!!isEditable"
-    :class="{ 'hidden-question': isHidden }">
+    :class="{ 'hidden-questionnaire': isHidden }">
     <summary class="panel-heading">
+			<input type="checkbox" @click="toggleItem()" v-if="selected_product" :checked="!isHidden">
 			{{ props.questionnaire.internal_name }}
     </summary>
     <div class="panel-body" v-if="!isHidden">