Use deserialized data structures for mapping configuration

doc/api/resources/webhooks.rst

@@ -60,9 +60,6 @@ The following values for ``action_types`` are valid with pretix core:
     * ``pretix.event.added``
     * ``pretix.event.changed``
     * ``pretix.event.deleted``
-    * ``pretix.voucher.added``
-    * ``pretix.voucher.changed``
-    * ``pretix.voucher.deleted``
     * ``pretix.subevent.added``
     * ``pretix.subevent.changed``
     * ``pretix.subevent.deleted``

src/pretix/api/webhooks.py

@@ -78,13 +78,6 @@ class WebhookEvent:
         """
         raise NotImplementedError()  # NOQA
 
-    @property
-    def help_text(self) -> str:
-        """
-        A human-readable description
-        """
-        return ""
-
 
 def get_all_webhook_events():
     global _ALL_EVENTS
@@ -104,10 +97,9 @@ def get_all_webhook_events():
 
 
 class ParametrizedWebhookEvent(WebhookEvent):
-    def __init__(self, action_type, verbose_name, help_text=""):
+    def __init__(self, action_type, verbose_name):
         self._action_type = action_type
         self._verbose_name = verbose_name
-        self._help_text = help_text
         super().__init__()
 
     @property
@@ -118,10 +110,6 @@ class ParametrizedWebhookEvent(WebhookEvent):
     def verbose_name(self):
         return self._verbose_name
 
-    @property
-    def help_text(self):
-        return self._help_text
-
 
 class ParametrizedOrderWebhookEvent(ParametrizedWebhookEvent):
     def build_payload(self, logentry: LogEntry):
@@ -173,19 +161,6 @@ class ParametrizedEventWebhookEvent(ParametrizedWebhookEvent):
         }
 
 
-class ParametrizedVoucherWebhookEvent(ParametrizedWebhookEvent):
-
-    def build_payload(self, logentry: LogEntry):
-        # do not use content_object, this is also called in deletion
-        return {
-            'notification_id': logentry.pk,
-            'organizer': logentry.event.organizer.slug,
-            'event': logentry.event.slug,
-            'voucher': logentry.object_id,
-            'action': logentry.action_type,
-        }
-
-
 class ParametrizedSubEventWebhookEvent(ParametrizedWebhookEvent):
 
     def build_payload(self, logentry: LogEntry):
@@ -371,9 +346,8 @@ def register_default_webhook_events(sender, **kwargs):
         ),
         ParametrizedItemWebhookEvent(
             'pretix.event.item.*',
-            _('Product changed'),
-            _('This includes product added or deleted and changes to nested objects like '
-              'variations or bundles.'),
+            _('Product changed (including product added or deleted and including changes to nested objects like '
+              'variations or bundles)'),
         ),
         ParametrizedEventWebhookEvent(
             'pretix.event.live.activated',
@@ -407,19 +381,6 @@ def register_default_webhook_events(sender, **kwargs):
             'pretix.event.orders.waitinglist.voucher_assigned',
             _('Waiting list entry received voucher'),
         ),
-        ParametrizedVoucherWebhookEvent(
-            'pretix.voucher.added',
-            _('Voucher added'),
-        ),
-        ParametrizedVoucherWebhookEvent(
-            'pretix.voucher.changed',
-            _('Voucher changed'),
-            _('Only includes explicit changes to the voucher, not e.g. an increase of the number of redemptions.')
-        ),
-        ParametrizedVoucherWebhookEvent(
-            'pretix.voucher.deleted',
-            _('Voucher deleted'),
-        ),
         ParametrizedCustomerWebhookEvent(
             'pretix.customer.created',
             _('Customer account created'),

src/pretix/base/datasync/sourcefields.py

@@ -93,15 +93,6 @@ def split_name_on_last_space(name, part):
     return name_parts[part] if len(name_parts) > part else ""
 
 
-def normalize_email(email):
-    if email:
-        local, host = email.split("@")
-        host = host.encode("idna").decode()
-        return f"{local}@{host}"
-    else:
-        return None
-
-
 ORDER_POSITION = 'position'
 ORDER = 'order'
 EVENT = 'event'
@@ -182,10 +173,8 @@ def get_data_fields(event, for_model=None):
                 _("Attendee email"),
                 Question.TYPE_STRING,
                 None,
-                lambda position: normalize_email(
-                    position.attendee_email
-                    or (position.addon_to.attendee_email if position.addon_to else None)
-                ),
+                lambda position: position.attendee_email
+                or (position.addon_to.attendee_email if position.addon_to else None),
             ),
             DataFieldInfo(
                 ORDER_POSITION,
@@ -193,11 +182,9 @@ def get_data_fields(event, for_model=None):
                 _("Attendee or order email"),
                 Question.TYPE_STRING,
                 None,
-                lambda position: normalize_email(
-                    position.attendee_email
-                    or (position.addon_to.attendee_email if position.addon_to else None)
-                    or position.order.email
-                ),
+                lambda position: position.attendee_email
+                or (position.addon_to.attendee_email if position.addon_to else None)
+                or position.order.email,
             ),
             DataFieldInfo(
                 ORDER_POSITION,
@@ -314,7 +301,7 @@ def get_data_fields(event, for_model=None):
                 _("Order email"),
                 Question.TYPE_STRING,
                 None,
-                lambda order: normalize_email(order.email),
+                lambda order: order.email,
             ),
             DataFieldInfo(
                 ORDER,

src/pretix/base/models/waitinglist.py

@@ -207,19 +207,16 @@ class WaitingListEntry(LoggedModel):
                 block_quota=True,
                 subevent=self.subevent,
             )
-            v.log_action('pretix.voucher.added', {
+            v.log_action('pretix.voucher.added.waitinglist', {
                 'item': self.item.pk,
                 'variation': self.variation.pk if self.variation else None,
                 'tag': 'waiting-list',
                 'block_quota': True,
                 'valid_until': v.valid_until.isoformat(),
                 'max_usages': 1,
-                'subevent': self.subevent.pk if self.subevent else None,
-                'source': 'waitinglist',
-            }, user=user, auth=auth)
-            v.log_action('pretix.voucher.added.waitinglist', {
                 'email': self.email,
                 'waitinglistentry': self.pk,
+                'subevent': self.subevent.pk if self.subevent else None,
             }, user=user, auth=auth)
             self.voucher = v
             self.save()

src/pretix/base/services/datasync.py

@@ -76,9 +76,7 @@ def sync_all():
 
             if not target_cls:
                 # sync plugin not found (plugin deactivated or uninstalled) -> drop outstanding jobs
-                num_deleted, _ = OrderSyncQueue.objects.filter(pk__in=[sq.pk for sq in queued_orders]).delete()
-                logger.info("Deleted %d queue entries from %r because plugin %s inactive", num_deleted, event, target)
-                continue
+                OrderSyncQueue.objects.filter(pk__in=[sq.pk for sq in queued_orders]).delete()
 
             with scope(organizer=event.organizer):
                 with target_cls(event=event) as p:

src/pretix/control/forms/organizer.py

@@ -43,7 +43,7 @@ from django.forms import formset_factory, inlineformset_factory
 from django.forms.utils import ErrorDict
 from django.urls import reverse
 from django.utils.crypto import get_random_string
-from django.utils.html import conditional_escape, format_html
+from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes.forms import SafeModelChoiceField
@@ -695,9 +695,7 @@ class WebHookForm(forms.ModelForm):
         self.fields['events'].choices = [
             (
                 a.action_type,
-                format_html('{} – <code>{}</code><br><span class="text-muted">{}</span>', a.verbose_name, a.action_type, a.help_text)
-                if a.help_text else
-                format_html('{} – <code>{}</code>', a.verbose_name, a.action_type)
+                mark_safe('{} – <code>{}</code>'.format(a.verbose_name, a.action_type))
             ) for a in get_all_webhook_events().values()
         ]
         if self.instance and self.instance.pk:

src/pretix/control/logdisplay.py

@@ -563,11 +563,11 @@ class CoreOrderLogEntryType(OrderLogEntryType):
 @log_entry_types.new_from_dict({
     'pretix.voucher.added': _('The voucher has been created.'),
     'pretix.voucher.sent': _('The voucher has been sent to {recipient}.'),
+    'pretix.voucher.added.waitinglist': _('The voucher has been created and sent to a person on the waiting list.'),
     'pretix.voucher.expired.waitinglist': _(
         'The voucher has been set to expire because the recipient removed themselves from the waiting list.'),
     'pretix.voucher.changed': _('The voucher has been changed.'),
     'pretix.voucher.deleted': _('The voucher has been deleted.'),
-    'pretix.voucher.added.waitinglist': _('The voucher has been sent to {email} through the waiting list.'),
 })
 class CoreVoucherLogEntryType(VoucherLogEntryType):
     pass

src/pretix/control/views/vouchers.py

@@ -380,7 +380,7 @@ class VoucherCreate(EventPermissionRequiredMixin, CreateView):
         messages.success(self.request, mark_safe(_('The new voucher has been created: {code}').format(
             code=format_html('<a href="{url}">{code}</a>', url=url, code=self.object.code)
         )))
-        form.instance.log_action('pretix.voucher.added', data={**dict(form.cleaned_data), "source": "control"}, user=self.request.user)
+        form.instance.log_action('pretix.voucher.added', data=dict(form.cleaned_data), user=self.request.user)
         return ret
 
     @transaction.atomic
@@ -475,7 +475,7 @@ class VoucherBulkCreate(EventPermissionRequiredMixin, AsyncFormView):
                 data['bulk'] = True
                 del data['codes']
                 log_entries.append(
-                    v.log_action('pretix.voucher.added', data={**data, "source": "control_bulk"}, user=self.request.user, save=False)
+                    v.log_action('pretix.voucher.added', data=data, user=self.request.user, save=False)
                 )
             LogEntry.bulk_create_and_postprocess(log_entries)
             form.post_bulk_save(batch_vouchers)

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

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-08-05 07:29+0000\n"
-"PO-Revision-Date: 2025-08-06 09:46+0000\n"
+"PO-Revision-Date: 2025-08-05 07:57+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix/de/"
 ">\n"
@@ -6163,7 +6163,7 @@ msgstr "Wert"
 
 #: pretix/base/models/orders.py:2546
 msgid "Order position"
-msgstr "Bestellposition"
+msgstr "Bestelltes Produkt"
 
 #: pretix/base/models/orders.py:3091
 msgid "Cart ID (e.g. session key)"

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

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-08-05 07:29+0000\n"
-"PO-Revision-Date: 2025-08-06 09:46+0000\n"
+"PO-Revision-Date: 2025-08-05 07:58+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German (informal) <https://translate.pretix.eu/projects/"
 "pretix/pretix/de_Informal/>\n"
@@ -6159,7 +6159,7 @@ msgstr "Wert"
 
 #: pretix/base/models/orders.py:2546
 msgid "Order position"
-msgstr "Bestellposition"
+msgstr "Bestelltes Produkt"
 
 #: pretix/base/models/orders.py:3091
 msgid "Cart ID (e.g. session key)"

src/tests/base/test_datasync.py

@@ -61,7 +61,7 @@ def event():
         option2 = question2.options.create(identifier="F2", answer="vegan")
 
         o1 = Order.objects.create(
-            code='1AAA', event=event, email='anonymous@🌈.example.org',
+            code='1AAA', event=event, email='anonymous@example.org',
             status=Order.STATUS_PENDING, locale='en',
             datetime=now(), expires=now() + timedelta(days=10),
             total=46,
@@ -100,7 +100,7 @@ def expected_order_sync_result():
             {
                 '_id': 0,
                 'ordernumber': 'DUMMY-1AAA',
-                'orderemail': 'anonymous@xn--og8h.example.org',
+                'orderemail': 'anonymous@example.org',
                 'status': 'pending',
                 'total': '46.00',
                 'payment_date': None,
@@ -158,7 +158,7 @@ def expected_sync_result_with_associations():
             {
                 '_id': 0,
                 'ordernumber': 'DUMMY-1AAA',
-                'orderemail': 'anonymous@xn--og8h.example.org',
+                'orderemail': 'anonymous@example.org',
                 'firstname': '',
                 'lastname': '',
                 'status': 'pending',

src/tests/base/test_shredders.py

@@ -140,7 +140,7 @@ def test_waitinglist_shredder(event, item):
     )
     wle.send_voucher()
     assert '@' in wle.voucher.comment
-    assert '@' in wle.voucher.all_logentries().get(action_type="pretix.voucher.added.waitinglist").data
+    assert '@' in wle.voucher.all_logentries().last().data
     s = WaitingListShredder(event)
     f = list(s.generate_files())
     assert json.loads(f[0][2]) == [
@@ -166,7 +166,7 @@ def test_waitinglist_shredder(event, item):
     assert '@' not in wle.email
     assert '+49' not in str(wle.phone)
     assert '@' not in wle.voucher.comment
-    assert '@' not in wle.voucher.all_logentries().get(action_type="pretix.voucher.added.waitinglist").data
+    assert '@' not in wle.voucher.all_logentries().last().data
 
 
 @pytest.mark.django_db