Fix test case

Co-authored-by: Richard Schreiber <schreiber@rami.io>

doc/admin/config.rst

@@ -288,7 +288,6 @@ Example::
     [django]
     secret=j1kjps5a5&4ilpn912s7a1!e2h!duz^i3&idu@_907s$wrz@x-
     debug=off
-    passwords_argon2=on
 
 ``secret``
     The secret to be used by Django for signing and verification purposes. If this
@@ -304,10 +303,6 @@ Example::
 
     .. WARNING:: Never set this to ``True`` in production!
 
-``passwords_argon``
-    Use the ``argon2`` algorithm for password hashing. Disable on systems with a small number of CPU cores (currently
-    less than 8).
-
 ``profile``
     Enable code profiling for a random subset of requests. Disabled by default, see
     :ref:`perf-monitoring` for details.

doc/admin/installation/docker_smallscale.rst

@@ -231,10 +231,11 @@ The following snippet is an example on how to configure a nginx proxy for pretix
         }
     }
     server {
-        listen 443 ssl default_server;
-        listen [::]:443 ipv6only=on ssl default_server;
+        listen 443 default_server;
+        listen [::]:443 ipv6only=on default_server;
         server_name pretix.mydomain.com;
 
+        ssl on;
         ssl_certificate /path/to/cert.chain.pem;
         ssl_certificate_key /path/to/key.pem;
 

doc/admin/installation/manual_smallscale.rst

@@ -216,10 +216,11 @@ The following snippet is an example on how to configure a nginx proxy for pretix
         }
     }
     server {
-        listen 443 ssl default_server;
-        listen [::]:443 ipv6only=on ssl default_server;
+        listen 443 default_server;
+        listen [::]:443 ipv6only=on default_server;
         server_name pretix.mydomain.com;
 
+        ssl on;
         ssl_certificate /path/to/cert.chain.pem;
         ssl_certificate_key /path/to/key.pem;
 

doc/api/resources/seats.rst

@@ -249,7 +249,7 @@ Endpoints
             "orderposition": null,
             "cartposition": null,
             "voucher": null
-        }
+        },
 
    :param organizer: The ``slug`` field of the organizer to modify
    :param event: The ``slug`` field of the event to modify
@@ -260,114 +260,3 @@ Endpoints
    :statuscode 401: Authentication failure
    :statuscode 403: The requested organizer or event does not exist **or** you have no permission to change this resource.
    :statuscode 404: Seat does not exist; or the endpoint without subevent id was used for event with subevents, or vice versa.
-
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/seats/bulk_block/
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/subevents/(id)/seats/bulk_block/
-
-   Set the ``blocked`` attribute to ``true`` for a large number of seats at once.
-   You can pass either a list of ``id`` values or a list of ``seat_guid`` values.
-   You can pass up to 10,000 seats in one request.
-
-   The endpoint will return an error if you pass a seat ID that does not exist.
-   However, it will not return an error if one of the passed seats is already blocked or sold.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-        PATCH /api/v1/organizers/bigevents/events/sampleconf/seats/bulk_block/ HTTP/1.1
-        Host: pretix.eu
-        Accept: application/json, text/javascript
-        Content-Type: application/json
-
-        {
-            "ids": [12, 45, 56]
-        }
-
-   or
-
-   .. sourcecode:: http
-
-        PATCH /api/v1/organizers/bigevents/events/sampleconf/seats/bulk_block/ HTTP/1.1
-        Host: pretix.eu
-        Accept: application/json, text/javascript
-        Content-Type: application/json
-
-        {
-            "seat_guids": ["6c0e29e5-05d6-421f-99f3-afd01478ecad", "c2899340-e2e7-4d05-8100-000a4b6d7cf4"]
-        }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-        HTTP/1.1 200 OK
-        Vary: Accept
-        Content-Type: application/json
-
-        {}
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param subevent_id: The ``id`` field of the subevent to modify
-   :statuscode 200: no error
-   :statuscode 400: The seat could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer or event does not exist **or** you have no permission to change this resource.
-   :statuscode 404: Seat does not exist; or the endpoint without subevent id was used for event with subevents, or vice versa.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/seats/bulk_unblock/
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/subevents/(id)/seats/bulk_unblock/
-
-   Set the ``blocked`` attribute to ``false`` for a large number of seats at once.
-   You can pass either a list of ``id`` values or a list of ``seat_guid`` values.
-   You can pass up to 10,000 seats in one request.
-
-   The endpoint will return an error if you pass a seat ID that does not exist.
-   However, it will not return an error if one of the passed seat is already unblocked or is sold.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-        PATCH /api/v1/organizers/bigevents/events/sampleconf/seats/bulk_unblock/ HTTP/1.1
-        Host: pretix.eu
-        Accept: application/json, text/javascript
-        Content-Type: application/json
-
-        {
-            "ids": [12, 45, 56]
-        }
-
-   or
-
-   .. sourcecode:: http
-
-        PATCH /api/v1/organizers/bigevents/events/sampleconf/seats/bulk_unblock/ HTTP/1.1
-        Host: pretix.eu
-        Accept: application/json, text/javascript
-        Content-Type: application/json
-
-        {
-            "seat_guids": ["6c0e29e5-05d6-421f-99f3-afd01478ecad", "c2899340-e2e7-4d05-8100-000a4b6d7cf4"]
-        }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-        HTTP/1.1 200 OK
-        Vary: Accept
-        Content-Type: application/json
-
-        {}
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param subevent_id: The ``id`` field of the subevent to modify
-   :statuscode 200: no error
-   :statuscode 400: The seat could not be modified due to invalid submitted data
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer or event does not exist **or** you have no permission to change this resource.
-   :statuscode 404: Seat does not exist; or the endpoint without subevent id was used for event with subevents, or vice versa.

doc/development/api/plugins.rst

@@ -121,7 +121,6 @@ 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
 -------
 
@@ -154,28 +153,6 @@ 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,8 +20,7 @@ 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.comment', user=user,
-                    data={"new_comment": "Hello, world."})
+   order.log_action('pretix.event.order.canceled', user=user, data={})
 
 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
