Update doc/development/nfc/uid.rst

Co-authored-by: robbi5 <richt@rami.io>

.github/workflows/tests.yml

@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: harmon758/postgresql-action@v1
         with:
-          postgresql version: '15'
+          postgresql version: '11'
           postgresql db: 'pretix'
           postgresql user: 'postgres'
           postgresql password: 'postgres'

deployment/docker/production_settings.py

@@ -1,4 +1,4 @@
 from pretix.settings import *
 
 LOGGING['handlers']['mail_admins']['include_html'] = True
-STORAGES["staticfiles"]["BACKEND"] = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
+STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'

doc/development/implementation/i18n.rst

@@ -37,7 +37,7 @@ you to execute a piece of code with a different locale:
 This is very useful e.g. when sending an email to a user that has a different language than the user performing the
 action that causes the mail to be sent.
 
-.. _translation features: https://docs.djangoproject.com/en/4.2/topics/i18n/translation/
+.. _translation features: https://docs.djangoproject.com/en/1.9/topics/i18n/translation/
 .. _GNU gettext: https://www.gnu.org/software/gettext/
 .. _strings: https://django-i18nfield.readthedocs.io/en/latest/strings.html
 .. _database fields: https://django-i18nfield.readthedocs.io/en/latest/quickstart.html

doc/development/implementation/urlconfig.rst

@@ -15,33 +15,25 @@ and the admin panel is available at ``https://pretix.eu/control/event/bigorg/awe
 
 If the organizer now configures a custom domain like ``tickets.bigorg.com``, his event will
 from now on be available on ``https://tickets.bigorg.com/awesomecon/``. The former URL at
-``pretix.eu`` will redirect there. It's also possible to do this for just an event, in which
-case the event will be available on ``https://tickets.awesomecon.org/``.
-
-However, the admin panel will still only be available on ``pretix.eu`` for convenience and security reasons.
+``pretix.eu`` will redirect there. However, the admin panel will still only be available
+on ``pretix.eu`` for convenience and security reasons.
 
 URL routing
 -----------
 
 The hard part about implementing this URL routing in Django is that
 ``https://pretix.eu/bigorg/awesomecon/`` contains two parameters of nearly arbitrary content
-and ``https://tickets.bigorg.com/awesomecon/`` contains only one and ``https://tickets.awesomecon.org/`` does not contain any.
-The only robust way to do this is by having *separate* URL configuration for those three cases.
+and ``https://tickets.bigorg.com/awesomecon/`` contains only one. The only robust way to do
+this is by having *separate* URL configuration for those two cases. In pretix, we call the
+former our ``maindomain`` config and the latter our ``subdomain`` config. For pretix's core
+modules we do some magic to avoid duplicate configuration, but for a fairly simple plugin with
+only a handful of routes, we recommend just configuring the two URL sets separately.
 
-In pretix, we therefore do not have a global URL configuration, but three, living in the following modules:
-
-- ``pretix.multidomain.maindomain_urlconf``
-- ``pretix.multidomain.organizer_domain_urlconf``
-- ``pretix.multidomain.event_domain_urlconf``
-
-We provide some helper utilities to work with these to avoid duplicate configuration of the individual URLs.
 The file ``urls.py`` inside your plugin package will be loaded and scanned for URL configuration
 automatically and should be provided by any plugin that provides any view.
-However, unlike plain Django, we look not only for a ``urlpatterns`` attribute on the module but support other
-attributes like ``event_patterns`` and ``organizer_patterns`` as well.
 
-For example, for a simple plugin that adds one URL to the backend and one event-level URL to the frontend, you can
-create the following configuration in your ``urls.py``::
+A very basic example that provides one view in the admin panel and one view in the frontend
+could look like this::
 
     from django.urls import re_path
 
@@ -60,7 +52,7 @@ create the following configuration in your ``urls.py``::
     As you can see, the view in the frontend is not included in the standard Django ``urlpatterns``
     setting but in a separate list with the name ``event_patterns``. This will automatically prepend
     the appropriate parameters to the regex (e.g. the event or the event and the organizer, depending
-    on the called domain). For organizer-level views, ``organizer_patterns`` works the same way.
+    on the called domain).
 
 If you only provide URLs in the admin area, you do not need to provide a ``event_patterns`` attribute.
 
@@ -79,16 +71,11 @@ is a python method that emulates a behavior similar to ``reverse``:
 
 .. autofunction:: pretix.multidomain.urlreverse.eventreverse
 
-If you need to communicate the URL externally, you can use a different method to ensure that it is always an absolute URL:
-
-.. autofunction:: pretix.multidomain.urlreverse.build_absolute_uri
-
 In addition, there is a template tag that works similar to ``url`` but takes an event or organizer object
 as its first argument and can be used like this::
 
     {% load eventurl %}
     <a href="{% eventurl request.event "presale:event.checkout" step="payment" %}">Pay</a>
-    <a href="{% abseventurl request.event "presale:event.checkout" step="payment" %}">Pay</a>
 
 
 Implementation details

doc/development/setup.rst

@@ -96,20 +96,6 @@ http://localhost:8000/control/ for the admin view.
           port (for example because you develop on `pretixdroid`_), you can check
           `Django's documentation`_ for more options.
 
-When running the local development webserver, ensure Celery is not configured
-in ``pretix.cfg``. i.e., you should remove anything such as::
-
-    [celery]
-    backend=redis://redis:6379/2
-    broker=redis://redis:6379/2
-
-If you choose to use Celery for development, you must also start a Celery worker
-process::
-
-    celery -A pretix.celery_app worker -l info
-
-However, beware that code changes will not auto-reload within Celery.
-
 .. _`checksandtests`:
 
 Code checks and unit tests

pyproject.toml

