deprecation notice for logentry_display and logentry_object_link

# Conflicts:
#	src/pretix/control/logdisplay.py

doc/development/api/plugins.rst

@@ -121,6 +121,7 @@ This will automatically make pretix discover this plugin as soon as it is instal
 through ``pip``. During development, you can just run ``python setup.py develop`` inside
 your plugin source directory to make it discoverable.
 
+.. _`Signals`:
 Signals
 -------
 
@@ -153,6 +154,28 @@ in the ``installed`` method:
 Note that ``installed`` will *not* be called if the plugin is indirectly activated for an event
 because the event is created with settings copied from another event.
 
+.. _`Registries`:
+Registries
+----------
+
+Many signals in pretix are used so that plugins can "register" a class, e.g. a payment provider or a
+ticket renderer.
+
+However, for some of them (types of :ref:`Log Entries <logging>`) we use a different method to keep track of them:
+In a ``Registry``, classes are collected at application startup, along with a unique key (in case
+of LogEntryType, the action_type) as well as which plugin registered them.
+
+To register a class, you can use one of several decorator provided by the Registry object:
+
+.. code-block:: python
+
+   @log_entry_types.new('my_pretix_plugin.some.action', _('Some action in My Pretix Plugin occured.'))
+   class MyPretixPluginLogEntryType(EventLogEntryType):
+       pass
+
+All files in which classes are registered need to be imported in the ``AppConfig.ready`` as explained
+in `Signals`_ above.
+
 Views
 -----
 

doc/development/implementation/logging.rst

@@ -20,7 +20,8 @@ To actually log an action, you can just call the ``log_action`` method on your o
 
 .. code-block:: python
 
-   order.log_action('pretix.event.order.canceled', user=user, data={})
+   order.log_action('pretix.event.order.comment', user=user,
+                    data={"new_comment": "Hello, world."})
 
 The positional ``action`` argument should represent the type of action and should be globally unique, we
 recommend to prefix it with your package name, e.g. ``paypal.payment.rejected``. The ``user`` argument is
@@ -72,24 +73,87 @@ following ready-to-include template::
    {% include "pretixcontrol/includes/logs.html" with obj=order %}
 
 We now need a way to translate the action codes like ``pretix.event.changed`` into human-readable
-strings. The :py:attr:`pretix.base.signals.logentry_display` signals allows you to do so. A simple
+strings. The :py:attr:`pretix.base.logentrytypes.log_entry_types` :ref:`Registry <Registries>` allows you to do so. A simple
 implementation could look like:
 
 .. code-block:: python
 
     from django.utils.translation import gettext as _
-    from pretix.base.signals import logentry_display
+    from pretix.base.logentrytypes import log_entry_types
 
-    @receiver(signal=logentry_display)
-    def pretixcontrol_logentry_display(sender, logentry, **kwargs):
-        plains = {
-            'pretix.event.order.paid': _('The order has been marked as paid.'),
-            'pretix.event.order.refunded': _('The order has been refunded.'),
-            'pretix.event.order.canceled': _('The order has been canceled.'),
-            ...
-        }
-        if logentry.action_type in plains:
-            return plains[logentry.action_type]
+
+    @log_entry_types.new_from_dict({
+        'pretix.event.order.comment': _('The order\'s internal comment has been updated to: {new_comment}'),
+        'pretix.event.order.paid': _('The order has been marked as paid.'),
+        # ...
+    })
+    class CoreOrderLogEntryType(OrderLogEntryType):
+        pass
+
+Please note that you always need to define your own inherited LogEntryType class in your plugin. If you would just
+register an instance of a LogEntryType class defined in pretix core, it is not correctly registered as belonging to
+your plugin, leading to confusing user interface situations.
+
+
+Customizing log entry display
+""""""""""""""""""""""""""""""""""
+
+The base LogEntryType classes allows for varying degree of customization in their descendants.
+
+If you want to add another log message for an existing core object (e.g. an Order, Item or Voucher), you can inherit
+from its predefined LogEntryType, e.g. `OrderLogEntryType` and just specify a new plaintext string. You can use format
+strings to insert information from the LogEntry's `data` object as shown in the section above.
+
+If you defined a new model object in your plugin, you should make sure proper object links in the user interface are
+displayed for it. If your model object belongs logically to a pretix `Event`, you can inherit from `EventLogEntryType`,
+and set the `object_link_*` fields accordingly. `object_link_viewname` refers to a django url name, which needs to
+accept the arguments `organizer` and `event`, containing the respective slugs, and an argument named by `object_link_argname`.
+The latter will contain the ID of the model object, if not customized by overriding `object_link_argvalue`.
+If you want to customize the name displayed for the object (instead of the result of calling `str()` on it),
+overwrite `object_link_display_name`.
+
+.. code-block:: python
+
+    class OrderLogEntryType(EventLogEntryType):
+        object_link_wrapper = _('Order {val}')
+        object_link_viewname = 'control:event.order'
+        object_link_argname = 'code'
+
+        def object_link_argvalue(self, order):
+            return order.code
+
+        def object_link_display_name(self, order):
+            return order.code
+
+To show more sophisticated message strings, e.g. varying the message depending on information from the LogEntry's
+`data` object, overwrite the `display` method:
+
+.. code-block:: python
+
+    @log_entry_types.new()
+    class PaypalEventLogEntryType(EventLogEntryType):
+        action_type = 'pretix.plugins.paypal.event'
+
+        def display(self, logentry):
+            event_type = logentry.parsed_data.get('event_type')
+            text = {
+                'PAYMENT.SALE.COMPLETED': _('Payment completed.'),
+                'PAYMENT.SALE.DENIED': _('Payment denied.'),
+                # ...
+            }.get(event_type, f"({event_type})")
+            return _('PayPal reported an event: {}').format(text)
+
+.. automethod:: pretix.base.logentrytypes.LogEntryType.display
+
+If your new model object does not belong to an `Event`, you need to implement
+
+meow
+
+.. autoclass:: pretix.base.logentrytypes.Registry
+   :members: new
+
+.. autoclass:: pretix.base.logentrytypes.LogEntryTypeRegistry
+   :members: new, new_from_dict
 
 Sending notifications
 ---------------------

pyproject.toml

@@ -44,7 +44,7 @@ dependencies = [
   "django-formtools==2.5.1",
   "django-hierarkey==1.2.*",
   "django-hijack==3.7.*",
-  "django-i18nfield==1.9.*,>=1.9.4",
+  "django-i18nfield==1.9.*,>=1.9.5",
   "django-libsass==0.9",
   "django-localflavor==4.0",
   "django-markup",

src/pretix/_base_settings.py

@@ -75,6 +75,14 @@ FORMAT_MODULE_PATH = [
     'pretix.helpers.formats',
 ]
 
+CORE_MODULES = {
+    "pretix.base",
+    "pretix.presale",
+    "pretix.control",
+    "pretix.plugins.checkinlists",
+    "pretix.plugins.reports",
+}
+
 ALL_LANGUAGES = [
     ('en', _('English')),
     ('de', _('German')),

src/pretix/api/serializers/event.py

@@ -35,7 +35,7 @@
 import logging
 
 from django.conf import settings
-from django.core.exceptions import PermissionDenied, ValidationError
+from django.core.exceptions import PermissionDenied
 from django.db import transaction
 from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
@@ -43,6 +43,7 @@ from django.utils.translation import gettext as _
 from django_countries.serializers import CountryFieldMixin
 from pytz import common_timezones
 from rest_framework import serializers
+from rest_framework.exceptions import ValidationError
 from rest_framework.fields import ChoiceField, Field
 from rest_framework.relations import SlugRelatedField
 

src/pretix/api/serializers/i18n.py

@@ -19,57 +19,8 @@
 # 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/>.
 #
-from django.conf import settings
 from django.core.validators import URLValidator
-from i18nfield.fields import I18nCharField, I18nTextField
-from i18nfield.strings import LazyI18nString
-from rest_framework.exceptions import ValidationError
-from rest_framework.fields import Field
-from rest_framework.serializers import ModelSerializer
-
-
-class I18nField(Field):
-    def __init__(self, **kwargs):
-        self.allow_blank = kwargs.pop('allow_blank', False)
-        self.trim_whitespace = kwargs.pop('trim_whitespace', True)
-        self.max_length = kwargs.pop('max_length', None)
-        self.min_length = kwargs.pop('min_length', None)
-        super().__init__(**kwargs)
-
-    def to_representation(self, value):
-        if hasattr(value, 'data'):
-            if isinstance(value.data, dict):
-                return value.data
-            elif value.data is None:
-                return None
-            else:
-                return {
-                    settings.LANGUAGE_CODE: str(value.data)
-                }
-        elif value is None:
-            return None
-        else:
-            return {
-                settings.LANGUAGE_CODE: str(value)
-            }
-
-    def to_internal_value(self, data):
-        if isinstance(data, str):
-            return LazyI18nString(data)
-        elif isinstance(data, dict):
-            if any([k not in dict(settings.LANGUAGES) for k in data.keys()]):
-                raise ValidationError('Invalid languages included.')
-            return LazyI18nString(data)
-        else:
-            raise ValidationError('Invalid data type.')
-
-
-class I18nAwareModelSerializer(ModelSerializer):
-    pass
-
-
-I18nAwareModelSerializer.serializer_field_mapping[I18nCharField] = I18nField
-I18nAwareModelSerializer.serializer_field_mapping[I18nTextField] = I18nField
+from i18nfield.rest_framework import I18nAwareModelSerializer, I18nField
 
 
 class I18nURLField(I18nField):
@@ -84,3 +35,10 @@ class I18nURLField(I18nField):
         else:
             URLValidator()(value.data)
         return value
+
+
+__all__ = [
+    "I18nAwareModelSerializer",  # for backwards compatibility
+    "I18nField",  # for backwards compatibility
+    "I18nURLField",
+]

src/pretix/base/forms/questions.py

@@ -277,6 +277,10 @@ class NamePartsFormField(forms.MultiValueField):
         return value
 
 
+def name_parts_is_empty(name_parts_dict):
+    return not any(k != "_scheme" and v for k, v in name_parts_dict.items())
+
+
 class WrappedPhonePrefixSelect(Select):
     initial = None
 
@@ -1149,12 +1153,12 @@ class BaseInvoiceAddressForm(forms.ModelForm):
             data['vat_id'] = ''
         if data.get('is_business') and not ask_for_vat_id(data.get('country')):
             data['vat_id'] = ''
-        if self.event.settings.invoice_address_required:
+        if self.address_validation and self.event.settings.invoice_address_required and not self.all_optional:
             if data.get('is_business') and not data.get('company'):
                 raise ValidationError({"company": _('You need to provide a company name.')})
-            if not data.get('is_business') and not data.get('name_parts'):
+            if not data.get('is_business') and name_parts_is_empty(data.get('name_parts', {})):
                 raise ValidationError(_('You need to provide your name.'))
-            if not self.all_optional and 'street' in self.fields and not data.get('street') and not data.get('zipcode') and not data.get('city'):
+            if not data.get('street') and not data.get('zipcode') and not data.get('city'):
                 raise ValidationError({"street": _('This field is required.')})
 
         if 'vat_id' in self.changed_data or not data.get('vat_id'):
@@ -1167,7 +1171,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
 
         if all(
                 not v for k, v in data.items() if k not in ('is_business', 'country', 'name_parts')
-        ) and len(data.get('name_parts', {})) == 1:
+        ) and name_parts_is_empty(data.get('name_parts', {})):
             # Do not save the country if it is the only field set -- we don't know the user even checked it!
             self.cleaned_data['country'] = ''
 

src/pretix/base/logentrytypes.py

@@ -0,0 +1,288 @@
+import json
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io 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/>.
+#
+from collections import defaultdict
+from functools import cached_property
+
+import jsonschema
+from django.urls import reverse
+from django.utils.html import escape
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
+
+from pretix.base.signals import EventPluginRegistry
+
+
+def make_link(a_map, wrapper, is_active=True, event=None, plugin_name=None):
+    if a_map:
+        if is_active:
+            a_map['val'] = '<a href="{href}">{val}</a>'.format_map(a_map)
+        elif event and plugin_name:
+            a_map['val'] = (
+                '<i>{val}</i> <a href="{plugin_href}">'
+                '<span data-toggle="tooltip" title="{errmes}" class="fa fa-warning fa-fw"></span></a>'
+            ).format_map({
+                **a_map,
+                "errmes": _("The relevant plugin is currently not active. To activate it, click here to go to the plugin settings."),
+                "plugin_href": reverse('control:event.settings.plugins', kwargs={
+                    'organizer': event.organizer.slug,
+                    'event': event.slug,
+                }) + '#plugin_' + plugin_name,
+            })
+        else:
+            a_map['val'] = '<i>{val}</i> <span data-toggle="tooltip" title="{errmes}" class="fa fa-warning fa-fw"></span>'.format_map({
+                **a_map,
+                "errmes": _("The relevant plugin is currently not active."),
+            })
+        return wrapper.format_map(a_map)
+
+
+class LogEntryTypeRegistry(EventPluginRegistry):
+    def new_from_dict(self, data):
+        """
+        Register multiple instance of a LogEntryType class with different action_type
+        and plain text strings, as given by the items of the specified data dictionary.
+
+        This method is designed to be used as a decorator as follows:
+
+        .. code-block:: python
+
+            @log_entry_types.new_from_dict({
+                'pretix.event.item.added': _('The product has been created.'),
+                'pretix.event.item.changed': _('The product has been changed.'),
+                # ...
+            })
+            class CoreItemLogEntryType(ItemLogEntryType):
+                # ...
+
+        :param data: action types and descriptions
+                     ``{"some_action_type": "Plain text description", ...}``
+        """
+        def reg(clz):
+            for action_type, plain in data.items():
+                self.register(clz(action_type=action_type, plain=plain))
+            return clz
+        return reg
+
+
+"""
+Registry for LogEntry types.
+
+Each entry in this registry should be an instance of a subclass of ``LogEntryType``.
+They are annotated with their ``action_type`` and the defining ``plugin``.
+"""
+log_entry_types = LogEntryTypeRegistry({'action_type': lambda o: getattr(o, 'action_type')})
+
+
+def prepare_schema(schema):
+    def handle_properties(t):
+        return {"shred_properties": [k for k, v in t["properties"].items() if v["shred"]]}
+
+    def walk_tree(schema):
+        if type(schema) is dict:
+            new_keys = {}
+            for k, v in schema.items():
+                if k == "properties":
+                    new_keys = handle_properties(schema)
+                walk_tree(v)
+            if schema.get("type") == "object" and "additionalProperties" not in new_keys:
+                new_keys["additionalProperties"] = False
+            schema.update(new_keys)
+        elif type(schema) is list:
+            for v in schema:
+                walk_tree(v)
+
+    walk_tree(schema)
+    return schema
+
+
+class LogEntryType:
+    """
+    Base class for a type of LogEntry, identified by its action_type.
+    """
+
+    data_schema = None  # {"type": "object", "properties": []}
+
+    def __init__(self, action_type=None, plain=None):
+        assert self.__module__ != LogEntryType.__module__  # must not instantiate base classes, only derived ones
+        if self.data_schema:
+            print(self.__class__.__name__, "has schema", self._prepared_schema)
+        if action_type:
+            self.action_type = action_type
+        if plain:
+            self.plain = plain
+
+    def display(self, logentry):
+        """
+        Returns the message to be displayed for a given logentry of this type.
+
+        :return: `str` or `LazyI18nString`
+        """
+        if hasattr(self, 'plain'):
+            plain = str(self.plain)
+            if '{' in plain:
+                data = defaultdict(lambda: '?', logentry.parsed_data)
+                return plain.format_map(data)
+            else:
+                return plain
+
+    def get_object_link_info(self, logentry) -> dict:
+        """
+        Return information to generate a link to the content_object of a given logentry.
+
+        Not implemented in the base class, causing the object link to be omitted.
+
+        :return: `dict` with the keys `href` (containing a URL to view/edit the object) and `val` (containing the
+        escaped text for the anchor element)
+        """
+        pass
+
+    def get_object_link(self, logentry):
+        a_map = self.get_object_link_info(logentry)
+        return make_link(a_map, self.object_link_wrapper)
+
+    object_link_wrapper = '{val}'
+
+    def validate_data(self, parsed_data):
+        if not self._prepared_schema:
+            return
+        jsonschema.validate(parsed_data, self._prepared_schema)
+
+    @cached_property
+    def _prepared_schema(self):
+        if self.data_schema:
+            return prepare_schema(self.data_schema)
+
+    def shred_pii(self, logentry):
+        """
+        To be used for shredding personally identified information contained in the data field of a LogEntry of this
+        type.
+        """
+        if self._prepared_schema:
+            def shred_fun(validator, value, instance, schema):
+                for key in value:
+                    instance[key] = "##########"
+
+            v = jsonschema.validators.extend(jsonschema.validators.Draft202012Validator,
+                                             validators={"shred_properties": shred_fun})
+            data = logentry.parsed_data
+            jsonschema.validate(data, self._prepared_schema, v)
+            logentry.data = json.dumps(data)
+        else:
+            raise NotImplementedError
+
+
+class EventLogEntryType(LogEntryType):
+    """
+    Base class for any LogEntry type whose content_object is either an `Event` itself or belongs to a specific `Event`.
+    """
+
+    def get_object_link_info(self, logentry) -> dict:
+        if hasattr(self, 'object_link_viewname') and hasattr(self, 'object_link_argname') and logentry.content_object:
+            return {
+                'href': reverse(self.object_link_viewname, kwargs={
+                    'event': logentry.event.slug,
+                    'organizer': logentry.event.organizer.slug,
+                    self.object_link_argname: self.object_link_argvalue(logentry.content_object),
+                }),
+                'val': escape(self.object_link_display_name(logentry.content_object)),
+            }
+
+    def object_link_argvalue(self, content_object):
+        """Return the identifier used in a link to content_object."""
+        return content_object.id
+
+    def object_link_display_name(self, content_object):
+        """Return the display name to refer to content_object in the user interface."""
+        return str(content_object)
+
+
+class OrderLogEntryType(EventLogEntryType):
+    object_link_wrapper = _('Order {val}')
+    object_link_viewname = 'control:event.order'
+    object_link_argname = 'code'
+
+    def object_link_argvalue(self, order):
+        return order.code
+
+    def object_link_display_name(self, order):
+        return order.code
+
+
+class VoucherLogEntryType(EventLogEntryType):
+    object_link_wrapper = _('Voucher {val}…')
+    object_link_viewname = 'control:event.voucher'
+    object_link_argname = 'voucher'
+
+    def object_link_display_name(self, voucher):
+        return voucher.code[:6]
+
+
+class ItemLogEntryType(EventLogEntryType):
+    object_link_wrapper = _('Product {val}')
+    object_link_viewname = 'control:event.item'
+    object_link_argname = 'item'
+
+
+class SubEventLogEntryType(EventLogEntryType):
+    object_link_wrapper = pgettext_lazy('subevent', 'Date {val}')
+    object_link_viewname = 'control:event.subevent'
+    object_link_argname = 'subevent'
+
+
+class QuotaLogEntryType(EventLogEntryType):
+    object_link_wrapper = _('Quota {val}')
+    object_link_viewname = 'control:event.items.quotas.show'
+    object_link_argname = 'quota'
+
+
+class DiscountLogEntryType(EventLogEntryType):
+    object_link_wrapper = _('Discount {val}')
+    object_link_viewname = 'control:event.items.discounts.edit'
+    object_link_argname = 'discount'
+
+
+class ItemCategoryLogEntryType(EventLogEntryType):
+    object_link_wrapper = _('Category {val}')
+    object_link_viewname = 'control:event.items.categories.edit'
+    object_link_argname = 'category'
+
+
+class QuestionLogEntryType(EventLogEntryType):
+    object_link_wrapper = _('Question {val}')
+    object_link_viewname = 'control:event.items.questions.show'
+    object_link_argname = 'question'
+
+
+class TaxRuleLogEntryType(EventLogEntryType):
+    object_link_wrapper = _('Tax rule {val}')
+    object_link_viewname = 'control:event.settings.tax.edit'
+    object_link_argname = 'rule'
+
+
+class NoOpShredderMixin:
+    def shred_pii(self, logentry):
+        pass
+
+
+class ClearDataShredderMixin:
+    def shred_pii(self, logentry):
+        logentry.data = None

src/pretix/base/management/commands/runperiodic.py

@@ -81,7 +81,7 @@ class Command(BaseCommand):
             try:
                 r = receiver(signal=periodic_task, sender=self)
             except Exception as err:
-                if isinstance(Exception, KeyboardInterrupt):
+                if isinstance(err, KeyboardInterrupt):
                     raise err
                 if settings.SENTRY_ENABLED:
                     from sentry_sdk import capture_exception

src/pretix/base/models/base.py

@@ -31,6 +31,7 @@ from django.urls import reverse
 from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
 
+from pretix.base.logentrytypes import log_entry_types
 from pretix.helpers.json import CustomJSONEncoder
 
 
@@ -124,7 +125,13 @@ class LoggingMixin:
                     if (sensitivekey in k) and v:
                         data[k] = "********"
 
+            type, meta = log_entry_types.get(action_type=action)
+            if not type:
+                raise TypeError("Undefined log entry type '%s'" % action)
+
             logentry.data = json.dumps(data, cls=CustomJSONEncoder, sort_keys=True)
+
+            type.validate_data(json.loads(logentry.data))
         elif data:
             raise TypeError("You should only supply dictionaries as log data.")
         if save:

src/pretix/base/models/log.py

@@ -33,16 +33,15 @@
 # License for the specific language governing permissions and limitations under the License.
 
 import json
+import logging
 
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
-from django.urls import reverse
 from django.utils.functional import cached_property
-from django.utils.html import escape
-from django.utils.translation import gettext_lazy as _, pgettext_lazy
 
-from pretix.base.signals import logentry_object_link
+from pretix.base.logentrytypes import log_entry_types, make_link
+from pretix.base.signals import is_app_active, logentry_object_link
 
 
 class VisibleOnlyManager(models.Manager):
@@ -92,6 +91,10 @@ class LogEntry(models.Model):
         indexes = [models.Index(fields=["datetime", "id"])]
 
     def display(self):
+        log_entry_type, meta = log_entry_types.get(action_type=self.action_type)
+        if log_entry_type:
+            return log_entry_type.display(self)
+
         from ..signals import logentry_display
 
         for receiver, response in logentry_display.send(self.event, logentry=self):
@@ -126,10 +129,18 @@ class LogEntry(models.Model):
     @cached_property
     def display_object(self):
         from . import (
-            Discount, Event, Item, ItemCategory, Order, Question, Quota,
-            SubEvent, TaxRule, Voucher,
+            Discount, Event, Item, Order, Question, Quota, SubEvent, Voucher,
         )
 
+        log_entry_type, meta = log_entry_types.get(action_type=self.action_type)
+        if log_entry_type:
+            link_info = log_entry_type.get_object_link_info(self)
+            if is_app_active(self.event, meta['plugin']):
+                return make_link(link_info, log_entry_type.object_link_wrapper)
+            else:
+                return make_link(link_info, log_entry_type.object_link_wrapper, is_active=False,
+                                 event=self.event, plugin_name=meta['plugin'] and getattr(meta['plugin'], 'name'))
+
         try:
             if self.content_type.model_class() is Event:
                 return ''
@@ -137,110 +148,15 @@ class LogEntry(models.Model):
             co = self.content_object
         except:
             return ''
-        a_map = None
-        a_text = None
 
-        if isinstance(co, Order):
-            a_text = _('Order {val}')
-            a_map = {
-                'href': reverse('control:event.order', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
-                    'code': co.code
-                }),
-                'val': escape(co.code),
-            }
-        elif isinstance(co, Voucher):
-            a_text = _('Voucher {val}…')
-            a_map = {
-                'href': reverse('control:event.voucher', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
-                    'voucher': co.id
-                }),
-                'val': escape(co.code[:6]),
-            }
-        elif isinstance(co, Item):
-            a_text = _('Product {val}')
-            a_map = {
-                'href': reverse('control:event.item', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
-                    'item': co.id
-                }),
-                'val': escape(co.name),
-            }
-        elif isinstance(co, SubEvent):
-            a_text = pgettext_lazy('subevent', 'Date {val}')
-            a_map = {
-                'href': reverse('control:event.subevent', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
-                    'subevent': co.id
-                }),
-                'val': escape(str(co))
-            }
-        elif isinstance(co, Quota):
-            a_text = _('Quota {val}')
-            a_map = {
-                'href': reverse('control:event.items.quotas.show', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
-                    'quota': co.id
-                }),
-                'val': escape(co.name),
-            }
-        elif isinstance(co, Discount):
-            a_text = _('Discount {val}')
-            a_map = {
-                'href': reverse('control:event.items.discounts.edit', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
-                    'discount': co.id
-                }),
-                'val': escape(co.internal_name),
-            }
-        elif isinstance(co, ItemCategory):
-            a_text = _('Category {val}')
-            a_map = {
-                'href': reverse('control:event.items.categories.edit', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
-                    'category': co.id
-                }),
-                'val': escape(co.name),
-            }
-        elif isinstance(co, Question):
-            a_text = _('Question {val}')
-            a_map = {
-                'href': reverse('control:event.items.questions.show', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
-                    'question': co.id
-                }),
-                'val': escape(co.question),
-            }
-        elif isinstance(co, TaxRule):
-            a_text = _('Tax rule {val}')
-            a_map = {
-                'href': reverse('control:event.settings.tax.edit', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
-                    'rule': co.id
-                }),
-                'val': escape(co.name),
-            }
+        for receiver, response in logentry_object_link.send(self.event, logentry=self):
+            if response:
+                return response
 
-        if a_text and a_map:
-            a_map['val'] = '<a href="{href}">{val}</a>'.format_map(a_map)
-            return a_text.format_map(a_map)
-        elif a_text:
-            return a_text
-        else:
-            for receiver, response in logentry_object_link.send(self.event, logentry=self):
-                if response:
-                    return response
-            return ''
+        if isinstance(co, (Order, Voucher, Item, SubEvent, Quota, Discount, Question)):
+            logging.warning("LogEntryType missing or ill-defined: %s", self.action_type)
+
+        return ''
 
     @cached_property
     def parsed_data(self):

src/pretix/base/payment.py

@@ -1419,50 +1419,51 @@ class GiftCardPayment(BasePaymentProvider):
     def payment_refund_supported(self, payment: OrderPayment) -> bool:
         return True
 
-    def checkout_prepare(self, request: HttpRequest, cart: Dict[str, Any]) -> Union[bool, str, None]:
-        from pretix.base.services.cart import add_payment_to_cart
+    def _add_giftcard_to_cart(self, cs, gc):
+        from pretix.base.services.cart import add_payment_to_cart_session
 
+        if gc.currency != self.event.currency:
+            raise ValidationError(_("This gift card does not support this currency."))
+        if gc.testmode and not self.event.testmode:
+            raise ValidationError(_("This gift card can only be used in test mode."))
+        if not gc.testmode and self.event.testmode:
+            raise ValidationError(_("Only test gift cards can be used in test mode."))
+        if gc.expires and gc.expires < time_machine_now():
+            raise ValidationError(_("This gift card is no longer valid."))
+        if gc.value <= Decimal("0.00"):
+            raise ValidationError(_("All credit on this gift card has been used."))
+
+        for p in cs.get('payments', []):
+            if p['provider'] == self.identifier and p['info_data']['gift_card'] == gc.pk:
+                raise ValidationError(_("This gift card is already used for your payment."))
+
+        add_payment_to_cart_session(
+            cs,
+            self,
+            max_value=gc.value,
+            info_data={
+                'gift_card': gc.pk,
+                'gift_card_secret': gc.secret,
+            }
+        )
+
+    def checkout_prepare(self, request: HttpRequest, cart: Dict[str, Any]) -> Union[bool, str, None]:
         for p in get_cart(request):
             if p.item.issue_giftcard:
                 messages.error(request, _("You cannot pay with gift cards when buying a gift card."))
                 return
 
-        cs = cart_session(request)
         try:
             gc = self.event.organizer.accepted_gift_cards.get(
                 secret=request.POST.get("giftcard").strip()
             )
-            if gc.currency != self.event.currency:
-                messages.error(request, _("This gift card does not support this currency."))
+            cs = cart_session(request)
+            try:
+                self._add_giftcard_to_cart(cs, gc)
+                return True
+            except ValidationError as e:
+                messages.error(request, str(e.message))
                 return
-            if gc.testmode and not self.event.testmode:
-                messages.error(request, _("This gift card can only be used in test mode."))
-                return
-            if not gc.testmode and self.event.testmode:
-                messages.error(request, _("Only test gift cards can be used in test mode."))
-                return
-            if gc.expires and gc.expires < time_machine_now():
-                messages.error(request, _("This gift card is no longer valid."))
-                return
-            if gc.value <= Decimal("0.00"):
-                messages.error(request, _("All credit on this gift card has been used."))
-                return
-
-            for p in cs.get('payments', []):
-                if p['provider'] == self.identifier and p['info_data']['gift_card'] == gc.pk:
-                    messages.error(request, _("This gift card is already used for your payment."))
-                    return
-
-            add_payment_to_cart(
-                request,
-                self,
-                max_value=gc.value,
-                info_data={
-                    'gift_card': gc.pk,
-                    'gift_card_secret': gc.secret,
-                }
-            )
-            return True
         except GiftCard.DoesNotExist:
             if self.event.vouchers.filter(code__iexact=request.POST.get("giftcard")).exists():
                 messages.warning(request, _("You entered a voucher instead of a gift card. Vouchers can only be entered on the first page of the shop below "

src/pretix/base/services/cart.py

@@ -1426,6 +1426,28 @@ class CartManager:
             raise CartError(err)
 
 
+def add_payment_to_cart_session(cart_session, provider, min_value: Decimal=None, max_value: Decimal=None, info_data: dict=None):
+    """
+    :param cart_session: The current cart session.
+    :param provider: The instance of your payment provider.
+    :param min_value: The minimum value this payment instrument supports, or ``None`` for unlimited.
+    :param max_value: The maximum value this payment instrument supports, or ``None`` for unlimited. Highly discouraged
+                      to use for payment providers which charge a payment fee, as this can be very user-unfriendly if
+                      users need a second payment method just for the payment fee of the first method.
+    :param info_data: A dictionary of information that will be passed through to the ``OrderPayment.info_data`` attribute.
+    :return:
+    """
+    cart_session.setdefault('payments', [])
+    cart_session['payments'].append({
+        'id': str(uuid.uuid4()),
+        'provider': provider.identifier,
+        'multi_use_supported': provider.multi_use_supported,
+        'min_value': str(min_value) if min_value is not None else None,
+        'max_value': str(max_value) if max_value is not None else None,
+        'info_data': info_data or {},
+    })
+
+
 def add_payment_to_cart(request, provider, min_value: Decimal=None, max_value: Decimal=None, info_data: dict=None):
     """
     :param request: The current HTTP request context.
