Fix timepicker in checkinrules (#6182)

The timepickers format was changed by accident to the datetimeformat in the vue3 migration

.github/workflows/tests.yml

@@ -123,7 +123,7 @@ jobs:
         working-directory: ./src
         run: make all compress
       - name: Install Playwright browsers
-        run: npx playwright install
+        run: playwright install
       - name: Run E2E tests
         working-directory: ./src
         run: PRETIX_CONFIG_FILE=tests/ci_postgres.cfg py.test tests/e2e/ -v --maxfail=10

pyproject.toml

@@ -126,6 +126,7 @@ dev = [
   "pytest-xdist==3.8.*",
   "pytest-playwright",
   "pytest==9.0.*",
+  "playwright",
   "responses",
 ]
 

src/pretix/api/serializers/exporters.py

@@ -133,37 +133,43 @@ class JobRunSerializer(serializers.Serializer):
         return not bool(self._errors)
 
 
+class ExportFormDataField(serializers.Field):
+    def get_attribute(self, instance):
+        return (instance.export_identifier, instance.export_form_data)
+
+    def to_representation(self, value):
+        export_identifier, export_form_data = value
+        exporter = self.context['exporters'].get(export_identifier)
+        if exporter:
+            return JobRunSerializer(exporter=exporter).to_representation(export_form_data)
+        else:
+            return export_form_data
+
+    def get_value(self, dictionary):
+        return dictionary
+
+    def to_internal_value(self, data):
+        if "export_form_data" in data:
+            identifier = data.get('export_identifier', self.parent.instance.export_identifier if self.parent.instance else None)
+            exporter = self.context['exporters'].get(identifier)
+            if exporter:
+                return JobRunSerializer(exporter=exporter).to_internal_value(data["export_form_data"])
+            else:
+                return data['export_form_data']
+
+
 class ScheduledExportSerializer(serializers.ModelSerializer):
     schedule_next_run = serializers.DateTimeField(read_only=True)
     export_identifier = serializers.ChoiceField(choices=[])
     locale = serializers.ChoiceField(choices=settings.LANGUAGES, default='en')
     owner = serializers.SlugRelatedField(slug_field='email', read_only=True)
     error_counter = serializers.IntegerField(read_only=True)
+    export_form_data = ExportFormDataField()
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['export_identifier'].choices = [(e, e) for e in self.context['exporters']]
 
-    def validate(self, attrs):
-        if attrs.get("export_form_data"):
-            identifier = attrs.get('export_identifier', self.instance.export_identifier if self.instance else None)
-            exporter = self.context['exporters'].get(identifier)
-            if exporter:
-                try:
-                    attrs["export_form_data"] = JobRunSerializer(exporter=exporter).to_internal_value(attrs["export_form_data"])
-                except ValidationError as e:
-                    raise ValidationError({"export_form_data": e.detail})
-            else:
-                raise ValidationError({"export_identifier": ["Unknown exporter."]})
-        return attrs
-
-    def to_representation(self, instance):
-        repr = super().to_representation(instance)
-        exporter = self.context['exporters'].get(instance.export_identifier)
-        if exporter:
-            repr["export_form_data"] = JobRunSerializer(exporter=exporter).to_representation(repr["export_form_data"])
-        return repr
-
     def validate_mail_additional_recipients(self, value):
         d = value.replace(' ', '')
         if len(d.split(',')) > 25:

src/pretix/api/serializers/forms.py

@@ -45,6 +45,12 @@ class PrimaryKeyRelatedField(serializers.PrimaryKeyRelatedField):
             return value
         return super().to_representation(value)
 
+    def to_internal_value(self, data):
+        value = super().to_internal_value(data)
+        if value is not None:
+            return value.pk
+        return value
+
 
 class FormFieldWrapperField(serializers.Field):
     def __init__(self, *args, **kwargs):

src/pretix/base/exporters/orderlist.py

@@ -160,7 +160,7 @@ class OrderListExporter(MultiSheetListExporter):
 
     def _get_all_payment_methods(self, qs):
         pps = dict(get_all_payment_providers())
-        return sorted([(pp, pps[pp]) for pp in set(
+        return sorted([(pp, pps.get(pp, pp)) for pp in set(
             OrderPayment.objects.exclude(provider='free').filter(order__event__in=self.events).values_list(
                 'provider', flat=True
             ).distinct()
@@ -330,6 +330,7 @@ class OrderListExporter(MultiSheetListExporter):
                 taxsum=Sum('tax_value'), grosssum=Sum('value')
             )
         }
+        payment_methods = None
         if form_data.get('include_payment_amounts'):
             payment_sum_cache = {
                 (o['order__id'], o['provider']): o['grosssum'] for o in
@@ -347,6 +348,7 @@ class OrderListExporter(MultiSheetListExporter):
                     grosssum=Sum('amount')
                 )
             }
+            payment_methods = self._get_all_payment_methods(qs)
         sum_cache = {
             (o['order__id'], o['tax_rate']): o for o in
             OrderPosition.objects.values('tax_rate', 'order__id').order_by().annotate(
@@ -434,7 +436,6 @@ class OrderListExporter(MultiSheetListExporter):
             )
 
             if form_data.get('include_payment_amounts'):
-                payment_methods = self._get_all_payment_methods(qs)
                 for id, vn in payment_methods:
                     row.append(
                         payment_sum_cache.get((order.id, id), Decimal('0.00')) -

src/pretix/base/modelimport_orders.py

@@ -442,7 +442,7 @@ class AttendeeState(ImportColumn):
 
     @property
     def verbose_name(self):
-        return _('Attendee address') + ': ' + _('State')
+        return _('Attendee address') + ': ' + pgettext('address', 'State')
 
     def clean(self, value, previous_values):
         if value:

src/pretix/base/models/base.py

@@ -125,7 +125,7 @@ class LoggingMixin:
         elif isinstance(self, Event):
             event = self
             organizer_id = self.organizer_id
-        elif hasattr(self, 'event'):
+        elif hasattr(self, 'event') and self.event:
             event = self.event
             organizer_id = self.event.organizer_id
         elif hasattr(self, 'organizer_id'):

src/pretix/control/logdisplay.py

@@ -34,11 +34,11 @@
 # License for the specific language governing permissions and limitations under the License.
 
 from collections import defaultdict
+from datetime import datetime
 from decimal import Decimal
 from typing import Optional
 
 import bleach
-import dateutil.parser
 from django.dispatch import receiver
 from django.urls import reverse
 from django.utils.formats import date_format
@@ -248,7 +248,7 @@ class OrderValidFromChanged(OrderChangeLogEntryType):
     def display_prefixed(self, event: Event, logentry: LogEntry, data):
         return _('The validity start date for position #{posid} has been changed to {value}.').format(
             posid=data.get('positionid', '?'),
-            value=date_format(dateutil.parser.parse(data.get('new_value')), 'SHORT_DATETIME_FORMAT') if data.get(
+            value=date_format(datetime.fromisoformat(data.get('new_value')), 'SHORT_DATETIME_FORMAT') if data.get(
                 'new_value') else '–'
         )
 
@@ -260,7 +260,7 @@ class OrderValidUntilChanged(OrderChangeLogEntryType):
     def display_prefixed(self, event: Event, logentry: LogEntry, data):
         return _('The validity end date for position #{posid} has been changed to {value}.').format(
             posid=data.get('positionid', '?'),
-            value=date_format(dateutil.parser.parse(data.get('new_value')), 'SHORT_DATETIME_FORMAT') if data.get('new_value') else '–'
+            value=date_format(datetime.fromisoformat(data.get('new_value')), 'SHORT_DATETIME_FORMAT') if data.get('new_value') else '–'
         )
 
 
@@ -364,7 +364,7 @@ class CheckinErrorLogEntryType(OrderLogEntryType):
         data['posid'] = logentry.parsed_data.get('positionid', '?')
 
         if 'datetime' in data:
-            dt = dateutil.parser.parse(data.get('datetime'))
+            dt = datetime.fromisoformat(data.get('datetime'))
             if abs((logentry.datetime - dt).total_seconds()) > 5 or data.get('forced'):
                 if event:
                     data['datetime'] = date_format(dt.astimezone(event.timezone), "SHORT_DATETIME_FORMAT")
@@ -430,7 +430,7 @@ class OrderPrintLogEntryType(OrderLogEntryType):
         return _('Position #{posid} has been printed at {datetime} with type "{type}".').format(
             posid=data.get('positionid'),
             datetime=date_format(
-                dateutil.parser.parse(data["datetime"]).astimezone(logentry.event.timezone),
+                datetime.fromisoformat(data["datetime"]).astimezone(logentry.event.timezone),
                 "SHORT_DATETIME_FORMAT"
             ) if logentry.event else data["datetime"],
             type=dict(PrintLog.PRINT_TYPES)[data["type"]],
@@ -985,7 +985,7 @@ class LegacyCheckinLogEntryType(OrderLogEntryType):
 
     def display(self, logentry, data):
         # deprecated
-        dt = dateutil.parser.parse(data.get('datetime'))
+        dt = datetime.fromisoformat(data.get('datetime'))
         tz = logentry.event.timezone
         dt_formatted = date_format(dt.astimezone(tz), "SHORT_DATETIME_FORMAT")
         if 'list' in data:

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

@@ -89,7 +89,9 @@
             </button>
         </div>
     </form>
-    {{ items|json_script:"items" }}
+    {% if items %}
+        {{ items|json_script:"items" }}
+    {% endif %}
 
     {% compress js %}
         <script type="text/javascript" src="{% static "d3/d3.v6.js" %}"></script>

src/pretix/plugins/checkinlists/exporters.py

@@ -82,7 +82,8 @@ class CheckInListMixin(BaseExporter):
                      widget=forms.RadioSelect(
                          attrs={'class': 'scrolling-choice'}
                      ),
-                     initial=self.event.checkin_lists.first()
+                     initial=self.event.checkin_lists.first(),
+                     required=True
                  )),
                 ('date_range',
                  DateFrameField(
@@ -143,7 +144,6 @@ class CheckInListMixin(BaseExporter):
         if not self.event.has_subevents:
             del d['date_range']
 
-        d['list'].queryset = self.event.checkin_lists.all()
         d['list'].widget = Select2(
             attrs={
                 'data-model-select2': 'generic',
@@ -155,7 +155,6 @@ class CheckInListMixin(BaseExporter):
             }
         )
         d['list'].widget.choices = d['list'].choices
-        d['list'].required = True
 
         return d
 

src/pretix/static/pretixcontrol/js/ui/checkinrules/constants.ts

@@ -191,3 +191,8 @@ export const DATETIME_OPTIONS = {
 		close: 'fa fa-remove'
 	}
 }
+
+export const TIME_OPTIONS = {
+	...DATETIME_OPTIONS,
+	format: document.body.dataset.timeformat,
+}

src/pretix/static/pretixcontrol/js/ui/checkinrules/timefield.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, watch, onMounted, onUnmounted } from 'vue'
-import { DATETIME_OPTIONS } from './constants'
+import { TIME_OPTIONS } from './constants'
 
 const props = defineProps<{
 	required?: boolean
@@ -20,7 +20,7 @@ watch(() => props.value, (val) => {
 onMounted(() => {
 	$(input.value)
 		.datetimepicker({
-			...DATETIME_OPTIONS,
+			...TIME_OPTIONS,
 			showClear: props.required,
 		})
 		.trigger('change')

src/pretix/static/pretixcontrol/js/ui/checkinrules/viz-node.vue

@@ -180,7 +180,7 @@ g
 				br
 				span(v-if="varresult !== null") {{ varresult }}
 				strong
-					| {{ op.label }} {{ rightoperand }}
+					| {{ op?.label}} {{ rightoperand }}
 			span(v-else-if="vardata && vardata.type === 'int_by_datetime'")
 				span.fa.fa-sign-in(v-if="variable.startsWith('entries_')")
 				| {{ vardata.label }}
@@ -193,21 +193,21 @@ g
 				br
 				span(v-if="varresult !== null") {{ varresult }}
 				strong
-					| {{ op.label }} {{ rightoperand }}
+					| {{ op?.label }} {{ rightoperand }}
 			span(v-else-if="vardata && variable === 'now'")
 				span.fa.fa-clock-o
 				|  {{ vardata.label }}
 				br
 				span(v-if="varresult !== null") {{ varresult }}
 				strong
-					| {{ op.label }}
+					| {{ op?.label }}
 					br
-					span(v-if="rightoperand.buildTime[0] === 'custom'")
-						| {{ df(rightoperand.buildTime[1]) }}
-					span(v-else-if="rightoperand.buildTime[0] === 'customtime'")
-						| {{ tf(rightoperand.buildTime[1]) }}
+					span(v-if="rightoperand?.buildTime[0] === 'custom'")
+						| {{ df(rightoperand?.buildTime[1]) }}
+					span(v-else-if="rightoperand?.buildTime[0] === 'customtime'")
+						| {{ tf(rightoperand?.buildTime[1]) }}
 					span(v-else)
-						| {{ TEXTS[rightoperand.buildTime[0]] }}
+						| {{ TEXTS[rightoperand?.buildTime[0]] }}
 					span(v-if="operands[2]")
 						span(v-if="operator === 'isBefore'") +
 						span(v-else) -
@@ -220,14 +220,14 @@ g
 				span(v-if="varresult !== null")  ({{ varresult }})
 				br
 				strong
-					| {{ rightoperand.objectList.map((o: any) => o.lookup[2]).join(", ") }}
+					| {{ rightoperand?.objectList.map((o: any) => o.lookup[2]).join(", ") }}
 			span(v-else-if="vardata && vardata.type === 'enum_entry_status'")
 				span.fa.fa-check-circle-o
 				| {{ vardata.label }}
 				span(v-if="varresult !== null")  ({{ varresult }})
 				br
 				strong
-					| {{ op.label }} {{ rightoperand }}
+					| {{ op?.label }} {{ rightoperand }}
 
 	g(v-if="result === false", :transform="`translate(${x + boxWidth - 15}, ${y - 10})`")
 		ellipse(fill="#fff", cx="14.685823", cy="14.318233", rx="12.140151", ry="11.55523")

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

@@ -93,11 +93,11 @@ const showTaxline = computed(() => props.price.rate !== '0.00' && props.price.gr
 	span(v-if="!freePrice && !originalPrice", v-html="priceline")
 	span(v-if="!freePrice && originalPrice")
 		del.pretix-widget-pricebox-original-price(:aria-label="originalPriceAriaLabel", v-html="originalLine")
-		|
+		|!{' '}
 		ins.pretix-widget-pricebox-new-price(:aria-label="newPriceAriaLabel", v-html="priceline")
 	div(v-if="freePrice")
 		span.pretix-widget-pricebox-currency(:id="priceBoxId") {{ store.currency }}
-		|
+		|!{' '}
 		input.pretix-widget-pricebox-price-input(
 			type="number",
 			placeholder="0",

src/tests/api/conftest.py

@@ -212,4 +212,17 @@ def membership_type(organizer):
     return organizer.membership_types.create(name='foo')
 
 
+@pytest.fixture
+def clist(event, item):
+    c = event.checkin_lists.create(name="Default", all_products=False)
+    c.limit_products.add(item)
+    return c
+
+
+@pytest.fixture
+def clist_all(event, item):
+    c = event.checkin_lists.create(name="Default", all_products=True)
+    return c
+
+
 utils.setup_databases = scopes_disabled()(utils.setup_databases)

src/tests/api/test_checkin.py

@@ -252,19 +252,6 @@ TEST_HISTORY_RES = {
 }
 
 
-@pytest.fixture
-def clist(event, item):
-    c = event.checkin_lists.create(name="Default", all_products=False)
-    c.limit_products.add(item)
-    return c
-
-
-@pytest.fixture
-def clist_all(event, item):
-    c = event.checkin_lists.create(name="Default", all_products=True)
-    return c
-
-
 @pytest.mark.django_db
 def test_list_list(token_client, organizer, event, clist, item, subevent, django_assert_num_queries):
     res = dict(TEST_LIST_RES)

src/tests/api/test_exporters.py

@@ -1079,3 +1079,18 @@ def test_event_edit_restrictions(client, event, organizer, user, team):
     assert _get_and_patch_event_export(user2_client, s2)
     assert _get_and_patch_event_export(team1_client, s2)
     assert _get_and_patch_event_export(user1_client, s2)
+
+
+@pytest.mark.django_db
+def test_event_checkinlist_patch(user_client, organizer, event, user, event_scheduled_export, clist):
+    event_scheduled_export.export_identifier = "checkinlistpdf"
+    event_scheduled_export.save()
+
+    resp = user_client.patch(
+        '/api/v1/organizers/{}/events/{}/scheduled_exports/{}/'.format(organizer.slug, event.slug, event_scheduled_export.id),
+        data={
+            "export_form_data": {"list": clist.pk},
+        },
+        format='json',
+    )
+    assert resp.status_code == 200