@@ -36,7 +36,7 @@ dependencies = [
   "css-inline==0.8.*",
   "defusedcsv>=1.1.0",
   "dj-static",
-  "Django==4.2.*",
+  "Django==4.1.*",
   "django-bootstrap3==23.1.*",
   "django-compressor==4.3.*",
   "django-countries==7.5.*",
@@ -90,7 +90,7 @@ dependencies = [
   "pytz-deprecation-shim==0.1.*",
   "pyuca",
   "qrcode==7.4.*",
-  "redis==4.6.*",
+  "redis==4.5.*,>=4.5.4",
   "reportlab==4.0.*",
   "requests==2.31.*",
   "sentry-sdk==1.15.*",
@@ -112,7 +112,6 @@ memcached = ["pylibmc"]
 dev = [
   "coverage",
   "coveralls",
-  "fakeredis==2.18.*",
   "flake8==6.0.*",
   "freezegun",
   "isort==5.12.*",

src/pretix/__init__.py

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

src/pretix/_base_settings.py

@@ -196,14 +196,7 @@ STATICFILES_DIRS = [
 
 STATICI18N_ROOT = os.path.join(BASE_DIR, "pretix/static")
 
-STORAGES = {
-    "default": {
-        "BACKEND": "django.core.files.storage.FileSystemStorage",
-    },
-    "staticfiles": {
-        "BACKEND": "django.contrib.staticfiles.storage.ManifestStaticFilesStorage",
-    },
-}
+STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
 
 # if os.path.exists(os.path.join(DATA_DIR, 'static')):
 #     STATICFILES_DIRS.insert(0, os.path.join(DATA_DIR, 'static'))

src/pretix/api/serializers/order.py

@@ -27,7 +27,6 @@ from decimal import Decimal
 import pycountry
 from django.conf import settings
 from django.core.files import File
-from django.db import models
 from django.db.models import F, Q
 from django.utils.encoding import force_str
 from django.utils.timezone import now
@@ -373,15 +372,11 @@ class PdfDataSerializer(serializers.Field):
                 self.context['vars_images'] = get_images(self.context['event'])
 
             for k, f in self.context['vars'].items():
-                if 'evaluate_bulk' in f:
-                    # Will be evaluated later by our list serializers
-                    res[k] = (f['evaluate_bulk'], instance)
-                else:
-                    try:
-                        res[k] = f['evaluate'](instance, instance.order, ev)
-                    except:
-                        logger.exception('Evaluating PDF variable failed')
-                        res[k] = '(error)'
+                try:
+                    res[k] = f['evaluate'](instance, instance.order, ev)
+                except:
+                    logger.exception('Evaluating PDF variable failed')
+                    res[k] = '(error)'
 
             if not hasattr(ev, '_cached_meta_data'):
                 ev._cached_meta_data = ev.meta_data
@@ -434,38 +429,6 @@ class PdfDataSerializer(serializers.Field):
             return res
 
 
-class OrderPositionListSerializer(serializers.ListSerializer):
-
-    def to_representation(self, data):
-        # We have a custom implementation of this method because PdfDataSerializer() might keep some elements unevaluated
-        # with a (callable, input) tuple. We'll loop over these entries and evaluate them bulk-wise to save on SQL queries.
-
-        if isinstance(self.parent, OrderSerializer) and isinstance(self.parent.parent, OrderListSerializer):
-            # Do not execute our custom code because it will be executed by OrderListSerializer later for the
-            # full result set.
-            return super().to_representation(data)
-
-        iterable = data.all() if isinstance(data, models.Manager) else data
-
-        data = []
-        evaluate_queue = defaultdict(list)
-
-        for item in iterable:
-            entry = self.child.to_representation(item)
-            if "pdf_data" in entry:
-                for k, v in entry["pdf_data"].items():
-                    if isinstance(v, tuple) and callable(v[0]):
-                        evaluate_queue[v[0]].append((v[1], entry, k))
-            data.append(entry)
-
-        for func, entries in evaluate_queue.items():
-            results = func([item for (item, entry, k) in entries])
-            for (item, entry, k), result in zip(entries, results):
-                entry["pdf_data"][k] = result
-
-        return data
-
-
 class OrderPositionSerializer(I18nAwareModelSerializer):
     checkins = CheckinSerializer(many=True, read_only=True)
     answers = AnswerSerializer(many=True)
@@ -477,7 +440,6 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
     attendee_name = serializers.CharField(required=False)
 
     class Meta:
-        list_serializer_class = OrderPositionListSerializer
         model = OrderPosition
         fields = ('id', 'order', 'positionid', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
                   'company', 'street', 'zipcode', 'city', 'country', 'state', 'discount',
@@ -506,20 +468,6 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
     def validate(self, data):
         raise TypeError("this serializer is readonly")
 
-    def to_representation(self, data):
-        if isinstance(self.parent, (OrderListSerializer, OrderPositionListSerializer)):
-            # Do not execute our custom code because it will be executed by OrderListSerializer later for the
-            # full result set.
-            return super().to_representation(data)
-
-        entry = super().to_representation(data)
-        if "pdf_data" in entry:
-            for k, v in entry["pdf_data"].items():
-                if isinstance(v, tuple) and callable(v[0]):
-                    entry["pdf_data"][k] = v[0]([v[1]])[0]
-
-        return entry
-
 
 class RequireAttentionField(serializers.Field):
     def to_representation(self, instance: OrderPosition):
@@ -665,34 +613,6 @@ class OrderURLField(serializers.URLField):
         })
 
 
-class OrderListSerializer(serializers.ListSerializer):
-
-    def to_representation(self, data):
-        # We have a custom implementation of this method because PdfDataSerializer() might keep some elements
-        # unevaluated with a (callable, input) tuple. We'll loop over these entries and evaluate them bulk-wise to
-        # save on SQL queries.
-        iterable = data.all() if isinstance(data, models.Manager) else data
-
-        data = []
-        evaluate_queue = defaultdict(list)
-
-        for item in iterable:
-            entry = self.child.to_representation(item)
-            for p in entry.get("positions", []):
-                if "pdf_data" in p:
-                    for k, v in p["pdf_data"].items():
-                        if isinstance(v, tuple) and callable(v[0]):
-                            evaluate_queue[v[0]].append((v[1], p, k))
-            data.append(entry)
-
-        for func, entries in evaluate_queue.items():
-            results = func([item for (item, entry, k) in entries])
-            for (item, entry, k), result in zip(entries, results):
-                entry["pdf_data"][k] = result
-
-        return data
-
-
 class OrderSerializer(I18nAwareModelSerializer):
     invoice_address = InvoiceAddressSerializer(allow_null=True)
     positions = OrderPositionSerializer(many=True, read_only=True)
@@ -707,7 +627,6 @@ class OrderSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = Order
-        list_serializer_class = OrderListSerializer
         fields = (
             'code', 'status', 'testmode', 'secret', 'email', 'phone', 'locale', 'datetime', 'expires', 'payment_date',
             'payment_provider', 'fees', 'total', 'comment', 'custom_followup_at', 'invoice_address', 'positions', 'downloads',

src/pretix/api/views/device.py

@@ -166,6 +166,7 @@ class InitializeView(APIView):
         device.software_brand = serializer.validated_data.get('software_brand')
         device.software_version = serializer.validated_data.get('software_version')
         device.info = serializer.validated_data.get('info')
+        print(serializer.validated_data, request.data)
         device.rsa_pubkey = serializer.validated_data.get('rsa_pubkey')
         device.api_token = generate_api_token()
         device.save()

src/pretix/base/middleware.py

@@ -271,8 +271,6 @@ class SecurityMiddleware(MiddlewareMixin):
                 (url.url_name == "event.checkout" and url.kwargs['step'] == "payment")
         ):
             h['script-src'].append('https://pay.google.com')
-            h['frame-src'].append('https://pay.google.com')
-            h['connect-src'].append('https://google.com/pay')
         if settings.LOG_CSP:
             h['report-uri'] = ["/csp_report/"]
         if 'Content-Security-Policy' in resp:

src/pretix/base/models/_transactions.py

@@ -97,7 +97,7 @@ def _transactions_mark_order_dirty(order_id, using=None):
     if getattr(dirty_transactions, 'order_ids', None) is None:
         dirty_transactions.order_ids = set()
 
-    if _check_for_dirty_orders not in [func for (savepoint_id, func, *__) in conn.run_on_commit]:
+    if _check_for_dirty_orders not in [func for savepoint_id, func in conn.run_on_commit]:
         transaction.on_commit(_check_for_dirty_orders, using)
         dirty_transactions.order_ids.clear()  # This is necessary to clean up after old threads with rollbacked transactions
 

src/pretix/base/models/items.py

@@ -43,7 +43,6 @@ from typing import Optional, Tuple
 from zoneinfo import ZoneInfo
 
 import dateutil.parser
-import django_redis
 from dateutil.tz import datetime_exists
 from django.conf import settings
 from django.core.exceptions import ValidationError
@@ -58,6 +57,7 @@ from django.utils.functional import cached_property
 from django.utils.timezone import is_naive, make_aware, now
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_countries.fields import Country
+from django_redis import get_redis_connection
 from django_scopes import ScopedManager
 from i18nfield.fields import I18nCharField, I18nTextField
 
@@ -1910,13 +1910,8 @@ class Quota(LoggedModel):
 
     def rebuild_cache(self, now_dt=None):
         if settings.HAS_REDIS:
-            rc = django_redis.get_redis_connection("redis")
-            p = rc.pipeline()
-            p.hdel(f'quotas:{self.event_id}:availabilitycache', str(self.pk))
-            p.hdel(f'quotas:{self.event_id}:availabilitycache:nocw', str(self.pk))
-            p.hdel(f'quotas:{self.event_id}:availabilitycache:igcl', str(self.pk))
-            p.hdel(f'quotas:{self.event_id}:availabilitycache:nocw:igcl', str(self.pk))
-            p.execute()
+            rc = get_redis_connection("redis")
+            rc.hdel(f'quotas:{self.event_id}:availabilitycache', str(self.pk))
             self.availability(now_dt=now_dt)
 
     def availability(

src/pretix/base/models/log.py

@@ -88,7 +88,9 @@ class LogEntry(models.Model):
 
     class Meta:
         ordering = ('-datetime', '-id')
-        indexes = [models.Index(fields=["datetime", "id"])]
+        index_together = [
+            ['datetime', 'id']
+        ]
 
     def display(self):
         from ..signals import logentry_display

src/pretix/base/models/media.py

@@ -121,10 +121,7 @@ class ReusableMedium(LoggedModel):
 
     class Meta:
         unique_together = (("identifier", "type", "organizer"),)
-        indexes = [
-            models.Index(fields=("identifier", "type", "organizer")),
-            models.Index(fields=("updated", "id")),
-        ]
+        index_together = (("identifier", "type", "organizer"), ("updated", "id"))
         ordering = "identifier", "type", "organizer"
 
 

src/pretix/base/models/orders.py

@@ -270,9 +270,9 @@ class Order(LockModel, LoggedModel):
         verbose_name = _("Order")
         verbose_name_plural = _("Orders")
         ordering = ("-datetime", "-pk")
-        indexes = [
-            models.Index(fields=["datetime", "id"]),
-            models.Index(fields=["last_modified", "id"]),
+        index_together = [
+            ["datetime", "id"],
+            ["last_modified", "id"],
         ]
 
     def __str__(self):
@@ -907,11 +907,6 @@ class Order(LockModel, LoggedModel):
             return self.expires
 
         expires = self.expires.date() + timedelta(days=delay)
-        if self.event.settings.get('payment_term_weekdays'):
-            if expires.weekday() == 5:
-                expires += timedelta(days=2)
-            elif expires.weekday() == 6:
-                expires += timedelta(days=1)
 
         tz = ZoneInfo(self.event.settings.timezone)
         expires = make_aware(datetime.combine(
@@ -1676,7 +1671,7 @@ class OrderPayment(models.Model):
         """
         Marks the order as failed and sets info to ``info``, but only if the order is in ``created`` or ``pending``
         state. This is equivalent to setting ``state`` to ``OrderPayment.PAYMENT_STATE_FAILED`` and logging a failure,
-        but it adds strong database locking since we do not want to report a failure for an order that has just
+        but it adds strong database logging since we do not want to report a failure for an order that has just
         been marked as paid.
         :param send_mail: Whether an email should be sent to the user about this event (default: ``True``).
         """
@@ -2756,8 +2751,8 @@ class Transaction(models.Model):
 
     class Meta:
         ordering = 'datetime', 'pk'
-        indexes = [
-            models.Index(fields=['datetime', 'id'])
+        index_together = [
+            ['datetime', 'id']
         ]
 
     def save(self, *args, **kwargs):

src/pretix/base/orderimport.py

@@ -805,7 +805,7 @@ class QuestionColumn(ImportColumn):
                 return self.q.clean_answer(value)
 
     def assign(self, value, order, position, invoice_address, **kwargs):
-        if value is not None:
+        if value:
             if not hasattr(order, '_answers'):
                 order._answers = []
             if isinstance(value, QuestionOption):

src/pretix/base/pdf.py

@@ -108,10 +108,7 @@ DEFAULT_VARIABLES = OrderedDict((
     ("positionid", {
         "label": _("Order position number"),
         "editor_sample": "1",
-        "evaluate": lambda orderposition, order, event: str(orderposition.positionid),
-        # There is no performance gain in using evaluate_bulk here, but we want to make sure it is used somewhere
-        # in core to make sure we notice if the implementation of the API breaks.
-        "evaluate_bulk": lambda orderpositions: [str(p.positionid) for p in orderpositions],
+        "evaluate": lambda orderposition, order, event: str(orderposition.positionid)
     }),
     ("order_positionid", {
         "label": _("Order code and position number"),

src/pretix/base/services/orders.py

@@ -2476,11 +2476,6 @@ class OrderChangeManager:
             split_order.status = Order.STATUS_PAID
         else:
             split_order.status = Order.STATUS_PENDING
-            if self.order.status == Order.STATUS_PAID:
-                split_order.set_expires(
-                    now(),
-                    list(set(p.subevent_id for p in split_positions))
-                )
         split_order.save()
 
         if offset_amount > Decimal('0.00'):

src/pretix/base/services/quotas.py

@@ -24,13 +24,13 @@ import time
 from collections import Counter, defaultdict
 from itertools import zip_longest
 
-import django_redis
 from django.conf import settings
 from django.db import models
 from django.db.models import (
     Case, Count, F, Func, Max, OuterRef, Q, Subquery, Sum, Value, When,
 )
 from django.utils.timezone import now
+from django_redis import get_redis_connection
 
 from pretix.base.models import (
     CartPosition, Checkin, Order, OrderPosition, Quota, Voucher,
@@ -102,12 +102,6 @@ class QuotaAvailability:
         self.count_waitinglist = defaultdict(int)
         self.count_cart = defaultdict(int)
 
-        self._cache_key_suffix = ""
-        if not self._count_waitinglist:
-            self._cache_key_suffix += ":nocw"
-        if self._ignore_closed:
-            self._cache_key_suffix += ":igcl"
-
         self.sizes = {}
 
     def queue(self, *quota):
@@ -127,14 +121,17 @@ class QuotaAvailability:
             if self._full_results:
                 raise ValueError("You cannot combine full_results and allow_cache.")
 
+            elif not self._count_waitinglist:
+                raise ValueError("If you set allow_cache, you need to set count_waitinglist.")
+
             elif settings.HAS_REDIS:
-                rc = django_redis.get_redis_connection("redis")
+                rc = get_redis_connection("redis")
                 quotas_by_event = defaultdict(list)
                 for q in [_q for _q in self._queue if _q.id in quota_ids_set]:
                     quotas_by_event[q.event_id].append(q)
 
                 for eventid, evquotas in quotas_by_event.items():
-                    d = rc.hmget(f'quotas:{eventid}:availabilitycache{self._cache_key_suffix}', [str(q.pk) for q in evquotas])
+                    d = rc.hmget(f'quotas:{eventid}:availabilitycache', [str(q.pk) for q in evquotas])
                     for redisval, q in zip(d, evquotas):
                         if redisval is not None:
                             data = [rv for rv in redisval.decode().split(',')]
@@ -167,12 +164,12 @@ class QuotaAvailability:
         if not settings.HAS_REDIS or not quotas:
             return
 
-        rc = django_redis.get_redis_connection("redis")
+        rc = get_redis_connection("redis")
         # We write the computed availability to redis in a per-event hash as
         #
         #   quota_id -> (availability_state, availability_number, timestamp).
         #
-        # We store this in a hash instead of individual values to avoid making too many redis requests
+        # We store this in a hash instead of inidividual values to avoid making two many redis requests
         # which would introduce latency.
 
         # The individual entries in the hash are "valid" for 120 seconds. This means in a typical peak scenario with
@@ -182,16 +179,16 @@ class QuotaAvailability:
         # these quotas. We choose 10 seconds since that should be well above the duration of a write.
 
         lock_name = '_'.join([str(p) for p in sorted([q.pk for q in quotas])])
-        if rc.exists(f'quotas:availabilitycachewrite:{lock_name}{self._cache_key_suffix}'):
+        if rc.exists(f'quotas:availabilitycachewrite:{lock_name}'):
             return
-        rc.setex(f'quotas:availabilitycachewrite:{lock_name}{self._cache_key_suffix}', '1', 10)
+        rc.setex(f'quotas:availabilitycachewrite:{lock_name}', '1', 10)
 
         update = defaultdict(list)
         for q in quotas:
             update[q.event_id].append(q)
 
         for eventid, quotas in update.items():
-            rc.hmset(f'quotas:{eventid}:availabilitycache{self._cache_key_suffix}', {
+            rc.hmset(f'quotas:{eventid}:availabilitycache', {
                 str(q.id): ",".join(
                     [str(i) for i in self.results[q]] +
                     [str(int(time.time()))]
@@ -200,7 +197,7 @@ class QuotaAvailability:
             # To make sure old events do not fill up our redis instance, we set an expiry on the cache. However, we set it
             # on 7 days even though we mostly ignore values older than 2 monites. The reasoning is that we have some places
             # where we set allow_cache_stale and use the old entries anyways to save on performance.
-            rc.expire(f'quotas:{eventid}:availabilitycache{self._cache_key_suffix}', 3600 * 24 * 7)
+            rc.expire(f'quotas:{eventid}:availabilitycache', 3600 * 24 * 7)
 
         # We used to also delete item_quota_cache:* from the event cache here, but as the cache
         # gets more complex, this does not seem worth it. The cache is only present for up to

src/pretix/base/settings.py

@@ -941,9 +941,9 @@ DEFAULTS = {
         'form_kwargs': dict(
             label=_('Expiration delay'),
             help_text=_("The order will only actually expire this many days after the expiration date communicated "
-                        "to the customer. If you select \"Only end payment terms on weekdays\" above, this will also "
-                        "be respected. However, this will not delay beyond the \"last date of payments\" "
-                        "configured above, which is always enforced."),
+                        "to the customer. However, this will not delay beyond the \"last date of payments\" "
+                        "configured above, which is always enforced. The delay may also end on a weekend regardless "
+                        "of the other settings above."),
             # Every order in between the official expiry date and the delayed expiry date has a performance penalty
             # for the cron job, so we limit this feature to 30 days to prevent arbitrary numbers of orders needing
             # to be checked.

src/pretix/base/signals.py

@@ -683,16 +683,12 @@ dictionaries as values that contain keys like in the following example::
         "product": {
             "label": _("Product name"),
             "editor_sample": _("Sample product"),
-            "evaluate": lambda orderposition, order, event: str(orderposition.item),
-            "evaluate_bulk": lambda orderpositions: [str(op.item) for op in orderpositions],
+            "evaluate": lambda orderposition, order, event: str(orderposition.item)
         }
     }
 
 The ``evaluate`` member will be called with the order position, order and event as arguments. The event might
 also be a subevent, if applicable.
-
-The ``evaluate_bulk`` member is optional but can significantly improve performance in some situations because you
-can perform database fetches in bulk instead of single queries for every position.
 """
 
 

src/pretix/control/forms/filter.py

@@ -1732,8 +1732,8 @@ class CheckinListAttendeeFilterForm(FilterForm):
         '-timestamp': (OrderBy(F('last_entry'), nulls_last=True, descending=True), '-order__code'),
         'item': ('item__name', 'variation__value', 'order__code'),
         '-item': ('-item__name', '-variation__value', '-order__code'),
-        'seat': ('seat__sorting_rank', 'seat__seat_guid'),
-        '-seat': ('-seat__sorting_rank', '-seat__seat_guid'),
+        'seat': ('seat__sorting_rank', 'seat__guid'),
+        '-seat': ('-seat__sorting_rank', '-seat__guid'),
         'date': ('subevent__date_from', 'subevent__id', 'order__code'),
         '-date': ('-subevent__date_from', 'subevent__id', '-order__code'),
         'name': {'_order': F('display_name').asc(nulls_first=True),
@@ -1940,7 +1940,7 @@ class VoucherFilterForm(FilterForm):
             'item__category__position',
             'item__category',
             'item__position',
-            'variation__position',
+            'item__variation__position',
             'quota__name',
         ),
         'subevent': 'subevent__date_from',
@@ -1950,7 +1950,7 @@ class VoucherFilterForm(FilterForm):
             '-item__category__position',
             '-item__category',
             '-item__position',
-            '-variation__position',
+            '-item__variation__position',
             '-quota__name',
         )
     }

src/pretix/control/forms/item.py

@@ -461,6 +461,11 @@ class ItemCreateForm(I18nModelForm):
                 )
 
         if self.cleaned_data.get('copy_from'):
+            for mv in self.cleaned_data['copy_from'].meta_values.all():
+                mv.pk = None
+                mv.item = instance
+                mv.save(force_insert=True)
+
             for question in self.cleaned_data['copy_from'].questions.all():
                 question.items.add(instance)
                 question.log_action('pretix.event.question.changed', user=self.user, data={

src/pretix/control/logdisplay.py

@@ -341,7 +341,6 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
         'pretix.giftcards.acceptance.added': _('Gift card acceptance for another organizer has been added.'),
         'pretix.giftcards.acceptance.removed': _('Gift card acceptance for another organizer has been removed.'),
         'pretix.giftcards.acceptance.acceptor.invited': _('A new gift card acceptor has been invited.'),
-        'pretix.giftcards.acceptance.acceptor.removed': _('A gift card acceptor has been removed.'),
         'pretix.giftcards.acceptance.issuer.removed': _('A gift card issuer has been removed or declined.'),
         'pretix.giftcards.acceptance.issuer.accepted': _('A new gift card issuer has been accepted.'),
         'pretix.webhook.created': _('The webhook has been created.'),

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

@@ -1,27 +0,0 @@
-{% load i18n %}
-<ul class="dropdown-menu dropdown-menu-right">
-    <li>
-        <a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="png" %}{% if url %}?url={{ url|urlencode }}{% endif %}"
-           target="_blank" download>
-            {% blocktrans with filetype="PNG" %}Download QR code as {{ filetype }} image{% endblocktrans %}
-        </a>
-    </li>
-    <li>
-        <a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="svg" %}{% if url %}?url={{ url|urlencode }}{% endif %}"
-           target="_blank" download>
-            {% blocktrans with filetype="SVG" %}Download QR code as {{ filetype }} image{% endblocktrans %}
-        </a>
-    </li>
-    <li>
-        <a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="jpeg" %}{% if url %}?url={{ url|urlencode }}{% endif %}"
-           target="_blank" download>
-            {% blocktrans with filetype="JPG" %}Download QR code as {{ filetype }} image{% endblocktrans %}
-        </a>
-    </li>
-    <li>
-        <a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="gif" %}{% if url %}?url={{ url|urlencode }}{% endif %}"
-           target="_blank" download>
-            {% blocktrans with filetype="GIF" %}Download QR code as {{ filetype }} image{% endblocktrans %}
-        </a>
-    </li>
-</ul>

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

@@ -27,7 +27,28 @@
             <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{% trans "Create QR code" %}" aria-haspopup="true" aria-expanded="false">
                 <i class="fa fa-qrcode" aria-hidden="true"></i>
             </button>
-            {% include "pretixcontrol/event/fragment_qr_dropdown.html" with url=0 %}
+            <ul class="dropdown-menu dropdown-menu-right">
+                <li>
+                    <a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="png" %}" target="_blank" download>
+                        {% blocktrans with filetype="PNG" %}Download QR code as {{ filetype }} image{% endblocktrans %}
+                    </a>
+                </li>
+                <li>
+                    <a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="svg" %}" target="_blank" download>
+                        {% blocktrans with filetype="SVG" %}Download QR code as {{ filetype }} image{% endblocktrans %}
+                    </a>
+                </li>
+                <li>
+                    <a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="jpeg" %}" target="_blank" download>
+                        {% blocktrans with filetype="JPG" %}Download QR code as {{ filetype }} image{% endblocktrans %}
+                    </a>
+                </li>
+                <li>
+                    <a href="{% url "control:event.qrcode" event=request.event.slug organizer=request.organizer.slug filetype="gif" %}" target="_blank" download>
+                        {% blocktrans with filetype="GIF" %}Download QR code as {{ filetype }} image{% endblocktrans %}
+                    </a>
+                </li>
+            </ul>
         </div>
         <div class="clearfix"></div>
     </div>

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

@@ -337,7 +337,7 @@
                 <div class="alert alert-info">
                     {% blocktrans trimmed %}
                         The waiting list currently is not compatible with some advanced features of pretix such as
-                        hidden products, add-on products or product bundles.
+                        add-on products or product bundles.
                     {% endblocktrans %}
                 </div>
                 <div class="alert alert-info">

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

@@ -187,7 +187,7 @@
                         {% endif %}
                         {% for f in plugin_forms %}
                             {% if f.is_layouts and not f.title %}
-                                {% if f.template and not "template" in f.fields %}
+                                {% if f.template %}
                                     {% include f.template with form=f %}
                                 {% else %}
                                     {% bootstrap_form f layout="control" %}
@@ -261,7 +261,7 @@
                         {% bootstrap_field form.show_quota_left layout="control" %}
                         {% for f in plugin_forms %}
                             {% if not f.is_layouts and not f.title %}
-                                {% if f.template and not "template" in f.fields %}
+                                {% if f.template %}
                                     {% include f.template with form=f %}
                                 {% else %}
                                     {% bootstrap_form f layout="control" %}
@@ -273,7 +273,7 @@
                         {% if not f.is_layouts and f.title %}
                             <fieldset>
                                 <legend>{{ f.title }}</legend>
-                                {% if f.template and not "template" in f.fields %}
+                                {% if f.template %}
                                     {% include f.template with form=f %}
                                 {% else %}
                                     {% bootstrap_form f layout="control" %}

src/pretix/control/templates/pretixcontrol/order/transactions.html

@@ -69,7 +69,7 @@
         <td></td>
         <td class="text-right flip">
             <strong>
-                {{ sums.sum_count }}
+                {{ sums.count }}
             </strong>
         </td>
         <td></td>

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

@@ -295,11 +295,6 @@
                         {% bootstrap_field sform.invoice_regenerate_allowed layout="control" %}
                     </fieldset>
                 </div>
-                <div class="form-group submit-group">
-                    <button type="submit" class="btn btn-primary btn-save">
-                        {% trans "Save" %}
-                    </button>
-                </div>
             </div>
             <div class="col-xs-12 col-lg-2">
                 <div class="panel panel-default">
@@ -312,5 +307,10 @@
                 </div>
             </div>
         </div>
+        <div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
+        </div>
     </form>
 {% endblock %}

src/pretix/control/templates/pretixcontrol/vouchers/detail.html

@@ -42,18 +42,10 @@
                         <div class="form-group">
                             <label class="col-md-3 control-label" for="id_url">{% trans "Voucher link" %}</label>
                             <div class="col-md-9">
-                                <div class="input-group">
-                                    <input type="text" name="url"
-                                            value="{{ url }}"
-                                            class="form-control"
-                                            id="id_url" readonly>
-                                    <div class="input-group-btn">
-                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="{% trans "Create QR code" %}" aria-haspopup="true" aria-expanded="false">
-                                            <i class="fa fa-qrcode" aria-hidden="true"></i>
-                                        </button>
-                                        {% include "pretixcontrol/event/fragment_qr_dropdown.html" with url=url %}
-                                    </div>
-                                </div>
+                                <input type="text" name="url"
+                                        value="{% abseventurl request.event "presale:event.redeem" %}?voucher={{ voucher.code|urlencode }}{% if voucher.subevent_id %}&subevent={{ voucher.subevent_id }}{% endif %}"
+                                        class="form-control"
+                                        id="id_url" readonly>
                             </div>
                         </div>
                     {% endif %}

src/pretix/control/templates/pretixcontrol/vouchers/index.html

@@ -96,9 +96,7 @@
                     <tr>
                         <th>
                             {% if "can_change_vouchers" in request.eventpermset %}
-                                <label aria-label="{% trans "select all rows for batch-operation" %}" class="batch-select-label">
-                                    <input type="checkbox" data-toggle-table />
-                                </label>
+                                <input type="checkbox" data-toggle-table />
                             {% endif %}
                         </th>
                         <th>
@@ -141,9 +139,7 @@
                         <tr>
                             <td>
                                 {% if "can_change_vouchers" in request.eventpermset %}
-                                    <label aria-label="{% trans "select row for batch-operation" %}" class="batch-select-label">
-                                        <input type="checkbox" name="voucher" class="batch-select-checkbox" value="{{ v.pk }}"/>
-                                    </label>
+                                    <input type="checkbox" name="voucher" class="" value="{{ v.pk }}"/>
                                 {% endif %}
                             </td>
                             <td>
@@ -198,12 +194,9 @@
                 </table>
             </div>
             {% if "can_change_vouchers" in request.eventpermset %}
-                <div class="batch-select-actions">
-                    <button type="submit" class="btn btn-danger" name="action" value="delete">
-                        <i class="fa fa-trash" aria-hidden="true"></i>
-                        {% trans "Delete selected" %}
-                    </button>
-                </div>
+                <button type="submit" class="btn btn-default btn-save" name="action" value="delete">
+                    {% trans "Delete selected" %}
+                </button>
             {% endif %}
         </form>
         {% include "pretixcontrol/pagination.html" %}

src/pretix/control/views/event.py

@@ -40,7 +40,7 @@ from collections import OrderedDict
 from decimal import Decimal
 from io import BytesIO
 from itertools import groupby
-from urllib.parse import urlparse, urlsplit
+from urllib.parse import urlsplit
 from zoneinfo import ZoneInfo
 
 import bleach
@@ -50,7 +50,6 @@ from django.apps import apps
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import PermissionDenied
 from django.core.files import File
 from django.db import transaction
 from django.db.models import ProtectedError
@@ -62,7 +61,6 @@ 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.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
 from django.views.generic import FormView, ListView
@@ -1532,12 +1530,6 @@ class EventQRCode(EventPermissionRequiredMixin, View):
     def get(self, request, *args, filetype, **kwargs):
         url = build_absolute_uri(request.event, 'presale:event.index')
 
-        if "url" in request.GET:
-            if url_has_allowed_host_and_scheme(request.GET["url"], allowed_hosts=[urlparse(url).netloc]):
-                url = request.GET["url"]
-            else:
-                raise PermissionDenied("Untrusted URL")
-
         qr = qrcode.QRCode(
             version=1,
             error_correction=qrcode.constants.ERROR_CORRECT_M,

src/pretix/control/views/item.py

@@ -1188,46 +1188,30 @@ class MetaDataEditorMixin:
 
     @cached_property
     def meta_forms(self):
-        if getattr(self, 'object', None):
+        if hasattr(self, 'object') and self.object:
             val_instances = {
                 v.property_id: v for v in self.object.meta_values.all()
             }
         else:
             val_instances = {}
 
-        if getattr(self, 'copy_from', None):
-            defaults = {
-                v.property_id: v.value for v in self.copy_from.meta_values.all()
-            }
-        else:
-            defaults = {}
-
         formlist = []
 
         for p in self.request.event.item_meta_properties.all():
-            formlist.append(self._make_meta_form(p, val_instances, defaults))
+            formlist.append(self._make_meta_form(p, val_instances))
         return formlist
 
-    def _make_meta_form(self, p, val_instances, defaults):
+    def _make_meta_form(self, p, val_instances):
         return self.meta_form(
             prefix='prop-{}'.format(p.pk),
             property=p,
-            instance=val_instances.get(
-                p.pk,
-                self.meta_model(
-                    property=p,
-                    item=self.object if getattr(self, 'object', None) else None,
-                    value=defaults.get(p.pk, None)
-                )
-            ),
+            instance=val_instances.get(p.pk, self.meta_model(property=p, item=self.object)),
             data=(self.request.POST if self.request.method == "POST" else None)
         )
 
     def save_meta(self):
         for f in self.meta_forms:
             if f.cleaned_data.get('value'):
-                if not f.instance.item_id:
-                    f.instance.item = self.object
                 f.save()
             elif f.instance and f.instance.pk:
                 f.instance.delete()
@@ -1273,7 +1257,6 @@ class ItemCreate(EventPermissionRequiredMixin, MetaDataEditorMixin, CreateView):
         messages.success(self.request, _('Your changes have been saved.'))
 
         ret = super().form_valid(form)
-        self.save_meta()
         form.instance.log_action('pretix.event.item.added', user=self.request.user, data={
             k: (form.cleaned_data.get(k).name
                 if isinstance(form.cleaned_data.get(k), File)
@@ -1300,14 +1283,6 @@ class ItemCreate(EventPermissionRequiredMixin, MetaDataEditorMixin, CreateView):
         ctx['meta_forms'] = self.meta_forms
         return ctx
 
-    def post(self, request, *args, **kwargs):
-        self.object = None
-        form = self.get_form()
-        if form.is_valid() and all([f.is_valid() for f in self.meta_forms]):
-            return self.form_valid(form)
-        else:
-            return self.form_invalid(form)
-
 
 class ItemUpdateGeneral(ItemDetailMixin, EventPermissionRequiredMixin, MetaDataEditorMixin, UpdateView):
     form_class = ItemUpdateForm

src/pretix/control/views/orders.py

@@ -418,7 +418,7 @@ class OrderTransactions(OrderView):
             'item', 'variation', 'subevent'
         ).order_by('datetime')
         ctx['sums'] = self.order.transactions.aggregate(
-            sum_count=Sum('count'),
+            count=Sum('count'),
             full_price=Sum(F('count') * F('price')),
             full_tax_value=Sum(F('count') * F('tax_value')),
         )

src/pretix/control/views/typeahead.py

@@ -546,7 +546,7 @@ def variations_select2(request, **kwargs):
         F('item__category__position').asc(nulls_first=True),
         'item__category_id',
         'item__position',
-        'item__pk',
+        'item__pk'
         'position',
         'value'
     ).select_related('item')
@@ -718,7 +718,7 @@ def itemvarquota_select2(request, **kwargs):
             itemqs = request.event.items.prefetch_related('variations').filter(
                 Q(name__icontains=i18ncomp(query)) | Q(internal_name__icontains=query)
             )
-            quotaqs = request.event.quotas.filter(quotaf).select_related('subevent').order_by('-subevent__date_from', 'name')
+            quotaqs = request.event.quotas.filter(quotaf).select_related('subevent')
             more = False
         else:
             if page == 1:
@@ -727,7 +727,7 @@ def itemvarquota_select2(request, **kwargs):
                 )
             else:
                 itemqs = request.event.items.none()
-            quotaqs = request.event.quotas.filter(name__icontains=query).select_related('subevent').order_by('-subevent__date_from', 'name')
+            quotaqs = request.event.quotas.filter(name__icontains=query).select_related('subevent')
             total = quotaqs.count()
             pagesize = 20
             offset = (page - 1) * pagesize

src/pretix/control/views/vouchers.py

@@ -34,7 +34,6 @@
 # License for the specific language governing permissions and limitations under the License.
 
 import io
-from urllib.parse import urlencode
 
 import bleach
 from defusedcsv import csv
@@ -76,7 +75,6 @@ from pretix.control.views import PaginationMixin
 from pretix.helpers.compat import CompatDeleteView
 from pretix.helpers.format import format_map
 from pretix.helpers.models import modelcopy
-from pretix.multidomain.urlreverse import build_absolute_uri
 
 
 class VoucherList(PaginationMixin, EventPermissionRequiredMixin, ListView):
@@ -317,13 +315,6 @@ class VoucherUpdate(EventPermissionRequiredMixin, UpdateView):
             expires__gte=now()
         ).count()
         ctx['redeemed_in_carts'] = redeemed_in_carts
-
-        url_params = {
-            'voucher': self.object.code
-        }
-        if self.object.subevent_id:
-            url_params['subevent'] = self.object.subevent_id
-        ctx['url'] = build_absolute_uri(self.request.event, "presale:event.redeem") + "?" + urlencode(url_params)
         return ctx
 
 

src/pretix/locale/djangojs.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-27 11:50+0000\n"
+"POT-Creation-Date: 2023-07-21 13:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

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

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: French\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-21 11:46+0000\n"
-"PO-Revision-Date: 2023-08-02 02:00+0000\n"
+"PO-Revision-Date: 2023-07-19 17:00+0000\n"
 "Last-Translator: Ronan LE MEILLAT <ronan.le_meillat@highcanfly.club>\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 4.18.2\n"
+"X-Generator: Weblate 4.17\n"
 
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -63,7 +63,7 @@ msgstr "iDEAL"
 
 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:42
 msgid "SEPA Direct Debit"
-msgstr "Prélèvement SEPA"
+msgstr "Débit direct SEPA"
 
 #: pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js:43
 msgid "Bancontact"
@@ -679,8 +679,10 @@ msgid "Your local time:"
 msgstr "Votre heure locale :"
 
 #: pretix/static/pretixpresale/js/walletdetection.js:39
+#, fuzzy
+#| msgid "Apple Pay"
 msgid "Google Pay"
-msgstr "Google Pay"
+msgstr "Apple Pay"
 
 #: pretix/static/pretixpresale/js/widget/widget.js:17
 msgctxt "widget"

src/pretix/multidomain/urlreverse.py

@@ -77,8 +77,6 @@ def get_event_domain(event, fallback=False, return_info=False):
 
 def get_organizer_domain(organizer):
     assert isinstance(organizer, Organizer)
-    if not organizer.pk:
-        return None
     domain = getattr(organizer, '_cached_domain', None) or organizer.cache.get('domain')
     if domain is None:
         domains = organizer.domains.filter(event__isnull=True)
@@ -128,7 +126,7 @@ def eventreverse(obj, name, kwargs=None):
     :param kwargs: A dictionary of additional keyword arguments that should be used. You do not
         need to provide the organizer or event slug here, it will be added automatically as
         needed.
-    :returns: An absolute or relative URL as a string
+    :returns: An absolute URL (including scheme and host) as a string
     """
     from pretix.multidomain import (
         event_domain_urlconf, maindomain_urlconf, organizer_domain_urlconf,
@@ -177,17 +175,6 @@ def eventreverse(obj, name, kwargs=None):
 
 
 def build_absolute_uri(obj, urlname, kwargs=None):
-    """
-    Works similar to ``eventreverse`` but always returns an absolute URL.
-
-    :param obj: An ``Event`` or ``Organizer`` object
-    :param name: The name of the URL route
-    :type name: str
-    :param kwargs: A dictionary of additional keyword arguments that should be used. You do not
-        need to provide the organizer or event slug here, it will be added automatically as
-        needed.
-    :returns: An absolute URL (including scheme and host) as a string
-    """
     reversedurl = eventreverse(obj, urlname, kwargs)
     if '://' in reversedurl:
         return reversedurl

src/pretix/plugins/banktransfer/payment.py

@@ -535,11 +535,9 @@ class BankTransfer(BasePaymentProvider):
             'eu_barcodes': self.event.currency == 'EUR',
             'pending_description': self.settings.get('pending_description', as_type=LazyI18nString),
             'details': self.settings.get('bank_details', as_type=LazyI18nString),
-            'has_invoices': payment.order.invoices.exists(),
-            'invoice_email_enabled': self.settings.get('invoice_email', as_type=bool),
         }
         ctx['any_barcodes'] = ctx['swiss_qrbill'] or ctx['eu_barcodes']
-        return template.render(ctx, request=request)
+        return template.render(ctx)
 
     def payment_control_render(self, request: HttpRequest, payment: OrderPayment) -> str:
         warning = None

src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_assign.html

@@ -11,10 +11,10 @@
             <span class="icon icon-upload"></span> {% trans "Continue" %}
         </button>
         <div class="flipped-scroll-wrapper clearfix">
-            <table class="table table-condensed table-th-sticky-horizontal flipped-scroll-inner">
+            <table class="table table-condensed flipped-scroll-inner">
                 <thead>
                 <tr>
-                    <th scope="row">{% trans "Date" %}</th>
+                    <th>{% trans "Date" %}</th>
                     {% for col in rows.0 %}
                         <th>
                             <input type="radio" name="date" value="{{ forloop.counter0 }}"/>
@@ -22,7 +22,7 @@
                     {% endfor %}
                 </tr>
                 <tr>
-                    <th scope="row">{% trans "Amount" %}</th>
+                    <th>{% trans "Amount" %}</th>
                     {% for col in rows.0 %}
                         <th>
                             <input type="radio" name="amount" value="{{ forloop.counter0 }}" required="required"/>
@@ -30,7 +30,7 @@
                     {% endfor %}
                 </tr>
                 <tr>
-                    <th scope="row">{% trans "Reference" %}</th>
+                    <th>{% trans "Reference" %}</th>
                     {% for col in rows.0 %}
                         <th>
                             <input type="checkbox" name="reference" value="{{ forloop.counter0 }}"/>
@@ -38,7 +38,7 @@
                     {% endfor %}
                 </tr>
                 <tr>
-                    <th scope="row">{% trans "Payer" %}</th>
+                    <th>{% trans "Payer" %}</th>
                     {% for col in rows.0 %}
                         <th>
                             <input type="checkbox" name="payer" value="{{ forloop.counter0 }}"/>
@@ -46,7 +46,7 @@
                     {% endfor %}
                 </tr>
                 <tr>
-                    <th scope="row">
+                    <th>
                         {% trans "IBAN" %}
                         <label for="id_iban_clear">
                             <span class="btn btn-default btn-sm fa fa-close"></span>
@@ -62,7 +62,7 @@
                     {% endfor %}
                 </tr>
                 <tr>
-                    <th scope="row">
+                    <th>
                         {% trans "BIC" %}
                         <label for="id_bic_clear">
                             <span class="btn btn-default btn-sm fa fa-close"></span>

src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/pending.html

@@ -7,7 +7,6 @@
 {% load money %}
 {% load unidecode %}
 {% load rich_text %}
-{% load eventurl %}
 
 {% if pending_description %}
     {{ pending_description|rich_text }}
@@ -104,28 +103,3 @@ SCT
 {% if swiss_qrbill %}
 <link rel="stylesheet" href="{% static "pretixplugins/banktransfer/swisscross.css" %}">
 {% endif %}
-
-{% if invoice_email_enabled and has_invoices %}
-    <form method="post" action="{% eventurl event "plugins:banktransfer:mail_invoice" order=order.code secret=order.secret %}">
-        {% csrf_token %}
-        <p>
-            {% blocktrans trimmed %}
-                To send the invoice directly to your accounting department, please enter their email address:
-            {% endblocktrans %}
-        </p>
-        <div class="row">
-            <div class="col-md-9 col-xs-12">
-                <label for="mail_invoice_email" class="sr-only">{% trans "Invoice recipient email" %}:</label>
-                <input type="email" name="email" id="mail_invoice_email" class="form-control" value="" required
-                    placeholder="{% trans "Email address" %}" />
-            </div>
-            <div class="col-md-3 col-xs-12">
-                <button class="btn btn-default btn-block">
-                    <span class="fa fa-envelope-o" aria-hidden="true"></span>
-                    {% trans "Send invoice via email" %}
-                </button>
-            </div>
-        </div>
-    </form>
-    <hr>
-{% endif %}

src/pretix/plugins/banktransfer/urls.py

@@ -19,19 +19,13 @@
 # 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.urls import include, re_path
+from django.urls import re_path
 
 from pretix.api.urls import orga_router
 from pretix.plugins.banktransfer.api import BankImportJobViewSet
 
 from . import views
 
-event_patterns = [
-    re_path(r'^banktransfer/', include([
-        re_path(r'^(?P<order>[^/][^w]+)/(?P<secret>[A-Za-z0-9]+)/mail-invoice/$', views.SendInvoiceMailView.as_view(), name='mail_invoice'),
-    ])),
-]
-
 urlpatterns = [
     re_path(r'^control/organizer/(?P<organizer>[^/]+)/banktransfer/import/',
             views.OrganizerImportView.as_view(),

src/pretix/plugins/banktransfer/views.py

@@ -44,18 +44,14 @@ from typing import Set
 
 from django import forms
 from django.contrib import messages
-from django.core.exceptions import ValidationError
-from django.core.validators import validate_email
 from django.db import transaction
 from django.db.models import Count, Q, QuerySet
-from django.http import FileResponse, Http404, JsonResponse
+from django.http import FileResponse, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
-from django.utils.decorators import method_decorator
 from django.utils.functional import cached_property
 from django.utils.timezone import now
 from django.utils.translation import gettext as _
-from django.views.decorators.clickjacking import xframe_options_exempt
 from django.views.generic import DetailView, FormView, ListView, View
 from django.views.generic.detail import SingleObjectMixin
 from localflavor.generic.forms import BICFormField, IBANFormField
@@ -79,8 +75,6 @@ from pretix.plugins.banktransfer.refund_export import (
     build_sepa_xml, get_refund_export_csv,
 )
 from pretix.plugins.banktransfer.tasks import process_banktransfers
-from pretix.presale.views import EventViewMixin
-from pretix.presale.views.order import OrderDetailMixin
 
 logger = logging.getLogger('pretix.plugins.banktransfer')
 
@@ -892,36 +886,3 @@ class OrganizerSepaXMLExportView(OrganizerPermissionRequiredMixin, OrganizerDeta
             organizer=self.request.organizer,
             pk=self.kwargs.get('id')
         )
-
-
-@method_decorator(xframe_options_exempt, 'dispatch')
-class SendInvoiceMailView(EventViewMixin, OrderDetailMixin, View):
-    def post(self, request, *args, **kwargs):
-        if not self.order:
-            raise Http404(_('Unknown order code or not authorized to access this order.'))
-        try:
-            validate_email(request.POST['email'])
-        except ValidationError:
-            messages.error(request, _('Please enter a valid email address.'))
-            return redirect(self.get_order_url())
-
-        last_payment = self.order.payments.last()
-        if (not last_payment
-                or last_payment.provider != BankTransfer.identifier
-                or last_payment.state != OrderPayment.PAYMENT_STATE_CREATED):
-            messages.error(request, _('No pending bank transfer payment found. Maybe the order has been paid already?'))
-            return redirect(self.get_order_url())
-        if not last_payment.payment_provider.settings.get('invoice_email', as_type=bool):
-            messages.error(request, _('Sending invoices via email is disabled by the event organizer.'))
-            return redirect(self.get_order_url())
-
-        last_invoice = self.order.invoices.last()
-        if not last_invoice:
-            messages.error(request, _('No invoice found, please request an invoice first.'))
-            return redirect(self.get_order_url())
-
-        provider = last_payment.payment_provider
-        provider.send_invoice_to_alternate_email(self.order, last_invoice, request.POST['email'])
-
-        messages.success(request, _('Sending the latest invoice via e-mail to {email}.').format(email=request.POST['email']))
-        return redirect(self.get_order_url())

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

@@ -5,9 +5,9 @@
     <div class="panel panel-default items">
         <div class="panel-heading">
             <h3 class="panel-title">
-                <strong>{{ position.item.name }}</strong>
+                <strong>{{ position.item }}</strong>
                 {% if position.variation %}
-                    – {{ position.variation.value }}
+                    – {{ position.variation }}
                 {% endif %}
             </h3>
         </div>

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

@@ -1,66 +0,0 @@
-{% load i18n %}
-{% load eventurl %}
-{% if ev.location and show_location %}
-    <div class="info-row">
-        <span class="fa fa-map-marker fa-fw" aria-hidden="true" title="{% trans "Where does the event happen?" %}"></span>
-        <p><span class="sr-only">{% trans "Where does the event happen?" %}</span>
-            {{ ev.location|linebreaksbr }}
-        </p>
-    </div>
-{% endif %}
-{% if ev.settings.show_dates_on_frontpage %}
-    <div class="info-row">
-        <span class="fa fa-clock-o fa-fw" aria-hidden="true" title="{% trans "When does the event happen?" %}"></span>
-        <p><span class="sr-only">{% trans "When does the event happen?" %}</span>
-            {{ ev.get_date_range_display_as_html }}
-            {% if event.settings.show_times %}
-                <br>
-                <span data-time="{{ ev.date_from.isoformat }}" data-timezone="{{ request.event.timezone }}">
-                    {% with time_human=ev.date_from|date:"TIME_FORMAT" time_24=ev.date_from|time:"H:i" %}
-                        {% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
-                            Begin: {{ time }}
-                        {% endblocktrans %}
-                    {% endwith %}
-                </span>
-                {% if event.settings.show_date_to and ev.date_to %}
-                    <br>
-                    <span data-time="{{ ev.date_to.isoformat }}" data-timezone="{{ request.event.timezone }}">
-                        {% with time_human=ev.date_to|date:"TIME_FORMAT" time_24=ev.date_to|time:"H:i" %}
-                            {% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
-                                End: {{ time }}
-                            {% endblocktrans %}
-                        {% endwith %}
-                    </span>
-                {% endif %}
-            {% endif %}
-            {% if ev.date_admission %}
-                <br>
-                {% if ev.date_admission|date:"SHORT_DATE_FORMAT" == ev.date_from|date:"SHORT_DATE_FORMAT" %}
-                    <span data-time="{{ ev.date_admission.isoformat }}" data-timezone="{{ request.event.timezone }}">
-                        {% with time_human=ev.date_admission|date:"TIME_FORMAT" time_24=ev.date_admission|time:"H:i" %}
-                            {% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
-                                Admission: {{ time }}
-                            {% endblocktrans %}
-                        {% endwith %}
-                    </span>
-                {% else %}
-                    <span data-time="{{ ev.date_admission.isoformat }}" data-timezone="{{ request.event.timezone }}">
-                        {% with datetime_human=ev.date_admission|date:"SHORT_DATETIME_FORMAT" datetime_iso=ev.date_admission|time:"Y-m-d H:i" %}
-                            {% blocktrans trimmed with datetime='<time datetime="'|add:datetime_iso|add:'">'|add:datetime_human|add:"</time>"|safe %}
-                                Admission: {{ datetime }}
-                            {% endblocktrans %}
-                        {% endwith %}
-                    </span>
-                {% endif %}
-            {% endif %}
-            <br>
-            {% if subevent %}
-                <a href="{% eventurl event "presale:event.ical.download" subevent=subevent.pk %}">
-            {% else %}
-                <a href="{% eventurl event "presale:event.ical.download" %}">
-            {% endif %}
-            {% trans "Add to Calendar" %}
-            </a>
-        </p>
-    </div>
-{% endif %}

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

@@ -162,8 +162,73 @@
         {% endif %}
         {% if not cart_namespace or subevent %}
             <div>
-                {% include "pretixpresale/event/fragment_event_info.html" with event=request.event subevent=subevent ev=ev show_location=True %}
+                {% if ev.location %}
+                    <div class="info-row">
+                        <span class="fa fa-map-marker fa-fw" aria-hidden="true" title="{% trans "Where does the event happen?" %}"></span>
+                        <p><span class="sr-only">{% trans "Where does the event happen?" %}</span>
+                            {{ ev.location|linebreaksbr }}
+                        </p>
+                    </div>
+                {% endif %}
+                {% if ev.settings.show_dates_on_frontpage %}
+                    <div class="info-row">
+                        <span class="fa fa-clock-o fa-fw" aria-hidden="true" title="{% trans "When does the event happen?" %}"></span>
+                        <p><span class="sr-only">{% trans "When does the event happen?" %}</span>
+                            {{ ev.get_date_range_display_as_html }}
+                            {% if event.settings.show_times %}
+                                <br>
+                                <span data-time="{{ ev.date_from.isoformat }}" data-timezone="{{ request.event.timezone }}">
+                                {% with time_human=ev.date_from|date:"TIME_FORMAT" time_24=ev.date_from|time:"H:i" %}
+                                    {% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
+                                        Begin: {{ time }}
+                                    {% endblocktrans %}
+                                {% endwith %}
+                                </span>
+                                {% if event.settings.show_date_to and ev.date_to %}
+                                    <br>
+                                    <span data-time="{{ ev.date_to.isoformat }}" data-timezone="{{ request.event.timezone }}">
+                                    {% with time_human=ev.date_to|date:"TIME_FORMAT" time_24=ev.date_to|time:"H:i" %}
+                                        {% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
+                                            End: {{ time }}
+                                        {% endblocktrans %}
+                                    {% endwith %}
+                                   </span>
+                                {% endif %}
+                            {% endif %}
+                            {% if ev.date_admission %}
+                                <br>
+                                {% if ev.date_admission|date:"SHORT_DATE_FORMAT" == ev.date_from|date:"SHORT_DATE_FORMAT" %}
+                                    <span data-time="{{ ev.date_admission.isoformat }}" data-timezone="{{ request.event.timezone }}">  
+                                    {% with time_human=ev.date_admission|date:"TIME_FORMAT" time_24=ev.date_admission|time:"H:i" %}
+                                        {% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
+                                            Admission: {{ time }}
+                                        {% endblocktrans %}
+                                    {% endwith %}
+                                    </span>
+                                {% else %}
+                                    <span data-time="{{ ev.date_admission.isoformat }}" data-timezone="{{ request.event.timezone }}">
+                                    {% with datetime_human=ev.date_admission|date:"SHORT_DATETIME_FORMAT" datetime_iso=ev.date_admission|time:"Y-m-d H:i" %}
+                                        {% blocktrans trimmed with datetime='<time datetime="'|add:datetime_iso|add:'">'|add:datetime_human|add:"</time>"|safe %}
+                                            Admission: {{ datetime }}
+                                        {% endblocktrans %}
+                                    {% endwith %}
+                                    </span>
+                                {% endif %}
+                            {% endif %}
+                            <br>
+                            {% if subevent %}
+                                <a href="{% eventurl event "presale:event.ical.download" subevent=subevent.pk %}">
+                            {% else %}
+                                <a href="{% eventurl event "presale:event.ical.download" %}">
+                            {% endif %}
+                                {% trans "Add to Calendar" %}
+                            </a>
+                        </p>
+                    </div>
+                {% endif %}
+
             </div>
+
             {% eventsignal event "pretix.presale.signals.front_page_top" request=request subevent=subevent %}
         {% endif %}
 

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

@@ -13,28 +13,63 @@
         {% include "pretixpresale/event/fragment_cart_box.html" with open=request.GET.show_cart %}
     {% endif %}
 
+    <h2>{% trans "Voucher redemption" %}</h2>
+
     {% if subevent %}
-        <h2>{% trans "Voucher redemption" %}</h2>
         {% if request.GET.subevent and subevent.pk|stringformat:"i" != request.GET.subevent %}
             <div class="alert alert-warning">
                 {% trans "This voucher is valid only for the following specific date and time." %}
             </div>
         {% endif %}
         <h3>{{ subevent.name }}</h3>
-        {% include "pretixpresale/event/fragment_event_info.html" with event=request.event subevent=subevent ev=subevent show_location=True %}
-    {% else %}
-        {% if event_logo and event_logo_show_title %}
-            <h2 class="content-header">
-                {{ event.name }}
-                {% if request.event.settings.show_dates_on_frontpage %}
-                    <small>{{ event.get_date_range_display_as_html }}</small>
-                {% endif %}
-            </h2>
-            {% include "pretixpresale/event/fragment_event_info.html" with event=request.event subevent=None ev=request.event show_location=True %}
-            <h3>{% trans "Voucher redemption" %}</h3>
-        {% else %}
-            <h2>{% trans "Voucher redemption" %}</h2>
-        {% endif %}
+        {% with ev=subevent %}
+            <div class="info-row">
+                <span class="fa fa-clock-o fa-fw" aria-hidden="true"></span>
+                <p>
+                    {{ ev.get_date_range_display_as_html }}
+                    {% if event.settings.show_times %}
+                        <br>
+                        {% with time_human=ev.date_from|date:"TIME_FORMAT" time_24=ev.date_from|time:"H:i" %}
+                            {% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
+                                Begin: {{ time }}
+                            {% endblocktrans %}
+                        {% endwith %}
+                        {% if event.settings.show_date_to and ev.date_to %}
+                            <br>
+                            {% with time_human=ev.date_to|date:"TIME_FORMAT" time_24=ev.date_to|time:"H:i" %}
+                                {% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
+                                    End: {{ time }}
+                                {% endblocktrans %}
+                            {% endwith %}
+                        {% endif %}
+                    {% endif %}
+                    {% if ev.date_admission %}
+                        <br>
+                        {% if ev.date_admission|date:"SHORT_DATE_FORMAT" == ev.date_from|date:"SHORT_DATE_FORMAT" %}
+                            {% with time_human=ev.date_admission|date:"TIME_FORMAT" time_24=ev.date_admission|time:"H:i" %}
+                                {% blocktrans trimmed with time='<time datetime="'|add:time_24|add:'">'|add:time_human|add:"</time>"|safe %}
+                                    Admission: {{ time }}
+                                {% endblocktrans %}
+                            {% endwith %}
+                        {% else %}
+                            {% with datetime_human=ev.date_admission|date:"SHORT_DATETIME_FORMAT" datetime_iso=ev.date_admission|time:"Y-m-d H:i" %}
+                                {% blocktrans trimmed with datetime='<time datetime="'|add:datetime_iso|add:'">'|add:datetime_human|add:"</time>"|safe %}
+                                    Admission: {{ datetime }}
+                                {% endblocktrans %}
+                            {% endwith %}
+                        {% endif %}
+                    {% endif %}
+                    <br>
+                    {% if subevent %}
+                        <a href="{% eventurl event "presale:event.ical.download" subevent=subevent.pk %}">
+                    {% else %}
+                        <a href="{% eventurl event "presale:event.ical.download" %}">
+                    {% endif %}
+                        {% trans "Add to Calendar" %}
+                    </a>
+                </p>
+            </div>
+        {% endwith %}
     {% endif %}
 
     <p>

src/pretix/static/jsi18n/en/djangojs.js

@@ -80,15 +80,7 @@
     "DATE_INPUT_FORMATS": [
       "%Y-%m-%d",
       "%m/%d/%Y",
-      "%m/%d/%y",
-      "%b %d %Y",
-      "%b %d, %Y",
-      "%d %b %Y",
-      "%d %b, %Y",
-      "%B %d %Y",
-      "%B %d, %Y",
-      "%d %B %Y",
-      "%d %B, %Y"
+      "%m/%d/%y"
     ],
     "DECIMAL_SEPARATOR": ".",
     "FIRST_DAY_OF_WEEK": 0,

src/pretix/static/npm_dir/package-lock.json

@@ -8,7 +8,7 @@
       "name": "pretix",
       "version": "0.0.0",
       "dependencies": {
-        "@babel/core": "^7.22.9",
+        "@babel/core": "^7.22.5",
         "@babel/preset-env": "^7.22.9",
         "@rollup/plugin-babel": "^6.0.3",
         "@rollup/plugin-node-resolve": "^15.1.0",
@@ -50,25 +50,25 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
-      "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz",
+      "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.9",
-        "@babel/helper-module-transforms": "^7.22.9",
-        "@babel/helpers": "^7.22.6",
-        "@babel/parser": "^7.22.7",
+        "@babel/generator": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helpers": "^7.22.5",
+        "@babel/parser": "^7.22.5",
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.8",
+        "@babel/traverse": "^7.22.5",
         "@babel/types": "^7.22.5",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
         "json5": "^2.2.2",
-        "semver": "^6.3.1"
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -98,9 +98,9 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
-      "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz",
+      "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==",
       "dependencies": {
         "@babel/types": "^7.22.5",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -308,21 +308,21 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
-      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
+      "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-module-imports": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.5"
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
@@ -447,12 +447,12 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz",
-      "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz",
+      "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
       "dependencies": {
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.6",
+        "@babel/traverse": "^7.22.5",
         "@babel/types": "^7.22.5"
       },
       "engines": {
@@ -473,9 +473,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
-      "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
+      "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1631,17 +1631,17 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.8",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
-      "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz",
+      "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==",
       "dependencies": {
         "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.7",
+        "@babel/generator": "^7.22.5",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.7",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/parser": "^7.22.5",
         "@babel/types": "^7.22.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
@@ -4160,25 +4160,25 @@
       "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
     },
     "@babel/core": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
-      "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz",
+      "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.9",
-        "@babel/helper-module-transforms": "^7.22.9",
-        "@babel/helpers": "^7.22.6",
-        "@babel/parser": "^7.22.7",
+        "@babel/generator": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helpers": "^7.22.5",
+        "@babel/parser": "^7.22.5",
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.8",
+        "@babel/traverse": "^7.22.5",
         "@babel/types": "^7.22.5",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
         "json5": "^2.2.2",
-        "semver": "^6.3.1"
+        "semver": "^6.3.0"
       },
       "dependencies": {
         "json5": {
@@ -4194,9 +4194,9 @@
       }
     },
     "@babel/generator": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
-      "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz",
+      "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==",
       "requires": {
         "@babel/types": "^7.22.5",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -4355,15 +4355,18 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
-      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
+      "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-module-imports": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.5"
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -4449,12 +4452,12 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz",
-      "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz",
+      "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
       "requires": {
         "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.6",
+        "@babel/traverse": "^7.22.5",
         "@babel/types": "^7.22.5"
       }
     },
@@ -4469,9 +4472,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.22.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
-      "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
+      "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.22.5",
@@ -5224,17 +5227,17 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.22.8",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
-      "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz",
+      "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==",
       "requires": {
         "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.7",
+        "@babel/generator": "^7.22.5",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.7",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/parser": "^7.22.5",
         "@babel/types": "^7.22.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"

src/pretix/static/npm_dir/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {},
   "dependencies": {
-    "@babel/core": "^7.22.9",
+    "@babel/core": "^7.22.5",
     "@babel/preset-env": "^7.22.9",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-node-resolve": "^15.1.0",

src/pretix/static/pretixbase/js/details.js

@@ -4,20 +4,9 @@ setup_collapsible_details = function (el) {
 
     el.find('details.sneak-peek:not([open])').each(function() {
         this.open = true;
-        var $elements = $("> :not(summary)", this).show().filter(':not(.sneak-peek-trigger)');
+        var $elements = $("> :not(summary)", this).show().filter(':not(.sneak-peek-trigger)').attr('aria-hidden', 'true');
+
         var container = this;
-
-        if (Array.prototype.reduce.call($elements, function (h, e) {
-            return h + $(e).outerHeight();
-        }, 0) < 200) {
-            $(".sneak-peek-trigger", this).remove();
-            $(container).removeClass('sneak-peek');
-            container.style.removeProperty('height');
-            return;
-        }
-
-        $elements.attr('aria-hidden', 'true');
-
         var trigger = $('summary, .sneak-peek-trigger button', container);
         function onclick(e) {
             e.preventDefault();

src/pretix/static/pretixcontrol/js/ui/typeahead.js

@@ -1,7 +1,7 @@
 /*global $,u2f */
 $(function () {
     $('.sidebar .dropdown, ul.navbar-nav .dropdown, .navbar-events-collapse').on('shown.bs.collapse shown.bs.dropdown', function () {
-        $(this).parent().find("input").val("").trigger('forceRunQuery').focus();
+        $(this).parent().find("input").val("").change().focus();
     });
     $('.dropdown-menu .form-box input').click(function (e) {
         e.stopPropagation();
@@ -11,22 +11,11 @@ $(function () {
         var $container = $(this);
         var $query = $(this).find('[data-typeahead-query]').length ? $(this).find('[data-typeahead-query]') : $($(this).attr("data-typeahead-field"));
         $container.find("li:not(.query-holder)").remove();
-        var lastQuery = null;
+        var lastQuery = "";
         var runQueryTimeout = null;
-        var loadIndicatorTimeout = null;
-        function showLoadIndicator() {
-            $container.find("li:not(.query-holder)").remove();
-            $container.append("<li class='loading'><span class='fa fa-4x fa-cog fa-spin'></span></li>");
-            $container.toggleClass('focused', $query.is(":focus") && $container.children().length > 0);
-        }
         function runQuery() {
-            var thisQuery = $query.val();
-            if (thisQuery === lastQuery) return;
             lastQuery = $query.val();
-
-            window.clearTimeout(loadIndicatorTimeout)
-            loadIndicatorTimeout = window.setTimeout(showLoadIndicator, 80)
-
+            var thisQuery = $query.val();
             $.getJSON(
                 $container.attr("data-source") + "?query=" + encodeURIComponent($query.val()) + (typeof $container.attr("data-organizer") !== "undefined" ? "&organizer=" + $container.attr("data-organizer") : ""),
                 function (data) {
@@ -34,74 +23,107 @@ $(function () {
                         // Lost race condition
                         return;
                     }
-                    window.clearTimeout(loadIndicatorTimeout);
                     $container.find("li:not(.query-holder)").remove();
                     $.each(data.results, function (i, res) {
-                        let $linkContent = $("<div>");
                         if (res.type === "organizer") {
-                            $linkContent.append(
-                                $("<span>").addClass("event-name-full").append(
-                                    $("<span>").addClass("fa fa-users fa-fw")
-                                ).append(" ").append($("<div>").text(res.name).html())
-                            )
+                            $container.append(
+                                $("<li>").append(
+                                    $("<a>").attr("href", res.url).append(
+                                        $("<div>").append(
+                                            $("<span>").addClass("event-name-full").append(
+                                                $("<span>").addClass("fa fa-users fa-fw")
+                                            ).append(" ").append($("<div>").text(res.name).html())
+                                        )
+                                    ).on("mousedown", function (event) {
+                                        if ($(this).length) {
+                                            location.href = $(this).attr("href");
+                                        }
+                                        $(this).parent().addClass("active");
+                                        event.preventDefault();
+                                        event.stopPropagation();
+                                    })
+                                )
+                            );
                         } else if (res.type === "order" || res.type === "voucher") {
-                            $linkContent.append(
-                                $("<span>").addClass("event-name-full").append($("<div>").text(res.title).html())
-                            ).append(
-                                $("<span>").addClass("event-organizer").append(
-                                    $("<span>").addClass("fa fa-calendar fa-fw")
-                                ).append(" ").append($("<div>").text(res.event).html())
-                            )
+                            $container.append(
+                                $("<li>").append(
+                                    $("<a>").attr("href", res.url).append(
+                                        $("<div>").append(
+                                            $("<span>").addClass("event-name-full").append($("<div>").text(res.title).html())
+                                        ).append(
+                                            $("<span>").addClass("event-organizer").append(
+                                                $("<span>").addClass("fa fa-calendar fa-fw")
+                                            ).append(" ").append($("<div>").text(res.event).html())
+                                        )
+                                    ).on("mousedown", function (event) {
+                                        if ($(this).length) {
+                                            location.href = $(this).attr("href");
+                                        }
+                                        $(this).parent().addClass("active");
+                                        event.preventDefault();
+                                        event.stopPropagation();
+                                    })
+                                )
+                            );
                         } else if (res.type === "user") {
-                            $linkContent.append(
-                                $("<span>").addClass("event-name-full").append(
-                                    $("<span>").addClass("fa fa-user fa-fw")
-                                ).append(" ").append($("<div>").text(res.name).html())
-                            )
+                            $container.append(
+                                $("<li>").append(
+                                    $("<a>").attr("href", res.url).append(
+                                        $("<div>").append(
+                                            $("<span>").addClass("event-name-full").append(
+                                                $("<span>").addClass("fa fa-user fa-fw")
+                                            ).append(" ").append($("<div>").text(res.name).html())
+                                        )
+                                    ).on("mousedown", function (event) {
+                                        if ($(this).length) {
+                                            location.href = $(this).attr("href");
+                                        }
+                                        $(this).parent().addClass("active");
+                                        event.preventDefault();
+                                        event.stopPropagation();
+                                    })
+                                )
+                            );
                         } else {
-                            $linkContent.append(
-                                $("<span>").addClass("event-name-full").append($("<div>").text(res.name).html())
-                            ).append(
-                                $("<span>").addClass("event-organizer").append(
-                                    $("<span>").addClass("fa fa-users fa-fw")
-                                ).append(" ").append($("<div>").text(res.organizer).html())
-                            ).append(
-                                $("<span>").addClass("event-daterange").append(
-                                    $("<span>").addClass("fa fa-calendar fa-fw")
-                                ).append(" ").append(res.date_range)
-                            )
+                            $container.append(
+                                $("<li>").append(
+                                    $("<a>").attr("href", res.url).append(
+                                        $("<div>").append(
+                                            $("<span>").addClass("event-name-full").append($("<div>").text(res.name).html())
+                                        ).append(
+                                            $("<span>").addClass("event-organizer").append(
+                                                $("<span>").addClass("fa fa-users fa-fw")
+                                            ).append(" ").append($("<div>").text(res.organizer).html())
+                                        ).append(
+                                            $("<span>").addClass("event-daterange").append(
+                                                $("<span>").addClass("fa fa-calendar fa-fw")
+                                            ).append(" ").append(res.date_range)
+                                        )
+                                    ).on("mousedown", function (event) {
+                                        if ($(this).length) {
+                                            location.href = $(this).attr("href");
+                                        }
+                                        $(this).parent().addClass("active");
+                                        event.preventDefault();
+                                        event.stopPropagation();
+                                    })
+                                )
+                            );
                         }
-
-                        $container.append(
-                            $("<li>").append(
-                                $("<a>").attr("href", res.url).append(
-                                    $linkContent
-                                ).on("mousedown", function (event) {
-                                    if ($(this).length) {
-                                        location.href = $(this).attr("href");
-                                    }
-                                    $(this).parent().addClass("active");
-                                    event.preventDefault();
-                                    event.stopPropagation();
-                                })
-                            )
-                        );
                     });
                     $container.toggleClass('focused', $query.is(":focus") && $container.children().length > 0);
                 }
             );
         }
-        $query.on("forceRunQuery", function () {
-            runQuery();
-        });
-        $query.on("input", function () {
+        $query.on("change", function () {
             if ($container.attr("data-typeahead-field") && $query.val() === "") {
                 $container.removeClass('focused');
                 $container.find("li:not(.query-holder)").remove();
-                lastQuery = null;
                 return;
             }
-            window.clearTimeout(runQueryTimeout)
+            if (runQueryTimeout != null) {
+                window.clearTimeout(runQueryTimeout)
+            }
             runQueryTimeout = window.setTimeout(runQuery, 250)
         });
         $query.on("keydown", function (event) {
@@ -155,6 +177,8 @@ $(function () {
                 event.preventDefault();
                 event.stopPropagation();
                 return true;
+            } else {
+                $(this).change();
             }
         });
     });