Apply suggestions from code review

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

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,3 +260,114 @@ 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.

pyproject.toml

@@ -44,7 +44,7 @@ dependencies = [
   "django-formtools==2.5.1",
   "django-hierarkey==1.2.*",
   "django-hijack==3.7.*",
-  "django-i18nfield==1.9.*,>=1.9.4",
+  "django-i18nfield==1.9.*,>=1.9.5",
   "django-libsass==0.9",
   "django-localflavor==4.0",
   "django-markup",
@@ -97,10 +97,10 @@ dependencies = [
   "text-unidecode==1.*",
   "tlds>=2020041600",
   "tqdm==4.*",
-  "ua-parser==0.18.*",
+  "ua-parser==1.0.*",
   "vat_moss_forked==2020.3.20.0.11.0",
   "vobject==0.9.*",
-  "webauthn==2.2.*",
+  "webauthn==2.3.*",
   "zeep==4.3.*"
 ]
 

src/pretix/api/serializers/event.py

@@ -35,7 +35,7 @@
 import logging
 
 from django.conf import settings
-from django.core.exceptions import PermissionDenied, ValidationError
+from django.core.exceptions import PermissionDenied
 from django.db import transaction
 from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
@@ -43,6 +43,7 @@ from django.utils.translation import gettext as _
 from django_countries.serializers import CountryFieldMixin
 from pytz import common_timezones
 from rest_framework import serializers
+from rest_framework.exceptions import ValidationError
 from rest_framework.fields import ChoiceField, Field
 from rest_framework.relations import SlugRelatedField
 
@@ -989,6 +990,40 @@ 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,57 +19,8 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.conf import settings
 from django.core.validators import URLValidator
-from i18nfield.fields import I18nCharField, I18nTextField
-from i18nfield.strings import LazyI18nString
-from rest_framework.exceptions import ValidationError
-from rest_framework.fields import Field
-from rest_framework.serializers import ModelSerializer
-
-
-class I18nField(Field):
-    def __init__(self, **kwargs):
-        self.allow_blank = kwargs.pop('allow_blank', False)
-        self.trim_whitespace = kwargs.pop('trim_whitespace', True)
-        self.max_length = kwargs.pop('max_length', None)
-        self.min_length = kwargs.pop('min_length', None)
-        super().__init__(**kwargs)
-
-    def to_representation(self, value):
-        if hasattr(value, 'data'):
-            if isinstance(value.data, dict):
-                return value.data
-            elif value.data is None:
-                return None
-            else:
-                return {
-                    settings.LANGUAGE_CODE: str(value.data)
-                }
-        elif value is None:
-            return None
-        else:
-            return {
-                settings.LANGUAGE_CODE: str(value)
-            }
-
-    def to_internal_value(self, data):
-        if isinstance(data, str):
-            return LazyI18nString(data)
-        elif isinstance(data, dict):
-            if any([k not in dict(settings.LANGUAGES) for k in data.keys()]):
-                raise ValidationError('Invalid languages included.')
-            return LazyI18nString(data)
-        else:
-            raise ValidationError('Invalid data type.')
-
-
-class I18nAwareModelSerializer(ModelSerializer):
-    pass
-
-
-I18nAwareModelSerializer.serializer_field_mapping[I18nCharField] = I18nField
-I18nAwareModelSerializer.serializer_field_mapping[I18nTextField] = I18nField
+from i18nfield.rest_framework import I18nAwareModelSerializer, I18nField
 
 
 class I18nURLField(I18nField):
@@ -84,3 +35,10 @@ class I18nURLField(I18nField):
         else:
             URLValidator()(value.data)
         return value
+
+
+__all__ = [
+    "I18nAwareModelSerializer",  # for backwards compatibility
+    "I18nField",  # for backwards compatibility
+    "I18nURLField",
+]

src/pretix/api/views/event.py

@@ -40,6 +40,7 @@ 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,
 )
@@ -50,8 +51,9 @@ from pretix.api.auth.permission import EventCRUDPermission
 from pretix.api.pagination import TotalOrderingFilter
 from pretix.api.serializers.event import (
     CloneEventSerializer, DeviceEventSettingsSerializer, EventSerializer,
-    EventSettingsSerializer, ItemMetaPropertiesSerializer, SeatSerializer,
-    SubEventSerializer, TaxRuleSerializer,
+    EventSettingsSerializer, ItemMetaPropertiesSerializer,
+    SeatBulkBlockInputSerializer, SeatSerializer, SubEventSerializer,
+    TaxRuleSerializer,
 )
 from pretix.api.views import ConditionalListView
 from pretix.base.models import (
@@ -237,9 +239,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, action in changed.items():
+            for module, operation in changed.items():
                 serializer.instance.log_action(
-                    'pretix.event.plugins.' + action,
+                    'pretix.event.plugins.' + operation,
                     user=self.request.user,
                     auth=self.request.auth,
                     data={'plugin': module}
@@ -744,3 +746,24 @@ 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,6 +35,7 @@ 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
@@ -79,7 +80,7 @@ class BaseHTMLMailRenderer:
         return self.identifier
 
     def render(self, plain_body: str, plain_signature: str, subject: str, order=None,
-               position=None) -> str:
+               position=None, context=None) -> str:
         """
         This method should generate the HTML part of the email.
 
@@ -88,6 +89,7 @@ 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()
@@ -134,8 +136,10 @@ 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) -> str:
+    def render(self, plain_body: str, plain_signature: str, subject: str, order, position, context) -> 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,6 +277,10 @@ class NamePartsFormField(forms.MultiValueField):
         return value
 
 
+def name_parts_is_empty(name_parts_dict):
+    return not any(k != "_scheme" and v for k, v in name_parts_dict.items())
+
+
 class WrappedPhonePrefixSelect(Select):
     initial = None
 
@@ -1149,12 +1153,12 @@ class BaseInvoiceAddressForm(forms.ModelForm):
             data['vat_id'] = ''
         if data.get('is_business') and not ask_for_vat_id(data.get('country')):
             data['vat_id'] = ''
-        if self.event.settings.invoice_address_required:
+        if self.address_validation and self.event.settings.invoice_address_required and not self.all_optional:
             if data.get('is_business') and not data.get('company'):
                 raise ValidationError({"company": _('You need to provide a company name.')})
-            if not data.get('is_business') and not data.get('name_parts'):
+            if not data.get('is_business') and name_parts_is_empty(data.get('name_parts', {})):
                 raise ValidationError(_('You need to provide your name.'))
-            if not self.all_optional and 'street' in self.fields and not data.get('street') and not data.get('zipcode') and not data.get('city'):
+            if not data.get('street') and not data.get('zipcode') and not data.get('city'):
                 raise ValidationError({"street": _('This field is required.')})
 
         if 'vat_id' in self.changed_data or not data.get('vat_id'):
@@ -1167,7 +1171,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
 
         if all(
                 not v for k, v in data.items() if k not in ('is_business', 'country', 'name_parts')
-        ) and len(data.get('name_parts', {})) == 1:
+        ) and name_parts_is_empty(data.get('name_parts', {})):
             # Do not save the country if it is the only field set -- we don't know the user even checked it!
             self.cleaned_data['country'] = ''
 

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

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

src/pretix/base/models/event.py

@@ -823,6 +823,9 @@ 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/orders.py

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

src/pretix/base/services/cart.py

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

src/pretix/base/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 format_map
+from pretix.helpers.format import SafeFormatter, 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,7 +311,13 @@ 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
@@ -323,6 +329,8 @@ 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,
@@ -655,7 +663,7 @@ def render_mail(template, context):
     if isinstance(template, LazyI18nString):
         body = str(template)
         if context:
-            body = format_map(body, context)
+            body = format_map(body, context, mode=SafeFormatter.MODE_IGNORE_RICH)
     else:
         tpl = get_template(template)
         body = tpl.render(context)

src/pretix/base/services/placeholders.py

@@ -26,6 +26,7 @@ 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 _
 
@@ -39,7 +40,8 @@ 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.helpers.format import SafeFormatter
+from pretix.base.templatetags.rich_text import markdown_compile_email
+from pretix.helpers.format import PlainHtmlAlternativeString, SafeFormatter
 
 logger = logging.getLogger('pretix.base.services.placeholders')
 
@@ -107,6 +109,91 @@ 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
@@ -284,6 +371,27 @@ 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,
@@ -348,6 +456,27 @@ 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,
@@ -603,8 +732,8 @@ def base_placeholders(sender, **kwargs):
 
 
 class FormPlaceholderMixin:
-    def _set_field_placeholders(self, fn, base_parameters):
-        placeholders = get_available_placeholders(self.event, base_parameters)
+    def _set_field_placeholders(self, fn, base_parameters, rich=False):
+        placeholders = get_available_placeholders(self.event, base_parameters, rich=rich)
         ht = format_placeholders_help_text(placeholders, self.event)
         if self.fields[fn].help_text:
             self.fields[fn].help_text += ' ' + str(ht)
@@ -615,7 +744,7 @@ class FormPlaceholderMixin:
         )
 
 
-def get_available_placeholders(event, base_parameters):
+def get_available_placeholders(event, base_parameters, rich=False):
     if 'order' in base_parameters:
         base_parameters.append('invoice_address')
         base_parameters.append('position_or_address')
@@ -624,6 +753,35 @@ def get_available_placeholders(event, base_parameters):
         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,6 +56,7 @@ from django.utils.translation import (
 from django_countries.fields import Country
 from hierarkey.models import GlobalSettingsBase, Hierarkey
 from i18nfield.forms import I18nFormField, I18nTextarea, I18nTextInput
+from i18nfield.rest_framework import I18nField
 from i18nfield.strings import LazyI18nString
 from phonenumbers import PhoneNumber, parse
 from rest_framework import serializers
@@ -63,7 +64,7 @@ from rest_framework import serializers
 from pretix.api.serializers.fields import (
     ListMultipleChoiceField, UploadedFileField,
 )
-from pretix.api.serializers.i18n import I18nField, I18nURLField
+from pretix.api.serializers.i18n import I18nURLField
 from pretix.base.forms import I18nMarkdownTextarea, I18nURLFormField
 from pretix.base.models.tax import VAT_ID_COUNTRIES, TaxRule
 from pretix.base.reldate import (

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

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

src/pretix/base/templatetags/money.py

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

src/pretix/base/templatetags/rich_text.py

@@ -305,6 +305,7 @@ 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/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, urlparse
+from urllib.parse import urlencode
 from zoneinfo import ZoneInfo
 
 import pycountry
@@ -76,8 +76,10 @@ from pretix.control.forms import (
 )
 from pretix.control.forms.widgets import Select2
 from pretix.helpers.countries import CachedCountries
-from pretix.multidomain.models import KnownDomain
-from pretix.multidomain.urlreverse import build_absolute_uri
+from pretix.multidomain.models import AlternativeDomainAssignment, KnownDomain
+from pretix.multidomain.urlreverse import (
+    build_absolute_uri, get_organizer_domain,
+)
 from pretix.plugins.banktransfer.payment import BankTransfer
 from pretix.presale.style import get_fonts
 
@@ -363,14 +365,9 @@ 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:
@@ -379,48 +376,54 @@ class EventUpdateForm(I18nModelForm):
         self.fields['location'].widget.attrs['placeholder'] = _(
             'Sample Conference Center\nHeidelberg, Germany'
         )
-        if self.domain:
+
+        try:
             self.fields['domain'] = forms.CharField(
                 max_length=255,
-                label=_('Custom domain'),
+                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 "",
                 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)
 
-        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()
+        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()
             instance.cache.clear()
 
         return instance
@@ -1382,7 +1385,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)
+            self._set_field_placeholders(k, v, rich=k.startswith('mail_text_'))
 
         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,63 +133,108 @@ 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)
 
-        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()
+class KnownDomainForm(forms.ModelForm):
+    class Meta:
+        model = KnownDomain
+        fields = ["domainname", "mode", "event"]
+        field_classes = {
+            "event": SafeModelChoiceField,
+        }
 
-        return instance
+    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
+)
 
 
 class SafeOrderPositionChoiceField(forms.ModelChoiceField):

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="control" %}
+                    {% bootstrap_field form.domain layout="horizontal" %}
                 {% endif %}
                 {% bootstrap_field form.date_from layout="control" %}
                 {% bootstrap_field form.date_to layout="control" %}

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

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

src/pretix/control/templates/pretixcontrol/organizers/edit.html

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

src/pretix/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 escape
+from django.utils.html import conditional_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,9 +100,12 @@ 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 format_map
+from ...helpers.format import (
+    PlainHtmlAlternativeString, SafeFormatter, format_map,
+)
 from ..logdisplay import OVERVIEW_BANLIST
 from . import CreateView, PaginationMixin, UpdateView
 
@@ -239,7 +242,6 @@ 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):
@@ -717,20 +719,7 @@ class MailSettingsPreview(EventPermissionRequiredMixin, View):
 
     # 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]).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
+        return get_sample_context(self.request.event, MailSettingsForm.base_context[item])
 
     def post(self, request, *args, **kwargs):
         preview_item = request.POST.get('item', '')
@@ -752,9 +741,15 @@ class MailSettingsPreview(EventPermissionRequiredMixin, View):
                                     bleach.clean(v), self.placeholders(preview_item), raise_on_missing=True
                                 ), highlight=True)
                             else:
-                                msgs[self.supported_locale[idx]] = markdown_compile_email(
-                                    format_map(v, self.placeholders(preview_item), raise_on_missing=True)
+                                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,
                                 )
+
                         except ValueError:
                             msgs[self.supported_locale[idx]] = '<div class="alert alert-danger">{}</div>'.format(
                                 PlaceholderValidator.error_message)
@@ -777,13 +772,18 @@ 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]).values():
-            ctx[p.identifier] = escape(str(p.render_sample(self.request.event)))
+        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)
         return ctx
 
     def get(self, request, *args, **kwargs):
         v = str(request.event.settings.mail_text_order_placed)
-        v = format_map(v, self.placeholders('mail_text_order_placed'))
+        context = self.placeholders('mail_text_order_placed')
+        v = format_map(v, context)
         renderers = request.event.get_html_mail_renderers()
         if request.GET.get('renderer') in renderers:
             with rolledback_transaction():
@@ -801,7 +801,8 @@ class MailSettingsRendererPreview(MailSettingsPreview):
                     str(request.event.settings.mail_text_signature),
                     gettext('Your order: %(code)s') % {'code': order.code},
                     order,
-                    position=None
+                    position=None,
+                    context=context,
                 )
                 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 format_map
+from pretix.helpers.format import SafeFormatter, 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': markdown_compile_email(email_content)
+                'html': format_map(markdown_compile_email(email_content), email_context, mode=SafeFormatter.MODE_RICH_TO_HTML)
             }
             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,
-    MailSettingsForm, MembershipTypeForm, MembershipUpdateForm,
-    OrganizerDeleteForm, OrganizerFooterLinkFormset, OrganizerForm,
-    OrganizerSettingsForm, OrganizerUpdateForm, ReusableMediumCreateForm,
-    ReusableMediumUpdateForm, SalesChannelForm, SSOClientForm, SSOProviderForm,
-    TeamForm, WebHookForm,
+    KnownDomainFormset, 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 format_map
+from pretix.helpers.format import SafeFormatter, 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,9 +357,10 @@ class MailSettingsPreview(OrganizerPermissionRequiredMixin, View):
                                 highlight=True,
                             )
                         else:
-                            msgs[self.supported_locale[idx]] = markdown_compile_email(
-                                format_map(v, self.placeholders(preview_item))
-                            )
+                            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)
 
         return JsonResponse({
             'item': preview_item,
@@ -447,6 +448,10 @@ 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(
@@ -461,6 +466,8 @@ 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
@@ -483,6 +490,8 @@ 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',
@@ -493,10 +502,22 @@ 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
 
@@ -508,7 +529,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():
+        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()):
             return self.form_valid(form)
         else:
             return self.form_invalid(form)
@@ -519,6 +540,11 @@ 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 escape, format_html
+from django.utils.html import 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 format_map
+from pretix.helpers.format import SafeFormatter, format_map
 from pretix.helpers.models import modelcopy
 from pretix.multidomain.urlreverse import build_absolute_uri
 
@@ -549,22 +549,10 @@ 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']
-        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)
-                )
+        ctx = get_sample_context(self.request.event, base_ctx)
         return self.SafeDict(ctx)
 
     def post(self, request, *args, **kwargs):
@@ -579,9 +567,10 @@ class VoucherBulkMailPreview(EventPermissionRequiredMixin, View):
                 highlight=True
             )
         else:
-            msgs["all"] = markdown_compile_email(
-                format_map(request.POST.get(preview_item), self.placeholders(preview_item))
-            )
+            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)
 
         return JsonResponse({
             'item': preview_item,

src/pretix/helpers/format.py

@@ -25,14 +25,29 @@ 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.
     """
-    def __init__(self, context, raise_on_missing=False):
+    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):
         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