@@ -73,87 +72,24 @@ 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.logentrytypes.log_entry_types` :ref:`Registry <Registries>` allows you to do so. A simple
+strings. The :py:attr:`pretix.base.signals.logentry_display` signals allows you to do so. A simple
 implementation could look like:
 
 .. code-block:: python
 
     from django.utils.translation import gettext as _
-    from pretix.base.logentrytypes import log_entry_types
+    from pretix.base.signals import logentry_display
 
-
-    @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
+    @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]
 
 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.5",
+  "django-i18nfield==1.9.*,>=1.9.4",
   "django-libsass==0.9",
   "django-localflavor==4.0",
   "django-markup",
@@ -53,7 +53,7 @@ dependencies = [
   "django-phonenumber-field==7.3.*",
   "django-redis==5.4.*",
   "django-scopes==2.0.*",
-  "django-statici18n==2.6.*",
+  "django-statici18n==2.5.*",
   "djangorestframework==3.15.*",
   "dnspython==2.7.*",
   "drf_ujson2==1.7.*",
@@ -76,7 +76,7 @@ dependencies = [
   "phonenumberslite==8.13.*",
   "Pillow==11.0.*",
   "pretix-plugin-build",
-  "protobuf==5.29.*",
+  "protobuf==5.28.*",
   "psycopg2-binary",
   "pycountry",
   "pycparser==2.22",
@@ -97,17 +97,17 @@ dependencies = [
   "text-unidecode==1.*",
   "tlds>=2020041600",
   "tqdm==4.*",
-  "ua-parser==1.0.*",
+  "ua-parser==0.18.*",
   "vat_moss_forked==2020.3.20.0.11.0",
   "vobject==0.9.*",
-  "webauthn==2.3.*",
+  "webauthn==2.2.*",
   "zeep==4.3.*"
 ]
 
 [project.optional-dependencies]
 memcached = ["pylibmc"]
 dev = [
-  "aiohttp==3.11.*",
+  "aiohttp==3.10.*",
   "coverage",
   "coveralls",
   "fakeredis==2.26.*",

src/pretix/__init__.py

@@ -19,4 +19,4 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-__version__ = "2024.12.0.dev0"
+__version__ = "2024.11.0.dev0"

src/pretix/_base_settings.py

@@ -75,14 +75,6 @@ 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
+from django.core.exceptions import PermissionDenied, ValidationError
 from django.db import transaction
 from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
@@ -43,7 +43,6 @@ 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
 
@@ -990,40 +989,6 @@ def prefetch_by_id(items, qs, id_attr, target_attr):
             setattr(item, target_attr, result.get(getattr(item, id_attr)))
 
 
-class SeatBulkBlockInputSerializer(serializers.Serializer):
-    ids = serializers.ListField(child=serializers.IntegerField(), required=False, allow_empty=True)
-    seat_guids = serializers.ListField(child=serializers.CharField(), required=False, allow_empty=True)
-
-    def to_internal_value(self, data):
-        data = super().to_internal_value(data)
-
-        if data.get("seat_guids") and data.get("ids"):
-            raise ValidationError("Please pass either seat_guids or ids.")
-
-        if data.get("seat_guids"):
-            seat_ids = data["seat_guids"]
-            if len(seat_ids) > 10000:
-                raise ValidationError({"seat_guids": ["Please do not pass over 10000 seats."]})
-
-            seats = {s.seat_guid: s for s in self.context["queryset"].filter(seat_guid__in=seat_ids)}
-            for s in seat_ids:
-                if s not in seats:
-                    raise ValidationError({"seat_guids": [f"The seat '{s}' does not exist."]})
-        elif data.get("ids"):
-            seat_ids = data["ids"]
-            if len(seat_ids) > 10000:
-                raise ValidationError({"ids": ["Please do not pass over 10000 seats."]})
-
-            seats = self.context["queryset"].in_bulk(seat_ids)
-            for s in seat_ids:
-                if s not in seats:
-                    raise ValidationError({"ids": [f"The seat '{s}' does not exist."]})
-        else:
-            raise ValidationError("Please pass either seat_guids or ids.")
-
-        return {"seats": seats.values()}
-
-
 class SeatSerializer(I18nAwareModelSerializer):
     orderposition = serializers.IntegerField(source='orderposition_id')
     cartposition = serializers.IntegerField(source='cartposition_id')

src/pretix/api/serializers/i18n.py

@@ -19,8 +19,57 @@
 # 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.rest_framework import I18nAwareModelSerializer, I18nField
+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
 
 
 class I18nURLField(I18nField):
@@ -35,10 +84,3 @@ class I18nURLField(I18nField):
         else:
             URLValidator()(value.data)
         return value
-
-
-__all__ = [
-    "I18nAwareModelSerializer",  # for backwards compatibility
-    "I18nField",  # for backwards compatibility
-    "I18nURLField",
-]

src/pretix/api/views/event.py

@@ -40,7 +40,6 @@ from django.utils.timezone import now
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
 from django_scopes import scopes_disabled
 from rest_framework import serializers, views, viewsets
-from rest_framework.decorators import action
 from rest_framework.exceptions import (
     NotFound, PermissionDenied, ValidationError,
 )
@@ -51,9 +50,8 @@ from pretix.api.auth.permission import EventCRUDPermission
 from pretix.api.pagination import TotalOrderingFilter
 from pretix.api.serializers.event import (
     CloneEventSerializer, DeviceEventSettingsSerializer, EventSerializer,
-    EventSettingsSerializer, ItemMetaPropertiesSerializer,
-    SeatBulkBlockInputSerializer, SeatSerializer, SubEventSerializer,
-    TaxRuleSerializer,
+    EventSettingsSerializer, ItemMetaPropertiesSerializer, SeatSerializer,
+    SubEventSerializer, TaxRuleSerializer,
 )
 from pretix.api.views import ConditionalListView
 from pretix.base.models import (
@@ -239,9 +237,9 @@ class EventViewSet(viewsets.ModelViewSet):
             disabled = {m: 'disabled' for m in current_plugins_value if m not in updated_plugins_value}
             changed = merge_dicts(enabled, disabled)
 
-            for module, operation in changed.items():
+            for module, action in changed.items():
                 serializer.instance.log_action(
-                    'pretix.event.plugins.' + operation,
+                    'pretix.event.plugins.' + action,
                     user=self.request.user,
                     auth=self.request.auth,
                     data={'plugin': module}
@@ -746,24 +744,3 @@ class SeatViewSet(ConditionalListView, viewsets.ModelViewSet):
             auth=self.request.auth,
             data={"seats": [serializer.instance.pk]},
         )
-
-    def bulk_change_blocked(self, blocked):
-        s = SeatBulkBlockInputSerializer(
-            data=self.request.data,
-            context={"event": self.request.event, "queryset": self.get_queryset()},
-        )
-        s.is_valid(raise_exception=True)
-
-        seats = s.validated_data["seats"]
-        for seat in seats:
-            seat.blocked = blocked
-        Seat.objects.bulk_update(seats, ["blocked"], batch_size=1000)
-        return Response({})
-
-    @action(methods=["POST"], detail=False)
-    def bulk_block(self, request, *args, **kwargs):
-        return self.bulk_change_blocked(True)
-
-    @action(methods=["POST"], detail=False)
-    def bulk_unblock(self, request, *args, **kwargs):
-        return self.bulk_change_blocked(False)

src/pretix/base/email.py

@@ -35,7 +35,6 @@ from django.utils.translation import get_language, gettext_lazy as _
 from pretix.base.models import Event
 from pretix.base.signals import register_html_mail_renderers
 from pretix.base.templatetags.rich_text import markdown_compile_email
-from pretix.helpers.format import SafeFormatter, format_map
 
 from pretix.base.services.placeholders import (  # noqa
     get_available_placeholders, PlaceholderContext
@@ -80,7 +79,7 @@ class BaseHTMLMailRenderer:
         return self.identifier
 
     def render(self, plain_body: str, plain_signature: str, subject: str, order=None,
-               position=None, context=None) -> str:
+               position=None) -> str:
         """
         This method should generate the HTML part of the email.
 
@@ -89,7 +88,6 @@ class BaseHTMLMailRenderer:
         :param subject: The email subject.
         :param order: The order if this email is connected to one, otherwise ``None``.
         :param position: The order position if this email is connected to one, otherwise ``None``.
-        :param context: Context to use to render placeholders in the plain body
         :return: An HTML string
         """
         raise NotImplementedError()
@@ -136,10 +134,8 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
     def compile_markdown(self, plaintext):
         return markdown_compile_email(plaintext)
 
-    def render(self, plain_body: str, plain_signature: str, subject: str, order, position, context) -> str:
+    def render(self, plain_body: str, plain_signature: str, subject: str, order, position) -> str:
         body_md = self.compile_markdown(plain_body)
-        if context:
-            body_md = format_map(body_md, context=context, mode=SafeFormatter.MODE_RICH_TO_HTML)
         htmlctx = {
             'site': settings.PRETIX_INSTANCE_NAME,
             'site_url': settings.SITE_URL,

src/pretix/base/forms/questions.py

@@ -277,10 +277,6 @@ 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
 
@@ -1147,16 +1143,15 @@ class BaseInvoiceAddressForm(forms.ModelForm):
             validate_address  # local import to prevent impact on startup time
 
         data = self.cleaned_data
-
         if not data.get('is_business'):
             data['company'] = ''
             data['vat_id'] = ''
         if data.get('is_business') and not ask_for_vat_id(data.get('country')):
             data['vat_id'] = ''
-        if self.address_validation and self.event.settings.invoice_address_required and not self.all_optional:
+        if self.event.settings.invoice_address_required:
             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 name_parts_is_empty(data.get('name_parts', {})):
+            if not data.get('is_business') and not data.get('name_parts'):
                 raise ValidationError(_('You need to provide your name.'))
             if not data.get('street') and not data.get('zipcode') and not data.get('city'):
                 raise ValidationError({"street": _('This field is required.')})
@@ -1171,7 +1166,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 name_parts_is_empty(data.get('name_parts', {})):
+        ) and len(data.get('name_parts', {})) == 1:
             # 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

@@ -1,288 +0,0 @@
-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(err, KeyboardInterrupt):
+                if isinstance(Exception, KeyboardInterrupt):
                     raise err
                 if settings.SENTRY_ENABLED:
                     from sentry_sdk import capture_exception

src/pretix/base/migrations/0001_squashed_0028_auto_20160816_1242.py

@@ -9,7 +9,6 @@ from decimal import Decimal
 import django.core.validators
 import django.db.models.deletion
 import i18nfield.fields
-from argon2.exceptions import HashingError
 from django.conf import settings
 from django.contrib.auth.hashers import make_password
 from django.db import migrations, models
@@ -26,14 +25,7 @@ def initial_user(apps, schema_editor):
     user = User(email='admin@localhost')
     user.is_staff = True
     user.is_superuser = True
-    try:
-        user.password = make_password('admin')
-    except HashingError:
-        raise Exception(
-            "Could not hash password of initial user with argon2id. If this is a system with less than 8 CPU cores, "
-            "you might need to disable argon2id by setting `passwords_argon2=off` in the `[django]` section of the "
-            "pretix.cfg configuration file."
-        )
+    user.password = make_password('admin')
     user.save()
 
 

src/pretix/base/models/base.py

@@ -31,7 +31,6 @@ 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
 
 
@@ -125,13 +124,7 @@ 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/event.py

@@ -823,9 +823,6 @@ class Event(EventMixin, LoggedModel):
         self.save()
         self.log_action('pretix.object.cloned', data={'source': other.slug, 'source_id': other.pk})
 
-        if hasattr(other, 'alternative_domain_assignment'):
-            other.alternative_domain_assignment.domain.event_assignments.create(event=self)
-
         if not self.all_sales_channels:
             self.limit_sales_channels.set(
                 self.organizer.sales_channels.filter(

src/pretix/base/models/log.py

@@ -33,15 +33,16 @@
 # 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.logentrytypes import log_entry_types, make_link
-from pretix.base.signals import is_app_active, logentry_object_link
+from pretix.base.signals import logentry_object_link
 
 
 class VisibleOnlyManager(models.Manager):
@@ -91,10 +92,6 @@ 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):
@@ -129,18 +126,10 @@ class LogEntry(models.Model):
     @cached_property
     def display_object(self):
         from . import (
-            Discount, Event, Item, Order, Question, Quota, SubEvent, Voucher,
+            Discount, Event, Item, ItemCategory, Order, Question, Quota,
+            SubEvent, TaxRule, 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 ''
@@ -148,15 +137,110 @@ class LogEntry(models.Model):
             co = self.content_object
         except:
             return ''
+        a_map = None
+        a_text = None
 
-        for receiver, response in logentry_object_link.send(self.event, logentry=self):
-            if response:
-                return response
+        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),
+            }
 
-        if isinstance(co, (Order, Voucher, Item, SubEvent, Quota, Discount, Question)):
-            logging.warning("LogEntryType missing or ill-defined: %s", self.action_type)
-
-        return ''
+        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 ''
 
     @cached_property
     def parsed_data(self):

src/pretix/base/models/memberships.py

@@ -159,24 +159,10 @@ class Membership(models.Model):
         de = date_format(self.date_end, 'SHORT_DATE_FORMAT')
         return f'{self.membership_type.name}: {self.attendee_name} ({ds} – {de})'
 
-    @property
-    def percentage_used(self):
-        if self.membership_type.max_usages and self.usages:
-            return int(self.usages / self.membership_type.max_usages * 100)
-        return 0
-
     @property
     def attendee_name(self):
         return build_name(self.attendee_name_parts, fallback_scheme=lambda: self.customer.organizer.settings.name_scheme)
 
-    @property
-    def expired(self):
-        return time_machine_now() > self.date_end
-
-    @property
-    def not_yet_valid(self):
-        return time_machine_now() < self.date_start
-
     def is_valid(self, ev=None, ticket_valid_from=None, valid_from_not_chosen=False):
         if valid_from_not_chosen:
             return not self.canceled and self.date_end >= time_machine_now()

src/pretix/base/models/orders.py

@@ -2275,7 +2275,6 @@ class OrderFee(models.Model):
     FEE_TYPE_SERVICE = "service"
     FEE_TYPE_CANCELLATION = "cancellation"
     FEE_TYPE_INSURANCE = "insurance"
-    FEE_TYPE_LATE = "late"
     FEE_TYPE_OTHER = "other"
     FEE_TYPE_GIFTCARD = "giftcard"
     FEE_TYPES = (
@@ -2284,7 +2283,6 @@ class OrderFee(models.Model):
         (FEE_TYPE_SERVICE, _("Service fee")),
         (FEE_TYPE_CANCELLATION, _("Cancellation fee")),
         (FEE_TYPE_INSURANCE, _("Insurance fee")),
-        (FEE_TYPE_LATE, _("Late fee")),
         (FEE_TYPE_OTHER, _("Other fees")),
         (FEE_TYPE_GIFTCARD, _("Gift card")),
     )

src/pretix/base/payment.py

@@ -1419,51 +1419,50 @@ class GiftCardPayment(BasePaymentProvider):
     def payment_refund_supported(self, payment: OrderPayment) -> bool:
         return True
 
-    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]:
+        from pretix.base.services.cart import add_payment_to_cart
+
         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()
             )
-            cs = cart_session(request)
-            try:
-                self._add_giftcard_to_cart(cs, gc)
-                return True
-            except ValidationError as e:
-                messages.error(request, str(e.message))
+            if gc.currency != self.event.currency:
+                messages.error(request, _("This gift card does not support this currency."))
                 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,28 +1426,6 @@ 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.
@@ -1462,7 +1440,16 @@ 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)
-    add_payment_to_cart_session(cs, provider, min_value, max_value, info_data)
+    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 {},
+    })
 
 
 def get_fees(event, request, total, invoice_address, payments, positions):

src/pretix/base/services/mail.py

@@ -76,7 +76,7 @@ from pretix.base.services.tasks import TransactionAwareTask
 from pretix.base.services.tickets import get_tickets_for_order
 from pretix.base.signals import email_filter, global_email_filter
 from pretix.celery_app import app
-from pretix.helpers.format import SafeFormatter, format_map
+from pretix.helpers.format import format_map
 from pretix.helpers.hierarkey import clean_filename
 from pretix.multidomain.urlreverse import build_absolute_uri
 from pretix.presale.ical import get_private_icals
@@ -311,13 +311,7 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
             try:
                 if plain_text_only:
                     body_html = None
-                elif 'context' in inspect.signature(renderer.render).parameters:
-                    body_html = renderer.render(content_plain, signature, raw_subject, order, position, context)
                 elif 'position' in inspect.signature(renderer.render).parameters:
-                    # Backwards compatibility
-                    warnings.warn('Email renderer called without context argument because context argument is not '
-                                  'supported.',
-                                  DeprecationWarning)
                     body_html = renderer.render(content_plain, signature, raw_subject, order, position)
                 else:
                     # Backwards compatibility
@@ -329,8 +323,6 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
                 logger.exception('Could not render HTML body')
                 body_html = None
 
-        body_plain = format_map(body_plain, context, mode=SafeFormatter.MODE_RICH_TO_PLAIN)
-
         send_task = mail_send_task.si(
             to=[email] if isinstance(email, str) else list(email),
             cc=cc,
@@ -663,7 +655,7 @@ def render_mail(template, context):
     if isinstance(template, LazyI18nString):
         body = str(template)
         if context:
-            body = format_map(body, context, mode=SafeFormatter.MODE_IGNORE_RICH)
+            body = format_map(body, context)
     else:
         tpl = get_template(template)
         body = tpl.render(context)

src/pretix/base/services/placeholders.py

@@ -26,7 +26,6 @@ from decimal import Decimal
 
 from django.dispatch import receiver
 from django.utils.formats import date_format
-from django.utils.html import escape
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 
@@ -40,8 +39,7 @@ from pretix.base.settings import PERSON_NAME_SCHEMES, get_name_parts_localized
 from pretix.base.signals import (
     register_mail_placeholders, register_text_placeholders,
 )
-from pretix.base.templatetags.rich_text import markdown_compile_email
-from pretix.helpers.format import PlainHtmlAlternativeString, SafeFormatter
+from pretix.helpers.format import SafeFormatter
 
 logger = logging.getLogger('pretix.base.services.placeholders')
 
@@ -109,91 +107,6 @@ class SimpleFunctionalTextPlaceholder(BaseTextPlaceholder):
             return self._sample
 
 
-class BaseRichTextPlaceholder(BaseTextPlaceholder):
-    """
-    This is the base class for all placeholders which can render either to plain text
-    or to a rich HTML element.
-    """
-
-    def __init__(self, identifier, args):
-        self._identifier = identifier
-        self._args = args
-
-    @property
-    def identifier(self):
-        return self._identifier
-
-    @property
-    def required_context(self):
-        return self._args
-
-    @property
-    def is_block(self):
-        return False
-
-    def render(self, context):
-        return PlainHtmlAlternativeString(
-            self.render_plain(**{k: context[k] for k in self._args}),
-            self.render_html(**{k: context[k] for k in self._args}),
-            self.is_block,
-        )
-
-    def render_html(self, **kwargs):
-        """
-        HTML rendering of the placeholder. Should return "safe" HTML, i.e. everything needs to be
-        escaped.
-        """
-        raise NotImplementedError
-
-    def render_plain(self, **kwargs):
-        """
-        Plain text rendering of the placeholder.
-        """
-        raise NotImplementedError
-
-    def render_sample(self, event):
-        return PlainHtmlAlternativeString(
-            self.render_sample_plain(event=event),
-            self.render_sample_html(event=event),
-            self.is_block,
-        )
-
-    def render_sample_html(self, event):
-        raise NotImplementedError
-
-    def render_sample_plain(self, event):
-        raise NotImplementedError
-
-
-class SimpleButtonPlaceholder(BaseRichTextPlaceholder):
-    def __init__(self, identifier, args, url_func, text_func, sample_url_func, sample_text_func):
-        super().__init__(identifier, args)
-        self._url_func = url_func
-        self._text_func = text_func
-        self._sample_url_func = sample_url_func
-        self._sample_text_func = sample_text_func
-
-    def render_html(self, **context):
-        text = self._text_func(**{k: context[k] for k in self._args})
-        url = self._url_func(**{k: context[k] for k in self._args})
-        return f'<a href="{url}" class="button">{escape(text)}</a>'
-
-    def render_plain(self, **context):
-        text = self._text_func(**{k: context[k] for k in self._args})
-        url = self._url_func(**{k: context[k] for k in self._args})
-        return f'{text}: {url}'
-
-    def render_sample_html(self, event):
-        text = self._sample_text_func(event)
-        url = self._sample_url_func(event)
-        return f'<a href="{url}" class="button">{escape(text)}</a>'
-
-    def render_sample_plain(self, event):
-        text = self._sample_text_func(event)
-        url = self._sample_url_func(event)
-        return f'{text}: {url}'
-
-
 class PlaceholderContext(SafeFormatter):
     """
     Holds the contextual arguments and corresponding list of available placeholders for formatting
@@ -296,24 +209,13 @@ def get_best_name(position_or_address, parts=False):
 def base_placeholders(sender, **kwargs):
     from pretix.multidomain.urlreverse import build_absolute_uri
 
-    def _event_sample(event):
-        if event.has_subevents:
-            se = event.subevents.first()
-            if se:
-                return se.name
-        return event.name
-
     ph = [
         SimpleFunctionalTextPlaceholder(
             'event', ['event'], lambda event: event.name, lambda event: event.name
         ),
         SimpleFunctionalTextPlaceholder(
             'event', ['event_or_subevent'], lambda event_or_subevent: event_or_subevent.name,
-            _event_sample,
-        ),
-        SimpleFunctionalTextPlaceholder(
-            'event_series_name', ['event', 'event_or_subevent'], lambda event, event_or_subevent: event.name,
-            lambda event: event.name
+            lambda event_or_subevent: event_or_subevent.name
         ),
         SimpleFunctionalTextPlaceholder(
             'event_slug', ['event'], lambda event: event.slug, lambda event: event.slug
@@ -371,27 +273,6 @@ def base_placeholders(sender, **kwargs):
                 }
             ),
         ),
-        SimpleButtonPlaceholder(
-            'url_button', ['order', 'event'],
-            url_func=lambda order, event: build_absolute_uri(
-                event,
-                'presale:event.order.open', kwargs={
-                    'order': order.code,
-                    'secret': order.secret,
-                    'hash': order.email_confirm_secret()
-                }
-            ),
-            text_func=lambda order, event: _("View order details"),
-            sample_url_func=lambda event: build_absolute_uri(
-                event,
-                'presale:event.order.open', kwargs={
-                    'order': 'F8VVL',
-                    'secret': '6zzjnumtsx136ddy',
-                    'hash': '98kusd8ofsj8dnkd'
-                }
-            ),
-            sample_text_func=lambda event: _("View order details"),
-        ),
         SimpleFunctionalTextPlaceholder(
             'url_info_change', ['order', 'event'], lambda order, event: build_absolute_uri(
                 event,
@@ -456,27 +337,6 @@ def base_placeholders(sender, **kwargs):
                 }
             ),
         ),
-        SimpleButtonPlaceholder(
-            'url_button', ['event', 'position'],
-            url_func=lambda event, position: build_absolute_uri(
-                event,
-                'presale:event.order.position', kwargs={
-                    'order': position.order.code,
-                    'secret': position.web_secret,
-                    'position': position.positionid
-                }
-            ),
-            text_func=lambda event, position: _("View registration details"),
-            sample_url_func=lambda event: build_absolute_uri(
-                event,
-                'presale:event.order.position', kwargs={
-                    'order': 'F8VVL',
-                    'secret': '6zzjnumtsx136ddy',
-                    'position': '123'
-                }
-            ),
-            sample_text_func=lambda event: _("View registration details"),
-        ),
         SimpleFunctionalTextPlaceholder(
             'url_info_change', ['position', 'event'], lambda position, event: build_absolute_uri(
                 event,
@@ -732,8 +592,8 @@ def base_placeholders(sender, **kwargs):
 
 
 class FormPlaceholderMixin:
-    def _set_field_placeholders(self, fn, base_parameters, rich=False):
-        placeholders = get_available_placeholders(self.event, base_parameters, rich=rich)
+    def _set_field_placeholders(self, fn, base_parameters):
+        placeholders = get_available_placeholders(self.event, base_parameters)
         ht = format_placeholders_help_text(placeholders, self.event)
         if self.fields[fn].help_text:
             self.fields[fn].help_text += ' ' + str(ht)
@@ -744,7 +604,7 @@ class FormPlaceholderMixin:
         )
 
 
-def get_available_placeholders(event, base_parameters, rich=False):
+def get_available_placeholders(event, base_parameters):
     if 'order' in base_parameters:
         base_parameters.append('invoice_address')
         base_parameters.append('position_or_address')
@@ -753,35 +613,6 @@ def get_available_placeholders(event, base_parameters, rich=False):
         if not isinstance(val, (list, tuple)):
             val = [val]
         for v in val:
-            if isinstance(v, BaseRichTextPlaceholder) and not rich:
-                continue
             if all(rp in base_parameters for rp in v.required_context):
                 params[v.identifier] = v
     return params
-
-
-def get_sample_context(event, context_parameters, rich=True):
-    context_dict = {}
-    lbl = _('This value will be replaced based on dynamic parameters.')
-    for k, v in get_available_placeholders(event, context_parameters, rich=rich).items():
-        sample = v.render_sample(event)
-        if isinstance(sample, PlainHtmlAlternativeString):
-            context_dict[k] = PlainHtmlAlternativeString(
-                sample.plain,
-                '<{el} class="placeholder placeholder-html" title="{title}">{html}</{el}>'.format(
-                    el='div' if sample.is_block else 'span',
-                    title=lbl,
-                    html=sample.html,
-                )
-            )
-        elif str(sample).strip().startswith('* ') or str(sample).startswith('  '):
-            context_dict[k] = '<div class="placeholder" title="{}">{}</div>'.format(
-                lbl,
-                markdown_compile_email(str(sample))
-            )
-        else:
-            context_dict[k] = '<span class="placeholder" title="{}">{}</span>'.format(
-                lbl,
-                escape(sample)
-            )
-    return context_dict

src/pretix/base/settings.py

@@ -56,7 +56,6 @@ 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
@@ -64,7 +63,7 @@ from rest_framework import serializers
 from pretix.api.serializers.fields import (
     ListMultipleChoiceField, UploadedFileField,
 )
-from pretix.api.serializers.i18n import I18nURLField
+from pretix.api.serializers.i18n import I18nField, 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,15 +33,14 @@
 # License for the specific language governing permissions and limitations under the License.
 
 import warnings
-from typing import TYPE_CHECKING, Any, Callable, List, Tuple
+from typing import Any, Callable, List, Tuple
 
 import django.dispatch
 from django.apps import apps
 from django.conf import settings
 from django.dispatch.dispatcher import NO_RECEIVERS
 
-if TYPE_CHECKING:
-    from .models import Event
+from .models import Event
 
 app_cache = {}
 
@@ -53,50 +52,6 @@ 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
@@ -104,14 +59,40 @@ class EventPluginSignal(django.dispatch.Signal):
     Event.
     """
 
-    def send(self, sender: "Event", **named) -> List[Tuple[Callable, Any]]:
+    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]]:
         """
         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.")
 
@@ -123,12 +104,12 @@ class EventPluginSignal(django.dispatch.Signal):
             _populate_app_cache()
 
         for receiver in self._sorted_receivers(sender):
-            if is_receiver_active(sender, receiver):
+            if self._is_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
@@ -136,7 +117,6 @@ 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.")
 
@@ -148,12 +128,12 @@ class EventPluginSignal(django.dispatch.Signal):
             _populate_app_cache()
 
         for receiver in self._sorted_receivers(sender):
-            if is_receiver_active(sender, receiver):
+            if self._is_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
@@ -161,7 +141,6 @@ 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.")
 
@@ -176,7 +155,7 @@ class EventPluginSignal(django.dispatch.Signal):
             _populate_app_cache()
 
         for receiver in self._sorted_receivers(sender):
-            if is_receiver_active(sender, receiver):
+            if self._is_active(sender, receiver):
                 try:
                     response = receiver(signal=self, sender=sender, **named)
                 except Exception as err:
@@ -199,7 +178,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
@@ -223,115 +202,6 @@ 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
@@ -637,16 +507,41 @@ logentry_display = EventPluginSignal()
 """
 Arguments: ``logentry``
 
-**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
+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.
 """
 
 logentry_object_link = EventPluginSignal()
 """
 Arguments: ``logentry``
 
-**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
+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.
 """
 
 requiredaction_display = EventPluginSignal()

src/pretix/base/templates/pretixbase/email/base.html

@@ -131,9 +131,6 @@
             text-align: left;
             padding: 0;
         }
-        .content table td.align-right {
-            text-align: right;
-        }
 
         a.button {
             display: inline-block;
@@ -181,9 +178,6 @@
         pre, pre code {
             white-space: pre-line;
         }
-        .text-right, .content table td.text-right {
-            text-align: right;
-        }
 
         {% if rtl %}
             body {
@@ -192,9 +186,6 @@
             .content {
                 text-align: right;
             }
-            .text-right, .content table td.text-right {
-                text-align: left;
-            }
         {% endif %}
 
         {% block addcss %}{% endblock %}

src/pretix/base/templatetags/icon.py

@@ -1,34 +0,0 @@
-#
-# 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 django import template
-from django.utils.html import format_html
-
-register = template.Library()
-
-
-@register.simple_tag
-def icon(key, *args, **kwargs):
-    return format_html(
-        '<span class="fa fa-{} {}" aria-hidden="true"></span>',
-        key,
-        kwargs["class"] if "class" in kwargs else "",
-    )

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, "2g")
+            return floatformat(value, 2)
         else:
-            return '{} {}'.format(arg, floatformat(value, "2g"))
+            return '{} {}'.format(arg, floatformat(value, 2))
 
     if hide_currency:
-        return floatformat(value, f"{places}g")
+        return floatformat(value, places)
 
     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, f"{places}g"))
+        return '{} {}'.format(arg, floatformat(value, places))
 
 
 @register.filter("money_numberfield")

src/pretix/base/templatetags/rich_text.py

@@ -305,7 +305,6 @@ def markdown_compile_email(source, allowed_tags=ALLOWED_TAGS, allowed_attributes
         source,
         extensions=[
             'markdown.extensions.sane_lists',
-            'markdown.extensions.tables',
             EmailNl2BrExtension(),
             LinkifyAndCleanExtension(
                 linker,

src/pretix/base/templatetags/textbubble.py

@@ -1,42 +0,0 @@
-#
-# 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 django import template
-from django.utils.html import format_html, mark_safe
-
-register = template.Library()
-
-
-@register.simple_tag
-def textbubble(type, *args, **kwargs):
-    return format_html(
-        '<span class="textbubble-{}">{}',
-        type or "info",
-        "" if "icon" not in kwargs else format_html(
-            '<i class="fa fa-{}" aria-hidden="true"></i> ',
-            kwargs["icon"]
-        )
-    )
-
-
-@register.simple_tag
-def endtextbubble():
-    return mark_safe('</span>')

src/pretix/control/forms/event.py

@@ -35,7 +35,7 @@
 # License for the specific language governing permissions and limitations under the License.
 
 from decimal import Decimal
-from urllib.parse import urlencode
+from urllib.parse import urlencode, urlparse
 from zoneinfo import ZoneInfo
 
 import pycountry
@@ -76,10 +76,8 @@ from pretix.control.forms import (
 )
 from pretix.control.forms.widgets import Select2
 from pretix.helpers.countries import CachedCountries
-from pretix.multidomain.models import AlternativeDomainAssignment, KnownDomain
-from pretix.multidomain.urlreverse import (
-    build_absolute_uri, get_organizer_domain,
-)
+from pretix.multidomain.models import KnownDomain
+from pretix.multidomain.urlreverse import build_absolute_uri
 from pretix.plugins.banktransfer.payment import BankTransfer
 from pretix.presale.style import get_fonts
 
@@ -138,11 +136,6 @@ class EventWizardBasicsForm(I18nModelForm):
         choices=settings.LANGUAGES,
         label=_("Default language"),
     )
-    no_taxes = forms.BooleanField(
-        label=_("I don't want to specify taxes now"),
-        help_text=_("You can always configure tax rates later."),
-        required=False,
-    )
     tax_rate = forms.DecimalField(
         label=_("Sales tax rate"),
         help_text=_("Do you need to pay sales tax on your tickets? In this case, please enter the applicable tax rate "
@@ -230,11 +223,6 @@ class EventWizardBasicsForm(I18nModelForm):
             raise ValidationError({
                 'timezone': _('Your default locale must be specified.')
             })
-        if not data.get("no_taxes") and not data.get("tax_rate"):
-            raise ValidationError({
-                'tax_rate': _('You have not specified a tax rate. If you do not want us to compute sales taxes, please '
-                              'check "{field}" above.').format(field=self.fields["no_taxes"].label)
-            })
 
         # change timezone
         zone = ZoneInfo(data.get('timezone'))
@@ -365,9 +353,14 @@ class EventUpdateForm(I18nModelForm):
 
     def __init__(self, *args, **kwargs):
         self.change_slug = kwargs.pop('change_slug', False)
+        self.domain = kwargs.pop('domain', False)
 
         kwargs.setdefault('initial', {})
         self.instance = kwargs['instance']
+        if self.domain and self.instance:
+            initial_domain = self.instance.domains.first()
+            if initial_domain:
+                kwargs['initial'].setdefault('domain', initial_domain.domainname)
 
         super().__init__(*args, **kwargs)
         if not self.change_slug:
@@ -376,54 +369,48 @@ class EventUpdateForm(I18nModelForm):
         self.fields['location'].widget.attrs['placeholder'] = _(
             'Sample Conference Center\nHeidelberg, Germany'
         )
-
-        try:
+        if self.domain:
             self.fields['domain'] = forms.CharField(
                 max_length=255,
-                label=_('Domain'),
-                initial=self.instance.domain.domainname,
-                required=False,
-                disabled=True,
-                help_text=_('You can configure this in your organizer settings.')
-            )
-        except KnownDomain.DoesNotExist:
-            domain = get_organizer_domain(self.instance.organizer)
-            try:
-                current_domain_assignment = self.instance.alternative_domain_assignment
-            except AlternativeDomainAssignment.DoesNotExist:
-                current_domain_assignment = None
-            self.fields['domain'] = forms.ChoiceField(
-                label=_('Domain'),
-                help_text=_('You can add more domains in your organizer account.'),
-                choices=[('', _('Same as organizer account') + (f" ({domain})" if domain else ""))] + [
-                    (d.domainname, d.domainname) for d in self.instance.organizer.domains.filter(mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
-                ],
-                initial=current_domain_assignment.domain_id if current_domain_assignment else "",
+                label=_('Custom domain'),
                 required=False,
+                help_text=_('You need to configure the custom domain in the webserver beforehand.')
             )
         self.fields['limit_sales_channels'].queryset = self.event.organizer.sales_channels.all()
         self.fields['limit_sales_channels'].widget = SalesChannelCheckboxSelectMultiple(self.event, attrs={
             'data-inverse-dependency': '<[name$=all_sales_channels]',
         }, choices=self.fields['limit_sales_channels'].widget.choices)
 
+    def clean_domain(self):
+        d = self.cleaned_data['domain']
+        if d:
+            if d == urlparse(settings.SITE_URL).hostname:
+                raise ValidationError(
+                    _('You cannot choose the base domain of this installation.')
+                )
+            if KnownDomain.objects.filter(domainname=d).exclude(event=self.instance.pk).exists():
+                raise ValidationError(
+                    _('This domain is already in use for a different event or organizer.')
+                )
+        return d
+
     def save(self, commit=True):
         instance = super().save(commit)
 
-        try:
-            current_domain_assignment = instance.alternative_domain_assignment
-        except AlternativeDomainAssignment.DoesNotExist:
-            current_domain_assignment = None
-        if self.cleaned_data['domain'] and not hasattr(instance, 'domain'):
-            domain = self.instance.organizer.domains.get(mode=KnownDomain.MODE_ORG_ALT_DOMAIN, domainname=self.cleaned_data["domain"])
-            AlternativeDomainAssignment.objects.update_or_create(
-                event=instance,
-                defaults={
-                    "domain": domain,
-                }
-            )
-            instance.cache.clear()
-        elif current_domain_assignment:
-            current_domain_assignment.delete()
+        if self.domain:
+            current_domain = instance.domains.first()
+            if self.cleaned_data['domain']:
+                if current_domain and current_domain.domainname != self.cleaned_data['domain']:
+                    current_domain.delete()
+                    KnownDomain.objects.create(
+                        organizer=instance.organizer, event=instance, domainname=self.cleaned_data['domain']
+                    )
+                elif not current_domain:
+                    KnownDomain.objects.create(
+                        organizer=instance.organizer, event=instance, domainname=self.cleaned_data['domain']
+                    )
+            elif current_domain:
+                current_domain.delete()
             instance.cache.clear()
 
         return instance
@@ -1385,7 +1372,7 @@ class MailSettingsForm(FormPlaceholderMixin, SettingsForm):
         self.event.meta_values_cached = self.event.meta_values.select_related('property').all()
 
         for k, v in self.base_context.items():
-            self._set_field_placeholders(k, v, rich=k.startswith('mail_text_'))
+            self._set_field_placeholders(k, v)
 
         for k, v in list(self.fields.items()):
             if k.endswith('_attendee') and not event.settings.attendee_emails_asked:

src/pretix/control/forms/organizer.py

@@ -133,108 +133,63 @@ class OrganizerDeleteForm(forms.Form):
 class OrganizerUpdateForm(OrganizerForm):
 
     def __init__(self, *args, **kwargs):
+        self.domain = kwargs.pop('domain', False)
         self.change_slug = kwargs.pop('change_slug', False)
         kwargs.setdefault('initial', {})
         self.instance = kwargs['instance']
+        if self.domain and self.instance:
+            initial_domain = self.instance.domains.filter(event__isnull=True).first()
+            if initial_domain:
+                kwargs['initial'].setdefault('domain', initial_domain.domainname)
 
         super().__init__(*args, **kwargs)
         if not self.change_slug:
             self.fields['slug'].widget.attrs['readonly'] = 'readonly'
+        if self.domain:
+            self.fields['domain'] = forms.CharField(
+                max_length=255,
+                label=_('Custom domain'),
+                required=False,
+                help_text=_('You need to configure the custom domain in the webserver beforehand.')
+            )
+
+    def clean_domain(self):
+        d = self.cleaned_data['domain']
+        if d:
+            if d == urlparse(settings.SITE_URL).hostname:
+                raise ValidationError(
+                    _('You cannot choose the base domain of this installation.')
+                )
+            if KnownDomain.objects.filter(domainname=d).exclude(organizer=self.instance.pk,
+                                                                event__isnull=True).exists():
+                raise ValidationError(
+                    _('This domain is already in use for a different event or organizer.')
+                )
+        return d
 
     def clean_slug(self):
         if self.change_slug:
             return self.cleaned_data['slug']
         return self.instance.slug
 
+    def save(self, commit=True):
+        instance = super().save(commit)
 
-class KnownDomainForm(forms.ModelForm):
-    class Meta:
-        model = KnownDomain
-        fields = ["domainname", "mode", "event"]
-        field_classes = {
-            "event": SafeModelChoiceField,
-        }
+        if self.domain:
+            current_domain = instance.domains.filter(event__isnull=True).first()
+            if self.cleaned_data['domain']:
+                if current_domain and current_domain.domainname != self.cleaned_data['domain']:
+                    current_domain.delete()
+                    KnownDomain.objects.create(organizer=instance, domainname=self.cleaned_data['domain'])
+                elif not current_domain:
+                    KnownDomain.objects.create(organizer=instance, domainname=self.cleaned_data['domain'])
+            elif current_domain:
+                current_domain.delete()
+            instance.cache.clear()
+            for ev in instance.events.all():
+                ev.cache.clear()
 
-    def __init__(self, *args, **kwargs):
-        self.organizer = kwargs.pop('organizer')
-        super().__init__(*args, **kwargs)
-        self.fields["event"].queryset = self.organizer.events.all()
-        if self.instance and self.instance.pk:
-            self.fields["domainname"].widget.attrs['readonly'] = 'readonly'
-
-    def clean_domainname(self):
-        if self.instance and self.instance.pk:
-            return self.instance.domainname
-        d = self.cleaned_data['domainname']
-        if d:
-            if d == urlparse(settings.SITE_URL).hostname:
-                raise ValidationError(
-                    _('You cannot choose the base domain of this installation.')
-                )
-            if KnownDomain.objects.filter(domainname=d).exclude(organizer=self.instance.organizer).exists():
-                raise ValidationError(
-                    _('This domain is already in use for a different event or organizer.')
-                )
-        return d
-
-    def clean(self):
-        d = super().clean()
-
-        if d["mode"] == KnownDomain.MODE_ORG_DOMAIN and d["event"]:
-            raise ValidationError(
-                _("Do not choose an event for this mode.")
-            )
-
-        if d["mode"] == KnownDomain.MODE_ORG_ALT_DOMAIN and d["event"]:
-            raise ValidationError(
-                _("Do not choose an event for this mode. You can assign events to this domain in event settings.")
-            )
-
-        if d["mode"] == KnownDomain.MODE_EVENT_DOMAIN and not d["event"]:
-            raise ValidationError(
-                _("You need to choose an event.")
-            )
-
-        return d
-
-
-class BaseKnownDomainFormSet(forms.BaseInlineFormSet):
-    def __init__(self, *args, **kwargs):
-        self.organizer = kwargs.pop('organizer')
-        super().__init__(*args, **kwargs)
-
-    def _construct_form(self, i, **kwargs):
-        kwargs['organizer'] = self.organizer
-        return super()._construct_form(i, **kwargs)
-
-    @property
-    def empty_form(self):
-        form = self.form(
-            auto_id=self.auto_id,
-            prefix=self.add_prefix('__prefix__'),
-            empty_permitted=True,
-            use_required_attribute=False,
-            organizer=self.organizer,
-        )
-        self.add_fields(form, None)
-        return form
-
-    def clean(self):
-        super().clean()
-        data = [f.cleaned_data for f in self.forms]
-
-        if len([d for d in data if d.get("mode") == KnownDomain.MODE_ORG_DOMAIN and not d.get("DELETE")]) > 1:
-            raise ValidationError(_("You may set only one organizer domain."))
-
-        return data
-
-
-KnownDomainFormset = inlineformset_factory(
-    Organizer, KnownDomain,
-    KnownDomainForm,
-    formset=BaseKnownDomainFormSet,
-    can_order=False, can_delete=True, extra=0
-)
+        return instance
 
 
 class SafeOrderPositionChoiceField(forms.ModelChoiceField):

src/pretix/control/logdisplay.py

@@ -47,20 +47,12 @@ 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 (
-    app_cache, logentry_display, orderposition_blocked_display,
-)
+from pretix.base.signals import logentry_display, orderposition_blocked_display
 from pretix.base.templatetags.money import money_filter
 
 OVERVIEW_BANLIST = [
@@ -337,6 +329,278 @@ 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)
@@ -360,16 +624,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 logentry.parsed_data:
+        if 'list' in data:
             try:
-                checkin_list = sender.checkin_lists.get(pk=logentry.parsed_data.get('list')).name
+                checkin_list = sender.checkin_lists.get(pk=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=logentry.parsed_data.get('positionid'),
+            posid=data.get('positionid'),
             list=checkin_list,
         )
 
@@ -378,14 +642,83 @@ 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=logentry.parsed_data.get('positionid'),
+            posid=data.get('positionid'),
             datetime=date_format(
-                dateutil.parser.parse(logentry.parsed_data["datetime"]).astimezone(sender.timezone),
+                dateutil.parser.parse(data["datetime"]).astimezone(sender.timezone),
                 "SHORT_DATETIME_FORMAT"
             ),
-            type=dict(PrintLog.PRINT_TYPES)[logentry.parsed_data["type"]],
+            type=dict(PrintLog.PRINT_TYPES)[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):
@@ -393,479 +726,3 @@ 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 %}" id="plugin_{{ plugin.module }}">
+                            <div class="plugin-container {% if plugin.featured %}featured-plugin{% endif %}">
                             {% if plugin.featured %}
                                <div class="panel panel-default">
                                     <div class="panel-body">

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

@@ -22,7 +22,7 @@
                 {% bootstrap_field form.name layout="control" %}
                 {% bootstrap_field form.slug layout="control" %}
                 {% if form.domain %}
-                    {% bootstrap_field form.domain layout="horizontal" %}
+                    {% bootstrap_field form.domain layout="control" %}
                 {% endif %}
                 {% bootstrap_field form.date_from layout="control" %}
                 {% bootstrap_field form.date_to layout="control" %}

src/pretix/control/templates/pretixcontrol/events/create_basics.html

@@ -41,10 +41,7 @@
         {% endif %}
         {% include "pretixcontrol/event/fragment_geodata.html" %}
         {% bootstrap_field form.currency layout="control" %}
-        {% bootstrap_field form.no_taxes layout="control" %}
-        <div data-display-dependency="#{{ form.no_taxes.id_for_label }}" data-inverse>
-            {% bootstrap_field form.tax_rate addon_after="%" layout="control" %}
-        </div>
+        {% bootstrap_field form.tax_rate addon_after="%" layout="control" %}
     </fieldset>
     <fieldset>
         <legend>{% trans "Display settings" %}</legend>

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

@@ -220,6 +220,7 @@
                     {% 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/templates/pretixcontrol/organizers/edit.html

@@ -294,71 +294,6 @@
                         <legend>{% trans "Invoices" %}</legend>
                         {% bootstrap_field sform.invoice_regenerate_allowed layout="control" %}
                     </fieldset>
-                    {% if domain_formset %}
-                        <fieldset>
-                            <legend>{% trans "Domains" %}</legend>
-                            <div class="alert alert-warning">
-                                {% trans "This dialog is intended for advanced users." %}
-                                {% trans "The domain needs to be configured on your webserver before it can be used here." %}
-                            </div>
-                            <div class="formset" data-formset data-formset-prefix="{{ domain_formset.prefix }}">
-                                {{ domain_formset.management_form }}
-                                {% bootstrap_formset_errors domain_formset %}
-                                <div data-formset-body>
-                                    {% for form in domain_formset %}
-                                        <div class="row formset-row" data-formset-form>
-                                            <div class="sr-only">
-                                                {{ form.id }}
-                                                {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
-                                            </div>
-                                            <div class="col-md-4">
-                                                {% bootstrap_field form.domainname layout='' form_group_class="" %}
-                                                {% bootstrap_form_errors form %}
-                                            </div>
-                                            <div class="col-md-3">
-                                                {% bootstrap_field form.mode layout='' form_group_class="" %}
-                                            </div>
-                                            <div class="col-md-3">
-                                                {% bootstrap_field form.event layout='' form_group_class="" %}
-                                            </div>
-                                            <div class="col-md-2 text-right flip">
-                                                <label aria-hidden="true">&nbsp;</label><br>
-                                                <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                                    <i class="fa fa-trash"></i></button>
-                                            </div>
-                                        </div>
-                                    {% endfor %}
-                                </div>
-                                <script type="form-template" data-formset-empty-form>
-                                    {% escapescript %}
-                                        <div class="row formset-row" data-formset-form>
-                                            <div class="sr-only">
-                                                {{ domain_formset.empty_form.id }}
-                                                {% bootstrap_field domain_formset.empty_form.DELETE form_group_class="" layout="inline" %}
-                                            </div>
-                                            <div class="col-md-4">
-                                                {% bootstrap_field domain_formset.empty_form.domainname layout='' form_group_class="" %}
-                                            </div>
-                                            <div class="col-md-3">
-                                                {% bootstrap_field domain_formset.empty_form.mode layout='' form_group_class="" %}
-                                            </div>
-                                            <div class="col-md-3">
-                                                {% bootstrap_field domain_formset.empty_form.event layout='' form_group_class="" %}
-                                            </div>
-                                            <div class="col-md-2 text-right flip">
-                                                <label aria-hidden="true">&nbsp;</label><br>
-                                                <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                                    <i class="fa fa-trash"></i></button>
-                                            </div>
-                                        </div>
-                                    {% endescapescript %}
-                                </script>
-                                <p>
-                                    <button type="button" class="btn btn-default" data-formset-add>
-                                        <i class="fa fa-plus"></i> {% trans "Add domain" %}</button>
-                                </p>
-                        </fieldset>
-                    {% endif %}
                 </div>
                 <div class="form-group submit-group">
                     <button type="submit" class="btn btn-primary btn-save">

src/pretix/control/views/dashboards.py

@@ -38,7 +38,6 @@ 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,
 )
@@ -48,6 +47,7 @@ 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,7 +67,6 @@ 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>'
@@ -112,7 +111,7 @@ def base_widgets(sender, subevent=None, lazy=False, **kwargs):
 
     return [
         {
-            'content': None if lazy else NUM_WIDGET.format(num=intcomma(tickc), text=_('Attendees (ordered)')),
+            'content': None if lazy else NUM_WIDGET.format(num=tickc, text=_('Attendees (ordered)')),
             'lazy': 'attendees-ordered',
             'display_size': 'small',
             'priority': 100,
@@ -122,7 +121,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=intcomma(paidc), text=_('Attendees (paid)')),
+            'content': None if lazy else NUM_WIDGET.format(num=paidc, text=_('Attendees (paid)')),
             'lazy': 'attendees-paid',
             'display_size': 'small',
             'priority': 100,
@@ -133,9 +132,7 @@ def base_widgets(sender, subevent=None, lazy=False, **kwargs):
         },
         {
             'content': None if lazy else NUM_WIDGET.format(
-                num=money_filter(round_decimal(rev, sender.currency), sender.currency, hide_currency=True),
-                text=_('Total revenue ({currency})').format(currency=sender.currency)
-            ),
+                num=formats.localize(round_decimal(rev, sender.currency)), text=_('Total revenue ({currency})').format(currency=sender.currency)),
             'lazy': 'total-revenue',
             'display_size': 'small',
             'priority': 100,
@@ -210,7 +207,7 @@ def waitinglist_widgets(sender, subevent=None, lazy=False, **kwargs):
 
         widgets.append({
             'content': None if lazy else NUM_WIDGET.format(
-                num=intcomma(happy), text=_('available to give to people on waiting list')
+                num=str(happy), text=_('available to give to people on waiting list')
             ),
             'lazy': 'waitinglist-avail',
             'priority': 50,
@@ -220,7 +217,7 @@ def waitinglist_widgets(sender, subevent=None, lazy=False, **kwargs):
             })
         })
         widgets.append({
-            'content': None if lazy else NUM_WIDGET.format(num=intcomma(wles.count()), text=_('total waiting list length')),
+            'content': None if lazy else NUM_WIDGET.format(num=str(wles.count()), text=_('total waiting list length')),
             'lazy': 'waitinglist-length',
             'display_size': 'small',
             'priority': 50,
@@ -248,7 +245,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(intcomma(left), intcomma(q.size)) if q.size is not None else '\u221e',
+                num='{}/{}'.format(left, q.size) if q.size is not None else '\u221e',
                 text=_('{quota} left').format(quota=escape(q.name))
             ),
             'lazy': 'quota-{}'.format(q.pk),
@@ -300,7 +297,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(intcomma(cl.inside_count), intcomma(cl.position_count)),
+                num='{}/{}'.format(cl.inside_count, cl.position_count),
                 text=_('Present – {list}').format(list=escape(cl.name))
             ),
             'lazy': 'checkin-{}'.format(cl.pk),

src/pretix/control/views/event.py

@@ -62,7 +62,7 @@ from django.http import (
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
 from django.utils.functional import cached_property
-from django.utils.html import conditional_escape
+from django.utils.html import escape
 from django.utils.http import url_has_allowed_host_and_scheme
 from django.utils.timezone import now
 from django.utils.translation import gettext, gettext_lazy as _, gettext_noop
@@ -100,12 +100,9 @@ from ...base.models.items import (
     Item, ItemCategory, ItemMetaProperty, Question, Quota,
 )
 from ...base.services.mail import prefix_subject
-from ...base.services.placeholders import get_sample_context
 from ...base.settings import LazyI18nStringList
 from ...helpers.compat import CompatDeleteView
-from ...helpers.format import (
-    PlainHtmlAlternativeString, SafeFormatter, format_map,
-)
+from ...helpers.format import format_map
 from ..logdisplay import OVERVIEW_BANLIST
 from . import CreateView, PaginationMixin, UpdateView
 
@@ -242,6 +239,7 @@ class EventUpdate(DecoupleMixin, EventSettingsViewMixin, EventPermissionRequired
         kwargs = super().get_form_kwargs()
         if self.request.user.has_active_staff_session(self.request.session.session_key):
             kwargs['change_slug'] = True
+            kwargs['domain'] = True
         return kwargs
 
     def post(self, request, *args, **kwargs):
@@ -719,7 +717,20 @@ class MailSettingsPreview(EventPermissionRequiredMixin, View):
 
     # get all supported placeholders with dummy values
     def placeholders(self, item):
-        return get_sample_context(self.request.event, MailSettingsForm.base_context[item])
+        ctx = {}
+        for p in get_available_placeholders(self.request.event, MailSettingsForm.base_context[item]).values():
+            s = str(p.render_sample(self.request.event))
+            if s.strip().startswith('* '):
+                ctx[p.identifier] = '<div class="placeholder" title="{}">{}</div>'.format(
+                    _('This value will be replaced based on dynamic parameters.'),
+                    markdown_compile_email(s)
+                )
+            else:
+                ctx[p.identifier] = '<span class="placeholder" title="{}">{}</span>'.format(
+                    _('This value will be replaced based on dynamic parameters.'),
+                    escape(s)
+                )
+        return ctx
 
     def post(self, request, *args, **kwargs):
         preview_item = request.POST.get('item', '')
@@ -741,15 +752,9 @@ class MailSettingsPreview(EventPermissionRequiredMixin, View):
                                     bleach.clean(v), self.placeholders(preview_item), raise_on_missing=True
                                 ), highlight=True)
                             else:
-                                placeholders = self.placeholders(preview_item)
-                                msgs[self.supported_locale[idx]] = format_map(
-                                    markdown_compile_email(
-                                        format_map(v, placeholders, raise_on_missing=True)
-                                    ),
-                                    placeholders,
-                                    mode=SafeFormatter.MODE_RICH_TO_HTML,
+                                msgs[self.supported_locale[idx]] = markdown_compile_email(
+                                    format_map(v, self.placeholders(preview_item), raise_on_missing=True)
                                 )
-
                         except ValueError:
                             msgs[self.supported_locale[idx]] = '<div class="alert alert-danger">{}</div>'.format(
                                 PlaceholderValidator.error_message)
@@ -772,18 +777,13 @@ class MailSettingsRendererPreview(MailSettingsPreview):
     # get all supported placeholders with dummy values
     def placeholders(self, item):
         ctx = {}
-        for p in get_available_placeholders(self.request.event, MailSettingsForm.base_context[item], rich=True).values():
-            sample = p.render_sample(self.request.event)
-            if isinstance(sample, PlainHtmlAlternativeString):
-                ctx[p.identifier] = sample
-            else:
-                ctx[p.identifier] = conditional_escape(sample)
+        for p in get_available_placeholders(self.request.event, MailSettingsForm.base_context[item]).values():
+            ctx[p.identifier] = escape(str(p.render_sample(self.request.event)))
         return ctx
 
     def get(self, request, *args, **kwargs):
         v = str(request.event.settings.mail_text_order_placed)
-        context = self.placeholders('mail_text_order_placed')
-        v = format_map(v, context)
+        v = format_map(v, self.placeholders('mail_text_order_placed'))
         renderers = request.event.get_html_mail_renderers()
         if request.GET.get('renderer') in renderers:
             with rolledback_transaction():
@@ -801,8 +801,7 @@ class MailSettingsRendererPreview(MailSettingsPreview):
                     str(request.event.settings.mail_text_signature),
                     gettext('Your order: %(code)s') % {'code': order.code},
                     order,
-                    position=None,
-                    context=context,
+                    position=None
                 )
                 r = HttpResponse(v, content_type='text/html')
                 r._csp_ignore = True

src/pretix/control/views/orders.py

@@ -134,7 +134,7 @@ from pretix.control.signals import order_search_forms
 from pretix.control.views import PaginationMixin
 from pretix.helpers import OF_SELF
 from pretix.helpers.compat import CompatDeleteView
-from pretix.helpers.format import SafeFormatter, format_map
+from pretix.helpers.format import format_map
 from pretix.helpers.safedownload import check_token
 from pretix.presale.signals import question_form_fields
 
@@ -2351,7 +2351,7 @@ class OrderSendMail(EventPermissionRequiredMixin, OrderViewMixin, FormView):
                 'subject': mark_safe(_('Subject: {subject}').format(
                     subject=prefix_subject(order.event, escape(email_subject), highlight=True)
                 )),
-                'html': format_map(markdown_compile_email(email_content), email_context, mode=SafeFormatter.MODE_RICH_TO_HTML)
+                'html': markdown_compile_email(email_content)
             }
             return self.get(self.request, *self.args, **self.kwargs)
         else:

src/pretix/control/views/organizer.py

@@ -104,11 +104,11 @@ from pretix.control.forms.organizer import (
     CustomerCreateForm, CustomerUpdateForm, DeviceBulkEditForm, DeviceForm,
     EventMetaPropertyAllowedValueFormSet, EventMetaPropertyForm, GateForm,
     GiftCardAcceptanceInviteForm, GiftCardCreateForm, GiftCardUpdateForm,
-    KnownDomainFormset, MailSettingsForm, MembershipTypeForm,
-    MembershipUpdateForm, OrganizerDeleteForm, OrganizerFooterLinkFormset,
-    OrganizerForm, OrganizerSettingsForm, OrganizerUpdateForm,
-    ReusableMediumCreateForm, ReusableMediumUpdateForm, SalesChannelForm,
-    SSOClientForm, SSOProviderForm, TeamForm, WebHookForm,
+    MailSettingsForm, MembershipTypeForm, MembershipUpdateForm,
+    OrganizerDeleteForm, OrganizerFooterLinkFormset, OrganizerForm,
+    OrganizerSettingsForm, OrganizerUpdateForm, ReusableMediumCreateForm,
+    ReusableMediumUpdateForm, SalesChannelForm, SSOClientForm, SSOProviderForm,
+    TeamForm, WebHookForm,
 )
 from pretix.control.forms.rrule import RRuleForm
 from pretix.control.logdisplay import OVERVIEW_BANLIST
@@ -122,7 +122,7 @@ from pretix.control.views.mailsetup import MailSettingsSetupView
 from pretix.helpers import OF_SELF, GroupConcat
 from pretix.helpers.compat import CompatDeleteView
 from pretix.helpers.dicts import merge_dicts
-from pretix.helpers.format import SafeFormatter, format_map
+from pretix.helpers.format import format_map
 from pretix.helpers.urls import build_absolute_uri as build_global_uri
 from pretix.multidomain.urlreverse import build_absolute_uri
 from pretix.presale.forms.customer import TokenGenerator
@@ -357,10 +357,9 @@ class MailSettingsPreview(OrganizerPermissionRequiredMixin, View):
                                 highlight=True,
                             )
                         else:
-                            placeholders = self.placeholders(preview_item)
-                            msgs[self.supported_locale[idx]] = format_map(markdown_compile_email(
-                                format_map(v, placeholders)
-                            ), placeholders, mode=SafeFormatter.MODE_RICH_TO_HTML)
+                            msgs[self.supported_locale[idx]] = markdown_compile_email(
+                                format_map(v, self.placeholders(preview_item))
+                            )
 
         return JsonResponse({
             'item': preview_item,
@@ -448,10 +447,6 @@ class OrganizerUpdate(OrganizerPermissionRequiredMixin, UpdateView):
     def get_object(self, queryset=None) -> Organizer:
         return self.object
 
-    @cached_property
-    def domain_config(self):
-        return self.request.user.has_active_staff_session(self.request.session.session_key)
-
     @cached_property
     def sform(self):
         return OrganizerSettingsForm(
@@ -466,8 +461,6 @@ class OrganizerUpdate(OrganizerPermissionRequiredMixin, UpdateView):
         context = super().get_context_data(*args, **kwargs)
         context['sform'] = self.sform
         context['footer_links_formset'] = self.footer_links_formset
-        if self.domain_config:
-            context['domain_formset'] = self.domain_formset
         return context
 
     @transaction.atomic
@@ -490,8 +483,6 @@ class OrganizerUpdate(OrganizerPermissionRequiredMixin, UpdateView):
             self.request.organizer.log_action('pretix.organizer.footerlinks.changed', user=self.request.user, data={
                 'data': self.footer_links_formset.cleaned_data
             })
-        if self.domain_config and self.domain_formset.has_changed():
-            self._save_domain_config()
         if form.has_changed():
             self.request.organizer.log_action(
                 'pretix.organizer.changed',
@@ -502,22 +493,10 @@ class OrganizerUpdate(OrganizerPermissionRequiredMixin, UpdateView):
         messages.success(self.request, _('Your changes have been saved.'))
         return super().form_valid(form)
 
-    def _save_domain_config(self):
-        for form in self.domain_formset.initial_forms:
-            if form.instance.pk and form.has_changed():
-                self.object.domains.get(pk=form.instance.pk).log_delete(self.request.user)
-        self.domain_formset.save()
-        for new_obj in self.domain_formset.new_objects:
-            new_obj.log_create(self.request.user)
-        for ch_obj, form in self.domain_formset.changed_objects:
-            ch_obj.log_create(self.request.user)
-        self.request.organizer.cache.clear()
-        for ev in self.request.organizer.events.all():
-            ev.cache.clear()
-
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
         if self.request.user.has_active_staff_session(self.request.session.session_key):
+            kwargs['domain'] = True
             kwargs['change_slug'] = True
         return kwargs
 
@@ -529,7 +508,7 @@ class OrganizerUpdate(OrganizerPermissionRequiredMixin, UpdateView):
     def post(self, request, *args, **kwargs):
         self.object = self.get_object()
         form = self.get_form()
-        if form.is_valid() and self.sform.is_valid() and self.footer_links_formset.is_valid() and (not self.domain_config or self.domain_formset.is_valid()):
+        if form.is_valid() and self.sform.is_valid() and self.footer_links_formset.is_valid():
             return self.form_valid(form)
         else:
             return self.form_invalid(form)
@@ -540,11 +519,6 @@ class OrganizerUpdate(OrganizerPermissionRequiredMixin, UpdateView):
                                           organizer=self.object,
                                           prefix="footer-links", instance=self.object)
 
-    @cached_property
-    def domain_formset(self):
-        return KnownDomainFormset(self.request.POST if self.request.method == "POST" else None, prefix="domains",
-                                  instance=self.object, organizer=self.object)
-
     def save_footer_links_formset(self, obj):
         self.footer_links_formset.save()
 

src/pretix/control/views/vouchers.py

@@ -50,7 +50,7 @@ from django.http import (
 from django.shortcuts import redirect, render
 from django.urls import resolve, reverse
 from django.utils.functional import cached_property
-from django.utils.html import format_html
+from django.utils.html import escape, format_html
 from django.utils.safestring import mark_safe
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
@@ -59,12 +59,12 @@ from django.views.generic import (
 )
 from django_scopes import scopes_disabled
 
+from pretix.base.email import get_available_placeholders
 from pretix.base.models import (
     CartPosition, LogEntry, Voucher, WaitingListEntry,
 )
 from pretix.base.models.vouchers import generate_codes
 from pretix.base.services.mail import prefix_subject
-from pretix.base.services.placeholders import get_sample_context
 from pretix.base.services.vouchers import vouchers_send
 from pretix.base.templatetags.rich_text import markdown_compile_email
 from pretix.base.views.tasks import AsyncFormView
@@ -74,7 +74,7 @@ from pretix.control.permissions import EventPermissionRequiredMixin
 from pretix.control.signals import voucher_form_class
 from pretix.control.views import PaginationMixin
 from pretix.helpers.compat import CompatDeleteView
-from pretix.helpers.format import SafeFormatter, format_map
+from pretix.helpers.format import format_map
 from pretix.helpers.models import modelcopy
 from pretix.multidomain.urlreverse import build_absolute_uri
 
@@ -549,10 +549,22 @@ class VoucherBulkMailPreview(EventPermissionRequiredMixin, View):
 
     # get all supported placeholders with dummy values
     def placeholders(self, item):
+        ctx = {}
         base_ctx = ['event', 'name']
         if item == 'send_message':
             base_ctx += ['voucher_list']
-        ctx = get_sample_context(self.request.event, base_ctx)
+        for p in get_available_placeholders(self.request.event, base_ctx).values():
+            s = str(p.render_sample(self.request.event))
+            if s.strip().startswith('* ') or s.startswith('  '):
+                ctx[p.identifier] = '<div class="placeholder" title="{}">{}</div>'.format(
+                    _('This value will be replaced based on dynamic parameters.'),
+                    markdown_compile_email(s)
+                )
+            else:
+                ctx[p.identifier] = '<span class="placeholder" title="{}">{}</span>'.format(
+                    _('This value will be replaced based on dynamic parameters.'),
+                    escape(s)
+                )
         return self.SafeDict(ctx)
 
     def post(self, request, *args, **kwargs):
@@ -567,10 +579,9 @@ class VoucherBulkMailPreview(EventPermissionRequiredMixin, View):
                 highlight=True
             )
         else:
-            placeholders = self.placeholders(preview_item)
-            msgs["all"] = format_map(markdown_compile_email(
-                format_map(request.POST.get(preview_item), placeholders)
-            ), placeholders, mode=SafeFormatter.MODE_RICH_TO_HTML)
+            msgs["all"] = markdown_compile_email(
+                format_map(request.POST.get(preview_item), self.placeholders(preview_item))
+            )
 
         return JsonResponse({
             'item': preview_item,

src/pretix/helpers/format.py

@@ -25,29 +25,14 @@ from string import Formatter
 logger = logging.getLogger(__name__)
 
 
-class PlainHtmlAlternativeString:
-    def __init__(self, plain, html, is_block=False):
-        self.plain = plain
-        self.html = html
-        self.is_block = is_block
-
-    def __repr__(self):
-        return f"PlainHtmlAlternativeString('{self.plain}', '{self.html}')"
-
-
 class SafeFormatter(Formatter):
     """
     Customized version of ``str.format`` that (a) behaves just like ``str.format_map`` and
     (b) does not allow any unwanted shenanigans like attribute access or format specifiers.
     """
-    MODE_IGNORE_RICH = 0
-    MODE_RICH_TO_PLAIN = 1
-    MODE_RICH_TO_HTML = 2
-
-    def __init__(self, context, raise_on_missing=False, mode=MODE_IGNORE_RICH):
+    def __init__(self, context, raise_on_missing=False):
         self.context = context
         self.raise_on_missing = raise_on_missing
-        self.mode = mode
 
     def get_field(self, field_name, args, kwargs):
         return self.get_value(field_name, args, kwargs), field_name
@@ -55,22 +40,14 @@ class SafeFormatter(Formatter):
     def get_value(self, key, args, kwargs):
         if not self.raise_on_missing and key not in self.context:
             return '{' + str(key) + '}'
-        r = self.context[key]
-        if isinstance(r, PlainHtmlAlternativeString):
-            if self.mode == self.MODE_IGNORE_RICH:
-                return '{' + str(key) + '}'
-            elif self.mode == self.MODE_RICH_TO_PLAIN:
-                return r.plain
-            elif self.mode == self.MODE_RICH_TO_HTML:
-                return r.html
-        return r
+        return self.context[key]
 
     def format_field(self, value, format_spec):
-        # Ignore format_spec
+        # Ignore format _spec
         return super().format_field(value, '')
 
 
-def format_map(template, context, raise_on_missing=False, mode=SafeFormatter.MODE_IGNORE_RICH):
+def format_map(template, context, raise_on_missing=False):
     if not isinstance(template, str):
         template = str(template)
-    return SafeFormatter(context, raise_on_missing, mode=mode).format(template)
+    return SafeFormatter(context, raise_on_missing).format(template)

src/pretix/locale/djangojs.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-19 15:34+0000\n"
+"POT-Creation-Date: 2024-11-18 15:30+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

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-12-03 20:00+0000\n"
+"PO-Revision-Date: 2024-11-16 05: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.4\n"
+"X-Generator: Weblate 5.8.3\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 réalisées"
+msgstr "Commandes placées"
 
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:15
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:39

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

@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-08 13:45+0000\n"
-"PO-Revision-Date: 2024-11-28 06:00+0000\n"
+"PO-Revision-Date: 2024-10-01 22:52+0000\n"
 "Last-Translator: Patrick Chilton <chpatrick@gmail.com>\n"
-"Language-Team: Hungarian <https://translate.pretix.eu/projects/pretix/"
-"pretix-js/hu/>\n"
+"Language-Team: Hungarian <https://translate.pretix.eu/projects/pretix/pretix-"
+"js/hu/>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "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.7.2\n"
 
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -779,7 +779,7 @@ msgstr "A kosár lejárt"
 #: pretix/static/pretixpresale/js/ui/main.js:588
 #: pretix/static/pretixpresale/js/ui/main.js:607
 msgid "Time zone:"
-msgstr "Időzona:"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/ui/main.js:598
 msgid "Your local time:"

src/pretix/multidomain/middlewares.py

@@ -80,32 +80,28 @@ class MultiDomainMiddleware(MiddlewareMixin):
         request.port = int(port) if port else None
         request.host = domain
         if domain == default_domain:
-            request.domain_mode = "system"
             request.urlconf = "pretix.multidomain.maindomain_urlconf"
         elif domain:
-            cached = cache.get('pretix_multidomain_instances_{}'.format(domain))
+            cached = cache.get('pretix_multidomain_instance_{}'.format(domain))
 
             if cached is None:
                 try:
                     kd = KnownDomain.objects.select_related('organizer', 'event').get(domainname=domain)  # noqa
                     orga = kd.organizer
                     event = kd.event
-                    mode = kd.mode
                 except KnownDomain.DoesNotExist:
                     orga = False
                     event = False
-                    mode = "system"
                 cache.set(
-                    'pretix_multidomain_instances_{}'.format(domain),
-                    (orga.pk if orga else None, event.pk if event else None, mode),
+                    'pretix_multidomain_instance_{}'.format(domain),
+                    (orga.pk if orga else None, event.pk if event else None),
                     3600
                 )
             else:
-                orga, event, mode = cached
+                orga, event = cached
 
-            if mode == KnownDomain.MODE_EVENT_DOMAIN:
+            if event:
                 request.event_domain = True
-                request.domain_mode = KnownDomain.MODE_EVENT_DOMAIN
                 if isinstance(event, Event):
                     request.organizer = orga
                     request.event = event
@@ -114,18 +110,11 @@ class MultiDomainMiddleware(MiddlewareMixin):
                         request.event = Event.objects.select_related('organizer').get(pk=event)
                         request.organizer = request.event.organizer
                 request.urlconf = "pretix.multidomain.event_domain_urlconf"
-            elif mode == KnownDomain.MODE_ORG_ALT_DOMAIN:
+            elif orga:
                 request.organizer_domain = True
-                request.domain_mode = KnownDomain.MODE_ORG_ALT_DOMAIN
-                request.organizer = orga if isinstance(orga, Organizer) else Organizer.objects.get(pk=orga)
-                request.urlconf = "pretix.multidomain.organizer_alternative_domain_urlconf"
-            elif mode == KnownDomain.MODE_ORG_DOMAIN:
-                request.organizer_domain = True
-                request.domain_mode = KnownDomain.MODE_ORG_DOMAIN
                 request.organizer = orga if isinstance(orga, Organizer) else Organizer.objects.get(pk=orga)
                 request.urlconf = "pretix.multidomain.organizer_domain_urlconf"
             elif settings.DEBUG or domain in LOCAL_HOST_NAMES:
-                request.domain_mode = "system"
                 request.urlconf = "pretix.multidomain.maindomain_urlconf"
             else:
                 with scopes_disabled():

src/pretix/multidomain/migrations/0003_alternativedomainassignment_knowndomain_mode_and_more.py

@@ -1,71 +0,0 @@
-# Generated by Django 4.2.16 on 2024-11-12 10:46
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("pretixbase", "0273_remove_checkinlist_auto_checkin_sales_channels"),
-        ("pretixmultidomain", "0002_knowndomain_event"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="AlternativeDomainAssignment",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True, primary_key=True, serialize=False
-                    ),
-                ),
-            ],
-        ),
-        migrations.AddField(
-            model_name="knowndomain",
-            name="mode",
-            field=models.CharField(default="organizer", max_length=255),
-        ),
-        migrations.AlterField(
-            model_name="knowndomain",
-            name="event",
-            field=models.OneToOneField(
-                null=True,
-                on_delete=django.db.models.deletion.PROTECT,
-                related_name="domain",
-                to="pretixbase.event",
-            ),
-        ),
-        migrations.RunSQL(
-            sql="UPDATE pretixmultidomain_knowndomain SET mode = 'event' WHERE event_id IS NOT NULL",
-            reverse_sql=migrations.RunSQL.noop,
-        ),
-        migrations.AddConstraint(
-            model_name="knowndomain",
-            constraint=models.UniqueConstraint(
-                condition=models.Q(("mode", "organizer")),
-                fields=("organizer",),
-                name="unique_organizer_domain",
-            ),
-        ),
-        migrations.AddField(
-            model_name="alternativedomainassignment",
-            name="domain",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="event_assignments",
-                to="pretixmultidomain.knowndomain",
-            ),
-        ),
-        migrations.AddField(
-            model_name="alternativedomainassignment",
-            name="event",
-            field=models.OneToOneField(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="alternative_domain_assignment",
-                to="pretixbase.event",
-            ),
-        ),
-    ]

src/pretix/multidomain/models.py

@@ -21,7 +21,6 @@
 #
 from django.core.cache import cache
 from django.db import models
-from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 from django_scopes import scopes_disabled
 
@@ -29,134 +28,39 @@ from pretix.base.models import Event, Organizer
 
 
 class KnownDomain(models.Model):
-    MODE_ORG_DOMAIN = "organizer"
-    MODE_ORG_ALT_DOMAIN = "organizer_alternative"
-    MODE_EVENT_DOMAIN = "event"
-    MODES = (
-        (MODE_ORG_DOMAIN, _("Organizer domain")),
-        (MODE_ORG_ALT_DOMAIN, _("Alternative organizer domain for a set of events")),
-        (MODE_EVENT_DOMAIN, _("Event domain")),
-    )
-
-    domainname = models.CharField(
-        max_length=255,
-        primary_key=True,
-        verbose_name=_("Domain name"),
-    )
-    mode = models.CharField(
-        max_length=255,
-        choices=MODES,
-        default=MODE_ORG_DOMAIN,
-        verbose_name=_("Mode"),
-    )
-    organizer = models.ForeignKey(
-        Organizer,
-        blank=True,
-        null=True,
-        related_name='domains',
-        on_delete=models.CASCADE
-    )
-    event = models.OneToOneField(
-        Event,
-        blank=True,
-        null=True,
-        related_name='domain',
-        on_delete=models.PROTECT,
-        verbose_name=_("Event"),
-    )
+    domainname = models.CharField(max_length=255, primary_key=True)
+    organizer = models.ForeignKey(Organizer, blank=True, null=True, related_name='domains', on_delete=models.CASCADE)
+    event = models.ForeignKey(Event, blank=True, null=True, related_name='domains', on_delete=models.PROTECT)
 
     class Meta:
         verbose_name = _("Known domain")
         verbose_name_plural = _("Known domains")
-        constraints = [
-            models.UniqueConstraint(
-                fields=("organizer",),
-                name="unique_organizer_domain",
-                condition=Q(mode="organizer"),
-            ),
-        ]
-        ordering = ("-mode", "domainname")
 
     def __str__(self):
         return self.domainname
 
     @scopes_disabled()
     def save(self, *args, **kwargs):
-        if self.event:
-            self.mode = KnownDomain.MODE_EVENT_DOMAIN
-        elif self.mode == KnownDomain.MODE_EVENT_DOMAIN:
-            raise ValueError("Event domain needs event")
         super().save(*args, **kwargs)
         if self.event:
             self.event.get_cache().clear()
-            try:
-                self.event.alternative_domain_assignment.delete()
-            except AlternativeDomainAssignment.DoesNotExist:
-                pass
         elif self.organizer:
             self.organizer.get_cache().clear()
             for event in self.organizer.events.all():
                 event.get_cache().clear()
         cache.delete('pretix_multidomain_organizer_{}'.format(self.domainname))
-        cache.delete('pretix_multidomain_instances_{}'.format(self.domainname))
+        cache.delete('pretix_multidomain_instance_{}'.format(self.domainname))
         cache.delete('pretix_multidomain_event_{}'.format(self.domainname))
 
     @scopes_disabled()
     def delete(self, *args, **kwargs):
         if self.event:
-            self.event.cache.clear()
+            self.event.get_cache().clear()
         elif self.organizer:
-            self.organizer.cache.clear()
+            self.organizer.get_cache().clear()
             for event in self.organizer.events.all():
-                event.cache.clear()
+                event.get_cache().clear()
         cache.delete('pretix_multidomain_organizer_{}'.format(self.domainname))
-        cache.delete('pretix_multidomain_instances_{}'.format(self.domainname))
+        cache.delete('pretix_multidomain_instance_{}'.format(self.domainname))
         cache.delete('pretix_multidomain_event_{}'.format(self.domainname))
         super().delete(*args, **kwargs)
-
-    def _log_domain_action(self, user, data):
-        if self.event:
-            self.event.log_action(
-                'pretix.event.settings',
-                user=user,
-                data=data
-            )
-        else:
-            self.organizer.log_action(
-                'pretix.organizer.settings',
-                user=user,
-                data=data
-            )
-
-    def log_create(self, user):
-        self._log_domain_action(user, {'add_alt_domain': self.domainname} if self.mode == KnownDomain.MODE_ORG_ALT_DOMAIN else {'domain': self.domainname})
-
-    def log_delete(self, user):
-        self._log_domain_action(user, {'remove_alt_domain': self.domainname} if self.mode == KnownDomain.MODE_ORG_ALT_DOMAIN else {'domain': None})
-
-
-class AlternativeDomainAssignment(models.Model):
-    domain = models.ForeignKey(
-        KnownDomain,
-        on_delete=models.CASCADE,
-        related_name="event_assignments",
-    )
-    event = models.OneToOneField(
-        Event,
-        related_name="alternative_domain_assignment",
-        on_delete=models.CASCADE,
-    )
-
-    @scopes_disabled()
-    def save(self, *args, **kwargs):
-        super().save(*args, **kwargs)
-        self.event.cache.clear()
-        cache.delete('pretix_multidomain_instances_{}'.format(self.domain_id))
-        cache.delete('pretix_multidomain_event_{}'.format(self.domain_id))
-
-    @scopes_disabled()
-    def delete(self, *args, **kwargs):
-        self.event.cache.clear()
-        cache.delete('pretix_multidomain_instances_{}'.format(self.domain_id))
-        cache.delete('pretix_multidomain_event_{}'.format(self.domain_id))
-        super().delete(*args, **kwargs)