@@ -1440,16 +1462,7 @@ def add_payment_to_cart(request, provider, min_value: Decimal=None, max_value: D
     from pretix.presale.views.cart import cart_session
 
     cs = cart_session(request)
-    cs.setdefault('payments', [])
-
-    cs['payments'].append({
-        'id': str(uuid.uuid4()),
-        'provider': provider.identifier,
-        'multi_use_supported': provider.multi_use_supported,
-        'min_value': str(min_value) if min_value is not None else None,
-        'max_value': str(max_value) if max_value is not None else None,
-        'info_data': info_data or {},
-    })
+    add_payment_to_cart_session(cs, provider, min_value, max_value, info_data)
 
 
 def get_fees(event, request, total, invoice_address, payments, positions):

src/pretix/base/settings.py

@@ -56,6 +56,7 @@ from django.utils.translation import (
 from django_countries.fields import Country
 from hierarkey.models import GlobalSettingsBase, Hierarkey
 from i18nfield.forms import I18nFormField, I18nTextarea, I18nTextInput
+from i18nfield.rest_framework import I18nField
 from i18nfield.strings import LazyI18nString
 from phonenumbers import PhoneNumber, parse
 from rest_framework import serializers
@@ -63,7 +64,7 @@ from rest_framework import serializers
 from pretix.api.serializers.fields import (
     ListMultipleChoiceField, UploadedFileField,
 )
-from pretix.api.serializers.i18n import I18nField, I18nURLField
+from pretix.api.serializers.i18n import I18nURLField
 from pretix.base.forms import I18nMarkdownTextarea, I18nURLFormField
 from pretix.base.models.tax import VAT_ID_COUNTRIES, TaxRule
 from pretix.base.reldate import (

src/pretix/base/signals.py

@@ -33,14 +33,15 @@
 # License for the specific language governing permissions and limitations under the License.
 
 import warnings
-from typing import Any, Callable, List, Tuple
+from typing import TYPE_CHECKING, Any, Callable, List, Tuple
 
 import django.dispatch
 from django.apps import apps
 from django.conf import settings
 from django.dispatch.dispatcher import NO_RECEIVERS
 
-from .models import Event
+if TYPE_CHECKING:
+    from .models import Event
 
 app_cache = {}
 
@@ -52,6 +53,50 @@ def _populate_app_cache():
         app_cache[ac.name] = ac
 
 
+def get_defining_app(o):
+    # If sentry packed this in a wrapper, unpack that
+    if "sentry" in o.__module__:
+        o = o.__wrapped__
+
+    # Find the Django application this belongs to
+    searchpath = o.__module__
+
+    # Core modules are always active
+    if any(searchpath.startswith(cm) for cm in settings.CORE_MODULES):
+        return 'CORE'
+
+    if not app_cache:
+        _populate_app_cache()
+
+    while True:
+        app = app_cache.get(searchpath)
+        if "." not in searchpath or app:
+            break
+        searchpath, _ = searchpath.rsplit(".", 1)
+    return app
+
+
+def is_app_active(sender, app):
+    if app == 'CORE':
+        return True
+
+    excluded = settings.PRETIX_PLUGINS_EXCLUDE
+    if sender and app and app.name in sender.get_plugins() and app.name not in excluded:
+        if not hasattr(app, 'compatibility_errors') or not app.compatibility_errors:
+            return True
+    return False
+
+
+def is_receiver_active(sender, receiver):
+    if sender is None:
+        # Send to all events!
+        return True
+
+    app = get_defining_app(receiver)
+
+    return is_app_active(sender, app)
+
+
 class EventPluginSignal(django.dispatch.Signal):
     """
     This is an extension to Django's built-in signals which differs in a way that it sends
@@ -59,40 +104,14 @@ class EventPluginSignal(django.dispatch.Signal):
     Event.
     """
 
-    def _is_active(self, sender, receiver):
-        if sender is None:
-            # Send to all events!
-            return True
-
-        # If sentry packed this in a wrapper, unpack that
-        if "sentry" in receiver.__module__:
-            receiver = receiver.__wrapped__
-
-        # Find the Django application this belongs to
-        searchpath = receiver.__module__
-        core_module = any([searchpath.startswith(cm) for cm in settings.CORE_MODULES])
-        app = None
-        if not core_module:
-            while True:
-                app = app_cache.get(searchpath)
-                if "." not in searchpath or app:
-                    break
-                searchpath, _ = searchpath.rsplit(".", 1)
-
-        # Only fire receivers from active plugins and core modules
-        excluded = settings.PRETIX_PLUGINS_EXCLUDE
-        if core_module or (sender and app and app.name in sender.get_plugins() and app.name not in excluded):
-            if not hasattr(app, 'compatibility_errors') or not app.compatibility_errors:
-                return True
-        return False
-
-    def send(self, sender: Event, **named) -> List[Tuple[Callable, Any]]:
+    def send(self, sender: "Event", **named) -> List[Tuple[Callable, Any]]:
         """
         Send signal from sender to all connected receivers that belong to
         plugins enabled for the given Event.
 
         sender is required to be an instance of ``pretix.base.models.Event``.
         """
+        from .models import Event
         if sender and not isinstance(sender, Event):
             raise ValueError("Sender needs to be an event.")
 
@@ -104,12 +123,12 @@ class EventPluginSignal(django.dispatch.Signal):
             _populate_app_cache()
 
         for receiver in self._sorted_receivers(sender):
-            if self._is_active(sender, receiver):
+            if is_receiver_active(sender, receiver):
                 response = receiver(signal=self, sender=sender, **named)
                 responses.append((receiver, response))
         return responses
 
-    def send_chained(self, sender: Event, chain_kwarg_name, **named) -> List[Tuple[Callable, Any]]:
+    def send_chained(self, sender: "Event", chain_kwarg_name, **named) -> List[Tuple[Callable, Any]]:
         """
         Send signal from sender to all connected receivers. The return value of the first receiver
         will be used as the keyword argument specified by ``chain_kwarg_name`` in the input to the
@@ -117,6 +136,7 @@ class EventPluginSignal(django.dispatch.Signal):
 
         sender is required to be an instance of ``pretix.base.models.Event``.
         """
+        from .models import Event
         if sender and not isinstance(sender, Event):
             raise ValueError("Sender needs to be an event.")
 
@@ -128,12 +148,12 @@ class EventPluginSignal(django.dispatch.Signal):
             _populate_app_cache()
 
         for receiver in self._sorted_receivers(sender):
-            if self._is_active(sender, receiver):
+            if is_receiver_active(sender, receiver):
                 named[chain_kwarg_name] = response
                 response = receiver(signal=self, sender=sender, **named)
         return response
 
-    def send_robust(self, sender: Event, **named) -> List[Tuple[Callable, Any]]:
+    def send_robust(self, sender: "Event", **named) -> List[Tuple[Callable, Any]]:
         """
         Send signal from sender to all connected receivers. If a receiver raises an exception
         instead of returning a value, the exception is included as the result instead of
@@ -141,6 +161,7 @@ class EventPluginSignal(django.dispatch.Signal):
 
         sender is required to be an instance of ``pretix.base.models.Event``.
         """
+        from .models import Event
         if sender and not isinstance(sender, Event):
             raise ValueError("Sender needs to be an event.")
 
@@ -155,7 +176,7 @@ class EventPluginSignal(django.dispatch.Signal):
             _populate_app_cache()
 
         for receiver in self._sorted_receivers(sender):
-            if self._is_active(sender, receiver):
+            if is_receiver_active(sender, receiver):
                 try:
                     response = receiver(signal=self, sender=sender, **named)
                 except Exception as err:
@@ -178,7 +199,7 @@ class EventPluginSignal(django.dispatch.Signal):
 
 
 class GlobalSignal(django.dispatch.Signal):
-    def send_chained(self, sender: Event, chain_kwarg_name, **named) -> List[Tuple[Callable, Any]]:
+    def send_chained(self, sender: "Event", chain_kwarg_name, **named) -> List[Tuple[Callable, Any]]:
         """
         Send signal from sender to all connected receivers. The return value of the first receiver
         will be used as the keyword argument specified by ``chain_kwarg_name`` in the input to the
@@ -202,6 +223,115 @@ class DeprecatedSignal(django.dispatch.Signal):
         super().connect(receiver, sender=None, weak=True, dispatch_uid=None)
 
 
+class Registry:
+    """
+    A Registry is a collection of objects (entries), annotated with metadata. Entries can be searched and filtered by
+    metadata keys, and metadata is returned as part of the result.
+
+    Entry metadata is generated during registration using to the accessor functions given to the Registry
+    constructor.
+
+    Example:
+
+    .. code-block:: python
+
+        animal_sound_registry = Registry({"animal": lambda s: s.animal})
+
+        @animal_sound_registry.new("dog", "woof")
+        @animal_sound_registry.new("cricket", "chirp")
+        class AnimalSound:
+            def __init__(self, animal, sound):
+                self.animal = animal
+                self.sound = sound
+
+            def make_sound(self):
+                return self.sound
+
+        @animal_sound_registry.new()
+        class CatSound(AnimalSound):
+            def __init__(self):
+                super().__init__(animal="cat", sound=["meow", "meww", "miaou"])
+
+            def make_sound(self):
+                return random.choice(self.sound)
+    """
+
+    def __init__(self, keys):
+        """
+        :param keys: dictionary {key: accessor_function}
+                     When a new entry is registered, all accessor functions are called with the new entry as parameter.
+                     Their return value is stored as the metadata value for that key.
+        """
+        self.registered_entries = list()
+        self.keys = keys
+        self.by_key = {key: {} for key in self.keys.keys()}
+
+    def register(self, *objs):
+        """
+        Register one or more entries in this registry.
+
+        Usable as a regular method or as decorator on a class or function. If used on a class, the class type object
+        itself is registered, not an instance of the class. To register an instance, use the ``new`` method.
+
+        .. code-block:: python
+
+            @some_registry.register
+            def my_new_entry(foo):
+              # ...
+        """
+        for obj in objs:
+            meta = {k: accessor(obj) for k, accessor in self.keys.items()}
+            tup = (obj, meta)
+            for key, value in meta.items():
+                self.by_key[key][value] = tup
+            self.registered_entries.append(tup)
+
+    def new(self, *args, **kwargs):
+        """
+        Instantiate the decorated class with the given *args and **kwargs, and register the instance in this registry.
+        May be used multiple times.
+
+        .. code-block:: python
+
+            @animal_sound_registry.new("meow")
+            @animal_sound_registry.new("woof")
+            class AnimalSound:
+              def __init__(self, sound):
+                # ...
+        """
+        def reg(clz):
+            obj = clz(*args, **kwargs)
+            self.register(obj)
+            return clz
+        return reg
+
+    def get(self, **kwargs):
+        (key, value), = kwargs.items()
+        return self.by_key.get(key).get(value, (None, None))
+
+    def filter(self, **kwargs):
+        return ((entry, meta)
+                for entry, meta in self.registered_entries
+                if all(value == meta[key] for key, value in kwargs.items())
+                )
+
+
+class EventPluginRegistry(Registry):
+    """
+    A Registry which automatically annotates entries with a "plugin" key, specifying which plugin
+    the entry is defined in. This allows the consumer of entries to determine whether an entry is
+    enabled for a given event, or filter only for entries defined by enabled plugins.
+
+    .. code-block:: python
+
+        logtype, meta = my_registry.find(action_type="foo.bar.baz")
+        # meta["plugin"] contains the django app name of the defining plugin
+    """
+
+    def __init__(self, keys):
+        super().__init__({"plugin": lambda o: get_defining_app(o), **keys})
+
+
 event_live_issues = EventPluginSignal()
 """
 This signal is sent out to determine whether an event can be taken live. If you want to
@@ -507,41 +637,16 @@ logentry_display = EventPluginSignal()
 """
 Arguments: ``logentry``
 
-To display an instance of the ``LogEntry`` model to a human user,
-``pretix.base.signals.logentry_display`` will be sent out with a ``logentry`` argument.
-
-The first received response that is not ``None`` will be used to display the log entry
-to the user. The receivers are expected to return plain text.
-
-As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
+**DEPRECTATION:** Please do not use this signal for new LogEntry types. Use the log_entry_types
+registry instead, as described in https://docs.pretix.eu/en/latest/development/implementation/logging.html
 """
 
 logentry_object_link = EventPluginSignal()
 """
 Arguments: ``logentry``
 
-To display the relationship of an instance of the ``LogEntry`` model to another model
-to a human user, ``pretix.base.signals.logentry_object_link`` will be sent out with a
-``logentry`` argument.
-
-The first received response that is not ``None`` will be used to display the related object
-to the user. The receivers are expected to return a HTML link. The internal implementation
-builds the links like this::
-
-    a_text = _('Tax rule {val}')
-    a_map = {
-        'href': reverse('control:event.settings.tax.edit', kwargs={
-            'event': sender.slug,
-            'organizer': sender.organizer.slug,
-            'rule': logentry.content_object.id
-        }),
-        'val': escape(logentry.content_object.name),
-    }
-    a_map['val'] = '<a href="{href}">{val}</a>'.format_map(a_map)
-    return a_text.format_map(a_map)
-
-Make sure that any user content in the HTML code you return is properly escaped!
-As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
+**DEPRECTATION:** Please do not use this signal for new LogEntry types. Use the log_entry_types
+registry instead, as described in https://docs.pretix.eu/en/latest/development/implementation/logging.html
 """
 
 requiredaction_display = EventPluginSignal()

src/pretix/base/templatetags/money.py

@@ -52,12 +52,12 @@ def money_filter(value: Decimal, arg='', hide_currency=False):
         # would make the numbers incorrect. If this branch executes, it's likely a bug in
         # pretix, but we won't show wrong numbers!
         if hide_currency:
-            return floatformat(value, 2)
+            return floatformat(value, "2g")
         else:
-            return '{} {}'.format(arg, floatformat(value, 2))
+            return '{} {}'.format(arg, floatformat(value, "2g"))
 
     if hide_currency:
-        return floatformat(value, places)
+        return floatformat(value, f"{places}g")
 
     locale_parts = translation.get_language().split("-", 1)
     locale = locale_parts[0]
@@ -70,7 +70,7 @@ def money_filter(value: Decimal, arg='', hide_currency=False):
     try:
         return format_currency(value, arg, locale=locale)
     except:
-        return '{} {}'.format(arg, floatformat(value, places))
+        return '{} {}'.format(arg, floatformat(value, f"{places}g"))
 
 
 @register.filter("money_numberfield")

src/pretix/control/logdisplay.py

@@ -47,12 +47,20 @@ from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from i18nfield.strings import LazyI18nString
 
+from pretix.base.logentrytypes import (
+    DiscountLogEntryType, EventLogEntryType, ItemCategoryLogEntryType,
+    ItemLogEntryType, LogEntryType, OrderLogEntryType, QuestionLogEntryType,
+    QuotaLogEntryType, TaxRuleLogEntryType, VoucherLogEntryType,
+    log_entry_types,
+)
 from pretix.base.models import (
     Checkin, CheckinList, Event, ItemVariation, LogEntry, OrderPosition,
     TaxRule,
 )
 from pretix.base.models.orders import PrintLog
-from pretix.base.signals import logentry_display, orderposition_blocked_display
+from pretix.base.signals import (
+    app_cache, logentry_display, orderposition_blocked_display,
+)
 from pretix.base.templatetags.money import money_filter
 
 OVERVIEW_BANLIST = [
@@ -329,278 +337,6 @@ def _display_checkin(event, logentry):
 
 @receiver(signal=logentry_display, dispatch_uid="pretixcontrol_logentry_display")
 def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
-    plains = {
-        'pretix.object.cloned': _('This object has been created by cloning.'),
-        'pretix.organizer.changed': _('The organizer has been changed.'),
-        'pretix.organizer.settings': _('The organizer settings have been changed.'),
-        'pretix.organizer.footerlinks.changed': _('The footer links have been changed.'),
-        'pretix.organizer.export.schedule.added': _('A scheduled export has been added.'),
-        'pretix.organizer.export.schedule.changed': _('A scheduled export has been changed.'),
-        'pretix.organizer.export.schedule.deleted': _('A scheduled export has been deleted.'),
-        'pretix.organizer.export.schedule.executed': _('A scheduled export has been executed.'),
-        'pretix.organizer.export.schedule.failed': _('A scheduled export has failed: {reason}.'),
-        'pretix.giftcards.acceptance.added': _('Gift card acceptance for another organizer has been added.'),
-        'pretix.giftcards.acceptance.removed': _('Gift card acceptance for another organizer has been removed.'),
-        'pretix.giftcards.acceptance.acceptor.invited': _('A new gift card acceptor has been invited.'),
-        'pretix.giftcards.acceptance.acceptor.removed': _('A gift card acceptor has been removed.'),
-        'pretix.giftcards.acceptance.issuer.removed': _('A gift card issuer has been removed or declined.'),
-        'pretix.giftcards.acceptance.issuer.accepted': _('A new gift card issuer has been accepted.'),
-        'pretix.webhook.created': _('The webhook has been created.'),
-        'pretix.webhook.changed': _('The webhook has been changed.'),
-        'pretix.webhook.retries.expedited': _('The webhook call retry jobs have been manually expedited.'),
-        'pretix.webhook.retries.dropped': _('The webhook call retry jobs have been dropped.'),
-        'pretix.ssoprovider.created': _('The SSO provider has been created.'),
-        'pretix.ssoprovider.changed': _('The SSO provider has been changed.'),
-        'pretix.ssoprovider.deleted': _('The SSO provider has been deleted.'),
-        'pretix.ssoclient.created': _('The SSO client has been created.'),
-        'pretix.ssoclient.changed': _('The SSO client has been changed.'),
-        'pretix.ssoclient.deleted': _('The SSO client has been deleted.'),
-        'pretix.membershiptype.created': _('The membership type has been created.'),
-        'pretix.membershiptype.changed': _('The membership type has been changed.'),
-        'pretix.membershiptype.deleted': _('The membership type has been deleted.'),
-        'pretix.saleschannel.created': _('The sales channel has been created.'),
-        'pretix.saleschannel.changed': _('The sales channel has been changed.'),
-        'pretix.saleschannel.deleted': _('The sales channel has been deleted.'),
-        'pretix.customer.created': _('The account has been created.'),
-        'pretix.customer.changed': _('The account has been changed.'),
-        'pretix.customer.membership.created': _('A membership for this account has been added.'),
-        'pretix.customer.membership.changed': _('A membership of this account has been changed.'),
-        'pretix.customer.membership.deleted': _('A membership of this account has been deleted.'),
-        'pretix.customer.anonymized': _('The account has been disabled and anonymized.'),
-        'pretix.customer.password.resetrequested': _('A new password has been requested.'),
-        'pretix.customer.password.set': _('A new password has been set.'),
-        'pretix.reusable_medium.created': _('The reusable medium has been created.'),
-        'pretix.reusable_medium.created.auto': _('The reusable medium has been created automatically.'),
-        'pretix.reusable_medium.changed': _('The reusable medium has been changed.'),
-        'pretix.reusable_medium.linked_orderposition.changed': _('The medium has been connected to a new ticket.'),
-        'pretix.reusable_medium.linked_giftcard.changed': _('The medium has been connected to a new gift card.'),
-        'pretix.email.error': _('Sending of an email has failed.'),
-        'pretix.event.comment': _('The event\'s internal comment has been updated.'),
-        'pretix.event.canceled': _('The event has been canceled.'),
-        'pretix.event.deleted': _('An event has been deleted.'),
-        'pretix.event.shredder.started': _('A removal process for personal data has been started.'),
-        'pretix.event.shredder.completed': _('A removal process for personal data has been completed.'),
-        'pretix.event.order.modified': _('The order details have been changed.'),
-        'pretix.event.order.unpaid': _('The order has been marked as unpaid.'),
-        'pretix.event.order.secret.changed': _('The order\'s secret has been changed.'),
-        'pretix.event.order.expirychanged': _('The order\'s expiry date has been changed.'),
-        'pretix.event.order.valid_if_pending.set': _('The order has been set to be usable before it is paid.'),
-        'pretix.event.order.valid_if_pending.unset': _('The order has been set to require payment before use.'),
-        'pretix.event.order.expired': _('The order has been marked as expired.'),
-        'pretix.event.order.paid': _('The order has been marked as paid.'),
-        'pretix.event.order.cancellationrequest.deleted': _('The cancellation request has been deleted.'),
-        'pretix.event.order.refunded': _('The order has been refunded.'),
-        'pretix.event.order.reactivated': _('The order has been reactivated.'),
-        'pretix.event.order.deleted': _('The test mode order {code} has been deleted.'),
-        'pretix.event.order.placed': _('The order has been created.'),
-        'pretix.event.order.placed.require_approval': _('The order requires approval before it can continue to be processed.'),
-        'pretix.event.order.approved': _('The order has been approved.'),
-        'pretix.event.order.denied': _('The order has been denied (comment: "{comment}").'),
-        'pretix.event.order.contact.changed': _('The email address has been changed from "{old_email}" '
-                                                'to "{new_email}".'),
-        'pretix.event.order.contact.confirmed': _('The email address has been confirmed to be working (the user clicked on a link '
-                                                  'in the email for the first time).'),
-        'pretix.event.order.phone.changed': _('The phone number has been changed from "{old_phone}" '
-                                              'to "{new_phone}".'),
-        'pretix.event.order.customer.changed': _('The customer account has been changed.'),
-        'pretix.event.order.locale.changed': _('The order locale has been changed.'),
-        'pretix.event.order.invoice.generated': _('The invoice has been generated.'),
-        'pretix.event.order.invoice.regenerated': _('The invoice has been regenerated.'),
-        'pretix.event.order.invoice.reissued': _('The invoice has been reissued.'),
-        'pretix.event.order.comment': _('The order\'s internal comment has been updated.'),
-        'pretix.event.order.custom_followup_at': _('The order\'s follow-up date has been updated.'),
-        'pretix.event.order.checkin_attention': _('The order\'s flag to require attention at check-in has been '
-                                                  'toggled.'),
-        'pretix.event.order.checkin_text': _('The order\'s check-in text has been changed.'),
-        'pretix.event.order.pretix.event.order.valid_if_pending': _('The order\'s flag to be considered valid even if '
-                                                                    'unpaid has been toggled.'),
-        'pretix.event.order.payment.changed': _('A new payment {local_id} has been started instead of the previous one.'),
-        'pretix.event.order.email.sent': _('An unidentified type email has been sent.'),
-        'pretix.event.order.email.error': _('Sending of an email has failed.'),
-        'pretix.event.order.email.attachments.skipped': _('The email has been sent without attached tickets since they '
-                                                          'would have been too large to be likely to arrive.'),
-        'pretix.event.order.email.custom_sent': _('A custom email has been sent.'),
-        'pretix.event.order.position.email.custom_sent': _('A custom email has been sent to an attendee.'),
-        'pretix.event.order.email.download_reminder_sent': _('An email has been sent with a reminder that the ticket '
-                                                             'is available for download.'),
-        'pretix.event.order.email.expire_warning_sent': _('An email has been sent with a warning that the order is about '
-                                                          'to expire.'),
-        'pretix.event.order.email.order_canceled': _('An email has been sent to notify the user that the order has been canceled.'),
-        'pretix.event.order.email.event_canceled': _('An email has been sent to notify the user that the event has '
-                                                     'been canceled.'),
-        'pretix.event.order.email.order_changed': _('An email has been sent to notify the user that the order has been changed.'),
-        'pretix.event.order.email.order_free': _('An email has been sent to notify the user that the order has been received.'),
-        'pretix.event.order.email.order_paid': _('An email has been sent to notify the user that payment has been received.'),
-        'pretix.event.order.email.order_denied': _('An email has been sent to notify the user that the order has been denied.'),
-        'pretix.event.order.email.order_approved': _('An email has been sent to notify the user that the order has '
-                                                     'been approved.'),
-        'pretix.event.order.email.order_placed': _('An email has been sent to notify the user that the order has been received and requires payment.'),
-        'pretix.event.order.email.order_placed_require_approval': _('An email has been sent to notify the user that '
-                                                                    'the order has been received and requires '
-                                                                    'approval.'),
-        'pretix.event.order.email.resend': _('An email with a link to the order detail page has been resent to the user.'),
-        'pretix.event.order.email.payment_failed': _('An email has been sent to notify the user that the payment failed.'),
-        'pretix.event.order.payment.confirmed': _('Payment {local_id} has been confirmed.'),
-        'pretix.event.order.payment.canceled': _('Payment {local_id} has been canceled.'),
-        'pretix.event.order.payment.canceled.failed': _('Canceling payment {local_id} has failed.'),
-        'pretix.event.order.payment.started': _('Payment {local_id} has been started.'),
-        'pretix.event.order.payment.failed': _('Payment {local_id} has failed.'),
-        'pretix.event.order.quotaexceeded': _('The order could not be marked as paid: {message}'),
-        'pretix.event.order.overpaid': _('The order has been overpaid.'),
-        'pretix.event.order.refund.created': _('Refund {local_id} has been created.'),
-        'pretix.event.order.refund.created.externally': _('Refund {local_id} has been created by an external entity.'),
-        'pretix.event.order.refund.requested': _('The customer requested you to issue a refund.'),
-        'pretix.event.order.refund.done': _('Refund {local_id} has been completed.'),
-        'pretix.event.order.refund.canceled': _('Refund {local_id} has been canceled.'),
-        'pretix.event.order.refund.failed': _('Refund {local_id} has failed.'),
-        'pretix.event.export.schedule.added': _('A scheduled export has been added.'),
-        'pretix.event.export.schedule.changed': _('A scheduled export has been changed.'),
-        'pretix.event.export.schedule.deleted': _('A scheduled export has been deleted.'),
-        'pretix.event.export.schedule.executed': _('A scheduled export has been executed.'),
-        'pretix.event.export.schedule.failed': _('A scheduled export has failed: {reason}.'),
-        'pretix.control.auth.user.created': _('The user has been created.'),
-        'pretix.control.auth.user.new_source': _('A first login using {agent_type} on {os_type} from {country} has '
-                                                 'been detected.'),
-        'pretix.user.settings.2fa.enabled': _('Two-factor authentication has been enabled.'),
-        'pretix.user.settings.2fa.disabled': _('Two-factor authentication has been disabled.'),
-        'pretix.user.settings.2fa.regenemergency': _('Your two-factor emergency codes have been regenerated.'),
-        'pretix.user.settings.2fa.emergency': _('A two-factor emergency code has been generated.'),
-        'pretix.user.settings.2fa.device.added': _('A new two-factor authentication device "{name}" has been added to '
-                                                   'your account.'),
-        'pretix.user.settings.2fa.device.deleted': _('The two-factor authentication device "{name}" has been removed '
-                                                     'from your account.'),
-        'pretix.user.settings.notifications.enabled': _('Notifications have been enabled.'),
-        'pretix.user.settings.notifications.disabled': _('Notifications have been disabled.'),
-        'pretix.user.settings.notifications.changed': _('Your notification settings have been changed.'),
-        'pretix.user.anonymized': _('This user has been anonymized.'),
-        'pretix.user.oauth.authorized': _('The application "{application_name}" has been authorized to access your '
-                                          'account.'),
-        'pretix.control.auth.user.forgot_password.mail_sent': _('Password reset mail sent.'),
-        'pretix.control.auth.user.forgot_password.recovered': _('The password has been reset.'),
-        'pretix.control.auth.user.forgot_password.denied.repeated': _('A repeated password reset has been denied, as '
-                                                                      'the last request was less than 24 hours ago.'),
-        'pretix.organizer.deleted': _('The organizer "{name}" has been deleted.'),
-        '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.redeemed': _('The voucher has been redeemed in order {order_code}.'),
-        'pretix.event.item.added': _('The product has been created.'),
-        'pretix.event.item.changed': _('The product has been changed.'),
-        'pretix.event.item.reordered': _('The product has been reordered.'),
-        'pretix.event.item.deleted': _('The product has been deleted.'),
-        'pretix.event.item.variation.added': _('The variation "{value}" has been created.'),
-        'pretix.event.item.variation.deleted': _('The variation "{value}" has been deleted.'),
-        'pretix.event.item.variation.changed': _('The variation "{value}" has been changed.'),
-        'pretix.event.item.addons.added': _('An add-on has been added to this product.'),
-        'pretix.event.item.addons.removed': _('An add-on has been removed from this product.'),
-        'pretix.event.item.addons.changed': _('An add-on has been changed on this product.'),
-        'pretix.event.item.bundles.added': _('A bundled item has been added to this product.'),
-        'pretix.event.item.bundles.removed': _('A bundled item has been removed from this product.'),
-        'pretix.event.item.bundles.changed': _('A bundled item has been changed on this product.'),
-        'pretix.event.item_meta_property.added': _('A meta property has been added to this event.'),
-        'pretix.event.item_meta_property.deleted': _('A meta property has been removed from this event.'),
-        'pretix.event.item_meta_property.changed': _('A meta property has been changed on this event.'),
-        'pretix.event.quota.added': _('The quota has been added.'),
-        'pretix.event.quota.deleted': _('The quota has been deleted.'),
-        'pretix.event.quota.changed': _('The quota has been changed.'),
-        'pretix.event.quota.closed': _('The quota has closed.'),
-        'pretix.event.quota.opened': _('The quota has been re-opened.'),
-        'pretix.event.category.added': _('The category has been added.'),
-        'pretix.event.category.deleted': _('The category has been deleted.'),
-        'pretix.event.category.changed': _('The category has been changed.'),
-        'pretix.event.category.reordered': _('The category has been reordered.'),
-        'pretix.event.question.added': _('The question has been added.'),
-        'pretix.event.question.deleted': _('The question has been deleted.'),
-        'pretix.event.question.changed': _('The question has been changed.'),
-        'pretix.event.question.reordered': _('The question has been reordered.'),
-        'pretix.event.discount.added': _('The discount has been added.'),
-        'pretix.event.discount.deleted': _('The discount has been deleted.'),
-        'pretix.event.discount.changed': _('The discount has been changed.'),
-        'pretix.event.taxrule.added': _('The tax rule has been added.'),
-        'pretix.event.taxrule.deleted': _('The tax rule has been deleted.'),
-        'pretix.event.taxrule.changed': _('The tax rule has been changed.'),
-        'pretix.event.checkinlist.added': _('The check-in list has been added.'),
-        'pretix.event.checkinlist.deleted': _('The check-in list has been deleted.'),
-        'pretix.event.checkinlists.deleted': _('The check-in list has been deleted.'),  # backwards compatibility
-        'pretix.event.checkinlist.changed': _('The check-in list has been changed.'),
-        'pretix.event.settings': _('The event settings have been changed.'),
-        'pretix.event.tickets.settings': _('The ticket download settings have been changed.'),
-        'pretix.event.plugins.enabled': _('A plugin has been enabled.'),
-        'pretix.event.plugins.disabled': _('A plugin has been disabled.'),
-        'pretix.event.live.activated': _('The shop has been taken live.'),
-        'pretix.event.live.deactivated': _('The shop has been taken offline.'),
-        'pretix.event.testmode.activated': _('The shop has been taken into test mode.'),
-        'pretix.event.testmode.deactivated': _('The test mode has been disabled.'),
-        'pretix.event.added': _('The event has been created.'),
-        'pretix.event.changed': _('The event details have been changed.'),
-        'pretix.event.footerlinks.changed': _('The footer links have been changed.'),
-        '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.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.'),
-        'pretix.event.permissions.deleted': _('A user has been removed from the event team.'),
-        'pretix.waitinglist.voucher': _('A voucher has been sent to a person on the waiting list.'),  # legacy
-        'pretix.event.orders.waitinglist.voucher_assigned': _('A voucher has been sent to a person on the waiting list.'),
-        'pretix.event.orders.waitinglist.deleted': _('An entry has been removed from the waiting list.'),
-        'pretix.event.order.waitinglist.transferred': _('An entry has been transferred to another waiting list.'),  # legacy
-        'pretix.event.orders.waitinglist.changed': _('An entry has been changed on the waiting list.'),
-        'pretix.event.orders.waitinglist.added': _('An entry has been added to the waiting list.'),
-        'pretix.team.created': _('The team has been created.'),
-        'pretix.team.changed': _('The team settings have been changed.'),
-        'pretix.team.deleted': _('The team has been deleted.'),
-        'pretix.gate.created': _('The gate has been created.'),
-        'pretix.gate.changed': _('The gate has been changed.'),
-        'pretix.gate.deleted': _('The gate has been deleted.'),
-        'pretix.subevent.deleted': pgettext_lazy('subevent', 'The event date has been deleted.'),
-        'pretix.subevent.canceled': pgettext_lazy('subevent', 'The event date has been canceled.'),
-        'pretix.subevent.changed': pgettext_lazy('subevent', 'The event date has been changed.'),
-        'pretix.subevent.added': pgettext_lazy('subevent', 'The event date has been created.'),
-        'pretix.subevent.quota.added': pgettext_lazy('subevent', 'A quota has been added to the event date.'),
-        'pretix.subevent.quota.changed': pgettext_lazy('subevent', 'A quota has been changed on the event date.'),
-        'pretix.subevent.quota.deleted': pgettext_lazy('subevent', 'A quota has been removed from the event date.'),
-        'pretix.device.created': _('The device has been created.'),
-        'pretix.device.changed': _('The device has been changed.'),
-        'pretix.device.revoked': _('Access of the device has been revoked.'),
-        'pretix.device.initialized': _('The device has been initialized.'),
-        'pretix.device.keyroll': _('The access token of the device has been regenerated.'),
-        'pretix.device.updated': _('The device has notified the server of an hardware or software update.'),
-        'pretix.giftcards.created': _('The gift card has been created.'),
-        'pretix.giftcards.modified': _('The gift card has been changed.'),
-        'pretix.giftcards.transaction.manual': _('A manual transaction has been performed.'),
-    }
-
-    data = json.loads(logentry.data)
-
-    if logentry.action_type.startswith('pretix.event.item.variation'):
-        if 'value' not in data:
-            # Backwards compatibility
-            var = ItemVariation.objects.filter(id=data['id']).first()
-            if var:
-                data['value'] = str(var.value)
-            else:
-                data['value'] = '?'
-        else:
-            data['value'] = LazyI18nString(data['value'])
-
-    if logentry.action_type == "pretix.voucher.redeemed":
-        data = defaultdict(lambda: '?', data)
-        url = reverse('control:event.order', kwargs={
-            'event': logentry.event.slug,
-            'organizer': logentry.event.organizer.slug,
-            'code': data['order_code']
-        })
-        return mark_safe(plains[logentry.action_type].format(
-            order_code='<a href="{}">{}</a>'.format(url, data['order_code']),
-        ))
-
-    if logentry.action_type in plains:
-        data = defaultdict(lambda: '?', data)
-        return plains[logentry.action_type].format_map(data)
 
     if logentry.action_type.startswith('pretix.event.order.changed'):
         return _display_order_changed(sender, logentry)
@@ -624,16 +360,16 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
             return _('The order has been canceled.')
 
     if logentry.action_type in ('pretix.control.views.checkin.reverted', 'pretix.event.checkin.reverted'):
-        if 'list' in data:
+        if 'list' in logentry.parsed_data:
             try:
-                checkin_list = sender.checkin_lists.get(pk=data.get('list')).name
+                checkin_list = sender.checkin_lists.get(pk=logentry.parsed_data.get('list')).name
             except CheckinList.DoesNotExist:
                 checkin_list = _("(unknown)")
         else:
             checkin_list = _("(unknown)")
 
         return _('The check-in of position #{posid} on list "{list}" has been reverted.').format(
-            posid=data.get('positionid'),
+            posid=logentry.parsed_data.get('positionid'),
             list=checkin_list,
         )
 
@@ -642,83 +378,14 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
 
     if logentry.action_type == 'pretix.event.order.print':
         return _('Position #{posid} has been printed at {datetime} with type "{type}".').format(
-            posid=data.get('positionid'),
+            posid=logentry.parsed_data.get('positionid'),
             datetime=date_format(
-                dateutil.parser.parse(data["datetime"]).astimezone(sender.timezone),
+                dateutil.parser.parse(logentry.parsed_data["datetime"]).astimezone(sender.timezone),
                 "SHORT_DATETIME_FORMAT"
             ),
-            type=dict(PrintLog.PRINT_TYPES)[data["type"]],
+            type=dict(PrintLog.PRINT_TYPES)[logentry.parsed_data["type"]],
         )
 
-    if logentry.action_type == 'pretix.control.views.checkin':
-        # deprecated
-        dt = dateutil.parser.parse(data.get('datetime'))
-        tz = sender.timezone
-        dt_formatted = date_format(dt.astimezone(tz), "SHORT_DATETIME_FORMAT")
-        if 'list' in data:
-            try:
-                checkin_list = sender.checkin_lists.get(pk=data.get('list')).name
-            except CheckinList.DoesNotExist:
-                checkin_list = _("(unknown)")
-        else:
-            checkin_list = _("(unknown)")
-
-        if data.get('first'):
-            return _('Position #{posid} has been checked in manually at {datetime} on list "{list}".').format(
-                posid=data.get('positionid'),
-                datetime=dt_formatted,
-                list=checkin_list,
-            )
-        return _('Position #{posid} has been checked in again at {datetime} on list "{list}".').format(
-            posid=data.get('positionid'),
-            datetime=dt_formatted,
-            list=checkin_list
-        )
-
-    if logentry.action_type == 'pretix.team.member.added':
-        return _('{user} has been added to the team.').format(user=data.get('email'))
-
-    if logentry.action_type == 'pretix.team.member.removed':
-        return _('{user} has been removed from the team.').format(user=data.get('email'))
-
-    if logentry.action_type == 'pretix.team.member.joined':
-        return _('{user} has joined the team using the invite sent to {email}.').format(
-            user=data.get('email'), email=data.get('invite_email')
-        )
-
-    if logentry.action_type == 'pretix.team.invite.created':
-        return _('{user} has been invited to the team.').format(user=data.get('email'))
-
-    if logentry.action_type == 'pretix.team.invite.resent':
-        return _('Invite for {user} has been resent.').format(user=data.get('email'))
-
-    if logentry.action_type == 'pretix.team.invite.deleted':
-        return _('The invite for {user} has been revoked.').format(user=data.get('email'))
-
-    if logentry.action_type == 'pretix.team.token.created':
-        return _('The token "{name}" has been created.').format(name=data.get('name'))
-
-    if logentry.action_type == 'pretix.team.token.deleted':
-        return _('The token "{name}" has been revoked.').format(name=data.get('name'))
-
-    if logentry.action_type == 'pretix.user.settings.changed':
-        text = str(_('Your account settings have been changed.'))
-        if 'email' in data:
-            text = text + ' ' + str(_('Your email address has been changed to {email}.').format(email=data['email']))
-        if 'new_pw' in data:
-            text = text + ' ' + str(_('Your password has been changed.'))
-        if data.get('is_active') is True:
-            text = text + ' ' + str(_('Your account has been enabled.'))
-        elif data.get('is_active') is False:
-            text = text + ' ' + str(_('Your account has been disabled.'))
-        return text
-
-    if logentry.action_type == 'pretix.control.auth.user.impersonated':
-        return str(_('You impersonated {}.')).format(data['other_email'])
-
-    if logentry.action_type == 'pretix.control.auth.user.impersonate_stopped':
-        return str(_('You stopped impersonating {}.')).format(data['other_email'])
-
 
 @receiver(signal=orderposition_blocked_display, dispatch_uid="pretixcontrol_orderposition_blocked_display")
 def pretixcontrol_orderposition_blocked_display(sender: Event, orderposition, block_name, **kwargs):
@@ -726,3 +393,479 @@ def pretixcontrol_orderposition_blocked_display(sender: Event, orderposition, bl
         return _('Blocked manually')
     elif block_name.startswith('api:'):
         return _('Blocked because of an API integration')
+
+
+@log_entry_types.new_from_dict({
+    'pretix.event.order.modified': _('The order details have been changed.'),
+    'pretix.event.order.unpaid': _('The order has been marked as unpaid.'),
+    'pretix.event.order.secret.changed': _('The order\'s secret has been changed.'),
+    'pretix.event.order.expirychanged': _('The order\'s expiry date has been changed.'),
+    'pretix.event.order.valid_if_pending.set': _('The order has been set to be usable before it is paid.'),
+    'pretix.event.order.valid_if_pending.unset': _('The order has been set to require payment before use.'),
+    'pretix.event.order.expired': _('The order has been marked as expired.'),
+    'pretix.event.order.cancellationrequest.deleted': _('The cancellation request has been deleted.'),
+    'pretix.event.order.refunded': _('The order has been refunded.'),
+    'pretix.event.order.reactivated': _('The order has been reactivated.'),
+    'pretix.event.order.deleted': _('The test mode order {code} has been deleted.'),
+    'pretix.event.order.placed': _('The order has been created.'),
+    'pretix.event.order.placed.require_approval': _(
+        'The order requires approval before it can continue to be processed.'),
+    'pretix.event.order.approved': _('The order has been approved.'),
+    'pretix.event.order.denied': _('The order has been denied (comment: "{comment}").'),
+    'pretix.event.order.contact.changed': _('The email address has been changed from "{old_email}" '
+                                            'to "{new_email}".'),
+    'pretix.event.order.contact.confirmed': _(
+        'The email address has been confirmed to be working (the user clicked on a link '
+        'in the email for the first time).'),
+    'pretix.event.order.phone.changed': _('The phone number has been changed from "{old_phone}" '
+                                          'to "{new_phone}".'),
+    'pretix.event.order.customer.changed': _('The customer account has been changed.'),
+    'pretix.event.order.locale.changed': _('The order locale has been changed.'),
+    'pretix.event.order.invoice.generated': _('The invoice has been generated.'),
+    'pretix.event.order.invoice.regenerated': _('The invoice has been regenerated.'),
+    'pretix.event.order.invoice.reissued': _('The invoice has been reissued.'),
+    'pretix.event.order.comment': _('The order\'s internal comment has been updated.'),
+    'pretix.event.order.custom_followup_at': _('The order\'s follow-up date has been updated.'),
+    'pretix.event.order.checkin_attention': _('The order\'s flag to require attention at check-in has been '
+                                              'toggled.'),
+    'pretix.event.order.checkin_text': _('The order\'s check-in text has been changed.'),
+    'pretix.event.order.pretix.event.order.valid_if_pending': _('The order\'s flag to be considered valid even if '
+                                                                'unpaid has been toggled.'),
+    'pretix.event.order.payment.changed': _('A new payment {local_id} has been started instead of the previous one.'),
+    'pretix.event.order.email.sent': _('An unidentified type email has been sent.'),
+    'pretix.event.order.email.error': _('Sending of an email has failed.'),
+    'pretix.event.order.email.attachments.skipped': _('The email has been sent without attached tickets since they '
+                                                      'would have been too large to be likely to arrive.'),
+    'pretix.event.order.email.custom_sent': _('A custom email has been sent.'),
+    'pretix.event.order.position.email.custom_sent': _('A custom email has been sent to an attendee.'),
+    'pretix.event.order.email.download_reminder_sent': _('An email has been sent with a reminder that the ticket '
+                                                         'is available for download.'),
+    'pretix.event.order.email.expire_warning_sent': _('An email has been sent with a warning that the order is about '
+                                                      'to expire.'),
+    'pretix.event.order.email.order_canceled': _(
+        'An email has been sent to notify the user that the order has been canceled.'),
+    'pretix.event.order.email.event_canceled': _('An email has been sent to notify the user that the event has '
+                                                 'been canceled.'),
+    'pretix.event.order.email.order_changed': _(
+        'An email has been sent to notify the user that the order has been changed.'),
+    'pretix.event.order.email.order_free': _(
+        'An email has been sent to notify the user that the order has been received.'),
+    'pretix.event.order.email.order_paid': _(
+        'An email has been sent to notify the user that payment has been received.'),
+    'pretix.event.order.email.order_denied': _(
+        'An email has been sent to notify the user that the order has been denied.'),
+    'pretix.event.order.email.order_approved': _('An email has been sent to notify the user that the order has '
+                                                 'been approved.'),
+    'pretix.event.order.email.order_placed': _(
+        'An email has been sent to notify the user that the order has been received and requires payment.'),
+    'pretix.event.order.email.order_placed_require_approval': _('An email has been sent to notify the user that '
+                                                                'the order has been received and requires '
+                                                                'approval.'),
+    'pretix.event.order.email.resend': _('An email with a link to the order detail page has been resent to the user.'),
+    'pretix.event.order.email.payment_failed': _('An email has been sent to notify the user that the payment failed.'),
+})
+class CoreOrderLogEntryType(OrderLogEntryType):
+    pass
+
+
+@log_entry_types.new()
+class OrderPaidLogEntryType(CoreOrderLogEntryType):
+    action_type = 'pretix.event.order.paid'
+    plain = _('The order has been marked as paid.')
+    data_schema = {
+        "type": "object",
+        "properties": {
+            "provider": {"type": "string", "shred": False, },
+            "info": {"type": ["null", "string", "object"], "shred": True, },
+            "date": {"type": "string", "shred": False, },
+            "force": {"type": "boolean", "shred": False, },
+        },
+    }
+
+
+@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.'),
+})
+class CoreVoucherLogEntryType(VoucherLogEntryType):
+    pass
+
+
+@log_entry_types.new()
+class VoucherRedeemedLogEntryType(VoucherLogEntryType):
+    action_type = 'pretix.voucher.redeemed'
+    plain = _('The voucher has been redeemed in order {order_code}.')
+    data_schema = {
+        "type": "object",
+        "properties": {
+            "order_code": {"type": "string", "shred": False, },
+        },
+    }
+
+    def display(self, logentry):
+        data = json.loads(logentry.data)
+        data = defaultdict(lambda: '?', data)
+        url = reverse('control:event.order', kwargs={
+            'event': logentry.event.slug,
+            'organizer': logentry.event.organizer.slug,
+            'code': data['order_code']
+        })
+        return mark_safe(self.plain.format(
+            order_code='<a href="{}">{}</a>'.format(url, data['order_code']),
+        ))
+
+
+@log_entry_types.new_from_dict({
+    'pretix.event.category.added': _('The category has been added.'),
+    'pretix.event.category.deleted': _('The category has been deleted.'),
+    'pretix.event.category.changed': _('The category has been changed.'),
+    'pretix.event.category.reordered': _('The category has been reordered.'),
+})
+class CoreItemCategoryLogEntryType(ItemCategoryLogEntryType):
+    pass
+
+
+@log_entry_types.new_from_dict({
+    'pretix.event.taxrule.added': _('The tax rule has been added.'),
+    'pretix.event.taxrule.deleted': _('The tax rule has been deleted.'),
+    'pretix.event.taxrule.changed': _('The tax rule has been changed.'),
+})
+class CoreTaxRuleLogEntryType(TaxRuleLogEntryType):
+    pass
+
+
+class TeamMembershipLogEntryType(LogEntryType):
+    def display(self, logentry):
+        return self.plain.format(user=logentry.parsed_data.get('email'))
+
+
+@log_entry_types.new_from_dict({
+    'pretix.team.member.added': _('{user} has been added to the team.'),
+    'pretix.team.member.removed': _('{user} has been removed from the team.'),
+    'pretix.team.invite.created': _('{user} has been invited to the team.'),
+    'pretix.team.invite.resent': _('Invite for {user} has been resent.'),
+})
+class CoreTeamMembershipLogEntryType(TeamMembershipLogEntryType):
+    pass
+
+
+@log_entry_types.new()
+class TeamMemberJoinedLogEntryType(LogEntryType):
+    action_type = 'pretix.team.member.joined'
+
+    def display(self, logentry):
+        return _('{user} has joined the team using the invite sent to {email}.').format(
+            user=logentry.parsed_data.get('email'), email=logentry.parsed_data.get('invite_email')
+        )
+
+
+@log_entry_types.new()
+class UserSettingsChangedLogEntryType(LogEntryType):
+    action_type = 'pretix.user.settings.changed'
+
+    def display(self, logentry):
+        text = str(_('Your account settings have been changed.'))
+        if 'email' in logentry.parsed_data:
+            text = text + ' ' + str(
+                _('Your email address has been changed to {email}.').format(email=logentry.parsed_data['email']))
+        if 'new_pw' in logentry.parsed_data:
+            text = text + ' ' + str(_('Your password has been changed.'))
+        if logentry.parsed_data.get('is_active') is True:
+            text = text + ' ' + str(_('Your account has been enabled.'))
+        elif logentry.parsed_data.get('is_active') is False:
+            text = text + ' ' + str(_('Your account has been disabled.'))
+        return text
+
+
+class UserImpersonatedLogEntryType(LogEntryType):
+    def display(self, logentry):
+        return self.plain.format(logentry.parsed_data['other_email'])
+
+
+@log_entry_types.new_from_dict({
+    'pretix.control.auth.user.impersonated': _('You impersonated {}.'),
+    'pretix.control.auth.user.impersonate_stopped': _('You stopped impersonating {}.'),
+})
+class CoreUserImpersonatedLogEntryType(UserImpersonatedLogEntryType):
+    pass
+
+
+@log_entry_types.new_from_dict({
+    'pretix.object.cloned': _('This object has been created by cloning.'),
+    'pretix.organizer.changed': _('The organizer has been changed.'),
+    'pretix.organizer.settings': _('The organizer settings have been changed.'),
+    'pretix.organizer.footerlinks.changed': _('The footer links have been changed.'),
+    'pretix.organizer.export.schedule.added': _('A scheduled export has been added.'),
+    'pretix.organizer.export.schedule.changed': _('A scheduled export has been changed.'),
+    'pretix.organizer.export.schedule.deleted': _('A scheduled export has been deleted.'),
+    'pretix.organizer.export.schedule.executed': _('A scheduled export has been executed.'),
+    'pretix.organizer.export.schedule.failed': _('A scheduled export has failed: {reason}.'),
+    'pretix.giftcards.acceptance.added': _('Gift card acceptance for another organizer has been added.'),
+    'pretix.giftcards.acceptance.removed': _('Gift card acceptance for another organizer has been removed.'),
+    'pretix.giftcards.acceptance.acceptor.invited': _('A new gift card acceptor has been invited.'),
+    'pretix.giftcards.acceptance.acceptor.removed': _('A gift card acceptor has been removed.'),
+    'pretix.giftcards.acceptance.issuer.removed': _('A gift card issuer has been removed or declined.'),
+    'pretix.giftcards.acceptance.issuer.accepted': _('A new gift card issuer has been accepted.'),
+    'pretix.webhook.created': _('The webhook has been created.'),
+    'pretix.webhook.changed': _('The webhook has been changed.'),
+    'pretix.webhook.retries.expedited': _('The webhook call retry jobs have been manually expedited.'),
+    'pretix.webhook.retries.dropped': _('The webhook call retry jobs have been dropped.'),
+    'pretix.ssoprovider.created': _('The SSO provider has been created.'),
+    'pretix.ssoprovider.changed': _('The SSO provider has been changed.'),
+    'pretix.ssoprovider.deleted': _('The SSO provider has been deleted.'),
+    'pretix.ssoclient.created': _('The SSO client has been created.'),
+    'pretix.ssoclient.changed': _('The SSO client has been changed.'),
+    'pretix.ssoclient.deleted': _('The SSO client has been deleted.'),
+    'pretix.membershiptype.created': _('The membership type has been created.'),
+    'pretix.membershiptype.changed': _('The membership type has been changed.'),
+    'pretix.membershiptype.deleted': _('The membership type has been deleted.'),
+    'pretix.saleschannel.created': _('The sales channel has been created.'),
+    'pretix.saleschannel.changed': _('The sales channel has been changed.'),
+    'pretix.saleschannel.deleted': _('The sales channel has been deleted.'),
+    'pretix.customer.created': _('The account has been created.'),
+    'pretix.customer.changed': _('The account has been changed.'),
+    'pretix.customer.membership.created': _('A membership for this account has been added.'),
+    'pretix.customer.membership.changed': _('A membership of this account has been changed.'),
+    'pretix.customer.membership.deleted': _('A membership of this account has been deleted.'),
+    'pretix.customer.anonymized': _('The account has been disabled and anonymized.'),
+    'pretix.customer.password.resetrequested': _('A new password has been requested.'),
+    'pretix.customer.password.set': _('A new password has been set.'),
+    'pretix.reusable_medium.created': _('The reusable medium has been created.'),
+    'pretix.reusable_medium.created.auto': _('The reusable medium has been created automatically.'),
+    'pretix.reusable_medium.changed': _('The reusable medium has been changed.'),
+    'pretix.reusable_medium.linked_orderposition.changed': _('The medium has been connected to a new ticket.'),
+    'pretix.reusable_medium.linked_giftcard.changed': _('The medium has been connected to a new gift card.'),
+    'pretix.email.error': _('Sending of an email has failed.'),
+    'pretix.event.comment': _('The event\'s internal comment has been updated.'),
+    'pretix.event.canceled': _('The event has been canceled.'),
+    'pretix.event.deleted': _('An event has been deleted.'),
+    'pretix.event.shredder.started': _('A removal process for personal data has been started.'),
+    'pretix.event.shredder.completed': _('A removal process for personal data has been completed.'),
+    'pretix.event.export.schedule.added': _('A scheduled export has been added.'),
+    'pretix.event.export.schedule.changed': _('A scheduled export has been changed.'),
+    'pretix.event.export.schedule.deleted': _('A scheduled export has been deleted.'),
+    'pretix.event.export.schedule.executed': _('A scheduled export has been executed.'),
+    'pretix.event.export.schedule.failed': _('A scheduled export has failed: {reason}.'),
+    'pretix.control.auth.user.created': _('The user has been created.'),
+    'pretix.control.auth.user.new_source': _('A first login using {agent_type} on {os_type} from {country} has '
+                                             'been detected.'),
+    'pretix.user.settings.2fa.enabled': _('Two-factor authentication has been enabled.'),
+    'pretix.user.settings.2fa.disabled': _('Two-factor authentication has been disabled.'),
+    'pretix.user.settings.2fa.regenemergency': _('Your two-factor emergency codes have been regenerated.'),
+    'pretix.user.settings.2fa.emergency': _('A two-factor emergency code has been generated.'),
+    'pretix.user.settings.2fa.device.added': _('A new two-factor authentication device "{name}" has been added to '
+                                               'your account.'),
+    'pretix.user.settings.2fa.device.deleted': _('The two-factor authentication device "{name}" has been removed '
+                                                 'from your account.'),
+    'pretix.user.settings.notifications.enabled': _('Notifications have been enabled.'),
+    'pretix.user.settings.notifications.disabled': _('Notifications have been disabled.'),
+    'pretix.user.settings.notifications.changed': _('Your notification settings have been changed.'),
+    'pretix.user.anonymized': _('This user has been anonymized.'),
+    'pretix.user.oauth.authorized': _('The application "{application_name}" has been authorized to access your '
+                                      'account.'),
+    'pretix.control.auth.user.forgot_password.mail_sent': _('Password reset mail sent.'),
+    'pretix.control.auth.user.forgot_password.recovered': _('The password has been reset.'),
+    'pretix.control.auth.user.forgot_password.denied.repeated': _('A repeated password reset has been denied, as '
+                                                                  'the last request was less than 24 hours ago.'),
+    'pretix.organizer.deleted': _('The organizer "{name}" has been deleted.'),
+    'pretix.waitinglist.voucher': _('A voucher has been sent to a person on the waiting list.'),  # legacy
+    'pretix.event.orders.waitinglist.voucher_assigned': _('A voucher has been sent to a person on the waiting list.'),
+    'pretix.event.orders.waitinglist.deleted': _('An entry has been removed from the waiting list.'),
+    'pretix.event.order.waitinglist.transferred': _('An entry has been transferred to another waiting list.'),  # legacy
+    'pretix.event.orders.waitinglist.changed': _('An entry has been changed on the waiting list.'),
+    'pretix.event.orders.waitinglist.added': _('An entry has been added to the waiting list.'),
+    'pretix.team.created': _('The team has been created.'),
+    'pretix.team.changed': _('The team settings have been changed.'),
+    'pretix.team.deleted': _('The team has been deleted.'),
+    'pretix.gate.created': _('The gate has been created.'),
+    'pretix.gate.changed': _('The gate has been changed.'),
+    'pretix.gate.deleted': _('The gate has been deleted.'),
+    'pretix.subevent.deleted': pgettext_lazy('subevent', 'The event date has been deleted.'),
+    'pretix.subevent.canceled': pgettext_lazy('subevent', 'The event date has been canceled.'),
+    'pretix.subevent.changed': pgettext_lazy('subevent', 'The event date has been changed.'),
+    'pretix.subevent.added': pgettext_lazy('subevent', 'The event date has been created.'),
+    'pretix.subevent.quota.added': pgettext_lazy('subevent', 'A quota has been added to the event date.'),
+    'pretix.subevent.quota.changed': pgettext_lazy('subevent', 'A quota has been changed on the event date.'),
+    'pretix.subevent.quota.deleted': pgettext_lazy('subevent', 'A quota has been removed from the event date.'),
+    'pretix.device.created': _('The device has been created.'),
+    'pretix.device.changed': _('The device has been changed.'),
+    'pretix.device.revoked': _('Access of the device has been revoked.'),
+    'pretix.device.initialized': _('The device has been initialized.'),
+    'pretix.device.keyroll': _('The access token of the device has been regenerated.'),
+    'pretix.device.updated': _('The device has notified the server of an hardware or software update.'),
+    'pretix.giftcards.created': _('The gift card has been created.'),
+    'pretix.giftcards.modified': _('The gift card has been changed.'),
+    'pretix.giftcards.transaction.manual': _('A manual transaction has been performed.'),
+    'pretix.team.token.created': _('The token "{name}" has been created.'),
+    'pretix.team.token.deleted': _('The token "{name}" has been revoked.'),
+})
+class CoreLogEntryType(LogEntryType):
+    pass
+
+
+@log_entry_types.new_from_dict({
+    'pretix.event.item_meta_property.added': _('A meta property has been added to this event.'),
+    'pretix.event.item_meta_property.deleted': _('A meta property has been removed from this event.'),
+    'pretix.event.item_meta_property.changed': _('A meta property has been changed on this event.'),
+    'pretix.event.checkinlist.added': _('The check-in list has been added.'),
+    'pretix.event.checkinlist.deleted': _('The check-in list has been deleted.'),
+    'pretix.event.checkinlists.deleted': _('The check-in list has been deleted.'),  # backwards compatibility
+    'pretix.event.checkinlist.changed': _('The check-in list has been changed.'),
+    'pretix.event.settings': _('The event settings have been changed.'),
+    'pretix.event.tickets.settings': _('The ticket download settings have been changed.'),
+    'pretix.event.live.activated': _('The shop has been taken live.'),
+    'pretix.event.live.deactivated': _('The shop has been taken offline.'),
+    'pretix.event.testmode.activated': _('The shop has been taken into test mode.'),
+    'pretix.event.testmode.deactivated': _('The test mode has been disabled.'),
+    'pretix.event.added': _('The event has been created.'),
+    'pretix.event.changed': _('The event details have been changed.'),
+    'pretix.event.footerlinks.changed': _('The footer links have been changed.'),
+    '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.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.'),
+    'pretix.event.permissions.deleted': _('A user has been removed from the event team.'),
+})
+class CoreEventLogEntryType(EventLogEntryType):
+    pass
+
+
+@log_entry_types.new_from_dict({
+    'pretix.event.plugins.enabled': _('The plugin has been enabled.'),
+    'pretix.event.plugins.disabled': _('The plugin has been disabled.'),
+})
+class EventPluginStateLogEntryType(EventLogEntryType):
+    object_link_wrapper = _('Plugin {val}')
+
+    def get_object_link_info(self, logentry) -> dict:
+        if 'plugin' in logentry.parsed_data:
+            app = app_cache.get(logentry.parsed_data['plugin'])
+            if app and hasattr(app, 'PretixPluginMeta'):
+                return {
+                    'href': reverse('control:event.settings.plugins', kwargs={
+                        'organizer': logentry.event.organizer.slug,
+                        'event': logentry.event.slug,
+                    }) + '#plugin_' + logentry.parsed_data['plugin'],
+                    'val': app.PretixPluginMeta.name
+                }
+
+
+@log_entry_types.new_from_dict({
+    'pretix.event.item.added': _('The product has been created.'),
+    'pretix.event.item.changed': _('The product has been changed.'),
+    'pretix.event.item.reordered': _('The product has been reordered.'),
+    'pretix.event.item.deleted': _('The product has been deleted.'),
+    'pretix.event.item.addons.added': _('An add-on has been added to this product.'),
+    'pretix.event.item.addons.removed': _('An add-on has been removed from this product.'),
+    'pretix.event.item.addons.changed': _('An add-on has been changed on this product.'),
+    'pretix.event.item.bundles.added': _('A bundled item has been added to this product.'),
+    'pretix.event.item.bundles.removed': _('A bundled item has been removed from this product.'),
+    'pretix.event.item.bundles.changed': _('A bundled item has been changed on this product.'),
+})
+class CoreItemLogEntryType(ItemLogEntryType):
+    pass
+
+
+@log_entry_types.new_from_dict({
+    'pretix.event.item.variation.added': _('The variation "{value}" has been created.'),
+    'pretix.event.item.variation.deleted': _('The variation "{value}" has been deleted.'),
+    'pretix.event.item.variation.changed': _('The variation "{value}" has been changed.'),
+})
+class VariationLogEntryType(ItemLogEntryType):
+    def display(self, logentry):
+        if 'value' not in logentry.parsed_data:
+            # Backwards compatibility
+            var = ItemVariation.objects.filter(id=logentry.parsed_data['id']).first()
+            if var:
+                logentry.parsed_data['value'] = str(var.value)
+            else:
+                logentry.parsed_data['value'] = '?'
+        else:
+            logentry.parsed_data['value'] = LazyI18nString(logentry.parsed_data['value'])
+        return super().display(logentry)
+
+
+@log_entry_types.new_from_dict({
+    'pretix.event.order.payment.confirmed': _('Payment {local_id} has been confirmed.'),
+    'pretix.event.order.payment.canceled': _('Payment {local_id} has been canceled.'),
+    'pretix.event.order.payment.canceled.failed': _('Canceling payment {local_id} has failed.'),
+    'pretix.event.order.payment.started': _('Payment {local_id} has been started.'),
+    'pretix.event.order.payment.failed': _('Payment {local_id} has failed.'),
+    'pretix.event.order.quotaexceeded': _('The order could not be marked as paid: {message}'),
+    'pretix.event.order.overpaid': _('The order has been overpaid.'),
+    'pretix.event.order.refund.created': _('Refund {local_id} has been created.'),
+    'pretix.event.order.refund.created.externally': _('Refund {local_id} has been created by an external entity.'),
+    'pretix.event.order.refund.requested': _('The customer requested you to issue a refund.'),
+    'pretix.event.order.refund.done': _('Refund {local_id} has been completed.'),
+    'pretix.event.order.refund.canceled': _('Refund {local_id} has been canceled.'),
+    'pretix.event.order.refund.failed': _('Refund {local_id} has failed.'),
+})
+class CoreOrderPaymentLogEntryType(OrderLogEntryType):
+    pass
+
+
+@log_entry_types.new_from_dict({
+    'pretix.event.quota.added': _('The quota has been added.'),
+    'pretix.event.quota.deleted': _('The quota has been deleted.'),
+    'pretix.event.quota.changed': _('The quota has been changed.'),
+    'pretix.event.quota.closed': _('The quota has closed.'),
+    'pretix.event.quota.opened': _('The quota has been re-opened.'),
+})
+class CoreQuotaLogEntryType(QuotaLogEntryType):
+    pass
+
+
+@log_entry_types.new_from_dict({
+    'pretix.event.question.added': _('The question has been added.'),
+    'pretix.event.question.deleted': _('The question has been deleted.'),
+    'pretix.event.question.changed': _('The question has been changed.'),
+    'pretix.event.question.reordered': _('The question has been reordered.'),
+})
+class CoreQuestionLogEntryType(QuestionLogEntryType):
+    pass
+
+
+@log_entry_types.new_from_dict({
+    'pretix.event.discount.added': _('The discount has been added.'),
+    'pretix.event.discount.deleted': _('The discount has been deleted.'),
+    'pretix.event.discount.changed': _('The discount has been changed.'),
+})
+class CoreDiscountLogEntryType(DiscountLogEntryType):
+    pass
+
+
+@log_entry_types.new()
+class LegacyCheckinLogEntryType(OrderLogEntryType):
+    action_type = 'pretix.control.views.checkin'
+
+    def display(self, logentry):
+        # deprecated
+        dt = dateutil.parser.parse(logentry.parsed_data.get('datetime'))
+        tz = logentry.event.timezone
+        dt_formatted = date_format(dt.astimezone(tz), "SHORT_DATETIME_FORMAT")
+        if 'list' in logentry.parsed_data:
+            try:
+                checkin_list = logentry.event.checkin_lists.get(pk=logentry.parsed_data.get('list')).name
+            except CheckinList.DoesNotExist:
+                checkin_list = _("(unknown)")
+        else:
+            checkin_list = _("(unknown)")
+
+        if logentry.parsed_data.get('first'):
+            return _('Position #{posid} has been checked in manually at {datetime} on list "{list}".').format(
+                posid=logentry.parsed_data.get('positionid'),
+                datetime=dt_formatted,
+                list=checkin_list,
+            )
+        return _('Position #{posid} has been checked in again at {datetime} on list "{list}".').format(
+            posid=logentry.parsed_data.get('positionid'),
+            datetime=dt_formatted,
+            list=checkin_list
+        )

src/pretix/control/templates/pretixcontrol/event/plugins.html

@@ -23,7 +23,7 @@
                     <legend>{{ catlabel }}</legend>
                     <div class="plugin-list">
                         {% for plugin in plist %}
-                            <div class="plugin-container {% if plugin.featured %}featured-plugin{% endif %}">
+                            <div class="plugin-container {% if plugin.featured %}featured-plugin{% endif %}" id="plugin_{{ plugin.module }}">
                             {% if plugin.featured %}
                                <div class="panel panel-default">
                                     <div class="panel-body">

src/pretix/control/templates/pretixcontrol/item/include_variations.html

@@ -220,7 +220,6 @@
                     {% endif %}
                     {% bootstrap_field formset.empty_form.available_from visibility_field=formset.empty_form.available_from_mode layout="control_with_visibility"  %}
                     {% bootstrap_field formset.empty_form.available_until visibility_field=formset.empty_form.available_until_mode layout="control_with_visibility" %}
-                    {% bootstrap_field formset.empty_form.available_until layout="control" %}
                     {% bootstrap_field formset.empty_form.all_sales_channels layout="control" %}
                     {% bootstrap_field formset.empty_form.limit_sales_channels layout="control" %}
                     {% bootstrap_field formset.empty_form.hide_without_voucher layout="control" %}

src/pretix/control/views/dashboards.py

@@ -38,6 +38,7 @@ from zoneinfo import ZoneInfo
 
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
+from django.contrib.humanize.templatetags.humanize import intcomma
 from django.db.models import (
     Count, IntegerField, Max, Min, OuterRef, Prefetch, Q, Subquery, Sum,
 )
@@ -47,7 +48,6 @@ from django.http import JsonResponse
 from django.shortcuts import render
 from django.template.loader import get_template
 from django.urls import reverse
-from django.utils import formats
 from django.utils.formats import date_format
 from django.utils.html import escape
 from django.utils.timezone import now
@@ -67,6 +67,7 @@ from pretix.control.signals import (
 from pretix.helpers.daterange import daterange
 
 from ...base.models.orders import CancellationRequest
+from ...base.templatetags.money import money_filter
 from ..logdisplay import OVERVIEW_BANLIST
 
 NUM_WIDGET = '<div class="numwidget"><span class="num">{num}</span><span class="text">{text}</span></div>'
@@ -111,7 +112,7 @@ def base_widgets(sender, subevent=None, lazy=False, **kwargs):
 
     return [
         {
-            'content': None if lazy else NUM_WIDGET.format(num=tickc, text=_('Attendees (ordered)')),
+            'content': None if lazy else NUM_WIDGET.format(num=intcomma(tickc), text=_('Attendees (ordered)')),
             'lazy': 'attendees-ordered',
             'display_size': 'small',
             'priority': 100,
@@ -121,7 +122,7 @@ def base_widgets(sender, subevent=None, lazy=False, **kwargs):
             }) + ('?subevent={}'.format(subevent.pk) if subevent else '')
         },
         {
-            'content': None if lazy else NUM_WIDGET.format(num=paidc, text=_('Attendees (paid)')),
+            'content': None if lazy else NUM_WIDGET.format(num=intcomma(paidc), text=_('Attendees (paid)')),
             'lazy': 'attendees-paid',
             'display_size': 'small',
             'priority': 100,
@@ -132,7 +133,9 @@ def base_widgets(sender, subevent=None, lazy=False, **kwargs):
         },
         {
             'content': None if lazy else NUM_WIDGET.format(
-                num=formats.localize(round_decimal(rev, sender.currency)), text=_('Total revenue ({currency})').format(currency=sender.currency)),
+                num=money_filter(round_decimal(rev, sender.currency), sender.currency, hide_currency=True),
+                text=_('Total revenue ({currency})').format(currency=sender.currency)
+            ),
             'lazy': 'total-revenue',
             'display_size': 'small',
             'priority': 100,
@@ -207,7 +210,7 @@ def waitinglist_widgets(sender, subevent=None, lazy=False, **kwargs):
 
         widgets.append({
             'content': None if lazy else NUM_WIDGET.format(
-                num=str(happy), text=_('available to give to people on waiting list')
+                num=intcomma(happy), text=_('available to give to people on waiting list')
             ),
             'lazy': 'waitinglist-avail',
             'priority': 50,
@@ -217,7 +220,7 @@ def waitinglist_widgets(sender, subevent=None, lazy=False, **kwargs):
             })
         })
         widgets.append({
-            'content': None if lazy else NUM_WIDGET.format(num=str(wles.count()), text=_('total waiting list length')),
+            'content': None if lazy else NUM_WIDGET.format(num=intcomma(wles.count()), text=_('total waiting list length')),
             'lazy': 'waitinglist-length',
             'display_size': 'small',
             'priority': 50,
@@ -245,7 +248,7 @@ def quota_widgets(sender, subevent=None, lazy=False, **kwargs):
             status, left = qa.results[q] if q in qa.results else q.availability(allow_cache=True)
         widgets.append({
             'content': None if lazy else NUM_WIDGET.format(
-                num='{}/{}'.format(left, q.size) if q.size is not None else '\u221e',
+                num='{}/{}'.format(intcomma(left), intcomma(q.size)) if q.size is not None else '\u221e',
                 text=_('{quota} left').format(quota=escape(q.name))
             ),
             'lazy': 'quota-{}'.format(q.pk),
@@ -297,7 +300,7 @@ def checkin_widget(sender, subevent=None, lazy=False, **kwargs):
     for cl in qs:
         widgets.append({
             'content': None if lazy else NUM_WIDGET.format(
-                num='{}/{}'.format(cl.inside_count, cl.position_count),
+                num='{}/{}'.format(intcomma(cl.inside_count), intcomma(cl.position_count)),
                 text=_('Present – {list}').format(list=escape(cl.name))
             ),
             'lazy': 'checkin-{}'.format(cl.pk),

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

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-19 15:34+0000\n"
-"PO-Revision-Date: 2024-11-29 23:00+0000\n"
+"PO-Revision-Date: 2024-12-03 20:00+0000\n"
 "Last-Translator: CVZ-es <damien.bremont@casadevelazquez.org>\n"
 "Language-Team: Spanish <https://translate.pretix.eu/projects/pretix/pretix/"
 "es/>\n"
@@ -31498,7 +31498,7 @@ msgstr "Lo sentimos, se ha producido un error en el proceso de pago."
 #: pretix/plugins/ticketoutputpdf/apps.py:44
 #: pretix/plugins/ticketoutputpdf/apps.py:47
 msgid "PDF ticket output"
-msgstr "Salida de entradas de PDF"
+msgstr "Salida de entradas en PDF"
 
 #: pretix/plugins/ticketoutputpdf/apps.py:52
 msgid ""

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

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-19 15:34+0000\n"
-"PO-Revision-Date: 2024-11-29 23:00+0000\n"
+"PO-Revision-Date: 2024-12-03 20:00+0000\n"
 "Last-Translator: CVZ-es <damien.bremont@casadevelazquez.org>\n"
 "Language-Team: French <https://translate.pretix.eu/projects/pretix/pretix/fr/"
 ">\n"
@@ -8954,7 +8954,7 @@ msgstr "Nombre maximum d'articles par commande"
 
 #: pretix/base/settings.py:316
 msgid "Add-on products will not be counted."
-msgstr "Les Add-Ons ne seront pas pris en compte."
+msgstr "Les Add-Ons e sont pas comptabilisés."
 
 #: pretix/base/settings.py:325
 msgid ""
@@ -20630,17 +20630,16 @@ msgid ""
 "product. You can also specify the minimum and maximum number of add-ons of "
 "the given category that can or need to be chosen."
 msgstr ""
-"Avec les modules complémentaires, vous pouvez spécifier des produits qui "
-"peuvent être achetés en complément de ce produit. Par exemple, si vous "
-"organisez une conférence avec un ticket de conférence de base et un certain "
-"nombre d’ateliers, vous pouvez définir les ateliers comme des modules "
-"complémentaires au ticket de conférence. Avec cette configuration, les "
-"ateliers ne peuvent pas être achetés seuls, mais uniquement en combinaison "
-"avec un billet de conférence. Vous pouvez spécifier ici des catégories de "
-"produits qui peuvent être utilisés comme modules complémentaires à ce "
-"produit. Vous pouvez également spécifier le nombre minimal et maximal de "
-"modules complémentaires de la catégorie donnée qui peuvent ou doivent être "
-"choisis."
+"Avec les add-ons, vous pouvez spécifier des produits qui peuvent être "
+"achetés en complément de ce produit. Par exemple, si vous organisez une "
+"conférence avec un ticket de conférence de base et un certain nombre d’"
+"ateliers, vous pouvez définir les ateliers comme des modules complémentaires "
+"au ticket de conférence. Avec cette configuration, les ateliers ne peuvent "
+"pas être achetés seuls, mais uniquement en combinaison avec un billet de "
+"conférence. Vous pouvez spécifier ici des catégories de produits qui peuvent "
+"être utilisés comme modules complémentaires à ce produit. Vous pouvez "
+"également spécifier le nombre minimal et maximal de modules complémentaires "
+"de la catégorie donnée qui peuvent ou doivent être choisis."
 
 #: pretix/control/templates/pretixcontrol/item/include_addons.html:28
 #: pretix/control/templates/pretixcontrol/item/include_addons.html:62
@@ -31762,7 +31761,7 @@ msgstr "Désolé, une erreur s’est produite dans le processus de paiement."
 #: pretix/plugins/ticketoutputpdf/apps.py:44
 #: pretix/plugins/ticketoutputpdf/apps.py:47
 msgid "PDF ticket output"
-msgstr "Sortie du ticket PDF"
+msgstr "Génération de billets au format PDF"
 
 #: pretix/plugins/ticketoutputpdf/apps.py:52
 msgid ""

src/pretix/locale/fr/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: French\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-08 13:45+0000\n"
-"PO-Revision-Date: 2024-11-16 05:00+0000\n"
+"PO-Revision-Date: 2024-12-03 20:00+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.8.3\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -150,7 +150,7 @@ msgstr "Méthode de paiement non disponible"
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:15
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:39
 msgid "Placed orders"
-msgstr "Commandes placées"
+msgstr "Commandes réalisées"
 
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:15
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:39

src/pretix/plugins/badges/signals.py

@@ -26,13 +26,12 @@ from collections import defaultdict
 from django.dispatch import receiver
 from django.template.loader import get_template
 from django.urls import resolve, reverse
-from django.utils.html import escape
 from django.utils.translation import gettext_lazy as _
 
+from pretix.base.logentrytypes import EventLogEntryType, log_entry_types
 from pretix.base.models import Event, Order
 from pretix.base.signals import (
-    event_copy_data, item_copy_data, logentry_display, logentry_object_link,
-    register_data_exporters,
+    event_copy_data, item_copy_data, register_data_exporters,
 )
 from pretix.control.signals import (
     item_forms, nav_event, order_info, order_position_buttons,
@@ -173,35 +172,13 @@ def control_order_info(sender: Event, request, order: Order, **kwargs):
     return template.render(ctx, request=request)
 
 
-@receiver(signal=logentry_display, dispatch_uid="badges_logentry_display")
-def badges_logentry_display(sender, logentry, **kwargs):
-    if not logentry.action_type.startswith('pretix.plugins.badges'):
-        return
-
-    plains = {
-        'pretix.plugins.badges.layout.added': _('Badge layout created.'),
-        'pretix.plugins.badges.layout.deleted': _('Badge layout deleted.'),
-        'pretix.plugins.badges.layout.changed': _('Badge layout changed.'),
-    }
-
-    if logentry.action_type in plains:
-        return plains[logentry.action_type]
-
-
-@receiver(signal=logentry_object_link, dispatch_uid="badges_logentry_object_link")
-def badges_logentry_object_link(sender, logentry, **kwargs):
-    if not logentry.action_type.startswith('pretix.plugins.badges.layout') or not isinstance(logentry.content_object,
-                                                                                             BadgeLayout):
-        return
-
-    a_text = _('Badge layout {val}')
-    a_map = {
-        'href': reverse('plugins:badges:edit', kwargs={
-            'event': sender.slug,
-            'organizer': sender.organizer.slug,
-            'layout': logentry.content_object.id
-        }),
-        'val': escape(logentry.content_object.name),
-    }
-    a_map['val'] = '<a href="{href}">{val}</a>'.format_map(a_map)
-    return a_text.format_map(a_map)
+@log_entry_types.new_from_dict({
+    'pretix.plugins.badges.layout.added': _('Badge layout created.'),
+    'pretix.plugins.badges.layout.deleted': _('Badge layout deleted.'),
+    'pretix.plugins.badges.layout.changed': _('Badge layout changed.'),
+})
+class BadgeLogEntryType(EventLogEntryType):
+    object_type = BadgeLayout
+    object_link_wrapper = _('Badge layout {val}')
+    object_link_viewname = 'plugins:badges:edit'
+    object_link_argname = 'layout'

src/pretix/plugins/banktransfer/signals.py

@@ -25,9 +25,12 @@ from django.urls import resolve, reverse
 from django.utils.translation import gettext_lazy as _, gettext_noop
 from i18nfield.strings import LazyI18nString
 
-from pretix.base.signals import logentry_display, register_payment_providers
+from pretix.base.signals import register_payment_providers
 from pretix.control.signals import html_head, nav_event, nav_organizer
 
+from ...base.logentrytypes import (
+    ClearDataShredderMixin, OrderLogEntryType, log_entry_types,
+)
 from ...base.settings import settings_hierarkey
 from .payment import BankTransfer
 
@@ -117,13 +120,10 @@ def html_head_presale(sender, request=None, **kwargs):
         return ""
 
 
-@receiver(signal=logentry_display)
-def pretixcontrol_logentry_display(sender, logentry, **kwargs):
-    plains = {
-        'pretix.plugins.banktransfer.order.email.invoice': _('The invoice was sent to the designated email address.'),
-    }
-    if logentry.action_type in plains:
-        return plains[logentry.action_type]
+@log_entry_types.new()
+class BanktransferOrderEmailInvoiceLogEntryType(OrderLogEntryType, ClearDataShredderMixin):
+    action_type = 'pretix.plugins.banktransfer.order.email.invoice'
+    plain = _('The invoice was sent to the designated email address.')
 
 
 settings_hierarkey.add_default(

src/pretix/plugins/paypal/signals.py

@@ -22,17 +22,10 @@
 
 from django.dispatch import receiver
 
-from pretix.base.signals import logentry_display, register_payment_providers
+from pretix.base.signals import register_payment_providers
 
 
 @receiver(register_payment_providers, dispatch_uid="payment_paypal")
 def register_payment_provider(sender, **kwargs):
     from .payment import Paypal
     return Paypal
-
-
-@receiver(signal=logentry_display, dispatch_uid="paypal_logentry_display")
-def pretixcontrol_logentry_display(sender, logentry, **kwargs):
-    from pretix.plugins.paypal2.signals import pretixcontrol_logentry_display
-
-    return pretixcontrol_logentry_display(sender, logentry, **kwargs)

src/pretix/plugins/paypal2/signals.py

@@ -19,7 +19,6 @@
 # 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
 from collections import OrderedDict
 
 from django import forms
@@ -32,10 +31,11 @@ from django.utils.crypto import get_random_string
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 
 from pretix.base.forms import SecretKeySettingsField
+from pretix.base.logentrytypes import EventLogEntryType, log_entry_types
 from pretix.base.middleware import _merge_csp, _parse_csp, _render_csp
 from pretix.base.settings import settings_hierarkey
 from pretix.base.signals import (
-    logentry_display, register_global_settings, register_payment_providers,
+    register_global_settings, register_payment_providers,
 )
 from pretix.plugins.paypal2.payment import PaypalMethod
 from pretix.presale.signals import html_head, process_response
@@ -47,33 +47,32 @@ def register_payment_provider(sender, **kwargs):
     return [PaypalSettingsHolder, PaypalWallet, PaypalAPM]
 
 
-@receiver(signal=logentry_display, dispatch_uid="paypal2_logentry_display")
-def pretixcontrol_logentry_display(sender, logentry, **kwargs):
-    if logentry.action_type != 'pretix.plugins.paypal.event':
-        return
+@log_entry_types.new()
+class PaypalEventLogEntryType(EventLogEntryType):
+    action_type = 'pretix.plugins.paypal.event'
 
-    data = json.loads(logentry.data)
-    event_type = data.get('event_type')
-    text = None
-    plains = {
-        'PAYMENT.SALE.COMPLETED': _('Payment completed.'),
-        'PAYMENT.SALE.DENIED': _('Payment denied.'),
-        'PAYMENT.SALE.REFUNDED': _('Payment refunded.'),
-        'PAYMENT.SALE.REVERSED': _('Payment reversed.'),
-        'PAYMENT.SALE.PENDING': _('Payment pending.'),
-        'CHECKOUT.ORDER.APPROVED': pgettext_lazy('paypal', 'Order approved.'),
-        'CHECKOUT.ORDER.COMPLETED': pgettext_lazy('paypal', 'Order completed.'),
-        'PAYMENT.CAPTURE.COMPLETED': pgettext_lazy('paypal', 'Capture completed.'),
-        'PAYMENT.CAPTURE.PENDING': pgettext_lazy('paypal', 'Capture pending.'),
-    }
+    def display(self, logentry):
+        event_type = logentry.parsed_data.get('event_type')
+        text = None
+        plains = {
+            'PAYMENT.SALE.COMPLETED': _('Payment completed.'),
+            'PAYMENT.SALE.DENIED': _('Payment denied.'),
+            'PAYMENT.SALE.REFUNDED': _('Payment refunded.'),
+            'PAYMENT.SALE.REVERSED': _('Payment reversed.'),
+            'PAYMENT.SALE.PENDING': _('Payment pending.'),
+            'CHECKOUT.ORDER.APPROVED': pgettext_lazy('paypal', 'Order approved.'),
+            'CHECKOUT.ORDER.COMPLETED': pgettext_lazy('paypal', 'Order completed.'),
+            'PAYMENT.CAPTURE.COMPLETED': pgettext_lazy('paypal', 'Capture completed.'),
+            'PAYMENT.CAPTURE.PENDING': pgettext_lazy('paypal', 'Capture pending.'),
+        }
 
-    if event_type in plains:
-        text = plains[event_type]
-    else:
-        text = event_type
+        if event_type in plains:
+            text = plains[event_type]
+        else:
+            text = event_type
 
-    if text:
-        return _('PayPal reported an event: {}').format(text)
+        if text:
+            return _('PayPal reported an event: {}').format(text)
 
 
 @receiver(register_global_settings, dispatch_uid='paypal2_global_settings')

src/pretix/plugins/sendmail/signals.py

@@ -46,13 +46,16 @@ from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 from django_scopes import scope, scopes_disabled
 
+from pretix.base.logentrytypes import (
+    EventLogEntryType, OrderLogEntryType, log_entry_types,
+)
 from pretix.base.models import SubEvent
 from pretix.base.signals import (
-    EventPluginSignal, event_copy_data, logentry_display, periodic_task,
+    EventPluginSignal, event_copy_data, periodic_task,
 )
 from pretix.control.signals import nav_event
 from pretix.helpers import OF_SELF
-from pretix.plugins.sendmail.models import ScheduledMail
+from pretix.plugins.sendmail.models import Rule, ScheduledMail
 from pretix.plugins.sendmail.views import OrderSendView, WaitinglistSendView
 
 logger = logging.getLogger(__name__)
@@ -115,21 +118,28 @@ def control_nav_import(sender, request=None, **kwargs):
     ]
 
 
-@receiver(signal=logentry_display)
-def pretixcontrol_logentry_display(sender, logentry, **kwargs):
-    plains = {
-        'pretix.plugins.sendmail.sent': _('Mass email was sent to customers or attendees.'),
-        'pretix.plugins.sendmail.sent.waitinglist': _('Mass email was sent to waiting list entries.'),
-        'pretix.plugins.sendmail.order.email.sent': _('The order received a mass email.'),
-        'pretix.plugins.sendmail.order.email.sent.attendee': _('A ticket holder of this order received a mass email.'),
-        'pretix.plugins.sendmail.rule.added': _('An email rule was created'),
-        'pretix.plugins.sendmail.rule.changed': _('An email rule was updated'),
-        'pretix.plugins.sendmail.rule.order.email.sent': _('A scheduled email was sent to the order'),
-        'pretix.plugins.sendmail.rule.order.position.email.sent': _('A scheduled email was sent to a ticket holder'),
-        'pretix.plugins.sendmail.rule.deleted': _('An email rule was deleted'),
-    }
-    if logentry.action_type in plains:
-        return plains[logentry.action_type]
+@log_entry_types.new('pretix.plugins.sendmail.sent', _('Mass email was sent to customers or attendees.'))
+@log_entry_types.new('pretix.plugins.sendmail.sent.waitinglist', _('Mass email was sent to waiting list entries.'))
+class SendmailPluginLogEntryType(EventLogEntryType):
+    pass
+
+
+@log_entry_types.new('pretix.plugins.sendmail.order.email.sent', _('The order received a mass email.'))
+@log_entry_types.new('pretix.plugins.sendmail.order.email.sent.attendee', _('A ticket holder of this order received a mass email.'))
+class SendmailPluginOrderLogEntryType(OrderLogEntryType):
+    pass
+
+
+@log_entry_types.new('pretix.plugins.sendmail.rule.added', _('An email rule was created'))
+@log_entry_types.new('pretix.plugins.sendmail.rule.changed', _('An email rule was updated'))
+@log_entry_types.new('pretix.plugins.sendmail.rule.order.email.sent', _('A scheduled email was sent to the order'))
+@log_entry_types.new('pretix.plugins.sendmail.rule.order.position.email.sent', _('A scheduled email was sent to a ticket holder'))
+@log_entry_types.new('pretix.plugins.sendmail.rule.deleted', _('An email rule was deleted'))
+class SendmailPluginRuleLogEntryType(EventLogEntryType):
+    object_type = Rule
+    object_link_wrapper = _('Mail rule {val}')
+    object_link_viewname = 'plugins:sendmail:rule.update'
+    object_link_argname = 'rule'
 
 
 @receiver(periodic_task)

src/pretix/plugins/stripe/payment.py

@@ -388,21 +388,6 @@ class StripeSettingsHolder(BasePaymentProvider):
                          }
                      ),
                  )),
-                ('method_sofort',
-                 forms.BooleanField(
-                     label=_('SOFORT'),
-                     disabled=self.event.currency != 'EUR',
-                     help_text=(
-                         _('Stripe is in the process of removing this payment method. If you created your Stripe '
-                           'account after November 2023, you cannot use this payment method.') +
-                         '<div class="alert alert-warning">%s</div>' % _(
-                             'Despite the name, Sofort payments via Stripe are <strong>not</strong> processed '
-                             'instantly but might take up to <strong>14 days</strong> to be confirmed in some cases. '
-                             'Please only activate this payment method if your payment term allows for this lag.'
-                         )
-                     ),
-                     required=False,
-                 )),
                 ('method_eps',
                  forms.BooleanField(
                      label=_('EPS'),

src/pretix/plugins/ticketoutputpdf/signals.py

@@ -24,10 +24,9 @@ import json
 
 from django.dispatch import receiver
 from django.template.loader import get_template
-from django.urls import reverse
-from django.utils.html import escape
 from django.utils.translation import gettext_lazy as _
 
+from pretix.base.logentrytypes import EventLogEntryType, log_entry_types
 from pretix.base.models import Event, SalesChannel
 from pretix.base.signals import (  # NOQA: legacy import
     EventPluginSignal, event_copy_data, item_copy_data, layout_text_variables,
@@ -134,38 +133,16 @@ def pdf_event_copy_data_receiver(sender, other, item_map, question_map, **kwargs
     return layout_map
 
 
-@receiver(signal=logentry_display, dispatch_uid="pretix_ticketoutputpdf_logentry_display")
-def pdf_logentry_display(sender, logentry, **kwargs):
-    if not logentry.action_type.startswith('pretix.plugins.ticketoutputpdf'):
-        return
-
-    plains = {
-        'pretix.plugins.ticketoutputpdf.layout.added': _('Ticket layout created.'),
-        'pretix.plugins.ticketoutputpdf.layout.deleted': _('Ticket layout deleted.'),
-        'pretix.plugins.ticketoutputpdf.layout.changed': _('Ticket layout changed.'),
-    }
-
-    if logentry.action_type in plains:
-        return plains[logentry.action_type]
-
-
-@receiver(signal=logentry_object_link, dispatch_uid="pretix_ticketoutputpdf_logentry_object_link")
-def pdf_logentry_object_link(sender, logentry, **kwargs):
-    if not logentry.action_type.startswith('pretix.plugins.ticketoutputpdf.layout') or not isinstance(
-            logentry.content_object, TicketLayout):
-        return
-
-    a_text = _('Ticket layout {val}')
-    a_map = {
-        'href': reverse('plugins:ticketoutputpdf:edit', kwargs={
-            'event': sender.slug,
-            'organizer': sender.organizer.slug,
-            'layout': logentry.content_object.id
-        }),
-        'val': escape(logentry.content_object.name),
-    }
-    a_map['val'] = '<a href="{href}">{val}</a>'.format_map(a_map)
-    return a_text.format_map(a_map)
+@log_entry_types.new_from_dict({
+    'pretix.plugins.ticketoutputpdf.layout.added': _('Ticket layout created.'),
+    'pretix.plugins.ticketoutputpdf.layout.deleted': _('Ticket layout deleted.'),
+    'pretix.plugins.ticketoutputpdf.layout.changed': _('Ticket layout changed.'),
+})
+class PdfTicketLayoutLogEntryType(EventLogEntryType):
+    object_type = TicketLayout
+    object_link_wrapper = _('Ticket layout {val}')
+    object_link_viewname = 'plugins:ticketoutputpdf:edit'
+    object_link_argname = 'layout'
 
 
 def _ticket_layouts_for_item(request, item):

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

@@ -6,13 +6,14 @@
 {% load eventsignal %}
 {% load rich_text %}
 {% for c in form.categories %}
+    {% with category_idx=forloop.counter %}
     <fieldset data-addon-max-count="{{ c.max_count }}"{% if c.multi_allowed %} data-addon-multi-allowed{% endif %}>
         <legend>{{ c.category.name }}</legend>
         {% if c.category.description %}
             {{ c.category.description|rich_text }}
         {% endif %}
         {% if c.min_count == c.max_count %}
-            <p class="addon-count-desc">
+            <p class="addon-count-desc" id="c-{{ form.pos.pk }}-{{ category_idx }}-addon-count-desc">
                 {% blocktrans trimmed count min_count=c.min_count %}
                     You need to choose exactly one option from this category.
                 {% plural %}
@@ -21,7 +22,7 @@
             </p>
         {% elif c.min_count == 0 and c.max_count >= c.items|length and not c.multi_allowed %}
         {% elif c.min_count == 0 %}
-            <p class="addon-count-desc">
+            <p class="addon-count-desc" id="c-{{ form.pos.pk }}-{{ category_idx }}-addon-count-desc">
                 {% blocktrans trimmed count max_count=c.max_count %}
                     You can choose {{ max_count }} option from this category.
                 {% plural %}
@@ -29,7 +30,7 @@
                 {% endblocktrans %}
             </p>
         {% else %}
-            <p class="addon-count-desc">
+            <p class="addon-count-desc" id="c-{{ form.pos.pk }}-{{ category_idx }}-addon-count-desc">
                 {% blocktrans trimmed with min_count=c.min_count max_count=c.max_count %}
                     You can choose between {{ min_count }} and {{ max_count }} options from
                     this category.
@@ -58,7 +59,7 @@
                                     </div>
                                 {% endif %}
                                 {% if item.min_per_order and item.min_per_order > 1 %}
-                                    <p>
+                                    <p id="cp-{{ form.pos.pk }}-item-{{ item.pk }}-min-order">
                                         <small>
                                             {% blocktrans trimmed with num=item.min_per_order %}
                                                 minimum amount to order: {{ num }}
@@ -196,12 +197,14 @@
                                                         {% endif %}
                                                         id="cp_{{ form.pos.pk }}_variation_{{ item.id }}_{{ var.id }}"
                                                         name="cp_{{ form.pos.pk }}_variation_{{ item.id }}_{{ var.id }}"
-                                                        aria-label="{% blocktrans with item=item.name var=var %}Add {{ item }}, {{ var }} to cart{% endblocktrans %}">
+                                                        aria-label="{% blocktrans with item=item.name var=var %}Add {{ item }}, {{ var }} to cart{% endblocktrans %}"
+                                                        aria-describedby="c-{{ form.pos.pk }}-{{ category_idx }}-addon-count-desc">
                                                 <i class="fa fa-shopping-cart" aria-hidden="true"></i>
                                                 {% trans "Select" context "checkbox" %}
                                             </label>
                                         {% else %}
-                                            <div class="input-item-count-group">
+                                            <fieldset class="input-item-count-group" aria-describedby="c-{{ form.pos.pk }}-{{ category_idx }}-addon-count-desc cp-{{ form.pos.pk }}-item-{{ item.pk }}-min-order">
+                                                <legend class="sr-only">{% blocktrans with item=item.name %}Add {{ item }}, {{ var }} to cart{% endblocktrans %}</legend>
                                                 <button type="button" data-step="-1" data-controls="cp_{{ form.pos.pk }}_variation_{{ item.id }}_{{ var.id }}" class="btn btn-default input-item-count-dec" aria-label="{% trans "Decrease quantity" %}">-</button>
                                                 <input type="number" class="form-control input-item-count" placeholder="0" min="0"
                                                     {% if var.initial %}value="{{ var.initial }}"{% endif %}
@@ -211,9 +214,9 @@
                                                     max="{{ c.max_count }}"
                                                     id="cp_{{ form.pos.pk }}_variation_{{ item.id }}_{{ var.id }}"
                                                     name="cp_{{ form.pos.pk }}_variation_{{ item.id }}_{{ var.id }}"
-                                                    aria-label="{% blocktrans with item=item.name var=var %}Quantity of {{ item }}, {{ var }} to order{% endblocktrans %}">
+                                                    aria-label="{% trans "Quantity" %}">
                                                 <button type="button" data-step="1" data-controls="cp_{{ form.pos.pk }}_variation_{{ item.id }}_{{ var.id }}" class="btn btn-default input-item-count-inc" aria-label="{% trans "Increase quantity" %}">+</button>
-                                            </div>
+                                            </fieldset>
                                         {% endif %}
                                     </div>
                                 {% else %}
@@ -250,7 +253,7 @@
                                 {% include "pretixpresale/event/fragment_quota_left.html" with avail=item.cached_availability %}
                             {% endif %}
                             {% if item.min_per_order and item.min_per_order > 1 %}
-                                <p>
+                                <p id="cp-{{ form.pos.pk }}-item-{{ item.pk }}-min-order">
                                     <small>
                                         {% blocktrans trimmed with num=item.min_per_order %}
                                             minimum amount to order: {{ num }}
@@ -341,12 +344,13 @@
                                             name="cp_{{ form.pos.pk }}_item_{{ item.id }}"
                                             id="cp_{{ form.pos.pk }}_item_{{ item.id }}"
                                             aria-label="{% blocktrans with item=item.name %}Add {{ item }} to cart{% endblocktrans %}"
-                                            {% if item.description %} aria-describedby="cp-{{ form.pos.pk }}-item-{{ item.id }}-description"{% endif %}>
+                                            aria-describedby="c-{{ form.pos.pk }}-{{ category_idx }}-addon-count-desc">
                                             <i class="fa fa-shopping-cart" aria-hidden="true"></i>
                                             {% trans "Select" context "checkbox" %}
                                 </label>
                             {% else %}
-                                <div class="input-item-count-group">
+                                <fieldset class="input-item-count-group" aria-describedby="c-{{ form.pos.pk }}-{{ category_idx }}-addon-count-desc cp-{{ form.pos.pk }}-item-{{ item.pk }}-min-order">
+                                    <legend class="sr-only">{% blocktrans with item=item.name %}Add {{ item }} to cart{% endblocktrans %}</legend>
                                     <button type="button" data-step="-1" data-controls="cp_{{ form.pos.pk }}_item_{{ item.id }}" class="btn btn-default input-item-count-dec" aria-label="{% trans "Decrease quantity" %}">-</button>
                                     <input type="number" class="form-control input-item-count" placeholder="0" min="0"
                                         {% if item.free_price %}
@@ -356,10 +360,9 @@
                                         {% if item.initial %}value="{{ item.initial }}"{% endif %}
                                         name="cp_{{ form.pos.pk }}_item_{{ item.id }}"
                                         id="cp_{{ form.pos.pk }}_item_{{ item.id }}"
-                                        aria-label="{% blocktrans with item=item.name %}Quantity of {{ item }} to order{% endblocktrans %}"
-                                        {% if item.description %} aria-describedby="cp-{{ form.pos.pk }}-item-{{ item.id }}-description"{% endif %}>
+                                        aria-label="{% trans "Quantity" %}">
                                     <button type="button" data-step="1" data-controls="cp_{{ form.pos.pk }}_item_{{ item.id }}" class="btn btn-default input-item-count-inc" aria-label="{% trans "Increase quantity" %}">+</button>
-                                </div>
+                                </fieldset>
                             {% endif %}
                         </div>
                     {% else %}
@@ -370,6 +373,7 @@
             {% endif %}
         {% endfor %}
     </fieldset>
+    {% endwith %}
 {% empty %}
     <em>
         {% trans "There are no add-ons available for this product." %}

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

@@ -10,18 +10,41 @@
                 <i class="fa fa-shopping-cart" aria-hidden="true"></i>
                 <strong>{% trans "Your cart" %}</strong>
             </span>
-            <strong id="cart-deadline-short" data-expires="{{ cart.first_expiry|date:"Y-m-d H:i:sO" }}" aria-hidden="true">
-                {% if cart.minutes_left > 0 or cart.seconds_left > 0 %}
-                    {{ cart.minutes_left|stringformat:"02d" }}:{{ cart.seconds_left|stringformat:"02d" }}
-                {% else %}
-                    {% trans "Cart expired" %}
-                {% endif %}
-            </strong>
+            {% if cart.positions %}
+                <strong id="cart-deadline-short" data-expires="{{ cart.first_expiry|date:"Y-m-d H:i:sO" }}" aria-hidden="true">
+                    {% if cart.minutes_left > 0 or cart.seconds_left > 0 %}
+                        {{ cart.minutes_left|stringformat:"02d" }}:{{ cart.seconds_left|stringformat:"02d" }}
+                    {% else %}
+                        {% trans "Cart expired" %}
+                    {% endif %}
+                </strong>
+            {% endif %}
         </h2>
     </summary>
     <div>
         <div class="panel-body">
-            {% include "pretixpresale/event/fragment_cart.html" with cart=cart event=request.event editable=True %}
+            {% if cart.positions %}
+                {% include "pretixpresale/event/fragment_cart.html" with cart=cart event=request.event editable=True %}
+            {% endif %}
+            {% if cart.current_selected_payments %}
+                <p>{% trans "You already selected the following payment methods:" %}</p>
+                <div class="list-group">
+                    {% for p in cart.current_selected_payments %}
+                        <div class="list-group-item">
+                            <div class="row">
+                                <div class="col-xs-9">
+                                    {{ p.provider_name }}
+                                </div>
+                                <div class="col-xs-3 text-right">
+                                    {% if p.payment_amount %}
+                                        {{ p.payment_amount|money:request.event.currency }}
+                                    {% endif %}
+                                </div>
+                            </div>
+                        </div>
+                    {% endfor %}
+                </div>
+            {% endif %}
             <div class="checkout-button-row">
                 <form class="checkout-button-primary" method="get" action="{% eventurl request.event "presale:event.checkout.start" cart_namespace=cart_namespace  %}">
                     <p><button class="btn btn-primary btn-lg" type="submit"{% if has_addon_choices or cart.total == 0 %} aria-label="{% trans "Continue with order process" %}"{% endif %}>

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

@@ -219,7 +219,8 @@
                                                 {% trans "Select" context "checkbox" %}
                                             </label>
                                         {% else %}
-                                            <div class="input-item-count-group">
+                                            <fieldset class="input-item-count-group">
+                                                <legend class="sr-only">{% blocktrans with item=item.name %}Add {{ item }}, {{ var }} to cart{% endblocktrans %}</legend>
                                                 <button type="button" data-step="-1" data-controls="{{ form_prefix }}variation_{{ item.id }}_{{ var.id }}" class="btn btn-default input-item-count-dec" aria-label="{% trans "Decrease quantity" %}"
                                                     {% if not ev.presale_is_running %}disabled{% endif %}>-</button>
                                                 <input type="number" class="form-control input-item-count" placeholder="0" min="0"
@@ -230,10 +231,10 @@
                                                        max="{{ var.order_max }}"
                                                        id="{{ form_prefix }}variation_{{ item.id }}_{{ var.id }}"
                                                        name="{{ form_prefix }}variation_{{ item.id }}_{{ var.id }}"
-                                                       aria-label="{% blocktrans with item=item.name var=var.name %}Quantity of {{ item }}, {{ var }} to order{% endblocktrans %}">
+                                                       aria-label="{% trans "Quantity" %}">
                                                 <button type="button" data-step="1" data-controls="{{ form_prefix }}variation_{{ item.id }}_{{ var.id }}" class="btn btn-default input-item-count-inc" aria-label="{% trans "Increase quantity" %}"
                                                     {% if not ev.presale_is_running %}disabled{% endif %}>+</button>
-                                            </div>
+                                            </fieldset>
                                         {% endif %}
                                     </div>
                                 {% else %}
@@ -370,7 +371,8 @@
                                         {% trans "Select" context "checkbox" %}
                                 </label>
                             {% else %}
-                                <div class="input-item-count-group">
+                                <fieldset class="input-item-count-group">
+                                    <legend class="sr-only">{% blocktrans with item=item.name %}Add {{ item }} to cart{% endblocktrans %}</legend>
                                     <button type="button" data-step="-1" data-controls="{{ form_prefix }}item_{{ item.id }}" class="btn btn-default input-item-count-dec" aria-label="{% trans "Decrease quantity" %}"
                                         {% if not ev.presale_is_running %}disabled{% endif %}>-</button>
                                     <input type="number" class="form-control input-item-count" placeholder="0" min="0"
@@ -382,11 +384,10 @@
                                            max="{{ item.order_max }}"
                                            name="{{ form_prefix }}item_{{ item.id }}"
                                            id="{{ form_prefix }}item_{{ item.id }}"
-                                           aria-label="{% blocktrans with item=item.name %}Quantity of {{ item }} to order{% endblocktrans %}"
-                                           {% if item.description %} aria-describedby="{{ form_prefix }}item-{{ item.id }}-description"{% endif %}>
+                                           aria-label="{% trans "Quantity" %}">
                                     <button type="button" data-step="1" data-controls="{{ form_prefix }}item_{{ item.id }}" class="btn btn-default input-item-count-inc" aria-label="{% trans "Increase quantity" %}"
                                         {% if not ev.presale_is_running %}disabled{% endif %}>+</button>
-                                </div>
+                                </fieldset>
                             {% endif %}
                         </div>
                     {% else %}

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

@@ -231,16 +231,17 @@
                                                                 {% trans "Select" context "checkbox" %}
                                                             </label>
                                                         {% else %}
-                                                            <div class="input-item-count-group">
+                                                            <fieldset class="input-item-count-group">
+                                                                <legend class="sr-only">{% blocktrans with item=item.name %}Add {{ item }}, {{ var }} to cart{% endblocktrans %}</legend>
                                                                 <button type="button" data-step="-1" data-controls="variation_{{ item.id }}_{{ var.id }}" class="btn btn-default input-item-count-dec" aria-label="{% trans "Decrease quantity" %}">-</button>
                                                                 <input type="number" class="form-control input-item-count" placeholder="0" min="0"
                                                                     max="{{ var.order_max }}"
                                                                     id="variation_{{ item.id }}_{{ var.id }}"
                                                                     name="variation_{{ item.id }}_{{ var.id }}"
                                                                     {% if options == 1 %}value="1"{% endif %}
-                                                                    aria-label="{% blocktrans with item=item.name var=var.name %}Quantity of {{ item }}, {{ var }} to order{% endblocktrans %}">
+                                                                    aria-label="{% trans "Quantity" %}">
                                                                 <button type="button" data-step="1" data-controls="variation_{{ item.id }}_{{ var.id }}" class="btn btn-default input-item-count-inc" aria-label="{% trans "Increase quantity" %}">+</button>
-                                                            </div>
+                                                            </fieldset>
                                                         {% endif %}
                                                     {% else %}
                                                         <label>
@@ -385,7 +386,8 @@
                                                     {% trans "Select" context "checkbox" %}
                                                 </label>
                                             {% else %}
-                                                <div class="input-item-count-group">
+                                                <fieldset class="input-item-count-group">
+                                                    <legend class="sr-only">{% blocktrans with item=item.name %}Add {{ item }} to cart{% endblocktrans %}</legend>
                                                     <button type="button" data-step="-1" data-controls="item_{{ item.id }}" class="btn btn-default input-item-count-dec" aria-label="{% trans "Decrease quantity" %}">-</button>
                                                     <input type="number" class="form-control input-item-count"
                                                        placeholder="0" min="0"
@@ -393,10 +395,9 @@
                                                        id="item_{{ item.id }}"
                                                        name="item_{{ item.id }}"
                                                        {% if options == 1 %}value="1"{% endif %}
-                                                       aria-label="{% blocktrans with item=item.name %}Quantity of {{ item }} to order{% endblocktrans %}"
-                                                       {% if item.description %} aria-describedby="item-{{ item.id }}-description"{% endif %}>
+                                                       aria-label="{% trans "Quantity" %}">
                                                     <button type="button" data-step="1" data-controls="item_{{ item.id }}" class="btn btn-default input-item-count-inc" aria-label="{% trans "Increase quantity" %}">+</button>
-                                                </div>
+                                                </fieldset>
                                             {% endif %}
                                         {% else %}
                                             <label>

src/pretix/presale/templates/pretixpresale/organizers/index.html

@@ -1,9 +1,11 @@
 {% extends "pretixpresale/organizers/base.html" %}
 {% load i18n %}
+{% load icon %}
 {% load rich_text %}
 {% load tz %}
 {% load eventurl %}
 {% load urlreplace %}
+{% load textbubble %}
 {% load thumb %}
 {% block title %}{% trans "Event list" %}{% endblock %}
 {% block custom_header %}
@@ -86,51 +88,73 @@
                     <td>
                 </div>
                 <div class="col-md-2 col-xs-6">
+                    <small>
                     {% if e.has_subevents %}
-                        <span class="label label-default">{% trans "Event series" %}</span>
+                        {% textbubble "info" icon="bars" %}
+                            {% trans "Event series" %}
+                        {% endtextbubble %}
                     {% elif e.presale_is_running and request.organizer.settings.event_list_availability %}
                         {% if e.best_availability_state == 100 %}
                             {% if e.best_availability_is_low %}
-                                <span class="label label-success-warning">{% trans "Few tickets left" %}</span>
+                                {% textbubble "success-warning" icon="exclamation-triangle" %}
+                                    {% trans "Few tickets left" %}
+                                {% endtextbubble %}
                             {% else %}
-                                {% if e.has_paid_item %}
-                                    <span class="label label-success">{% trans "Buy now" context "available_event_in_list" %}</span>
-                                {% else %}
-                                    <span class="label label-success">{% trans "Book now" %}</span>
-                                {% endif %}
+                                {% textbubble "success" icon="check" %}
+                                    {% if e.has_paid_item %}
+                                        {% trans "Buy now" context "available_event_in_list" %}
+                                    {% else %}
+                                        {% trans "Book now" %}
+                                    {% endif %}
+                                {% endtextbubble %}
                             {% endif %}
                         {% elif e.waiting_list_active and e.best_availability_state >= 0 %}
-                            <span class="label label-warning">{% trans "Waiting list" %}</span>
+                            {% textbubble "warning" icon="ellipsis-h" %}
+                                {% trans "Waiting list" %}
+                            {% endtextbubble %}
                         {% elif e.best_availability_state == 20 %}
-                            <span class="label label-danger">{% trans "Reserved" %}</span>
+                            {% textbubble "danger" icon="minus" %}
+                                {% trans "Reserved" %}
+                            {% endtextbubble %}
                         {% elif e.best_availability_state < 20 %}
-                            {% if e.has_paid_item %}
-                                <span class="label label-danger">{% trans "Sold out" %}</span>
-                            {% else %}
-                                <span class="label label-danger">{% trans "Fully booked" %}</span>
-                            {% endif %}
+                            {% textbubble "danger" icon="times" %}
+                                {% if e.has_paid_item %}
+                                    {% trans "Sold out" %}
+                                {% else %}
+                                    {% trans "Fully booked" %}
+                                {% endif %}
+                            {% endtextbubble %}
                         {% endif %}
                     {% elif e.presale_is_running %}
-                        <span class="label label-success">{% trans "Book now" %}</span>
+                        {% textbubble "success" icon="check" %}
+                            {% trans "Book now" %}
+                        {% endtextbubble %}
                     {% elif e.presale_has_ended %}
-                        <span class="label label-danger">{% trans "Sale over" %}</span>
+                        {% textbubble "danger" icon="times" %}
+                            {% trans "Sale over" %}
+                        {% endtextbubble %}
                     {% elif e.settings.presale_start_show_date %}
-                        <span class="label label-warning">
-                                {% blocktrans trimmed with date=e.effective_presale_start|date:"SHORT_DATE_FORMAT" %}
+                        {% textbubble "warning" icon="clock-o" %}
+                            {% with date_iso=e.effective_presale_start.isoformat date_human=e.effective_presale_start|date:"SHORT_DATE_FORMAT" %}
+                                {% blocktrans trimmed with date='<time datetime="'|add:date_iso|add:'">'|add:date_human|add:"</time>"|safe %}
                                     Sale starts {{ date }}
                                 {% endblocktrans %}
-                            </span>
+                            {% endwith %}
+                        {% endtextbubble %}
                     {% else %}
-                        <span class="label label-warning">{% trans "Not yet on sale" %}</span>
+                        {% textbubble "warning" icon="clock-o" %}
+                            {% trans "Not yet on sale" %}
+                        {% endtextbubble %}
                     {% endif %}
+                    </small>
                 </div>
                 <div class="col-md-2 col-xs-6 text-right flip">
                     <a class="btn btn-primary btn-block" href="{{ url }}{% if e.has_subevents and e.match_by_subevents %}{{ filterquery }}{% endif %}">
-                        {% if e.has_subevents %}<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Tickets" %}
+                        {% if e.has_subevents %}{% icon "ticket" %} {% trans "Tickets" %}
                         {% elif e.presale_is_running and e.best_availability_state == 100 %}
-                            <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Tickets" %}
+                            {% icon "ticket" %} {% trans "Tickets" %}
                         {% else %}
-                            <span class="fa fa-info" aria-hidden="true"></span> {% trans "More info" %}
+                            {% icon "info" %} {% trans "More info" %}
                         {% endif %}
                     </a>
                 </div>

src/pretix/presale/views/__init__.py

@@ -251,7 +251,8 @@ class CartMixin:
             'seconds_left': seconds_left,
             'first_expiry': first_expiry,
             'is_ordered': bool(order),
-            'itemcount': sum(c.count for c in positions if not c.addon_to)
+            'itemcount': sum(c.count for c in positions if not c.addon_to),
+            'current_selected_payments': [p for p in self.current_selected_payments(total) if p.get('multi_use_supported')]
         }
 
     def current_selected_payments(self, total, warn=False, total_includes_payment_fees=False):

src/pretix/presale/views/cart.py

@@ -42,6 +42,7 @@ from urllib.parse import quote
 from django.conf import settings
 from django.contrib import messages
 from django.core.cache import caches
+from django.core.exceptions import ValidationError
 from django.db.models import Q
 from django.http import FileResponse, Http404, JsonResponse
 from django.shortcuts import get_object_or_404, render
@@ -57,7 +58,7 @@ from django.views.generic import TemplateView, View
 from django_scopes import scopes_disabled
 
 from pretix.base.models import (
-    CartPosition, InvoiceAddress, QuestionAnswer, SubEvent, Voucher,
+    CartPosition, GiftCard, InvoiceAddress, QuestionAnswer, SubEvent, Voucher,
 )
 from pretix.base.services.cart import (
     CartError, add_items_to_cart, apply_voucher, clear_cart, error_messages,
@@ -438,8 +439,48 @@ class CartApplyVoucher(EventViewMixin, CartActionMixin, AsyncAction, View):
         return _('We applied the voucher to as many products in your cart as we could.')
 
     def post(self, request, *args, **kwargs):
+        from pretix.base.payment import GiftCardPayment
+
         if 'voucher' in request.POST:
-            return self.do(self.request.event.id, request.POST.get('voucher'), get_or_create_cart_id(self.request),
+            code = request.POST.get('voucher').strip()
+
+            if not self.request.event.vouchers.filter(code__iexact=code):
+                try:
+                    gc = self.request.event.organizer.accepted_gift_cards.get(secret=code)
+                    gcp = GiftCardPayment(self.request.event)
+                    if not gcp.is_enabled or not gcp.is_allowed(self.request, Decimal("1.00")):
+                        raise ValidationError(error_messages['voucher_invalid'])
+                    else:
+                        cs = cart_session(request)
+                        gcp._add_giftcard_to_cart(cs, gc)
+                        messages.success(
+                            request,
+                            _("The gift card has been saved to your cart. Please continue your checkout.")
+                        )
+                        if "ajax" in self.request.POST or "ajax" in self.request.GET:
+                            return JsonResponse({
+                                'ready': True,
+                                'success': True,
+                                'redirect': self.get_success_url(),
+                                'message': str(
+                                    _("The gift card has been saved to your cart. Please continue your checkout.")
+                                )
+                            })
+                        return redirect_to_url(self.get_success_url())
+                except GiftCard.DoesNotExist:
+                    pass
+                except ValidationError as e:
+                    messages.error(self.request, str(e.message))
+                    if "ajax" in self.request.POST or "ajax" in self.request.GET:
+                        return JsonResponse({
+                            'ready': True,
+                            'success': False,
+                            'redirect': self.get_success_url(),
+                            'message': str(e.message)
+                        })
+                    return redirect_to_url(self.get_error_url())
+
+            return self.do(self.request.event.id, code, get_or_create_cart_id(self.request),
                            translation.get_language(), request.sales_channel.identifier,
                            time_machine_now(default=None))
         else:
@@ -631,6 +672,8 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, CartMixin, TemplateView
         return context
 
     def dispatch(self, request, *args, **kwargs):
+        from pretix.base.payment import GiftCardPayment
+
         err = None
         v = request.GET.get('voucher')
 
@@ -653,10 +696,24 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, CartMixin, TemplateView
                 if v_avail < 1 and not err:
                     err = error_messages['voucher_redeemed_cart'] % self.request.event.settings.reservation_time
             except Voucher.DoesNotExist:
-                if self.request.event.organizer.accepted_gift_cards.filter(secret__iexact=request.GET.get("voucher")).exists():
-                    err = error_messages['gift_card']
-                else:
+                try:
+                    gc = self.request.event.organizer.accepted_gift_cards.get(secret=v.strip())
+                    gcp = GiftCardPayment(self.request.event)
+                    if not gcp.is_enabled or not gcp.is_allowed(self.request, Decimal("1.00")):
+                        err = error_messages['voucher_invalid']
+                    else:
+                        cs = cart_session(request)
+                        gcp._add_giftcard_to_cart(cs, gc)
+                        messages.success(
+                            request,
+                            _("The gift card has been saved to your cart. Please now select the products "
+                              "you want to purchase.")
+                        )
+                        return redirect_to_url(self.get_next_url())
+                except GiftCard.DoesNotExist:
                     err = error_messages['voucher_invalid']
+                except ValidationError as e:
+                    err = str(e.message)
         else:
             context = {}
             context['cart'] = self.get_cart()

src/pretix/presale/views/event.py

@@ -632,7 +632,7 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
             context['subevent_list_cache_key'] = self._subevent_list_cachekey()
 
         context['show_cart'] = (
-            context['cart']['positions'] and (
+            (context['cart']['positions'] or context['cart'].get('current_selected_payments')) and (
                 self.request.event.has_subevents or self.request.event.presale_is_running
             )
         )

src/pretix/settings.py

@@ -435,14 +435,6 @@ REST_FRAMEWORK = {
 }
 
 
-CORE_MODULES = {
-    "pretix.base",
-    "pretix.presale",
-    "pretix.control",
-    "pretix.plugins.checkinlists",
-    "pretix.plugins.reports",
-}
-
 MIDDLEWARE = [
     'pretix.helpers.logs.RequestIdMiddleware',
     'pretix.api.middleware.IdempotencyMiddleware',

src/pretix/static/bootstrap/scss/bootstrap/_theme.scss

@@ -275,12 +275,12 @@
 }
 
 // Apply the mixin to the panel headings only
-.panel-default > .panel-heading   { @include panel-heading-styles($panel-default-heading-bg); }
-.panel-primary > .panel-heading   { @include panel-heading-styles($panel-primary-heading-bg); }
-.panel-success > .panel-heading   { @include panel-heading-styles($panel-success-heading-bg); }
-.panel-info > .panel-heading      { @include panel-heading-styles($panel-info-heading-bg); }
-.panel-warning > .panel-heading   { @include panel-heading-styles($panel-warning-heading-bg); }
-.panel-danger > .panel-heading    { @include panel-heading-styles($panel-danger-heading-bg); }
+.panel-default > .panel-heading, .panel-default > legend > .panel-heading   { @include panel-heading-styles($panel-default-heading-bg); }
+.panel-primary > .panel-heading, .panel-primary > legend > .panel-heading   { @include panel-heading-styles($panel-primary-heading-bg); }
+.panel-success > .panel-heading, .panel-success > legend > .panel-heading   { @include panel-heading-styles($panel-success-heading-bg); }
+.panel-info > .panel-heading, .panel-info > legend > .panel-heading      { @include panel-heading-styles($panel-info-heading-bg); }
+.panel-warning > .panel-heading, .panel-warning > legend > .panel-heading   { @include panel-heading-styles($panel-warning-heading-bg); }
+.panel-danger > .panel-heading, .panel-danger > legend > .panel-heading    { @include panel-heading-styles($panel-danger-heading-bg); }
 
 
 //

src/pretix/static/bootstrap/scss/bootstrap/mixins/_panels.scss

@@ -3,7 +3,7 @@
 @mixin panel-variant($border, $heading-text-color, $heading-bg-color, $heading-border) {
   border-color: $border;
 
-  & > .panel-heading {
+  & > .panel-heading, & > legend > .panel-heading {
     color: $heading-text-color;
     background-color: $heading-bg-color;
     border-color: $heading-border;

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

@@ -543,7 +543,7 @@ table td > .checkbox input[type="checkbox"] {
   display: block;
   margin: 0;
 }
-.panel-default>.accordion-radio>.panel-heading {
+.panel-default>.accordion-radio>.panel-heading, fieldset.accordion-panel>legend>.panel-heading {
   color: #333;
   background-color: #f5f5f5;
   padding: 12px 15px;
@@ -555,6 +555,9 @@ table td > .checkbox input[type="checkbox"] {
     top: 2px;
   }
 }
+fieldset.accordion-panel > legend {
+  display: contents;
+}
 .maildesignpreview {
   label {
     display: block;

src/pretix/static/pretixpresale/js/ui/main.js

@@ -243,6 +243,11 @@ function setup_basics(el) {
             $($(this).attr("data-target")).collapse('show');
         }
     });
+    $("fieldset.accordion-panel > legend input[type=radio]").change(function() {
+        $(this).closest("fieldset").siblings("fieldset").prop('disabled', true).children('.panel-body').slideUp();
+        $(this).closest("fieldset").prop('disabled', false).children('.panel-body').slideDown();
+    }).filter(':not(:checked)').each(function() { $(this).closest("fieldset").prop('disabled', true).children('.panel-body').hide(); });
+
     el.find(".js-only").removeClass("js-only");
     el.find(".js-hidden").hide();
 

src/pretix/static/pretixpresale/scss/_event.scss

@@ -136,6 +136,10 @@ article.item-with-variations .product-row:last-child:after {
     display: none;
 }
 
+.panel-body:not(:has(*)) {
+  padding: 0;
+}
+
 .panel-body > *:last-child,
 .panel-body address:last-child {
     margin-bottom: 0;

src/pretix/static/pretixpresale/scss/_forms.scss

@@ -134,10 +134,14 @@ a.btn, button.btn {
   display: block;
   margin: 0;
 }
-.panel-default>.accordion-radio>.panel-heading {
+.panel-default>.accordion-radio>.panel-heading, fieldset.accordion-panel>legend>.panel-heading {
+  display: block;
   color: #333;
   background-color: #f5f5f5;
   padding: 8px 15px;
+  margin: 0;
+  line-height: 1.428571429;
+  font-size: 16px;
 
   input[type=radio] {
     margin-top: 0;
@@ -147,6 +151,13 @@ a.btn, button.btn {
 .panel-default>.accordion-radio+.panel-collapse>.panel-body {
   border-top: 1px solid #ddd;
 }
+fieldset.accordion-panel > legend {
+  display: contents;
+}
+fieldset[disabled] legend input[type="radio"],
+fieldset[disabled] legend input[type="checkbox"] {
+  cursor: default;
+}
 
 .nav-tabs {
   border-bottom: 0px solid #ddd;

src/pretix/static/pretixpresale/scss/main.scss

@@ -335,6 +335,11 @@ body.loading .container {
     }
 }
 
+.font-normal {
+    font-style: normal;
+    font-weight: normal;
+}
+
 .blank-after {
     margin-bottom: 1em;
 }
@@ -531,7 +536,7 @@ h2 .label {
 }
 
 
-.textbubble-success, .textbubble-info, .textbubble-warning, .textbubble-danger {
+.textbubble-success, .textbubble-success-warning, .textbubble-info, .textbubble-warning, .textbubble-danger {
   padding: 0 .4em;
   border-radius: $border-radius-base;
   font-weight: bold;
@@ -548,6 +553,13 @@ h2 .label {
     color: var(--pretix-brand-success);
   }
 }
+.textbubble-success-warning {
+  color: var(--pretix-brand-success-shade-42);
+  background: linear-gradient(to right, var(--pretix-brand-warning-tint-85), var(--pretix-brand-success-tint-85) 50%);
+  .fa {
+    color: var(--pretix-brand-warning);
+  }
+}
 .textbubble-info {
   color: var(--pretix-brand-info-shade-42);
   background: var(--pretix-brand-info-tint-85);

src/tests/base/test_questions.py

@@ -0,0 +1,32 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io 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/>.
+#
+from pretix.base.forms.questions import name_parts_is_empty
+
+
+def test_name_parts_is_empty():
+    assert name_parts_is_empty({}) is True
+    assert name_parts_is_empty({"_scheme": "foo"}) is True
+    assert name_parts_is_empty({"_scheme": "foo", "full_name": ""}) is True
+    assert name_parts_is_empty({"full_name": None}) is True
+    assert name_parts_is_empty({"full_name": "Flora Nord"}) is False
+    assert name_parts_is_empty({"_scheme": "foo", "given_name": "Alice"}) is False
+    assert name_parts_is_empty({"_legacy": "Alice"}) is False

src/tests/base/test_templatetag.py

@@ -77,7 +77,7 @@ def test_urlreplace_replace_parameter():
 
         # rounding errors
         ("de", Decimal("1.234"), "EUR", "1,23" + NBSP + "€"),
-        ("de", Decimal("1023.1"), "JPY", "JPY 1023,10"),
+        ("de", Decimal("1023.1"), "JPY", "JPY 1.023,10"),
     ]
 )
 def test_money_filter(locale, amount, currency, expected):
@@ -99,9 +99,9 @@ def test_money_filter(locale, amount, currency, expected):
 @pytest.mark.parametrize(
     "locale,amount,currency,expected",
     [
-        ("de", Decimal("1000.00"), "EUR", "1000,00"),
-        ("en", Decimal("1000.00"), "EUR", "1000.00"),
-        ("de", Decimal("1023.1"), "JPY", "1023,10"),
+        ("de", Decimal("1000.00"), "EUR", "1.000,00"),
+        ("en", Decimal("1000.00"), "EUR", "1,000.00"),
+        ("de", Decimal("1023.1"), "JPY", "1.023,10"),
     ]
 )
 def test_money_filter_hidecurrency(locale, amount, currency, expected):

src/tests/presale/test_cart.py

@@ -2306,6 +2306,25 @@ class CartTest(CartTestMixin, TestCase):
             assert cp1.voucher is None
             assert cp2.voucher is None
 
+    def test_voucher_apply_is_a_giftcard(self):
+        with scopes_disabled():
+            CartPosition.objects.create(
+                event=self.event, cart_id=self.session_key, item=self.ticket,
+                price=23, listed_price=23, price_after_voucher=23, expires=now() + timedelta(minutes=10)
+            )
+            CartPosition.objects.create(
+                event=self.event, cart_id=self.session_key, item=self.shirt, variation=self.shirt_blue,
+                price=8, expires=now() + timedelta(minutes=10),
+            )
+            gc = self.orga.issued_gift_cards.create(secret="GIFTCARD", currency=self.event.currency)
+            gc.transactions.create(value=Decimal("12.24"), acceptor=self.orga)
+
+        html = self.client.post('/%s/%s/cart/voucher' % (self.orga.slug, self.event.slug), {
+            'voucher': 'GIFTCARD',
+        }, follow=True)
+        assert "alert-success" in html.rendered_content
+        assert "€12.24" in html.rendered_content
+
     def test_discount(self):
         with scopes_disabled():
             Discount.objects.create(event=self.event, condition_min_count=2, benefit_discount_matching_percent=20,

src/tests/presale/test_event.py

@@ -55,6 +55,7 @@ from pretix.base.models import (
 )
 from pretix.base.models.items import SubEventItem, SubEventItemVariation
 from pretix.base.reldate import RelativeDate, RelativeDateWrapper
+from pretix.testutils.sessions import get_cart_session_key
 
 
 class EventTestMixin:
@@ -1003,6 +1004,25 @@ class VoucherRedeemItemDisplayTest(EventTestMixin, SoupTest):
         assert 'name="variation_%d_%d' % (self.item.pk, var1.pk) not in html.rendered_content
         assert 'name="variation_%d_%d' % (self.item.pk, var2.pk) not in html.rendered_content
 
+    def test_voucher_is_a_gift_card(self):
+        gc = self.orga.issued_gift_cards.create(secret="GIFTCARD", currency=self.event.currency)
+        gc.transactions.create(value=Decimal("12.00"), acceptor=self.orga)
+
+        html = self.client.get('/%s/%s/redeem?voucher=%s' % (self.orga.slug, self.event.slug, 'GIFTCARD'), follow=True)
+        assert "alert-success" in html.rendered_content
+        assert "€12.00" in html.rendered_content
+
+        payments = self.client.session['carts'][get_cart_session_key(self.client, self.event)]["payments"]
+        assert payments[0]["info_data"]["gift_card_secret"] == "GIFTCARD"
+
+    def test_voucher_is_a_gift_card_but_invalid(self):
+        gc = self.orga.issued_gift_cards.create(secret="GIFTCARD", currency=self.event.currency, expires=now() - datetime.timedelta(days=1))
+        gc.transactions.create(value=Decimal("12.00"), acceptor=self.orga)
+
+        html = self.client.get('/%s/%s/redeem?voucher=%s' % (self.orga.slug, self.event.slug, 'GIFTCARD'), follow=True)
+        assert "alert-danger" in html.rendered_content
+        assert "This gift card is no longer valid" in html.rendered_content
+
 
 class WaitingListTest(EventTestMixin, SoupTest):
     @scopes_disabled()