@@ -40,14 +55,22 @@ 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) + '}'
-        return self.context[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
 
     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):
+def format_map(template, context, raise_on_missing=False, mode=SafeFormatter.MODE_IGNORE_RICH):
     if not isinstance(template, str):
         template = str(template)
-    return SafeFormatter(context, raise_on_missing).format(template)
+    return SafeFormatter(context, raise_on_missing, mode=mode).format(template)

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

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-19 15:34+0000\n"
-"PO-Revision-Date: 2024-11-27 03:00+0000\n"
+"PO-Revision-Date: 2024-12-03 20:00+0000\n"
 "Last-Translator: CVZ-es <damien.bremont@casadevelazquez.org>\n"
 "Language-Team: Spanish <https://translate.pretix.eu/projects/pretix/pretix/"
 "es/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.8.3\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: pretix/_base_settings.py:79
 msgid "English"
@@ -11397,7 +11397,7 @@ msgstr "Color de fondo de la página"
 
 #: pretix/base/settings.py:2845
 msgid "Use round edges"
-msgstr "Utilice bordes redondos"
+msgstr "Utilizar bordes redondos"
 
 #: pretix/base/settings.py:2854
 msgid ""
@@ -11433,7 +11433,7 @@ msgstr ""
 
 #: pretix/base/settings.py:2899 pretix/base/settings.py:2941
 msgid "Use header image in its full size"
-msgstr "Utilice la imagen del encabezado en su tamaño completo"
+msgstr "Utilizar la imagen del encabezado en su tamaño completo"
 
 #: pretix/base/settings.py:2900 pretix/base/settings.py:2942
 msgid "We recommend to upload a picture at least 1170 pixels wide."
@@ -13067,13 +13067,12 @@ msgstr ""
 
 #: pretix/control/forms/event.py:989 pretix/control/forms/organizer.py:534
 msgid "Bcc address"
-msgstr "Direcciones CCO"
+msgstr "Direcciones en copia oculta"
 
 #: pretix/control/forms/event.py:990 pretix/control/forms/organizer.py:535
 msgid "All emails will be sent to this address as a Bcc copy"
 msgstr ""
-"Todos los correos electrónicos se enviarán a esta dirección como una copia "
-"de CCO"
+"Todos los correos electrónicos se enviarán a esta dirección en copia oculta"
 
 #: pretix/control/forms/event.py:996 pretix/control/forms/organizer.py:541
 msgid "Signature"
@@ -13650,7 +13649,7 @@ msgstr "Fecha de inicio"
 #: pretix/control/forms/filter.py:1710 pretix/control/forms/filter.py:1713
 #: pretix/control/forms/filter.py:2344
 msgid "Date until"
-msgstr "Fecha límite"
+msgstr "Fecha final"
 
 #: pretix/control/forms/filter.py:1218
 msgid "Start time from"
@@ -16020,11 +16019,11 @@ msgstr ""
 
 #: pretix/control/logdisplay.py:422
 msgid "A custom email has been sent."
-msgstr "Un e-mail personalizado ha sido enviado."
+msgstr "Un email personalizado ha sido enviado."
 
 #: pretix/control/logdisplay.py:423
 msgid "A custom email has been sent to an attendee."
-msgstr "Un e-mail personalizado ha sido enviado al participante."
+msgstr "Un email personalizado ha sido enviado al participante."
 
 #: pretix/control/logdisplay.py:424
 msgid ""
@@ -16472,7 +16471,7 @@ msgstr "Un plugin ha sido desactivado."
 
 #: pretix/control/logdisplay.py:533
 msgid "The shop has been taken live."
-msgstr "La tienda ha sido tomada en vivo."
+msgstr "La tienda ha sido puesta en marcha."
 
 #: pretix/control/logdisplay.py:534
 msgid "The shop has been taken offline."
@@ -16951,11 +16950,11 @@ msgstr "Parametrizaciones globales"
 
 #: pretix/control/navigation.py:440
 msgid "Update check"
-msgstr "Verificación de actualización"
+msgstr "Comprobación de actualizaciones"
 
 #: pretix/control/navigation.py:445
 msgid "License check"
-msgstr "Revisa de licencia"
+msgstr "Verificación de la licencia"
 
 #: pretix/control/navigation.py:450
 msgid "System report"
@@ -17952,7 +17951,7 @@ msgstr "Regla de check-in personalizada"
 #: pretix/control/templates/pretixcontrol/vouchers/bulk.html:117
 #: pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html:84
 msgid "Edit"
-msgstr "Tratar"
+msgstr "Editar"
 
 #: pretix/control/templates/pretixcontrol/checkin/list_edit.html:89
 msgid "Visualize"
@@ -20028,8 +20027,8 @@ msgid ""
 "For more information or to obtain a paid pretix Enterprise license, contact "
 "support@pretix.eu."
 msgstr ""
-"Para obtener más información u obtener una licencia pretix Enterprise paga, "
-"comuníquese con support@pretix.eu."
+"Para obtener más información u obtener una licencia pretix Enterprise de "
+"pago, comuníquese con support@pretix.eu."
 
 #: pretix/control/templates/pretixcontrol/global_license.html:26
 msgid "License settings and check"
@@ -20071,10 +20070,9 @@ msgid ""
 "pretix support when your license renews. It may also be requested by pretix "
 "support to aid debugging of problems."
 msgstr ""
-"Si tienes una licencia de pretix de Enterprise, este informe se debe "
-"entregar al equipo del servicio al cliente de pretix cuando tu licencia "
-"renueve. También el servicio al cliente de pretix podría pedirlo para ayudar "
-"durante depurar."
+"Si dispone de una licencia de pretix Enterprise, deberá enviar este informe "
+"al servicio de asistencia pretix cuando renueve su licencia. También puede "
+"ser solicitado por el soporte pretix para ayudar a la solución de problemas."
 
 #: pretix/control/templates/pretixcontrol/global_sysreport.html:8
 msgid ""
@@ -21288,11 +21286,11 @@ msgstr "Revocar"
 #: pretix/control/templates/pretixcontrol/oauth/authorized.html:6
 #: pretix/control/templates/pretixcontrol/user/settings.html:61
 msgid "Authorized applications"
-msgstr "Solicitudes autorizadas"
+msgstr "Aplicaciones autorizadas"
 
 #: pretix/control/templates/pretixcontrol/oauth/authorized.html:9
 msgid "Manage your own apps"
-msgstr "Gestiona tus propias aplicaciones"
+msgstr "Gestione sus propias aplicaciones"
 
 #: pretix/control/templates/pretixcontrol/oauth/authorized.html:18
 msgid "Permissions"
@@ -31500,7 +31498,7 @@ msgstr "Lo sentimos, se ha producido un error en el proceso de pago."
 #: pretix/plugins/ticketoutputpdf/apps.py:44
 #: pretix/plugins/ticketoutputpdf/apps.py:47
 msgid "PDF ticket output"
-msgstr "Salida de entradas de PDF"
+msgstr "Salida de entradas en PDF"
 
 #: pretix/plugins/ticketoutputpdf/apps.py:52
 msgid ""
@@ -31603,7 +31601,7 @@ msgstr ""
 
 #: pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/form.html:14
 msgid "Open Layout Designer"
-msgstr "Abrir diseñador de diseño"
+msgstr "Abrir herramienta de diseño"
 
 #: pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/form.html:18
 msgid "Advanced mode (multiple layouts)"

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

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-19 15:34+0000\n"
-"PO-Revision-Date: 2024-11-27 03:00+0000\n"
+"PO-Revision-Date: 2024-12-03 20:00+0000\n"
 "Last-Translator: CVZ-es <damien.bremont@casadevelazquez.org>\n"
 "Language-Team: French <https://translate.pretix.eu/projects/pretix/pretix/fr/"
 ">\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.8.3\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: pretix/_base_settings.py:79
 msgid "English"
@@ -8954,7 +8954,7 @@ msgstr "Nombre maximum d'articles par commande"
 
 #: pretix/base/settings.py:316
 msgid "Add-on products will not be counted."
-msgstr "Les Add-Ons ne seront pas pris en compte."
+msgstr "Les Add-Ons e sont pas comptabilisés."
 
 #: pretix/base/settings.py:325
 msgid ""
@@ -9966,7 +9966,7 @@ msgstr ""
 
 #: pretix/base/settings.py:1520
 msgid "Allow users to download tickets"
-msgstr "Autoriser les utilisateurs à télécharger des billets"
+msgstr "Autoriser les utilisateurs à télécharger les billets"
 
 #: pretix/base/settings.py:1521
 msgid "If this is off, nobody can download a ticket."
@@ -18254,7 +18254,7 @@ msgstr "Voir tous les événements récents"
 
 #: pretix/control/templates/pretixcontrol/dashboard.html:65
 msgid "Your event series"
-msgstr "Votre série d'événements"
+msgstr "Vos séries d'événements"
 
 #: pretix/control/templates/pretixcontrol/dashboard.html:81
 msgid "View all event series"
@@ -20630,17 +20630,16 @@ msgid ""
 "product. You can also specify the minimum and maximum number of add-ons of "
 "the given category that can or need to be chosen."
 msgstr ""
-"Avec les modules complémentaires, vous pouvez spécifier des produits qui "
-"peuvent être achetés en complément de ce produit. Par exemple, si vous "
-"organisez une conférence avec un ticket de conférence de base et un certain "
-"nombre d’ateliers, vous pouvez définir les ateliers comme des modules "
-"complémentaires au ticket de conférence. Avec cette configuration, les "
-"ateliers ne peuvent pas être achetés seuls, mais uniquement en combinaison "
-"avec un billet de conférence. Vous pouvez spécifier ici des catégories de "
-"produits qui peuvent être utilisés comme modules complémentaires à ce "
-"produit. Vous pouvez également spécifier le nombre minimal et maximal de "
-"modules complémentaires de la catégorie donnée qui peuvent ou doivent être "
-"choisis."
+"Avec les add-ons, vous pouvez spécifier des produits qui peuvent être "
+"achetés en complément de ce produit. Par exemple, si vous organisez une "
+"conférence avec un ticket de conférence de base et un certain nombre d’"
+"ateliers, vous pouvez définir les ateliers comme des modules complémentaires "
+"au ticket de conférence. Avec cette configuration, les ateliers ne peuvent "
+"pas être achetés seuls, mais uniquement en combinaison avec un billet de "
+"conférence. Vous pouvez spécifier ici des catégories de produits qui peuvent "
+"être utilisés comme modules complémentaires à ce produit. Vous pouvez "
+"également spécifier le nombre minimal et maximal de modules complémentaires "
+"de la catégorie donnée qui peuvent ou doivent être choisis."
 
 #: pretix/control/templates/pretixcontrol/item/include_addons.html:28
 #: pretix/control/templates/pretixcontrol/item/include_addons.html:62
@@ -31762,7 +31761,7 @@ msgstr "Désolé, une erreur s’est produite dans le processus de paiement."
 #: pretix/plugins/ticketoutputpdf/apps.py:44
 #: pretix/plugins/ticketoutputpdf/apps.py:47
 msgid "PDF ticket output"
-msgstr "Sortie du ticket PDF"
+msgstr "Génération de billets au format PDF"
 
 #: pretix/plugins/ticketoutputpdf/apps.py:52
 msgid ""

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

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: French\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-08 13:45+0000\n"
-"PO-Revision-Date: 2024-11-16 05:00+0000\n"
+"PO-Revision-Date: 2024-12-03 20:00+0000\n"
 "Last-Translator: CVZ-es <damien.bremont@casadevelazquez.org>\n"
 "Language-Team: French <https://translate.pretix.eu/projects/pretix/pretix-js/"
 "fr/>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.8.3\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -150,7 +150,7 @@ msgstr "Méthode de paiement non disponible"
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:15
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:39
 msgid "Placed orders"
-msgstr "Commandes placées"
+msgstr "Commandes réalisées"
 
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:15
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:39

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

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-19 15:34+0000\n"
-"PO-Revision-Date: 2024-11-27 03:00+0000\n"
+"PO-Revision-Date: 2024-12-02 06:00+0000\n"
 "Last-Translator: Patrick Chilton <chpatrick@gmail.com>\n"
 "Language-Team: Hungarian <https://translate.pretix.eu/projects/pretix/pretix/"
 "hu/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.8.3\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: pretix/_base_settings.py:79
 msgid "English"
@@ -2796,12 +2796,9 @@ msgid "Reusable media"
 msgstr ""
 
 #: pretix/base/exporters/reusablemedia.py:35
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "No date selected."
 msgctxt "export_category"
 msgid "Reusable media"
-msgstr "Nincs dátum kiválasztva."
+msgstr ""
 
 #: pretix/base/exporters/reusablemedia.py:36
 msgid ""
@@ -3572,11 +3569,8 @@ msgid "Invalid option selected."
 msgstr ""
 
 #: pretix/base/modelimport_orders.py:658 pretix/base/modelimport_orders.py:666
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "No date selected."
 msgid "Ambiguous option selected."
-msgstr "Nincs dátum kiválasztva."
+msgstr ""
 
 #: pretix/base/modelimport_orders.py:697 pretix/base/models/orders.py:238
 #: pretix/control/forms/orders.py:686 pretix/control/forms/organizer.py:795
@@ -8262,11 +8256,8 @@ msgid ""
 msgstr ""
 
 #: pretix/base/settings.py:190
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "No date selected."
 msgid "Activate re-usable media"
-msgstr "Nincs dátum kiválasztva."
+msgstr ""
 
 #: pretix/base/settings.py:191
 msgid ""
@@ -12857,11 +12848,8 @@ msgid "Device status"
 msgstr ""
 
 #: pretix/control/forms/filter.py:2621
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "No date selected."
 msgid "Active devices"
-msgstr "Nincs dátum kiválasztva."
+msgstr ""
 
 #: pretix/control/forms/filter.py:2622
 msgid "Revoked devices"
@@ -13891,11 +13879,8 @@ msgid "Organizer short name"
 msgstr "Szervező rövidített név"
 
 #: pretix/control/forms/organizer.py:1092
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "No date selected."
 msgid "Allow access to reusable media"
-msgstr "Nincs dátum kiválasztva."
+msgstr ""
 
 #: pretix/control/forms/organizer.py:1093
 msgid ""
@@ -20970,11 +20955,8 @@ msgid ""
 msgstr ""
 
 #: pretix/control/templates/pretixcontrol/orders/index.html:291
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "No date selected."
 msgid "Select action"
-msgstr "Nincs dátum kiválasztva."
+msgstr ""
 
 #: pretix/control/templates/pretixcontrol/orders/index.html:312
 #: pretix/control/views/orders.py:335
@@ -21401,11 +21383,8 @@ msgstr ""
 
 #: pretix/control/templates/pretixcontrol/organizers/devices.html:188
 #: pretix/control/templates/pretixcontrol/subevents/index.html:211
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "No date selected."
 msgid "Edit selected"
-msgstr "Nincs dátum kiválasztva."
+msgstr ""
 
 #: pretix/control/templates/pretixcontrol/organizers/edit.html:12
 msgid "Organizer settings"
@@ -22746,18 +22725,12 @@ msgid "Delete selected"
 msgstr ""
 
 #: pretix/control/templates/pretixcontrol/subevents/index.html:214
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "No date selected."
 msgid "Activate selected"
-msgstr "Nincs dátum kiválasztva."
+msgstr "Aktiválás"
 
 #: pretix/control/templates/pretixcontrol/subevents/index.html:217
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "No date selected."
 msgid "Deactivate selected"
-msgstr "Nincs dátum kiválasztva."
+msgstr "Deaktiválás"
 
 #: pretix/control/templates/pretixcontrol/user/2fa_add.html:4
 #: pretix/control/templates/pretixcontrol/user/2fa_add.html:6
@@ -25706,11 +25679,8 @@ msgid "Badge layout: %(name)s"
 msgstr ""
 
 #: pretix/plugins/badges/templates/pretixplugins/badges/edit.html:26
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "No date selected."
 msgid "Save & continue"
-msgstr "Nincs dátum kiválasztva."
+msgstr "Mentés és folytatás"
 
 #: pretix/plugins/badges/templates/pretixplugins/badges/index.html:10
 msgid "You haven't created any badge layouts yet."
@@ -28628,7 +28598,7 @@ msgstr ""
 
 #: pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_confirm.html:4
 msgid "The total amount will be withdrawn from your credit card."
-msgstr ""
+msgstr "Az összeg a kártyádról kerül levonásra."
 
 #: pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_confirm.html:8
 #: pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_card.html:29
@@ -29906,12 +29876,9 @@ msgstr "%(item)s, %(var)s hozzáadása a kosárhoz"
 #: pretix/presale/templates/pretixpresale/event/fragment_product_list.html:370
 #: pretix/presale/templates/pretixpresale/event/voucher.html:231
 #: pretix/presale/templates/pretixpresale/event/voucher.html:385
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "No date selected."
 msgctxt "checkbox"
 msgid "Select"
-msgstr "Nincs dátum kiválasztva."
+msgstr "Kiválaszt"
 
 #: pretix/presale/templates/pretixpresale/event/fragment_addon_choice.html:205
 #: pretix/presale/templates/pretixpresale/event/fragment_addon_choice.html:350
@@ -31427,11 +31394,8 @@ msgid "Social features"
 msgstr ""
 
 #: pretix/presale/templates/pretixpresale/fragment_modals.html:114
-#, fuzzy
-#| msgctxt "subevent"
-#| msgid "No date selected."
 msgid "Save selection"
-msgstr "Nincs dátum kiválasztva."
+msgstr "Kijelölés mentése"
 
 #: pretix/presale/templates/pretixpresale/fragment_week_calendar.html:82
 #, python-format
@@ -31758,7 +31722,7 @@ msgstr "Ismeretlen eseménykód vagy nincs jogod az eseményhez."
 #: pretix/presale/views/event.py:902
 msgctxt "subevent"
 msgid "No date selected."
-msgstr "Nincs dátum kiválasztva."
+msgstr "Nincs időpont kiválasztva."
 
 #: pretix/presale/views/event.py:905
 msgctxt "subevent"

src/pretix/multidomain/middlewares.py

@@ -80,28 +80,32 @@ 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_instance_{}'.format(domain))
+            cached = cache.get('pretix_multidomain_instances_{}'.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_instance_{}'.format(domain),
-                    (orga.pk if orga else None, event.pk if event else None),
+                    'pretix_multidomain_instances_{}'.format(domain),
+                    (orga.pk if orga else None, event.pk if event else None, mode),
                     3600
                 )
             else:
-                orga, event = cached
+                orga, event, mode = cached
 
-            if event:
+            if mode == KnownDomain.MODE_EVENT_DOMAIN:
                 request.event_domain = True
+                request.domain_mode = KnownDomain.MODE_EVENT_DOMAIN
                 if isinstance(event, Event):
                     request.organizer = orga
                     request.event = event
@@ -110,11 +114,18 @@ 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 orga:
+            elif mode == KnownDomain.MODE_ORG_ALT_DOMAIN:
                 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

@@ -0,0 +1,71 @@
+# 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,6 +21,7 @@
 #
 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
 
@@ -28,39 +29,134 @@ from pretix.base.models import Event, Organizer
 
 
 class KnownDomain(models.Model):
-    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)
+    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"),
+    )
 
     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_instance_{}'.format(self.domainname))
+        cache.delete('pretix_multidomain_instances_{}'.format(self.domainname))
         cache.delete('pretix_multidomain_event_{}'.format(self.domainname))
 
     @scopes_disabled()
     def delete(self, *args, **kwargs):
         if self.event:
-            self.event.get_cache().clear()
+            self.event.cache.clear()
         elif self.organizer:
-            self.organizer.get_cache().clear()
+            self.organizer.cache.clear()
             for event in self.organizer.events.all():
-                event.get_cache().clear()
+                event.cache.clear()
         cache.delete('pretix_multidomain_organizer_{}'.format(self.domainname))
-        cache.delete('pretix_multidomain_instance_{}'.format(self.domainname))
+        cache.delete('pretix_multidomain_instances_{}'.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)

src/pretix/multidomain/organizer_alternative_domain_urlconf.py

@@ -0,0 +1,63 @@
+#
+# 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/>.
+#
+import importlib.util
+
+from django.apps import apps
+from django.urls import include, re_path
+
+from pretix.multidomain.plugin_handler import plugin_event_urls
+from pretix.presale.urls import event_patterns, locale_patterns
+from pretix.presale.views import organizer
+from pretix.urls import common_patterns
+
+presale_patterns = [
+    re_path(r'', include((locale_patterns + [
+        re_path(r'^$', organizer.RedirectToOrganizerIndex.as_view(), name='organizer.alt.index'),
+        re_path(r'^(?P<event>[^/]+)/', include(event_patterns)),
+    ], 'presale')))
+]
+
+raw_plugin_patterns = []
+for app in apps.get_app_configs():
+    if hasattr(app, 'PretixPluginMeta'):
+        if importlib.util.find_spec(app.name + '.urls'):
+            urlmod = importlib.import_module(app.name + '.urls')
+            if hasattr(urlmod, 'event_patterns'):
+                patterns = plugin_event_urls(urlmod.event_patterns, plugin=app.name)
+                raw_plugin_patterns.append(
+                    re_path(r'^(?P<event>[^/]+)/', include((patterns, app.label)))
+                )
+            if hasattr(urlmod, 'organizer_patterns'):
+                patterns = plugin_event_urls(urlmod.organizer_patterns, plugin=app.name)
+                raw_plugin_patterns.append(
+                    re_path(r'', include((patterns, app.label)))
+                )
+
+plugin_patterns = [
+    re_path(r'', include((raw_plugin_patterns, 'plugins')))
+]
+
+# The presale namespace comes last, because it contains a wildcard catch
+urlpatterns = common_patterns + plugin_patterns + presale_patterns
+
+handler404 = 'pretix.base.views.errors.page_not_found'
+handler500 = 'pretix.base.views.errors.server_error'

src/pretix/multidomain/urlreverse.py

@@ -43,28 +43,33 @@ from pretix.base.models import Event, Organizer
 from .models import KnownDomain
 
 
-def get_event_domain(event, fallback=False, return_info=False):
+def get_event_domain(event, fallback=False, return_mode=False):
     assert isinstance(event, Event)
     if not event.pk:
         # Can happen on the "event deleted" response
-        return (None, None) if return_info else None
-    suffix = ('_fallback' if fallback else '') + ('_info' if return_info else '')
+        return (None, None) if return_mode else None
+    suffix = ('_fallback' if fallback else '') + ('_mode' if return_mode else '')
     domain = getattr(event, '_cached_domain' + suffix, None) or event.cache.get('domain' + suffix)
     if domain is None:
         domain = None, None
-        if fallback:
+        if hasattr(event, 'alternative_domain_assignment'):
+            domain = event.alternative_domain_assignment.domain_id, KnownDomain.MODE_ORG_ALT_DOMAIN
+        elif fallback:
             domains = KnownDomain.objects.filter(
-                Q(event=event) | Q(organizer_id=event.organizer_id, event__isnull=True)
+                Q(event=event, mode=KnownDomain.MODE_EVENT_DOMAIN) |
+                Q(organizer_id=event.organizer_id, event__isnull=True, mode=KnownDomain.MODE_ORG_DOMAIN)
             )
             domains_event = [d for d in domains if d.event_id == event.pk]
             domains_org = [d for d in domains if not d.event_id]
             if domains_event:
-                domain = domains_event[0].domainname, "event"
+                domain = domains_event[0].domainname, KnownDomain.MODE_EVENT_DOMAIN
             elif domains_org:
-                domain = domains_org[0].domainname, "organizer"
+                domain = domains_org[0].domainname, KnownDomain.MODE_ORG_DOMAIN
         else:
-            domains = event.domains.all()
-            domain = domains[0].domainname if domains else None, "event"
+            try:
+                domain = event.domain.domainname, KnownDomain.MODE_EVENT_DOMAIN
+            except KnownDomain.DoesNotExist:
+                domain = None, None
         event.cache.set('domain' + suffix, domain or 'none')
         setattr(event, '_cached_domain' + suffix, domain or 'none')
     elif domain == 'none':
@@ -72,7 +77,7 @@ def get_event_domain(event, fallback=False, return_info=False):
         domain = None, None
     else:
         setattr(event, '_cached_domain' + suffix, domain)
-    return domain if return_info or not isinstance(domain, tuple) else domain[0]
+    return domain if return_mode else domain[0]
 
 
 def get_organizer_domain(organizer):
@@ -81,7 +86,7 @@ def get_organizer_domain(organizer):
         return None
     domain = getattr(organizer, '_cached_domain', None) or organizer.cache.get('domain')
     if domain is None:
-        domains = organizer.domains.filter(event__isnull=True)
+        domains = organizer.domains.filter(event__isnull=True, mode=KnownDomain.MODE_ORG_DOMAIN)
         domain = domains[0].domainname if domains else None
         organizer.cache.set('domain', domain or 'none')
         organizer._cached_domain = domain or 'none'
@@ -131,7 +136,8 @@ def eventreverse(obj, name, kwargs=None):
     :returns: An absolute or relative URL as a string
     """
     from pretix.multidomain import (
-        event_domain_urlconf, maindomain_urlconf, organizer_domain_urlconf,
+        event_domain_urlconf, maindomain_urlconf,
+        organizer_alternative_domain_urlconf, organizer_domain_urlconf,
     )
 
     c = None
@@ -153,17 +159,24 @@ def eventreverse(obj, name, kwargs=None):
         raise TypeError('obj should be Event or Organizer')
 
     if event:
-        domain, domaintype = get_event_domain(obj, fallback=True, return_info=True)
+        domain, domaintype = get_event_domain(obj, fallback=True, return_mode=True)
     else:
-        domain, domaintype = get_organizer_domain(organizer), "organizer"
+        domain, domaintype = get_organizer_domain(organizer), KnownDomain.MODE_ORG_DOMAIN
 
     if domain:
-        if domaintype == "event" and 'event' in kwargs:
+        if domaintype == KnownDomain.MODE_EVENT_DOMAIN and 'event' in kwargs:
             del kwargs['event']
         if 'organizer' in kwargs:
             del kwargs['organizer']
 
-        path = reverse(name, kwargs=kwargs, urlconf=event_domain_urlconf if domaintype == "event" else organizer_domain_urlconf)
+        if domaintype == KnownDomain.MODE_EVENT_DOMAIN:
+            urlconf = event_domain_urlconf
+        elif domaintype == KnownDomain.MODE_ORG_ALT_DOMAIN:
+            urlconf = organizer_alternative_domain_urlconf
+        else:
+            urlconf = organizer_domain_urlconf
+
+        path = reverse(name, kwargs=kwargs, urlconf=urlconf)
         siteurlsplit = urlsplit(settings.SITE_URL)
         if siteurlsplit.port and siteurlsplit.port not in (80, 443):
             domain = '%s:%d' % (domain, siteurlsplit.port)

src/pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js

@@ -92,8 +92,8 @@ var pretixpaypal = {
         }
 
         // We are setting the cogwheel already here, as the renderAPM() method might take some time to get loaded.
-        let apmtextselector = $("label[for=input_payment_paypal_apm]");
-        apmtextselector.prepend('<span class="fa fa-cog fa-spin"></span> ');
+        const apmtextselector = $("input[name=payment][value=paypal_apm]").closest("label").find(".accordion-label-text");
+        apmtextselector.append(' <span aria-hidden="true" class="fa fa-cog fa-spin"></span>');
 
         let sdk_url = 'https://www.paypal.com/sdk/js' +
             '?client-id=' + pretixpaypal.client_id +
@@ -269,11 +269,7 @@ var pretixpaypal = {
     renderAPMs: function () {
         pretixpaypal.restore();
         let inputselector = $("input[name=payment][value=paypal_apm]");
-        // The first selector is used on the regular payment-step of the checkout flow
-        // The second selector is used for the payment method change view.
-        // In the long run, the layout of both pages should be adjusted to be one.
-        let textselector = $("label[for=input_payment_paypal_apm]");
-        let textselector2 = inputselector.next("strong");
+        let textselector = inputselector.closest("label").find('.accordion-label-text');
         let eligibles = [];
 
         pretixpaypal.paypal.getFundingSources().forEach(function (fundingSource) {
@@ -297,10 +293,6 @@ var pretixpaypal = {
             textselector.text(eligibles.join(', '));
             textselector.fadeIn(300);
         });
-        textselector2.fadeOut(300, function () {
-            textselector2[0].textContent = eligibles.join(', ');
-            textselector2.fadeIn(300);
-        });
     },
 
     guessLocale: function() {

src/pretix/plugins/sendmail/forms.py

@@ -79,8 +79,8 @@ class BaseMailForm(FormPlaceholderMixin, forms.Form):
             widget=I18nMarkdownTextarea, required=True,
             locales=event.settings.get('locales'),
         )
-        self._set_field_placeholders('subject', context_parameters)
-        self._set_field_placeholders('message', context_parameters)
+        self._set_field_placeholders('subject', context_parameters, rich=False)
+        self._set_field_placeholders('message', context_parameters, rich=True)
 
 
 class WaitinglistMailForm(BaseMailForm):
@@ -382,7 +382,7 @@ class RuleForm(FormPlaceholderMixin, I18nModelForm):
         )
 
         self._set_field_placeholders('subject', ['event', 'order', 'event_or_subevent'])
-        self._set_field_placeholders('template', ['event', 'order', 'event_or_subevent'])
+        self._set_field_placeholders('template', ['event', 'order', 'event_or_subevent'], rich=True)
 
         choices = [(e, l) for e, l in Order.STATUS_CHOICE if e != 'n']
         choices.insert(0, ('n__valid_if_pending', _('payment pending but already confirmed')))

src/pretix/plugins/sendmail/views.py

@@ -46,12 +46,10 @@ from django.shortcuts import get_object_or_404, redirect
 from django.template.loader import get_template
 from django.urls import reverse
 from django.utils.functional import cached_property
-from django.utils.html import escape
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, ngettext
 from django.views.generic import DeleteView, FormView, ListView, TemplateView
 
-from pretix.base.email import get_available_placeholders
 from pretix.base.i18n import LazyI18nString, language
 from pretix.base.models import Checkin, LogEntry, Order, OrderPosition
 from pretix.base.models.event import SubEvent
@@ -63,7 +61,8 @@ from pretix.plugins.sendmail.tasks import (
 )
 
 from ...base.services.mail import prefix_subject
-from ...helpers.format import format_map
+from ...base.services.placeholders import get_sample_context
+from ...helpers.format import SafeFormatter, format_map
 from ...helpers.models import modelcopy
 from . import forms
 from .models import Rule, ScheduledMail
@@ -191,17 +190,15 @@ class BaseSenderView(EventPermissionRequiredMixin, FormView):
         if self.request.POST.get("action") != "send":
             for l in self.request.event.settings.locales:
                 with language(l, self.request.event.settings.region):
-                    context_dict = {}
-                    for k, v in get_available_placeholders(self.request.event, self.context_parameters).items():
-                        context_dict[k] = '<span class="placeholder" title="{}">{}</span>'.format(
-                            _('This value will be replaced based on dynamic parameters.'),
-                            escape(v.render_sample(self.request.event))
-                        )
-
+                    context_dict = get_sample_context(self.request.event, self.context_parameters)
                     subject = bleach.clean(form.cleaned_data['subject'].localize(l), tags=set())
                     preview_subject = prefix_subject(self.request.event, format_map(subject, context_dict), highlight=True)
                     message = form.cleaned_data['message'].localize(l)
-                    preview_text = markdown_compile_email(format_map(message, context_dict))
+                    preview_text = format_map(
+                        markdown_compile_email(format_map(message, context_dict)),
+                        context_dict,
+                        mode=SafeFormatter.MODE_RICH_TO_HTML,
+                    )
 
                     self.output[l] = {
                         'subject': _('Subject: {subject}').format(subject=preview_subject),
@@ -603,31 +600,6 @@ class CreateRule(EventPermissionRequiredMixin, CreateView):
         return super().form_invalid(form)
 
     def form_valid(self, form):
-        self.output = {}
-
-        if self.request.POST.get("action") == "preview":
-            for l in self.request.event.settings.locales:
-                with language(l, self.request.event.settings.region):
-                    context_dict = {}
-                    for k, v in get_available_placeholders(self.request.event, ['event', 'order',
-                                                                                'position_or_address']).items():
-                        context_dict[k] = '<span class="placeholder" title="{}">{}</span>'.format(
-                            _('This value will be replaced based on dynamic parameters.'),
-                            escape(v.render_sample(self.request.event))
-                        )
-
-                    subject = bleach.clean(form.cleaned_data['subject'].localize(l), tags=set())
-                    preview_subject = prefix_subject(self.request.event, format_map(subject, context_dict), highlight=True)
-                    template = form.cleaned_data['template'].localize(l)
-                    preview_text = markdown_compile_email(format_map(template, context_dict))
-
-                    self.output[l] = {
-                        'subject': _('Subject: {subject}').format(subject=preview_subject),
-                        'html': preview_text,
-                    }
-
-            return self.get(self.request, *self.args, **self.kwargs)
-
         messages.success(self.request, _('Your rule has been created.'))
 
         form.instance.event = self.request.event
@@ -685,17 +657,15 @@ class UpdateRule(EventPermissionRequiredMixin, UpdateView):
 
         for lang in self.request.event.settings.locales:
             with language(lang, self.request.event.settings.region):
-                placeholders = {}
-                for k, v in get_available_placeholders(self.request.event, ['event', 'order', 'position_or_address']).items():
-                    placeholders[k] = '<span class="placeholder" title="{}">{}</span>'.format(
-                        _('This value will be replaced based on dynamic parameters.'),
-                        escape(v.render_sample(self.request.event))
-                    )
-
+                placeholders = get_sample_context(self.request.event, ['event', 'order', 'position_or_address'])
                 subject = bleach.clean(self.object.subject.localize(lang), tags=set())
                 preview_subject = prefix_subject(self.request.event, format_map(subject, placeholders), highlight=True)
                 template = self.object.template.localize(lang)
-                preview_text = markdown_compile_email(format_map(template, placeholders))
+                preview_text = format_map(
+                    markdown_compile_email(format_map(template, placeholders)),
+                    placeholders,
+                    mode=SafeFormatter.MODE_RICH_TO_HTML,
+                )
 
                 o[lang] = {
                     'subject': _('Subject: {subject}'.format(subject=preview_subject)),

src/pretix/plugins/stripe/payment.py

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

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

@@ -13,7 +13,7 @@
         </p>
     {% elif incomplete %}
         <div class="alert alert-danger">
-            {% trans "A product in your cart is only sold in combination with add-on products that are no longer available. Please contact the event organizer." %}
+            {% trans "A product in your cart is only sold in combination with add-on products that are not available. Please contact the event organizer." %}
         </div>
     {% endif %}
     <form class="form-horizontal" method="post" data-asynctask

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

@@ -8,134 +8,118 @@
     <form method="post">
         {% csrf_token %}
         <div class="panel-group" id="customer">
-            <div class="panel panel-default">
-                <div class="accordion-radio">
-                    <div class="panel-heading">
-                        <p class="panel-title">
+            <fieldset class="panel panel-default accordion-panel">
+                <legend class="accordion-radio">
+                    <label class="panel-heading">
+                        <span class="panel-title">
                             <input type="radio" name="customer_mode" value="login"
-                                    data-parent="#customer"
                                     {% if selected == "login" or not signup_allowed %}checked="checked"{% endif %}
-                                    id="input_customer_login"
-                                    data-toggle="radiocollapse" data-target="#customer_login"/>
-                            <label for="input_customer_login"><strong>{% trans "Log in with a customer account" %}</strong></label>
+                                    aria-controls="customer_login" />
+                            {% trans "Log in with a customer account" %}
+                        </span>
+                    </label>
+                </legend>
+                <div id="customer_login" class="panel-body form-horizontal">
+                    {% if customer %}
+                        <p>
+                            {% blocktrans trimmed with org=request.organizer.name %}
+                                You are currently logged in with the following credentials.
+                            {% endblocktrans %}
                         </p>
-                    </div>
-                </div>
-                <div id="customer_login"
-                        class="panel-collapse collapsed {% if selected == "login" or not signup_allowed %}in{% endif %}">
-                    <div class="panel-body form-horizontal">
-                        {% if customer %}
-                            <p>
-                                {% blocktrans trimmed with org=request.organizer.name %}
-                                    You are currently logged in with the following credentials.
-                                {% endblocktrans %}
-                            </p>
-                            <dl class="dl-horizontal">
-                                <dt>{% trans "Email" %}</dt>
-                                <dd>
-                                    {{ customer.email }}
-                                </dd>
-                                <dt>{% trans "Name" %}</dt>
-                                <dd>{{ customer.name }}</dd>
-                                <dt>{% trans "Customer ID" %}</dt>
-                                <dd>
-                                    #{{ customer.identifier }}
-                                </dd>
-                            </dl>
-                        {% else %}
-                            <p>
-                                {% blocktrans trimmed with org=request.organizer.name %}
-                                    If you created a customer account at {{ org }} before, you can log in now and connect
-                                    your order to your account. This will allow you to see all your orders in one place
-                                    and access them at any time.
-                                {% endblocktrans %}
-                            </p>
-                            {% if request.organizer.settings.customer_accounts_native %}
-                                {% bootstrap_form login_form layout="checkout" %}
-                                <div class="row">
-                                    <div class="col-md-offset-3 col-md-9">
-                                        <a
-                                                href="{% abseventurl request.organizer "presale:organizer.customer.resetpw" %}"
-                                                target="_blank">
-                                            {% trans "Reset password" %}
-                                        </a>
-                                    </div>
-                                </div>
-                            {% endif %}
+                        <dl class="dl-horizontal">
+                            <dt>{% trans "Email" %}</dt>
+                            <dd>
+                                {{ customer.email }}
+                            </dd>
+                            <dt>{% trans "Name" %}</dt>
+                            <dd>{{ customer.name }}</dd>
+                            <dt>{% trans "Customer ID" %}</dt>
+                            <dd>
+                                #{{ customer.identifier }}
+                            </dd>
+                        </dl>
+                    {% else %}
+                        <p>
+                            {% blocktrans trimmed with org=request.organizer.name %}
+                                If you created a customer account at {{ org }} before, you can log in now and connect
+                                your order to your account. This will allow you to see all your orders in one place
+                                and access them at any time.
+                            {% endblocktrans %}
+                        </p>
+                        {% if request.organizer.settings.customer_accounts_native %}
+                            {% bootstrap_form login_form layout="checkout" %}
                             <div class="row">
-                                <div class="col-md-6 col-md-offset-3">
-                                    {% for provider in request.organizer.sso_providers.all %}
-                                        {% if provider.is_active %}
-                                            <a href="{% eventurl request.organizer "presale:organizer.customer.login" provider=provider.pk %}?next={% if request.event_domain %}{{ request.scheme }}://{{ request.get_host }}{% endif %}{{ request.get_full_path|urlencode }}"
-                                               class="btn btn-primary btn-lg btn-block" data-open-in-popup-window>
-                                                {{ provider.button_label }}
-                                            </a>
-                                        {% endif %}
-                                    {% endfor %}
+                                <div class="col-md-offset-3 col-md-9">
+                                    <a
+                                            href="{% abseventurl request.organizer "presale:organizer.customer.resetpw" %}"
+                                            target="_blank">
+                                        {% trans "Reset password" %}
+                                    </a>
                                 </div>
                             </div>
-                            <input type="hidden" name="login-sso-data" id="login_sso_data">
                         {% endif %}
-                    </div>
+                        <div class="row">
+                            <div class="col-md-6 col-md-offset-3">
+                                {% for provider in request.organizer.sso_providers.all %}
+                                    {% if provider.is_active %}
+                                        <a href="{% eventurl request.organizer "presale:organizer.customer.login" provider=provider.pk %}?next={% if request.event_domain %}{{ request.scheme }}://{{ request.get_host }}{% endif %}{{ request.get_full_path|urlencode }}"
+                                           class="btn btn-primary btn-lg btn-block" data-open-in-popup-window>
+                                            {{ provider.button_label }}
+                                        </a>
+                                    {% endif %}
+                                {% endfor %}
+                            </div>
+                        </div>
+                        <input type="hidden" name="login-sso-data" id="login_sso_data">
+                    {% endif %}
                 </div>
-            </div>
+            </fieldset>
             {% if signup_allowed %}
-                <div class="panel panel-default">
-                    <div class="accordion-radio">
-                        <div class="panel-heading">
-                            <p class="panel-title">
+                <fieldset class="panel panel-default accordion-panel">
+                    <legend class="accordion-radio">
+                        <label class="panel-heading">
+                            <span class="panel-title">
                                 <input type="radio" name="customer_mode" value="register"
-                                        data-parent="#customer"
                                         {% if selected == "register" %}checked="checked"{% endif %}
-                                        id="input_customer_register"
-                                        data-toggle="radiocollapse" data-target="#customer_register"/>
-                                <label for="input_customer_register"><strong>{% trans "Create a new customer account" %}</strong></label>
-                            </p>
-                        </div>
+                                        aria-controls="customer_register" />
+                                {% trans "Create a new customer account" %}
+                            </span>
+                        </label>
+                    </legend>
+                    <div id="customer_register" class="panel-body form-horizontal">
+                        {% bootstrap_form register_form layout="checkout" %}
+                        <p>
+                            {% blocktrans trimmed with org=request.organizer.name %}
+                                We will send you an email with a link to activate your account and set a password, so
+                                you can use the account for future orders at {{ org }}. You can still go ahead with this
+                                purchase before you received the email.
+                            {% endblocktrans %}
+                        </p>
                     </div>
-                    <div id="customer_register"
-                            class="panel-collapse collapsed {% if selected == "register" %}in{% endif %}">
-                        <div class="panel-body form-horizontal">
-                            {% bootstrap_form register_form layout="checkout" %}
-                            <p>
-                                {% blocktrans trimmed with org=request.organizer.name %}
-                                    We will send you an email with a link to activate your account and set a password, so
-                                    you can use the account for future orders at {{ org }}. You can still go ahead with this
-                                    purchase before you received the email.
-                                {% endblocktrans %}
-                            </p>
-                        </div>
-                    </div>
-                </div>
+                </fieldset>
             {% endif %}
             {% if guest_allowed %}
-                <div class="panel panel-default">
-                    <div class="accordion-radio">
-                        <div class="panel-heading">
-                            <p class="panel-title">
+                <fieldset class="panel panel-default accordion-panel">
+                    <legend class="accordion-radio">
+                        <label class="panel-heading">
+                            <span class="panel-title">
                                 <input type="radio" name="customer_mode" value="guest"
-                                        data-parent="#customer"
                                         {% if selected == "guest" %}checked="checked"{% endif %}
-                                        id="input_customer_guest"
-                                        aria-describedby="customer_guest"
-                                        data-toggle="radiocollapse" data-target="#customer_guest"/>
-                                <label for="input_customer_guest"><strong>{% trans "Continue as a guest" %}</strong></label>
-                            </p>
-                        </div>
+                                        aria-controls="customer_guest" />
+                                {% trans "Continue as a guest" %}
+                            </span>
+                        </label>
+                    </legend>
+                    <div id="customer_guest" class="panel-body form-horizontal">
+                        <p>
+                            {% blocktrans trimmed %}
+                                You are not required to create an account. If you proceed as a guest, you will be able
+                                to access the details and status of your order any time through the secret link we will
+                                send you via email once the order is complete.
+                            {% endblocktrans %}
+                        </p>
                     </div>
-                    <div id="customer_guest"
-                            class="panel-collapse collapsed {% if selected == "guest" %}in{% endif %}">
-                        <div class="panel-body form-horizontal">
-                            <p>
-                                {% blocktrans trimmed %}
-                                    You are not required to create an account. If you proceed as a guest, you will be able
-                                    to access the details and status of your order any time through the secret link we will
-                                    send you via email once the order is complete.
-                                {% endblocktrans %}
-                            </p>
-                        </div>
-                    </div>
-                </div>
+                </fieldset>
             {% endif %}
         </div>
         <div class="row checkout-button-row">

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

@@ -62,58 +62,52 @@
             {% endif %}
             <div class="panel-group" id="payment_accordion">
                 {% for p in providers %}
-                    <div class="panel panel-default">
-                        <div class="accordion-radio">
-                            <div class="panel-heading">
-                                <p class="panel-title">
+                    <fieldset class="panel panel-default accordion-panel">
+                        <legend class="accordion-radio">
+                            <label class="panel-heading">
+                                <span class="panel-title">
                                     {% if show_fees %}
                                         <strong class="pull-right flip">{% if p.fee < 0 %}-{% else %}+{% endif %} {{ p.fee|money:event.currency|cut:"-" }}</strong>
                                     {% endif %}
                                     <input type="radio" name="payment" value="{{ p.provider.identifier }}"
                                            title="{{ p.provider.public_name }}"
-                                           data-parent="#payment_accordion"
                                            {% if selected == p.provider.identifier %}checked="checked"{% endif %}
-                                           id="input_payment_{{ p.provider.identifier }}"
-                                           aria-describedby="payment_{{ p.provider.identifier }}"
-                                           data-toggle="radiocollapse" data-target="#payment_{{ p.provider.identifier }}"
+                                           aria-controls="payment_{{ p.provider.identifier }}"
                                            data-wallets="{{ p.provider.walletqueries|join:"|" }}" />
-                                    <label for="input_payment_{{ p.provider.identifier }}"><strong>{{ p.provider.public_name }}</strong></label>
-                                </p>
-                            </div>
-                        </div>
-                        <div id="payment_{{ p.provider.identifier }}"
-                             class="panel-collapse collapsed {% if selected == p.provider.identifier %}in{% endif %}">
-                            <div class="panel-body form-horizontal">
-                                {% if request.event.testmode %}
-                                    {% if p.provider.test_mode_message %}
-                                        <div class="alert alert-info">
-                                            <p>{{ p.provider.test_mode_message }}</p>
-                                        </div>
-                                        {% if not request.sales_channel.type_instance.testmode_supported %}
-                                            <div class="alert alert-danger">
-                                                <p>
-                                                {% trans "This sales channel does not provide support for test mode." %}
-                                                <strong>
-                                                    {% trans "If you continue, you might pay an actual order with non-existing money!" %}
-                                                </strong>
-                                                </p>
-                                            </div>
-                                        {% endif %}
-                                    {% else %}
-                                        <div class="alert alert-warning">
+                                    <strong class="accordion-label-text">{{ p.provider.public_name }}</strong>
+                                </span>
+                            </label>
+                        </legend>
+                        <div id="payment_{{ p.provider.identifier }}" class="panel-body form-horizontal">
+                            {% if request.event.testmode %}
+                                {% if p.provider.test_mode_message %}
+                                    <div class="alert alert-info">
+                                        <p>{{ p.provider.test_mode_message }}</p>
+                                    </div>
+                                    {% if not request.sales_channel.type_instance.testmode_supported %}
+                                        <div class="alert alert-danger">
                                             <p>
-                                            {% trans "This payment provider does not provide support for test mode." %}
+                                            {% trans "This sales channel does not provide support for test mode." %}
                                             <strong>
-                                                {% trans "If you continue, actual money might be transferred." %}
+                                                {% trans "If you continue, you might pay an actual order with non-existing money!" %}
                                             </strong>
                                             </p>
                                         </div>
                                     {% endif %}
+                                {% else %}
+                                    <div class="alert alert-warning">
+                                        <p>
+                                        {% trans "This payment provider does not provide support for test mode." %}
+                                        <strong>
+                                            {% trans "If you continue, actual money might be transferred." %}
+                                        </strong>
+                                        </p>
+                                    </div>
                                 {% endif %}
-                                {{ p.form }}
-                            </div>
+                            {% endif %}
+                            {{ p.form }}
                         </div>
-                    </div>
+                    </fieldset>
                 {% endfor %}
                 {% if not providers %}
                     <p><em>{% trans "There are no payment providers enabled." %}</em></p>

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

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

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

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

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

@@ -10,12 +10,12 @@
         <section aria-labelledby="{{ form_prefix }}category-{{ category.id }}"{% if category.description %} aria-describedby="{{ form_prefix }}category-info-{{ category.id }}"{% endif %}>
             <h{{ headline_level|default:3 }} class="h3" id="{{ form_prefix }}category-{{ category.id }}">{{ category.name }}
                 {% if category.subevent_name %}
-                    <small class="text-muted"><i class="fa fa-calendar"></i> {{ category.subevent_name }}</small>
+                    <small class="text-muted"><i class="fa fa-calendar" aria-hidden="true"></i> {{ category.subevent_name }}</small>
                 {% endif %}
                 {% if category.category_has_discount %}
                     <small class="text-success">
                         <i class="fa fa-star" aria-hidden="true"></i>
-                        <span class="sr-only">Congratulations!</span>
+                        <span class="sr-only">{% trans "Congratulations!" %}</span>
                         {% trans "Your order qualifies for a discount" %}
                     </small>
                 {% endif %}
@@ -219,7 +219,8 @@
                                                 {% trans "Select" context "checkbox" %}
                                             </label>
                                         {% else %}
-                                            <div class="input-item-count-group">
+                                            <fieldset class="input-item-count-group">
+                                                <legend class="sr-only">{% blocktrans with item=item.name %}Add {{ item }}, {{ var }} to cart{% endblocktrans %}</legend>
                                                 <button type="button" data-step="-1" data-controls="{{ form_prefix }}variation_{{ item.id }}_{{ var.id }}" class="btn btn-default input-item-count-dec" aria-label="{% trans "Decrease quantity" %}"
                                                     {% if not ev.presale_is_running %}disabled{% endif %}>-</button>
                                                 <input type="number" class="form-control input-item-count" placeholder="0" min="0"
@@ -230,10 +231,10 @@
                                                        max="{{ var.order_max }}"
                                                        id="{{ form_prefix }}variation_{{ item.id }}_{{ var.id }}"
                                                        name="{{ form_prefix }}variation_{{ item.id }}_{{ var.id }}"
-                                                       aria-label="{% blocktrans with item=item.name var=var.name %}Quantity of {{ item }}, {{ var }} to order{% endblocktrans %}">
+                                                       aria-label="{% trans "Quantity" %}">
                                                 <button type="button" data-step="1" data-controls="{{ form_prefix }}variation_{{ item.id }}_{{ var.id }}" class="btn btn-default input-item-count-inc" aria-label="{% trans "Increase quantity" %}"
                                                     {% if not ev.presale_is_running %}disabled{% endif %}>+</button>
-                                            </div>
+                                            </fieldset>
                                         {% endif %}
                                     </div>
                                 {% else %}
@@ -370,7 +371,8 @@
                                         {% trans "Select" context "checkbox" %}
                                 </label>
                             {% else %}
-                                <div class="input-item-count-group">
+                                <fieldset class="input-item-count-group">
+                                    <legend class="sr-only">{% blocktrans with item=item.name %}Add {{ item }} to cart{% endblocktrans %}</legend>
                                     <button type="button" data-step="-1" data-controls="{{ form_prefix }}item_{{ item.id }}" class="btn btn-default input-item-count-dec" aria-label="{% trans "Decrease quantity" %}"
                                         {% if not ev.presale_is_running %}disabled{% endif %}>-</button>
                                     <input type="number" class="form-control input-item-count" placeholder="0" min="0"
@@ -382,11 +384,10 @@
                                            max="{{ item.order_max }}"
                                            name="{{ form_prefix }}item_{{ item.id }}"
                                            id="{{ form_prefix }}item_{{ item.id }}"
-                                           aria-label="{% blocktrans with item=item.name %}Quantity of {{ item }} to order{% endblocktrans %}"
-                                           {% if item.description %} aria-describedby="{{ form_prefix }}item-{{ item.id }}-description"{% endif %}>
+                                           aria-label="{% trans "Quantity" %}">
                                     <button type="button" data-step="1" data-controls="{{ form_prefix }}item_{{ item.id }}" class="btn btn-default input-item-count-inc" aria-label="{% trans "Increase quantity" %}"
                                         {% if not ev.presale_is_running %}disabled{% endif %}>+</button>
-                                </div>
+                                </fieldset>
                             {% endif %}
                         </div>
                     {% else %}

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

@@ -29,29 +29,24 @@
         {% endif %}
         <div class="panel-group" id="payment_accordion">
             {% for p in providers %}
-                <div class="panel panel-default" data-total="{{ p.total|money_numberfield:request.event.currency }}">
-                    <div class="panel-heading">
-                        <h4 class="panel-title">
-                            <label class="radio">
+                <fieldset class="panel panel-default accordion-panel" data-total="{{ p.total|money_numberfield:request.event.currency }}">
+                    <legend class="accordion-radio">
+                        <label class="panel-heading">
+                            <span class="panel-title">
                                 {% if show_fees %}
                                     <strong class="pull-right flip">{% if p.fee_diff >= 0 %}+{% else %}-{% endif %} {{ p.fee_diff_abs|money:event.currency }}</strong>
                                 {% endif %}
                                 <input type="radio" name="payment" value="{{ p.provider.identifier }}"
-                                        data-parent="#payment_accordion"
                                         {% if selected == p.provider.identifier %}checked="checked"{% endif %}
-                                        data-toggle="radiocollapse" data-target="#payment_{{ p.provider.identifier }}"
                                         data-wallets="{{ p.provider.walletqueries|join:"|" }}"/>
-                                <strong>{{ p.provider.public_name }}</strong>
-                            </label>
-                        </h4>
+                                <strong class="accordion-label-text">{{ p.provider.public_name }}</strong>
+                            </span>
+                        </label>
+                    </legend>
+                    <div id="payment_{{ p.provider.identifier }}" class="panel-body form-horizontal">
+                        {{ p.form }}
                     </div>
-                    <div id="payment_{{ p.provider.identifier }}"
-                         class="panel-collapse collapsed {% if selected == p.provider.identifier %}in{% endif %}">
-                        <div class="panel-body form-horizontal">
-                            {{ p.form }}
-                        </div>
-                    </div>
-                </div>
+                </fieldset>
             {% empty %}
                 <div class="alert alert-info">
                     {% trans "There are no alternative payment providers available for this order." %}

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

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

src/pretix/presale/templates/pretixpresale/fragment_calendar.html

@@ -2,7 +2,7 @@
 {% load date_fast %}
 {% load calendarhead %}
 <div class="table-responsive">
-    <table class="table table-calendar">
+    <table class="table table-calendar" role="grid">
         <caption class="sr-only">{% trans "Calendar" %}</caption>
         <thead>
         <tr>
@@ -18,7 +18,26 @@
                     {% if day %}
                         <td class="day {% if day.events %}has-events{% else %}no-events{% endif %}"
                             data-date="{{ day.date|date_fast:"SHORT_DATE_FORMAT" }}">
-                            <p><time datetime="{{ day.date|date_fast:"Y-m-d" }}">{{ day.day }}</time></p>
+                            <p>
+                            {% if day.events %}
+                                <a href="#selected-day" class="day-label event hidden-sm hidden-md hidden-lg">
+                                    <b aria-hidden="true">{{ day.day }}</b>
+                                    <time datetime="{{ day.date|date_fast:"Y-m-d" }}" class="sr-only">
+                                        {{ day.date|date_fast:"SHORT_DATE_FORMAT" }}
+                                    </time>
+                                    <span class="sr-only">
+                                        ({% blocktrans trimmed count count=day.events|length %}
+                                            {{ count }} event
+                                        {% plural %}
+                                            {{ count }} events
+                                        {% endblocktrans %})
+                                    </span>
+                                </a>
+                                <time datetime="{{ day.date|date_fast:"Y-m-d" }}" class="hidden-xs">{{ day.day }}</time>
+                            {% else %}
+                                <time datetime="{{ day.date|date_fast:"Y-m-d" }}" class="day-label">{{ day.day }}</time>
+                            {% endif %}
+                            </p>
                             <ul class="events">
                                 {% for event in day.events %}
                                     <li><a class="event {% if event.continued %}continued{% endif %} {% spaceless %}
@@ -111,9 +130,7 @@
                 {% endfor %}
             </tr>
         {% endfor %}
-        <tr class="selected-day hidden">
-            <td colspan="7"></td>
-        </tr>
         </tbody>
     </table>
+    <div id="selected-day" aria-live="polite" class="table-calendar hidden-sm hidden-md hidden-lg"></div>
 </div>

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

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

src/pretix/presale/utils.py

@@ -57,8 +57,9 @@ from pretix.base.middleware import LocaleMiddleware
 from pretix.base.models import Customer, Event, Organizer
 from pretix.base.timemachine import time_machine_now_assigned_from_request
 from pretix.helpers.http import redirect_to_url
+from pretix.multidomain.models import KnownDomain
 from pretix.multidomain.urlreverse import (
-    get_event_domain, get_organizer_domain,
+    build_absolute_uri, get_event_domain, get_organizer_domain,
 )
 from pretix.presale.signals import process_request, process_response
 
@@ -134,7 +135,7 @@ def update_customer_session_auth_hash(request, customer):
 
 
 def add_customer_to_request(request):
-    if 'cross_domain_customer_auth' in request.GET and request.event_domain:
+    if 'cross_domain_customer_auth' in request.GET and request.domain_mode in (KnownDomain.MODE_EVENT_DOMAIN, KnownDomain.MODE_ORG_ALT_DOMAIN):
         # The user is logged in on the main domain and now wants to take their session
         # to a event-specific domain. We validate the one time token received via a
         # query parameter and make sure we invalidate it right away. Then, we look up
@@ -258,11 +259,12 @@ def _detect_event(request, require_live=True, require_plugin=None):
 
     url = resolve(request.path_info)
 
+    request_domain_mode = getattr(request, 'domain_mode', 'system')
     try:
-        if hasattr(request, 'event_domain'):
+        if request_domain_mode == KnownDomain.MODE_EVENT_DOMAIN:
             # We are on an event's custom domain
             pass
-        elif hasattr(request, 'organizer_domain'):
+        elif request_domain_mode in (KnownDomain.MODE_ORG_DOMAIN, KnownDomain.MODE_ORG_ALT_DOMAIN):
             # We are on an organizer's custom domain
             if 'organizer' in url.kwargs and url.kwargs['organizer']:
                 if url.kwargs['organizer'] != request.organizer.slug:
@@ -277,12 +279,20 @@ def _detect_event(request, require_live=True, require_plugin=None):
                     organizer=request.organizer,
                 )
 
-                # If this event has a custom domain, send the user there
-                domain = get_event_domain(request.event)
-                if domain:
+                # If this event has a custom domain or is not available on this alt domain, send the user there
+                domain, domainmode = get_event_domain(request.event, fallback=False, return_mode=True)
+                if not domain and request_domain_mode == KnownDomain.MODE_ORG_ALT_DOMAIN:
+                    path = request.get_full_path().split("/", 2)[-1]
+                    r = redirect_to_url(build_absolute_uri(request.event, "presale:event.index") + path)
+                    r['Access-Control-Allow-Origin'] = '*'
+                    return r
+                elif domain and domain != request.host:
                     if request.port and request.port not in (80, 443):
                         domain = '%s:%d' % (domain, request.port)
-                    path = request.get_full_path().split("/", 2)[-1]
+                    if domainmode == KnownDomain.MODE_EVENT_DOMAIN:
+                        path = request.get_full_path().split("/", 2)[-1]
+                    else:
+                        path = request.get_full_path()
                     r = redirect_to_url(urljoin('%s://%s' % (request.scheme, domain), path))
                     r['Access-Control-Allow-Origin'] = '*'
                     return r
@@ -299,11 +309,14 @@ def _detect_event(request, require_live=True, require_plugin=None):
                 request.organizer = request.event.organizer
 
                 # If this event has a custom domain, send the user there
-                domain = get_event_domain(request.event)
+                domain, domainmode = get_event_domain(request.event, fallback=False, return_mode=True)
                 if domain:
                     if request.port and request.port not in (80, 443):
                         domain = '%s:%d' % (domain, request.port)
-                    path = request.get_full_path().split("/", 3)[-1]
+                    if domainmode == KnownDomain.MODE_EVENT_DOMAIN:
+                        path = request.get_full_path().split("/", 3)[-1]
+                    else:
+                        path = request.get_full_path().split("/", 2)[-1]
                     r = redirect_to_url(urljoin('%s://%s' % (request.scheme, domain), path))
                     r['Access-Control-Allow-Origin'] = '*'
                     return r
@@ -377,6 +390,7 @@ def _detect_event(request, require_live=True, require_plugin=None):
     except Event.DoesNotExist:
         try:
             if hasattr(request, 'organizer_domain'):
+                # Redirect for case-insensitive event slug
                 event = request.organizer.events.get(
                     slug__iexact=url.kwargs['event'],
                     organizer=request.organizer,
@@ -388,6 +402,7 @@ def _detect_event(request, require_live=True, require_plugin=None):
                 return r
             else:
                 if 'event' in url.kwargs and 'organizer' in url.kwargs:
+                    # Redirect for case-insensitive event or organizer slug
                     event = Event.objects.select_related('organizer').get(
                         slug__iexact=url.kwargs['event'],
                         organizer__slug__iexact=url.kwargs['organizer']
@@ -403,6 +418,7 @@ def _detect_event(request, require_live=True, require_plugin=None):
         raise Http404(_('The selected event was not found.'))
     except Organizer.DoesNotExist:
         if 'organizer' in url.kwargs:
+            # Redirect for case-insensitive organizer slug
             try:
                 organizer = Organizer.objects.get(
                     slug__iexact=url.kwargs['organizer']

src/pretix/presale/views/__init__.py

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

src/pretix/presale/views/cart.py

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

src/pretix/presale/views/customer.py

@@ -77,7 +77,7 @@ class RedirectBackMixin:
             self.redirect_field_name,
             self.request.GET.get(self.redirect_field_name, '')
         )
-        hosts = list(KnownDomain.objects.filter(event__organizer=self.request.organizer).values_list('domainname', flat=True))
+        hosts = list(KnownDomain.objects.filter(organizer=self.request.organizer).values_list('domainname', flat=True))
         siteurlsplit = urlsplit(settings.SITE_URL)
         if siteurlsplit.port and siteurlsplit.port not in (80, 443):
             hosts = ['%s:%d' % (h, siteurlsplit.port) for h in hosts]
@@ -168,7 +168,7 @@ class LogoutView(View):
         return HttpResponseRedirect(next_page)
 
     def get_next_page(self):
-        if getattr(self.request, 'event_domain', False):
+        if getattr(self.request, 'domain_mode', 'system') in (KnownDomain.MODE_ORG_ALT_DOMAIN, KnownDomain.MODE_EVENT_DOMAIN):
             # After we cleared the cookies on this domain, redirect to the parent domain to clear cookies as well
             next_page = eventreverse(self.request.organizer, 'presale:organizer.customer.logout', kwargs={})
             if self.redirect_field_name in self.request.POST or self.redirect_field_name in self.request.GET:
@@ -188,7 +188,7 @@ class LogoutView(View):
                     self.redirect_field_name,
                     self.request.GET.get(self.redirect_field_name)
                 )
-                hosts = list(KnownDomain.objects.filter(event__organizer=self.request.organizer).values_list('domainname', flat=True))
+                hosts = list(KnownDomain.objects.filter(organizer=self.request.organizer).values_list('domainname', flat=True))
                 siteurlsplit = urlsplit(settings.SITE_URL)
                 if siteurlsplit.port and siteurlsplit.port not in (80, 443):
                     hosts = ['%s:%d' % (h, siteurlsplit.port) for h in hosts]

src/pretix/presale/views/event.py

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

src/pretix/presale/views/organizer.py

@@ -71,7 +71,7 @@ from pretix.helpers.formats.en.formats import (
 )
 from pretix.helpers.http import redirect_to_url
 from pretix.helpers.thumb import get_thumbnail
-from pretix.multidomain.urlreverse import eventreverse
+from pretix.multidomain.urlreverse import build_absolute_uri, eventreverse
 from pretix.presale.forms.organizer import EventListFilterForm
 from pretix.presale.ical import get_public_ical
 from pretix.presale.views import OrganizerViewMixin
@@ -1305,3 +1305,8 @@ class OrganizerFavicon(View):
             return redirect_to_url(get_thumbnail(icon_file, '32x32^', formats=settings.PILLOW_FORMATS_QUESTIONS_FAVICON).thumb.url)
         else:
             return redirect_to_url(static("pretixbase/img/favicon.ico"))
+
+
+class RedirectToOrganizerIndex(View):
+    def get(self, *args, **kwargs):
+        return redirect_to_url(build_absolute_uri(self.request.organizer, "presale:organizer.index"))

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

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

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

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

src/pretix/static/pretixbase/scss/_theme_variables.scss

@@ -53,7 +53,9 @@ $in-border-radius-small: 2px !default;
   --pretix-brand-primary-darken-17: #{darken($in-brand-primary, 17%)};
   --pretix-brand-primary-darken-20: #{darken($in-brand-primary, 20%)};
   --pretix-brand-primary-darken-30: #{darken($in-brand-primary, 30%)};
+  --pretix-brand-primary-tint-90: #{tint($in-brand-primary, 90%)};
   --pretix-brand-primary-shade-25: #{shade($in-brand-primary, 25%)};
+  --pretix-brand-primary-shade-42: #{shade($in-brand-primary, 42%)};
   --pretix-brand-primary-lighten-28-saturate-20: #{saturate(lighten($in-brand-primary, 28%), 20%)};
   --pretix-brand-primary-lighten-23-saturate-2: #{saturate(lighten($in-brand-primary, 23%), 2%)};
 

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

@@ -194,66 +194,6 @@ div[data-formset-body], div[data-formset-form], div[data-nested-formset-form], d
   line-height: 30px;
 }
 
-div.mail-preview {
-  border: 1px solid #ccc;
-  border-top-width: 1px;
-  border-radius: 3px;
-
-  .placeholder {
-    background: var(--pretix-brand-warning-transparent-60);
-  }
-}
-
-.mail-preview-group div[lang] {
-  @include border-top-radius(0px);
-  @include border-bottom-radius(0px);
-  border-top-width: 0;
-  margin-bottom: 0;
-  padding-right: 15px;
-  padding-bottom: 8px;
-
-  &:first-child {
-    @include border-top-radius($input-border-radius);
-    border-top-width: 1px;
-  }
-  &:last-child {
-    @include border-bottom-radius($input-border-radius);
-    margin-bottom: 20px;
-  }
-  h2, h3 {
-    margin-bottom: 20px;
-    margin-top: 10px;
-  }
-  p {
-    margin: 0 0 10px;
-
-    /* These are technically the same, but use both */
-    overflow-wrap: break-word;
-    word-wrap: break-word;
-
-    -ms-word-break: break-all;
-    /* This is the dangerous one in WebKit, as it breaks things wherever */
-    word-break: break-all;
-    /* Instead use this non-standard one: */
-    word-break: break-word;
-
-    /* Adds a hyphen where the word breaks, if supported (No Blink) */
-    -ms-hyphens: auto;
-    -moz-hyphens: auto;
-    -webkit-hyphens: auto;
-    hyphens: auto;
-  }
-  p:last-child {
-    margin-bottom: 0;
-  }
-  /* Reset styling from bootstrap that we don't actually have in emails */
-  pre {
-    background: none;
-    border: none;
-    padding: 0;
-  }
-}
-
 .search-line {
   width: 100%;
   margin-bottom: 20px;
@@ -603,7 +543,7 @@ table td > .checkbox input[type="checkbox"] {
   display: block;
   margin: 0;
 }
-.panel-default>.accordion-radio>.panel-heading {
+.panel-default>.accordion-radio>.panel-heading, fieldset.accordion-panel>legend>.panel-heading {
   color: #333;
   background-color: #f5f5f5;
   padding: 12px 15px;
@@ -615,6 +555,9 @@ table td > .checkbox input[type="checkbox"] {
     top: 2px;
   }
 }
+fieldset.accordion-panel > legend {
+  display: contents;
+}
 .maildesignpreview {
   label {
     display: block;

src/pretix/static/pretixcontrol/scss/_mail_preview.scss

@@ -0,0 +1,93 @@
+div.mail-preview {
+  border: 1px solid #ccc;
+  border-top-width: 1px;
+  border-radius: 3px;
+
+  .placeholder {
+    background: var(--pretix-brand-warning-transparent-60);
+  }
+  .placeholder-html {
+    background: none;
+    outline: 2px solid var(--pretix-brand-warning-transparent-60);
+    display: inline-block;
+  }
+}
+
+.mail-preview-group div[lang] {
+  @include border-top-radius(0px);
+  @include border-bottom-radius(0px);
+  border-top-width: 0;
+  margin-bottom: 0;
+  padding-right: 15px;
+  padding-bottom: 8px;
+
+  &:first-child {
+    @include border-top-radius($input-border-radius);
+    border-top-width: 1px;
+  }
+  &:last-child {
+    @include border-bottom-radius($input-border-radius);
+    margin-bottom: 20px;
+  }
+  h2, h3 {
+    margin-bottom: 20px;
+    margin-top: 10px;
+  }
+  p {
+    margin: 0 0 10px;
+
+    /* These are technically the same, but use both */
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+
+    -ms-word-break: break-all;
+    /* This is the dangerous one in WebKit, as it breaks things wherever */
+    word-break: break-all;
+    /* Instead use this non-standard one: */
+    word-break: break-word;
+
+    /* Adds a hyphen where the word breaks, if supported (No Blink) */
+    -ms-hyphens: auto;
+    -moz-hyphens: auto;
+    -webkit-hyphens: auto;
+    hyphens: auto;
+  }
+  p:last-child {
+    margin-bottom: 0;
+  }
+  /* Reset styling from bootstrap that we don't actually have in emails */
+  pre {
+    background: none;
+    border: none;
+    padding: 0;
+  }
+
+  /* Add some basic styling similar to our default email renderers */
+  a.button {
+    display: inline-block;
+    padding: 10px 16px;
+    font-size: 14px;
+    line-height: 1.33333;
+    border: 1px solid #cccccc;
+    border-radius: 6px;
+    -webkit-border-radius: 6px;
+    -moz-border-radius: 6px;
+    margin: 5px;
+    text-decoration: none;
+    color: var(--pretix-brand-primary);
+  }
+
+  table {
+    width: 100%;
+  }
+
+  table td {
+    vertical-align: top;
+    text-align: left;
+    padding: 0;
+  }
+
+  .text-right, table td.text-right {
+    text-align: right;
+  }
+}

src/pretix/static/pretixcontrol/scss/main.scss

@@ -12,6 +12,7 @@
 @import "_flags.scss";
 @import "_orders.scss";
 @import "_dashboard.scss";
+@import "_mail_preview.scss";
 @import "../../pretixbase/scss/webfont.scss";
 @import "../../fileupload/jquery.fileupload.scss";
 @import "../../leaflet/leaflet.scss";

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

@@ -243,6 +243,11 @@ function setup_basics(el) {
             $($(this).attr("data-target")).collapse('show');
         }
     });
+    $("fieldset.accordion-panel > legend input[type=radio]").change(function() {
+        $(this).closest("fieldset").siblings("fieldset").prop('disabled', true).children('.panel-body').slideUp();
+        $(this).closest("fieldset").prop('disabled', false).children('.panel-body').slideDown();
+    }).filter(':not(:checked)').each(function() { $(this).closest("fieldset").prop('disabled', true).children('.panel-body').hide(); });
+
     el.find(".js-only").removeClass("js-only");
     el.find(".js-hidden").hide();
 
@@ -459,10 +464,26 @@ $(function () {
         .on("change mouseup keyup", update_cart_form);
 
     $(".table-calendar td.has-events").click(function () {
-        var $tr = $(this).closest(".table-calendar").find(".selected-day");
-        $tr.find("td").html($(this).find(".events").clone());
-        $tr.find("td").prepend($("<h3>").text($(this).attr("data-date")));
-        $tr.removeClass("hidden");
+        var $grid = $(this).closest("[role='grid']");
+        $grid.find("[aria-selected]").attr("aria-selected", false);
+        $(this).attr("aria-selected", true);
+        $("#selected-day")
+            .html($(this).find(".events").clone())
+            .prepend($("<h3>").text($(this).attr("data-date")));
+    }).each(function() {
+        // check all events classes and set the "winning" class for the availability of the day-label on mobile
+        var $dayLabel = $('.day-label', this);
+        if ($('.available.low', this).length == $('.available', this).length) {
+            $dayLabel.addClass('low');
+        }
+        var classes = ['available', 'waitinglist', 'soon', 'reserved', 'soldout', 'continued', 'over'];
+        for (var c of classes) {
+            if ($('.'+c, this).length) {
+                $dayLabel.addClass(c);
+                // CAREFUL: „return“ as „break“ is not supported before ES2015 and breaks e.g. on iOS 15
+                return;
+            }
+        }
     });
 
     $(".print-this-page").on("click", function (e) {

src/pretix/static/pretixpresale/js/walletdetection.js

@@ -53,8 +53,8 @@ $(function () {
         });
 
     wallets.forEach(function(wallet) {
-        const labels = $('[data-wallets*='+wallet+'] + label strong, [data-wallets*='+wallet+'] + strong')
-            .append('<span class="wallet wallet-loading" data-wallet="'+wallet+'"> <i aria-hidden="true" class="fa fa-cog fa-spin"></i></span>')
+        const labels = $('[data-wallets*='+wallet+'] + .accordion-label-text')
+            .append('<span class="wallet wallet-loading" data-wallet="'+wallet+'"> <span aria-hidden="true" class="fa fa-cog fa-spin"></span></span>')
         walletdetection[wallet]()
             .then(function(result) {
                 const spans = labels.find(".wallet-loading[data-wallet=" + wallet + "]");

src/pretix/static/pretixpresale/scss/_calendar.scss

@@ -13,93 +13,66 @@
     padding: 0;
   }
   a.event {
+    --status-bg-color: var(--pretix-brand-primary-tint-90);
+    --status-text-color: var(--pretix-brand-primary-shade-42);
+    --status-border-color: #{$brand-primary};
+    position: relative;
     display: block;
-    background: var(--pretix-brand-primary-lighten-48);
-    color: $brand-primary;
+    background: var(--status-bg-color);
+    color: var(--status-text-color);
+    border: 1px solid var(--status-border-color);
     border-radius: $border-radius-base;
-    border-style: solid;
-    border-color: var(--pretix-brand-primary-lighten-30);
-    border-width: 1px 1px 1px 12px;
-    border-left-color: inherit;
+    &:before {
+      content: "";
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 11px;
+      height: 100%;
+      background: var(--status-border-color);
+    }
 
-    padding: 3px 5px;
+    padding: 3px 5px 3px 17px;
     margin-bottom: 3px;
     font-size: 12px;
     overflow-wrap: anywhere;
     text-decoration: none;
 
     &:hover {
-      background: var(--pretix-brand-primary-lighten-50);
-      border-color: $brand-primary;
+      outline: 1px solid var(--status-border-color);
+      outline-offset: 0;
     }
     &:focus {
-      outline-color: inherit;
+      outline: 2px solid var(--status-border-color);
+      outline-offset: 2px;
     }
 
     &.continued, &.over {
-      background: lighten(#767676, 54%);
-      border-color: lighten(#767676, 44%);
-      border-left-color: lighten(#767676, 44%);
-      color: #767676;
-      &:hover {
-        background: lighten(#767676, 54%);
-        border-color: lighten(#767676, 40%);
-      }
-    }
-
-    &.soon {
-      background: var(--pretix-brand-primary-lighten-53);
-      border-color: var(--pretix-brand-primary-lighten-40);
-      border-left-color: var(--pretix-brand-primary-lighten-20);
-      color: var(--pretix-brand-primary-lighten-5);
-      &:hover {
-        background: var(--pretix-brand-primary-lighten-55);
-        border-color: var(--pretix-brand-primary-lighten-20);
-      }
+      --status-bg-color: #{$table-bg-accent};
+      --status-text-color: #{$text-muted};
+      --status-border-color: #{tint($text-muted, 50%)};
     }
 
     &.available {
-      background: var(--pretix-brand-success-lighten-48);
-      border-color: var(--pretix-brand-success-lighten-30);
-      border-left-color: $brand-success;
-      color: var(--pretix-brand-success-darken-12);
+      --status-bg-color: #{$alert-success-bg};
+      --status-text-color: #{$alert-success-text};
+      --status-border-color: #{$alert-success-border};
 
-      &.low {
-        border-left-color: var(--pretix-brand-warning-lighten-12);
-      }
-
-      &:hover {
-        background: var(--pretix-brand-success-lighten-50);
-        border-color: $brand-success;
-
-        &.low {
-          border-left-color: $brand-warning;
-        }
+      &.low:before {
+        background: linear-gradient(to bottom, var(--pretix-brand-warning) 1em, var(--status-border-color) 2.5em);
       }
     }
 
     &.waitinglist {
-      background: var(--pretix-brand-warning-lighten-41);
-      border-color: var(--pretix-brand-warning-lighten-31);
-      border-left-color: var(--pretix-brand-warning-lighten-12);
-      color: #963;
-
-      &:hover {
-        background: var(--pretix-brand-warning-lighten-43);
-        border-color: $brand-warning;
-      }
+      --status-bg-color: #{$alert-warning-bg};
+      --status-text-color: #{$alert-warning-text};
+      --status-border-color: #{$alert-warning-border};
     }
 
     &.reserved, &.soldout, {
-      background: var(--pretix-brand-danger-lighten-43);
-      border-color: var(--pretix-brand-danger-lighten-30);
-      border-left-color: var(--pretix-brand-danger-lighten-30);
-      color: var(--pretix-brand-danger-darken-5);
-
-      &:hover {
-        background: var(--pretix-brand-danger-lighten-45);
-        border-color: var(--pretix-brand-danger-lighten-25);
-      }
+      --status-bg-color: #{$alert-danger-bg};
+      --status-text-color: #{$alert-danger-text};
+      --status-border-color: #{$alert-danger-border};
     }
 
     &.available > *:first-child,
@@ -434,8 +407,6 @@ if concurrency is higher than 9, JavaScript (currently in pretixpresale/js/ui/ma
 }
 
 
-
-
 @media (min-width: $screen-md-min) {
   .week-calendar {
     display: flex;
@@ -464,24 +435,35 @@ if concurrency is higher than 9, JavaScript (currently in pretixpresale/js/ui/ma
     }
   }
 }
-@media (min-width: $screen-sm-min) {
-  .table-calendar, .week-calendar {
-    .selected-day {
-      display: none !important;
+@media (max-width: $screen-xs-max) {
+  .table-calendar {
+    .day, .no-day {
+      padding: 3px 2px;
+    }
+    p {
+      margin-bottom: 0;
+    }
+    .day .events {
+      display: none;
+    }
+    a.day-label, .day-label {
+      --status-text-color: #{$text-muted};
+      display: block;
+      padding: 3px 3px 15px 12px;
+      font-size: 12px;
+      font-weight: bold;
+      color: var(--status-text-color);
+      margin-bottom: 0;
+    }
+    .no-events .day-label {
+      padding-left: 12px;
+    }
+    a.day-label:before {
+      width: 8px;
     }
   }
-}
-@media (max-width: $screen-xs-max) {
-  .table-calendar .day .events {
-    display: none;
-  }
-  .table-calendar td.day.has-events {
-    background: $brand-primary;
-    cursor: pointer;
-    color: white;
-  }
-  .table-calendar td.day.has-events:hover {
-    background: var(--pretix-brand-primary-darken-15);
+  #selected-day:has(*) {
+    padding: $table-cell-padding;
   }
 }
 #monthselform .row {

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

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

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

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

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

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

src/tests/api/test_events.py

@@ -1601,6 +1601,80 @@ def test_event_block_unblock_seat(token_client, organizer, event, seatingplan, i
     assert resp.data['blocked'] is False
 
 
+@pytest.mark.django_db
+def test_event_block_unblock_seat_bulk(token_client, organizer, event, seatingplan, item):
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/events/{}/'.format(organizer.slug, event.slug),
+        {
+            "seating_plan": seatingplan.pk,
+            "seat_category_mapping": {
+                "Stalls": item.pk
+            }
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+    event.refresh_from_db()
+
+    s1 = event.seats.first()
+    s2 = event.seats.last()
+    resp = token_client.post(
+        '/api/v1/organizers/{}/events/{}/seats/bulk_block/'.format(organizer.slug, event.slug),
+        {
+            "ids": [s1.pk, s2.pk],
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+
+    s1.refresh_from_db()
+    s2.refresh_from_db()
+    assert s1.blocked
+    assert s2.blocked
+
+    resp = token_client.post(
+        '/api/v1/organizers/{}/events/{}/seats/bulk_unblock/'.format(organizer.slug, event.slug),
+        {
+            "ids": [s1.pk, s2.pk],
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+
+    s1.refresh_from_db()
+    s2.refresh_from_db()
+    assert not s1.blocked
+    assert not s2.blocked
+
+    resp = token_client.post(
+        '/api/v1/organizers/{}/events/{}/seats/bulk_block/'.format(organizer.slug, event.slug),
+        {
+            "seat_guids": [s1.seat_guid, s2.seat_guid],
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+
+    s1.refresh_from_db()
+    s2.refresh_from_db()
+    assert s1.blocked
+    assert s2.blocked
+
+    resp = token_client.post(
+        '/api/v1/organizers/{}/events/{}/seats/bulk_unblock/'.format(organizer.slug, event.slug),
+        {
+            "seat_guids": [s1.seat_guid, s2.seat_guid],
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+
+    s1.refresh_from_db()
+    s2.refresh_from_db()
+    assert not s1.blocked
+    assert not s2.blocked
+
+
 @pytest.mark.django_db
 def test_event_expand_seat_filter_and_querycount(token_client, organizer, event, seatingplan, item):
     event.settings.seating_minimal_distance = 2

src/tests/api/test_orders.py

@@ -1967,7 +1967,7 @@ def test_pdf_data(token_client, organizer, event, order, django_assert_max_num_q
     assert not resp.data['positions'][0].get('pdf_data')
 
     # order list
-    with django_assert_max_num_queries(31):
+    with django_assert_max_num_queries(32):
         resp = token_client.get('/api/v1/organizers/{}/events/{}/orders/?pdf_data=true'.format(
             organizer.slug, event.slug
         ))
@@ -1982,7 +1982,7 @@ def test_pdf_data(token_client, organizer, event, order, django_assert_max_num_q
     assert not resp.data['results'][0]['positions'][0].get('pdf_data')
 
     # position list
-    with django_assert_max_num_queries(34):
+    with django_assert_max_num_queries(35):
         resp = token_client.get('/api/v1/organizers/{}/events/{}/orderpositions/?pdf_data=true'.format(
             organizer.slug, event.slug
         ))

src/tests/base/test_questions.py

@@ -0,0 +1,32 @@
+#
+# This file is part of pretix (Community Edition).
+#
+# Copyright (C) 2014-2020 Raphael Michel and contributors
+# Copyright (C) 2020-2021 rami.io GmbH and contributors
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+# Public License as published by the Free Software Foundation in version 3 of the License.
+#
+# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
+# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
+# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
+# this file, see <https://pretix.eu/about/en/license>.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
+# <https://www.gnu.org/licenses/>.
+#
+from pretix.base.forms.questions import name_parts_is_empty
+
+
+def test_name_parts_is_empty():
+    assert name_parts_is_empty({}) is True
+    assert name_parts_is_empty({"_scheme": "foo"}) is True
+    assert name_parts_is_empty({"_scheme": "foo", "full_name": ""}) is True
+    assert name_parts_is_empty({"full_name": None}) is True
+    assert name_parts_is_empty({"full_name": "Flora Nord"}) is False
+    assert name_parts_is_empty({"_scheme": "foo", "given_name": "Alice"}) is False
+    assert name_parts_is_empty({"_legacy": "Alice"}) is False

src/tests/base/test_templatetag.py

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

src/tests/helpers/test_format.py

@@ -19,7 +19,9 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from pretix.helpers.format import format_map
+from pretix.helpers.format import (
+    PlainHtmlAlternativeString, SafeFormatter, format_map,
+)
 
 
 def test_format_map():
@@ -28,3 +30,16 @@ def test_format_map():
     assert format_map("Foo {bar.__module__}", {"bar": 3}) == "Foo {bar.__module__}"
     assert format_map("Foo {bar!s}", {"bar": 3}) == "Foo 3"
     assert format_map("Foo {bar:<20}", {"bar": 3}) == "Foo 3"
+
+
+def test_format_alternatives():
+    ctx = {
+        "bar": PlainHtmlAlternativeString(
+            "plain text",
+            "<span>HTML version</span>",
+        )
+    }
+
+    assert format_map("Foo {bar}", ctx, mode=SafeFormatter.MODE_IGNORE_RICH) == "Foo {bar}"
+    assert format_map("Foo {bar}", ctx, mode=SafeFormatter.MODE_RICH_TO_PLAIN) == "Foo plain text"
+    assert format_map("Foo {bar}", ctx, mode=SafeFormatter.MODE_RICH_TO_HTML) == "Foo <span>HTML version</span>"

src/tests/multidomain/test_middlewares.py

@@ -40,16 +40,21 @@ def env():
 
 @pytest.mark.django_db
 def test_control_only_on_main_domain(env, client):
-    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0], mode=KnownDomain.MODE_ORG_DOMAIN)
     r = client.get('/control/login', HTTP_HOST='foobar')
     assert r.status_code == 302
     assert r['Location'] == 'http://example.com/control/login'
 
-    KnownDomain.objects.create(domainname='barfoo', organizer=env[0], event=env[1])
+    KnownDomain.objects.create(domainname='barfoo', organizer=env[0], event=env[1], mode=KnownDomain.MODE_EVENT_DOMAIN)
     r = client.get('/control/login', HTTP_HOST='barfoo')
     assert r.status_code == 302
     assert r['Location'] == 'http://example.com/control/login'
 
+    KnownDomain.objects.create(domainname='altfoo', organizer=env[0], mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
+    r = client.get('/control/login', HTTP_HOST='altfoo')
+    assert r.status_code == 302
+    assert r['Location'] == 'http://example.com/control/login'
+
 
 @pytest.mark.django_db
 def test_append_slash(env, client):
@@ -80,6 +85,15 @@ def test_event_on_custom_domain(env, client):
     assert b'<meta property="og:title" content="MRMCD2015" />' in r.content
 
 
+@pytest.mark.django_db
+def test_event_on_org_alt_domain(env, client):
+    d = KnownDomain.objects.create(domainname='foobar', organizer=env[0], mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
+    d.event_assignments.create(event=env[1])
+    r = client.get('/2015/', HTTP_HOST='foobar')
+    assert r.status_code == 200
+    assert b'<meta property="og:title" content="MRMCD2015" />' in r.content
+
+
 @pytest.mark.django_db
 def test_path_without_trailing_slash_on_org_domain(env, client):
     KnownDomain.objects.create(domainname='foobar', organizer=env[0])
@@ -95,6 +109,15 @@ def test_event_with_org_domain_on_main_domain(env, client):
     assert r['Location'] == 'http://foobar/2015/'
 
 
+@pytest.mark.django_db
+def test_event_with_org_alt_domain_on_main_domain(env, client):
+    d = KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    d.event_assignments.create(event=env[1])
+    r = client.get('/mrmcd/2015/', HTTP_HOST='example.com')
+    assert r.status_code == 302
+    assert r['Location'] == 'http://foobar/2015/'
+
+
 @pytest.mark.django_db
 def test_event_with_custom_domain_on_main_domain(env, client):
     KnownDomain.objects.create(domainname='foobar', organizer=env[0], event=env[1])
@@ -112,6 +135,40 @@ def test_event_with_custom_domain_on_org_domain(env, client):
     assert r['Location'] == 'http://barfoo'
 
 
+@pytest.mark.django_db
+def test_event_with_custom_domain_on_org_alt_domain(env, client):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    KnownDomain.objects.create(domainname='altfoo', organizer=env[0], mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
+    KnownDomain.objects.create(domainname='barfoo', organizer=env[0], event=env[1])
+    r = client.get('/2015/', HTTP_HOST='altfoo')
+    assert r.status_code == 302
+    assert r['Location'] == 'http://barfoo'
+
+
+@pytest.mark.django_db
+def test_event_with_org_alt_domain_on_org_domain(env, client):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0], mode=KnownDomain.MODE_ORG_DOMAIN)
+    d = KnownDomain.objects.create(domainname='altfoo', organizer=env[0], mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
+    d.event_assignments.create(event=env[1])
+
+    r = client.get('/2015/', HTTP_HOST='foobar')
+    assert r.status_code == 302
+    assert r['Location'] == 'http://altfoo/2015/'
+
+
+@pytest.mark.django_db
+def test_event_without_org_alt_domain_on_org_alt_domain(env, client):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0], mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
+    r = client.get('/', HTTP_HOST='foobar')
+    assert r.status_code == 302
+    assert r['Location'] == 'http://example.com/mrmcd/'
+
+    KnownDomain.objects.create(domainname='foobaz', organizer=env[0], mode=KnownDomain.MODE_ORG_DOMAIN)
+    r = client.get('/', HTTP_HOST='foobar')
+    assert r.status_code == 302
+    assert r['Location'] == 'http://foobaz/'
+
+
 @pytest.mark.django_db
 def test_organizer_with_org_domain_on_main_domain(env, client):
     KnownDomain.objects.create(domainname='foobar', organizer=env[0])
@@ -143,6 +200,10 @@ def test_unknown_event_on_org_domain(env, client):
     r = client.get('/1234/', HTTP_HOST='foobar')
     assert r.status_code == 404
 
+    KnownDomain.objects.create(domainname='altfoo', organizer=env[0], mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
+    r = client.get('/1234/', HTTP_HOST='altfoo')
+    assert r.status_code == 404
+
 
 @pytest.mark.django_db
 def test_cookie_domain_on_org_domain(env, client):
@@ -153,6 +214,16 @@ def test_cookie_domain_on_org_domain(env, client):
     assert r.client.cookies['pretix_session']['domain'] == ''
 
 
+@pytest.mark.django_db
+def test_cookie_domain_on_org_alt_domain(env, client):
+    d = KnownDomain.objects.create(domainname='foobar', organizer=env[0], mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
+    d.event_assignments.create(event=env[1])
+    client.post('/2015/cart/add', HTTP_HOST='foobar')
+    r = client.get('/2015/', HTTP_HOST='foobar')
+    assert r.client.cookies['pretix_csrftoken']['domain'] == ''
+    assert r.client.cookies['pretix_session']['domain'] == ''
+
+
 @pytest.mark.django_db
 def test_cookie_domain_on_event_domain(env, client):
     KnownDomain.objects.create(domainname='foobar', organizer=env[0])

src/tests/multidomain/test_templatetag.py

@@ -62,6 +62,36 @@ def test_event_custom_domain_front_page(env):
     assert rendered == 'http://foobar/2015/'
 
 
+@pytest.mark.django_db
+def test_event_custom_event_domain_front_page(env):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0], event=env[1], mode=KnownDomain.MODE_EVENT_DOMAIN)
+    rendered = TEMPLATE_FRONT_PAGE.render(Context({
+        'event': env[1]
+    })).strip()
+    assert rendered == 'http://foobar/'
+
+
+@pytest.mark.django_db
+def test_event_custom_org_alt_domain_front_page(env):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0], mode=KnownDomain.MODE_ORG_DOMAIN)
+    d = KnownDomain.objects.create(domainname='altfoo', organizer=env[0], mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
+    d.event_assignments.create(event=env[1])
+    rendered = TEMPLATE_FRONT_PAGE.render(Context({
+        'event': env[1]
+    })).strip()
+    assert rendered == 'http://altfoo/2015/'
+
+
+@pytest.mark.django_db
+def test_event_custom_org_alt_domain_unassigned_front_page(env):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0], mode=KnownDomain.MODE_ORG_DOMAIN)
+    KnownDomain.objects.create(domainname='altfoo', organizer=env[0], mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
+    rendered = TEMPLATE_FRONT_PAGE.render(Context({
+        'event': env[1]
+    })).strip()
+    assert rendered == 'http://foobar/2015/'
+
+
 @pytest.mark.django_db
 def test_event_main_domain_kwargs(env):
     rendered = TEMPLATE_KWARGS.render(Context({

src/tests/multidomain/test_urlreverse.py

@@ -37,7 +37,7 @@ def env():
         organizer=o, name='MRMCD2015', slug='2015',
         date_from=now()
     )
-    event.get_cache().clear()
+    event.cache.clear()
     return o, event
 
 
@@ -60,6 +60,16 @@ def test_event_org_domain_kwargs(env):
     assert eventreverse(env[1], 'presale:event.checkout', {'step': 'payment'}) == 'http://foobar/2015/checkout/payment/'
 
 
+@pytest.mark.django_db
+def test_event_org_alt_domain_kwargs(env):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    d = KnownDomain.objects.create(domainname='altfoo', organizer=env[0], mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
+    assert eventreverse(env[1], 'presale:event.checkout', {'step': 'payment'}) == 'http://foobar/2015/checkout/payment/'
+    d.event_assignments.create(event=env[1])
+    with scopes_disabled():
+        assert eventreverse(Event.objects.get(pk=env[1].pk), 'presale:event.checkout', {'step': 'payment'}) == 'http://altfoo/2015/checkout/payment/'
+
+
 @pytest.mark.django_db
 def test_event_main_domain_kwargs(env):
     assert eventreverse(env[1], 'presale:event.checkout', {'step': 'payment'}) == '/mrmcd/2015/checkout/payment/'
@@ -72,6 +82,15 @@ def test_event_org_domain_front_page(env):
     assert eventreverse(env[0], 'presale:organizer.index') == 'http://foobar/'
 
 
+@pytest.mark.django_db
+def test_event_org_alt_domain_front_page(env):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    d = KnownDomain.objects.create(domainname='altfoo', organizer=env[0], mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
+    d.event_assignments.create(event=env[1])
+    assert eventreverse(env[1], 'presale:event.index') == 'http://altfoo/2015/'
+    assert eventreverse(env[0], 'presale:organizer.index') == 'http://foobar/'
+
+
 @pytest.mark.django_db
 def test_event_custom_domain_front_page(env):
     KnownDomain.objects.create(domainname='barfoo', organizer=env[0], event=env[1])
@@ -109,8 +128,8 @@ def test_event_org_domain_keep_scheme(env):
     }
 })
 def test_event_main_domain_cache(env):
-    env[0].get_cache().clear()
-    with assert_num_queries(1):
+    env[0].cache.clear()
+    with assert_num_queries(2):
         eventreverse(env[1], 'presale:event.index')
     with assert_num_queries(0):
         eventreverse(env[1], 'presale:event.index')
@@ -125,8 +144,8 @@ def test_event_main_domain_cache(env):
 })
 def test_event_org_domain_cache(env):
     KnownDomain.objects.create(domainname='foobar', organizer=env[0])
-    env[0].get_cache().clear()
-    with assert_num_queries(1):
+    env[0].cache.clear()
+    with assert_num_queries(2):
         eventreverse(env[1], 'presale:event.index')
     with assert_num_queries(0):
         eventreverse(env[1], 'presale:event.index')
@@ -142,13 +161,36 @@ def test_event_org_domain_cache(env):
 def test_event_custom_domain_cache(env):
     KnownDomain.objects.create(domainname='foobar', organizer=env[0])
     KnownDomain.objects.create(domainname='barfoo', organizer=env[0], event=env[1])
-    env[0].get_cache().clear()
+    env[0].cache.clear()
     with assert_num_queries(1):
         eventreverse(env[1], 'presale:event.index')
     with assert_num_queries(0):
         eventreverse(env[1], 'presale:event.index')
 
 
+@pytest.mark.django_db
+@override_settings(CACHES={
+    'default': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        'LOCATION': 'unique-snowflake',
+    }
+})
+@scopes_disabled()
+def test_event_org_alt_domain_cache_clear(env):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    kd_alt = KnownDomain.objects.create(domainname='altfoo', organizer=env[0], mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
+    env[0].cache.clear()
+    with assert_num_queries(2):
+        eventreverse(env[1], 'presale:event.index')
+    kd_alt.event_assignments.create(event=env[1])
+    with assert_num_queries(2):
+        ev = Event.objects.get(pk=env[1].pk)
+        assert ev.pk == env[1].pk
+        assert ev.organizer == env[0]
+    with assert_num_queries(1):
+        eventreverse(ev, 'presale:event.index')
+
+
 @pytest.mark.django_db
 @override_settings(CACHES={
     'default': {
@@ -160,14 +202,14 @@ def test_event_custom_domain_cache(env):
 def test_event_org_domain_cache_clear(env):
     kd = KnownDomain.objects.create(domainname='foobar', organizer=env[0])
     env[0].cache.clear()
-    with assert_num_queries(1):
+    with assert_num_queries(2):
         eventreverse(env[1], 'presale:event.index')
     kd.delete()
     with assert_num_queries(2):
         ev = Event.objects.get(pk=env[1].pk)
         assert ev.pk == env[1].pk
         assert ev.organizer == env[0]
-    with assert_num_queries(1):
+    with assert_num_queries(2):
         eventreverse(ev, 'presale:event.index')
 
 
@@ -190,7 +232,7 @@ def test_event_custom_domain_cache_clear(env):
         ev = Event.objects.get(pk=env[1].pk)
         assert ev.pk == env[1].pk
         assert ev.organizer == env[0]
-    with assert_num_queries(1):
+    with assert_num_queries(2):
         eventreverse(ev, 'presale:event.index')
 
 
@@ -210,3 +252,11 @@ def test_event_custom_domain_absolute(env):
 def test_event_org_domain_absolute(env):
     KnownDomain.objects.create(domainname='foobar', organizer=env[0])
     assert build_absolute_uri(env[1], 'presale:event.index') == 'http://foobar/2015/'
+
+
+@pytest.mark.django_db
+def test_event_org_alt_domain_absolute(env):
+    KnownDomain.objects.create(domainname='foobar', organizer=env[0])
+    d = KnownDomain.objects.create(domainname='altfoo', organizer=env[0], mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
+    d.event_assignments.create(event=env[1])
+    assert build_absolute_uri(env[1], 'presale:event.index') == 'http://altfoo/2015/'

src/tests/presale/test_cart.py

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

src/tests/presale/test_customer.py

@@ -378,6 +378,13 @@ def test_org_sso_login_new_customer_popup(env, client, provider):
     _sso_login(client, provider, popup_origin="https://popuporigin")
 
 
+@pytest.mark.django_db
+def test_org_sso_login_new_customer_popup_org_alt_domain(env, client, provider):
+    d = KnownDomain.objects.create(organizer=env[0], domainname="popuporigin", mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
+    d.event_assignments.create(event=env[1])
+    _sso_login(client, provider, popup_origin="https://popuporigin")
+
+
 @pytest.mark.django_db
 def test_org_sso_login_new_customer_popup_invalid_origin(env, client, provider):
     KnownDomain.objects.create(organizer=env[0], event=env[1], domainname="popuporigin")
@@ -696,16 +703,21 @@ def client2():
     return Client()
 
 
-def _cross_domain_login(env, client, client2):
+def _cross_domain_login(env, client, client2, org_alt=False):
     with scopes_disabled():
         customer = env[0].customers.create(email='john@example.org', is_verified=True)
         customer.set_password('foo')
         customer.save()
         KnownDomain.objects.create(domainname='org.test', organizer=env[0])
-        KnownDomain.objects.create(domainname='event.test', organizer=env[0], event=env[1])
+        if org_alt:
+            d = KnownDomain.objects.create(domainname='event.test', organizer=env[0], mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
+            d.event_assignments.create(event=env[1])
+        else:
+            KnownDomain.objects.create(domainname='event.test', organizer=env[0], event=env[1])
 
     # Log in on org domain
-    r = client.post('/account/login?next=https://event.test/redeem&request_cross_domain_customer_auth=true', {
+    path = '/conf/' if org_alt else '/'
+    r = client.post(f'/account/login?next=https://event.test{path}redeem&request_cross_domain_customer_auth=true', {
         'email': 'john@example.org',
         'password': 'foo',
     }, HTTP_HOST='org.test')
@@ -713,12 +725,12 @@ def _cross_domain_login(env, client, client2):
 
     u = urlparse(r.headers['Location'])
     assert u.netloc == 'event.test'
-    assert u.path == '/redeem'
+    assert u.path == path + 'redeem'
     q = parse_qs(u.query)
     assert 'cross_domain_customer_auth' in q
 
     # Take session over to event domain
-    r = client2.get(f'/?{u.query}', HTTP_HOST='event.test')
+    r = client2.get(f'{path}?{u.query}', HTTP_HOST='event.test')
     assert r.status_code == 200
     assert b'john@example.org' in r.content
 
@@ -727,12 +739,27 @@ def _cross_domain_login(env, client, client2):
 def test_cross_domain_login(env, client, client2):
     _cross_domain_login(env, client, client2)
 
-    # Logged in on org domain
+    # Logged in on evnet domain
     r = client.get('/', HTTP_HOST='event.test')
     assert r.status_code == 200
     assert b'john@example.org' in r.content
 
-    # Logged in on event domain
+    # Logged in on org domain
+    r = client2.get('/', HTTP_HOST='org.test')
+    assert r.status_code == 200
+    assert b'john@example.org' in r.content
+
+
+@pytest.mark.django_db
+def test_cross_domain_login_org_alt(env, client, client2):
+    _cross_domain_login(env, client, client2, org_alt=True)
+
+    # Logged in on org alt domain
+    r = client.get('/conf/', HTTP_HOST='event.test')
+    assert r.status_code == 200
+    assert b'john@example.org' in r.content
+
+    # Logged in on org domain
     r = client2.get('/', HTTP_HOST='org.test')
     assert r.status_code == 200
     assert b'john@example.org' in r.content

src/tests/presale/test_event.py

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