Adapt remaining tests

doc/api/resources/orders.rst

@@ -203,8 +203,7 @@ checkins                              list of objects            List of **succe
 ├ datetime                            datetime                   Time of check-in
 ├ type                                string                     Type of scan (defaults to ``entry``)
 ├ gate                                integer                    Internal ID of the gate. Can be ``null``.
-├ device                              integer                    Internal ID of the device. Can be ``null``. **Deprecated**, since this ID is not otherwise used in the API and is therefore not very useful.
-├ device_id                           integer                    Attribute ``device_id`` of the device. Can be ``null``.
+├ device                              integer                    Internal ID of the device. Can be ``null``.
 └ auto_checked_in                     boolean                    Indicates if this check-in been performed automatically by the system
 downloads                             list of objects            List of ticket download options
 ├ output                              string                     Ticket output provider (e.g. ``pdf``, ``passbook``)

doc/api/resources/taxrules.rst

@@ -20,9 +20,8 @@ internal_name                         string                     An optional nam
 rate                                  decimal (string)           Tax rate in percent
 price_includes_tax                    boolean                    If ``true`` (default), tax is assumed to be included in
                                                                  the specified product price
-eu_reverse_charge                     boolean                    **DEPRECATED**. If ``true``, EU reverse charge rules
-                                                                 are applied. Will be ignored if custom rules are set.
-                                                                 Use custom rules instead.
+eu_reverse_charge                     boolean                    If ``true``, EU reverse charge rules are applied. Will
+                                                                 be ignored if custom rules are set.
 home_country                          string                     Merchant country (required for reverse charge), can be
                                                                  ``null`` or empty string
 keep_gross_if_rate_changes            boolean                    If ``true``, changes of the tax rate based on custom

doc/user/customers/index.rst

@@ -175,7 +175,7 @@ without any special behavior.
 Connecting SSO providers (pretix as the SSO client)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-To connect an external application as a SSO provider, go to "Customer accounts" → "SSO providers" → "Create a new SSO provider"
+To connect an external application as a SSO client, go to "Customer accounts" → "SSO providers" → "Create a new SSO provider"
 in your organizer account.
 
 .. thumbnail:: ../../screens/organizer/customer_ssoprovider_add.png

pyproject.toml

@@ -36,7 +36,7 @@ dependencies = [
   "css-inline==0.14.*",
   "defusedcsv>=1.1.0",
   "Django[argon2]==4.2.*,>=4.2.15",
-  "django-bootstrap3==24.3",
+  "django-bootstrap3==24.2",
   "django-compressor==4.5.1",
   "django-countries==7.6.*",
   "django-filter==24.3",
@@ -76,12 +76,12 @@ dependencies = [
   "phonenumberslite==8.13.*",
   "Pillow==10.4.*",
   "pretix-plugin-build",
-  "protobuf==5.28.*",
+  "protobuf==5.27.*",
   "psycopg2-binary",
   "pycountry",
   "pycparser==2.22",
   "pycryptodome==3.20.*",
-  "pypdf==5.0.*",
+  "pypdf==4.3.*",
   "python-bidi==0.6.*",  # Support for Arabic in reportlab
   "python-dateutil==2.9.*",
   "pytz",
@@ -91,7 +91,7 @@ dependencies = [
   "redis==5.0.*",
   "reportlab==4.2.*",
   "requests==2.31.*",
-  "sentry-sdk==2.14.*",
+  "sentry-sdk==2.13.*",
   "sepaxml==2.6.*",
   "slimit",
   "stripe==7.9.*",

src/pretix/__init__.py

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

src/pretix/_base_settings.py

@@ -80,7 +80,6 @@ ALL_LANGUAGES = [
     ('de', _('German')),
     ('de-informal', _('German (informal)')),
     ('ar', _('Arabic')),
-    ('eu', _('Basque')),
     ('ca', _('Catalan')),
     ('zh-hans', _('Chinese (simplified)')),
     ('zh-hant', _('Chinese (traditional)')),

src/pretix/api/serializers/event.py

@@ -896,7 +896,6 @@ class DeviceEventSettingsSerializer(EventSettingsSerializer):
         'locale',
         'last_order_modification_date',
         'show_quota_left',
-        'show_dates_on_frontpage',
         'max_items_per_order',
         'attendee_names_asked',
         'attendee_names_required',

src/pretix/api/serializers/order.py

@@ -273,15 +273,9 @@ class AnswerSerializer(I18nAwareModelSerializer):
 
 
 class CheckinSerializer(I18nAwareModelSerializer):
-    device_id = serializers.SlugRelatedField(
-        source='device',
-        slug_field='device_id',
-        read_only=True,
-    )
-
     class Meta:
         model = Checkin
-        fields = ('id', 'datetime', 'list', 'auto_checked_in', 'gate', 'device', 'device_id', 'type')
+        fields = ('id', 'datetime', 'list', 'auto_checked_in', 'gate', 'device', 'type')
 
 
 class FailedCheckinSerializer(I18nAwareModelSerializer):

src/pretix/api/views/checkin.py

@@ -377,7 +377,7 @@ def _checkin_list_position_queryset(checkinlists, ignore_status=False, ignore_pr
                 Prefetch(
                     'positions',
                     OrderPosition.objects.prefetch_related(
-                        Prefetch('checkins', queryset=Checkin.objects.select_related('device')),
+                        Prefetch('checkins', queryset=Checkin.objects.all()),
                         'item', 'variation', 'answers', 'answers__options', 'answers__question',
                     )
                 )

src/pretix/api/views/media.py

@@ -78,7 +78,7 @@ class ReusableMediaViewSet(viewsets.ModelViewSet):
                 queryset=OrderPosition.objects.select_related(
                     'order', 'order__event', 'order__event__organizer', 'seat',
                 ).prefetch_related(
-                    Prefetch('checkins', queryset=Checkin.objects.select_related('device')),
+                    Prefetch('checkins', queryset=Checkin.objects.all()),
                     'answers', 'answers__options', 'answers__question',
                 )
             ),

src/pretix/api/views/order.py

@@ -258,7 +258,7 @@ class OrderViewSetMixin:
             return Prefetch(
                 'positions',
                 opq.all().prefetch_related(
-                    Prefetch('checkins', queryset=Checkin.objects.select_related('device')),
+                    Prefetch('checkins', queryset=Checkin.objects.all()),
                     Prefetch('item', queryset=self.request.event.items.prefetch_related(
                         Prefetch('meta_values', ItemMetaValue.objects.select_related('property'), to_attr='meta_values_cached')
                     )),
@@ -279,7 +279,7 @@ class OrderViewSetMixin:
             return Prefetch(
                 'positions',
                 opq.all().prefetch_related(
-                    Prefetch('checkins', queryset=Checkin.objects.select_related('device')),
+                    Prefetch('checkins', queryset=Checkin.objects.all()),
                     'item', 'variation',
                     Prefetch('answers', queryset=QuestionAnswer.objects.prefetch_related('options', 'question').order_by('question__position')),
                     'seat',
@@ -1092,7 +1092,7 @@ class OrderPositionViewSet(viewsets.ModelViewSet):
                 'item_meta_properties',
             )
             qs = qs.prefetch_related(
-                Prefetch('checkins', queryset=Checkin.objects.select_related("device")),
+                Prefetch('checkins', queryset=Checkin.objects.all()),
                 Prefetch('item', queryset=self.request.event.items.prefetch_related(
                     Prefetch('meta_values', ItemMetaValue.objects.select_related('property'),
                              to_attr='meta_values_cached')
@@ -1111,7 +1111,7 @@ class OrderPositionViewSet(viewsets.ModelViewSet):
                     Prefetch(
                         'positions',
                         qs.prefetch_related(
-                            Prefetch('checkins', queryset=Checkin.objects.select_related('device')),
+                            Prefetch('checkins', queryset=Checkin.objects.all()),
                             Prefetch('item', queryset=self.request.event.items.prefetch_related(
                                 Prefetch('meta_values', ItemMetaValue.objects.select_related('property'),
                                          to_attr='meta_values_cached')
@@ -1135,7 +1135,7 @@ class OrderPositionViewSet(viewsets.ModelViewSet):
             )
         else:
             qs = qs.prefetch_related(
-                Prefetch('checkins', queryset=Checkin.objects.select_related("device")),
+                Prefetch('checkins', queryset=Checkin.objects.all()),
                 'answers', 'answers__options', 'answers__question',
             ).select_related(
                 'item', 'order', 'order__event', 'order__event__organizer', 'seat'

src/pretix/base/auth.py

@@ -32,16 +32,13 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
 
-import string
 from collections import OrderedDict
 from importlib import import_module
 
 from django import forms
 from django.conf import settings
 from django.contrib.auth import authenticate
-from django.contrib.auth.hashers import check_password, make_password
-from django.core.exceptions import ValidationError
-from django.utils.translation import gettext_lazy as _, ngettext
+from django.utils.translation import gettext_lazy as _
 
 
 def get_auth_backends():
@@ -163,62 +160,3 @@ class NativeAuthBackend(BaseAuthBackend):
         u = authenticate(request=request, email=form_data['email'].lower(), password=form_data['password'])
         if u and u.auth_backend == self.identifier:
             return u
-
-
-class NumericAndAlphabeticPasswordValidator:
-
-    def validate(self, password, user=None):
-        has_numeric = any(c in string.digits for c in password)
-        has_alpha = any(c in string.ascii_letters for c in password)
-        if not has_numeric or not has_alpha:
-            raise ValidationError(
-                _(
-                    "Your password must contain both numeric and alphabetic characters.",
-                ),
-                code="password_numeric_and_alphabetic",
-            )
-
-    def get_help_text(self):
-        return _(
-            "Your password must contain both numeric and alphabetic characters.",
-        )
-
-
-class HistoryPasswordValidator:
-
-    def __init__(self, history_length=4):
-        self.history_length = history_length
-
-    def validate(self, password, user=None):
-        from pretix.base.models import User
-
-        if not user or not user.pk or not isinstance(user, User):
-            return
-
-        for hp in user.historic_passwords.order_by("-created")[:self.history_length]:
-            if check_password(password, hp.password):
-                raise ValidationError(
-                    ngettext(
-                        "Your password may not be the same as your previous password.",
-                        "Your password may not be the same as one of your %(history_length)s previous passwords.",
-                        self.history_length,
-                    ),
-                    code="password_history",
-                    params={"history_length": self.history_length},
-                )
-
-    def get_help_text(self):
-        return ngettext(
-            "Your password may not be the same as your previous password.",
-            "Your password may not be the same as one of your %(history_length)s previous passwords.",
-            self.history_length,
-        ) % {"history_length": self.history_length}
-
-    def password_changed(self, password, user=None):
-        if not user:
-            pass
-
-        user.historic_passwords.create(password=make_password(password))
-        user.historic_passwords.filter(
-            pk__in=user.historic_passwords.order_by("-created")[self.history_length:].values_list("pk", flat=True),
-        ).delete()

src/pretix/base/customersso/oidc.py

@@ -46,8 +46,6 @@ This module contains utilities for implementing OpenID Connect for customer auth
 as well as an OpenID Provider (OP).
 """
 
-pretix_token_endpoint_auth_methods = ['client_secret_basic', 'client_secret_post']
-
 
 def _urljoin(base, path):
     if not base.endswith("/"):
@@ -129,16 +127,6 @@ def oidc_validate_and_complete_config(config):
                         fields=", ".join(provider_config.get("claims_supported", []))
                     ))
 
-    if "token_endpoint_auth_methods_supported" in provider_config:
-        token_endpoint_auth_methods_supported = provider_config.get("token_endpoint_auth_methods_supported",
-                                                                    ["client_secret_basic"])
-        if not any(x in pretix_token_endpoint_auth_methods for x in token_endpoint_auth_methods_supported):
-            raise ValidationError(
-                _(f'No supported Token Endpoint Auth Methods supported: {token_endpoint_auth_methods_supported}').format(
-                    token_endpoint_auth_methods_supported=", ".join(token_endpoint_auth_methods_supported)
-                )
-            )
-
     config['provider_config'] = provider_config
     return config
 
@@ -159,18 +147,6 @@ def oidc_authorize_url(provider, state, redirect_uri):
 
 def oidc_validate_authorization(provider, code, redirect_uri):
     endpoint = provider.configuration['provider_config']['token_endpoint']
-
-    # Wall of shame and RFC ignorant IDPs
-    if endpoint == 'https://www.linkedin.com/oauth/v2/accessToken':
-        token_endpoint_auth_method = 'client_secret_post'
-    else:
-        token_endpoint_auth_methods = provider.configuration['provider_config'].get(
-            'token_endpoint_auth_methods_supported', ['client_secret_basic']
-        )
-        token_endpoint_auth_method = [
-            x for x in pretix_token_endpoint_auth_methods if x in token_endpoint_auth_methods
-        ][0]
-
     params = {
         # https://datatracker.ietf.org/doc/html/rfc6749#section-4.1.3
         # https://openid.net/specs/openid-connect-core-1_0.html#TokenEndpoint
@@ -178,11 +154,6 @@ def oidc_validate_authorization(provider, code, redirect_uri):
         'code': code,
         'redirect_uri': redirect_uri,
     }
-
-    if token_endpoint_auth_method == 'client_secret_post':
-        params['client_id'] = provider.configuration['client_id']
-        params['client_secret'] = provider.configuration['client_secret']
-
     try:
         resp = requests.post(
             endpoint,
@@ -190,10 +161,7 @@ def oidc_validate_authorization(provider, code, redirect_uri):
             headers={
                 'Accept': 'application/json',
             },
-            auth=(
-                provider.configuration['client_id'],
-                provider.configuration['client_secret']
-            ) if token_endpoint_auth_method == 'client_secret_basic' else None,
+            auth=(provider.configuration['client_id'], provider.configuration['client_secret']),
         )
         resp.raise_for_status()
         data = resp.json()

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

@@ -50,7 +50,6 @@ class Command(BaseCommand):
     def add_arguments(self, parser):
         parser.add_argument('--tasks', action='store', type=str, help='Only execute the tasks with this name '
                                                                       '(dotted path, comma separation)')
-        parser.add_argument('--list-tasks', action='store_true', help='Only list all tasks')
         parser.add_argument('--exclude', action='store', type=str, help='Exclude the tasks with this name '
                                                                         '(dotted path, comma separation)')
 
@@ -62,9 +61,6 @@ class Command(BaseCommand):
 
         for receiver in periodic_task._live_receivers(self):
             name = f'{receiver.__module__}.{receiver.__name__}'
-            if options['list_tasks']:
-                print(name)
-                continue
             if options.get('tasks'):
                 if name not in options.get('tasks').split(','):
                     continue

src/pretix/base/migrations/0270_historicpassword.py

@@ -1,36 +0,0 @@
-# Generated by Django 4.2.15 on 2024-09-16 15:10
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("pretixbase", "0269_order_api_meta"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="HistoricPassword",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True, primary_key=True, serialize=False
-                    ),
-                ),
-                ("created", models.DateTimeField(auto_now_add=True)),
-                ("password", models.CharField(max_length=128)),
-                (
-                    "user",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="historic_passwords",
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-            ],
-        ),
-    ]

src/pretix/base/modelimport.py

@@ -213,13 +213,7 @@ class DatetimeColumnMixin:
             except (ValueError, TypeError):
                 pass
         else:
-            try:
-                d = datetime.datetime.fromisoformat(value)
-                if not d.tzinfo:
-                    d = d.replace(tzinfo=self.timezone)
-                return d
-            except (ValueError, TypeError):
-                raise ValidationError(_("Could not parse {value} as a date and time.").format(value=value))
+            raise ValidationError(_("Could not parse {value} as a date and time.").format(value=value))
 
 
 class DecimalColumnMixin:

src/pretix/base/modelimport_orders.py

@@ -40,8 +40,8 @@ from phonenumbers import SUPPORTED_REGIONS
 
 from pretix.base.forms.questions import guess_country
 from pretix.base.modelimport import (
-    BooleanColumnMixin, DatetimeColumnMixin, DecimalColumnMixin, ImportColumn,
-    SubeventColumnMixin, i18n_flat,
+    DatetimeColumnMixin, DecimalColumnMixin, ImportColumn, SubeventColumnMixin,
+    i18n_flat,
 )
 from pretix.base.models import (
     Customer, ItemVariation, OrderPosition, Question, QuestionAnswer,
@@ -604,22 +604,6 @@ class Comment(ImportColumn):
         order.comment = value or ''
 
 
-class CheckinAttentionColumn(BooleanColumnMixin, ImportColumn):
-    identifier = 'checkin_attention'
-    verbose_name = gettext_lazy('Requires special attention')
-
-    def assign(self, value, order, position, invoice_address, **kwargs):
-        order.checkin_attention = value
-
-
-class CheckinTextColumn(ImportColumn):
-    identifier = 'checkin_text'
-    verbose_name = gettext_lazy('Check-in text')
-
-    def assign(self, value, order, position, invoice_address, **kwargs):
-        order.checkin_text = value
-
-
 class QuestionColumn(ImportColumn):
     def __init__(self, event, q):
         self.q = q
@@ -758,8 +742,6 @@ def get_order_import_columns(event):
         ValidUntil(event),
         Locale(event),
         Saleschannel(event),
-        CheckinAttentionColumn(event),
-        CheckinTextColumn(event),
         Expires(event),
         Comment(event),
     ]

src/pretix/base/models/auth.py

@@ -654,9 +654,3 @@ class WebAuthnDevice(Device):
     @property
     def webauthnpubkey(self):
         return websafe_decode(self.pub_key)
-
-
-class HistoricPassword(models.Model):
-    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="historic_passwords")
-    created = models.DateTimeField(auto_now_add=True)
-    password = models.CharField(verbose_name=_("Password"), max_length=128)

src/pretix/base/models/event.py

@@ -313,9 +313,38 @@ class EventMixin:
             items=GroupConcat('pk', delimiter=',')
         ).values('items')
 
-        sq_active_variation = ItemVariation.objects.filter_available(channel=channel, voucher=voucher).filter(
-            Q(quotas__pk=OuterRef('pk'))
-        ).order_by().values_list('quotas__pk').annotate(
+        q_variation = (
+            Q(active=True)
+            & Q(Q(available_from__isnull=True) | Q(available_from__lte=time_machine_now()))
+            & Q(Q(available_until__isnull=True) | Q(available_until__gte=time_machine_now()))
+            & Q(item__active=True)
+            & Q(Q(item__available_from__isnull=True) | Q(item__available_from__lte=time_machine_now()))
+            & Q(Q(item__available_until__isnull=True) | Q(item__available_until__gte=time_machine_now()))
+            & Q(Q(item__category__isnull=True) | Q(item__category__is_addon=False))
+            & Q(item__require_bundling=False)
+            & Q(quotas__pk=OuterRef('pk'))
+        )
+
+        if isinstance(channel, str):
+            q_variation &= Q(Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=channel))
+            q_variation &= Q(Q(item__all_sales_channels=True) | Q(item__limit_sales_channels__identifier=channel))
+        else:
+            q_variation &= Q(Q(all_sales_channels=True) | Q(limit_sales_channels=channel))
+            q_variation &= Q(Q(item__all_sales_channels=True) | Q(item__limit_sales_channels=channel))
+
+        if voucher:
+            if voucher.variation_id:
+                q_variation &= Q(pk=voucher.variation_id)
+            elif voucher.item_id:
+                q_variation &= Q(item_id=voucher.item_id)
+            elif voucher.quota_id:
+                q_variation &= Q(quotas__in=[voucher.quota_id])
+
+        if not voucher or not voucher.show_hidden_items:
+            q_variation &= Q(hide_without_voucher=False)
+            q_variation &= Q(item__hide_without_voucher=False)
+
+        sq_active_variation = ItemVariation.objects.filter(q_variation).order_by().values_list('quotas__pk').annotate(
             items=GroupConcat('pk', delimiter=',')
         ).values('items')
         quota_base_qs = Quota.objects.using(settings.DATABASE_REPLICA).filter(

src/pretix/base/models/items.py

@@ -303,48 +303,6 @@ def filter_available(qs, channel='web', voucher=None, allow_addons=False):
     return qs.filter(q)
 
 
-def filter_variations_available(qs, channel='web', voucher=None, allow_addons=False):
-    # Channel can currently be a SalesChannel or a str, since we need that compatibility, but a SalesChannel
-    # makes the query SIGNIFICANTLY faster
-    from .organizer import SalesChannel
-
-    assert isinstance(channel, (SalesChannel, str))
-    q = (
-        Q(active=True)
-        & Q(Q(available_from__isnull=True) | Q(available_from__lte=time_machine_now()))
-        & Q(Q(available_until__isnull=True) | Q(available_until__gte=time_machine_now()))
-        & Q(item__active=True)
-        & Q(Q(item__available_from__isnull=True) | Q(item__available_from__lte=time_machine_now()))
-        & Q(Q(item__available_until__isnull=True) | Q(item__available_until__gte=time_machine_now()))
-        & Q(Q(item__category__isnull=True) | Q(item__category__is_addon=False))
-        & Q(item__require_bundling=False)
-    )
-
-    if isinstance(channel, str):
-        q &= Q(Q(all_sales_channels=True) | Q(limit_sales_channels__identifier=channel))
-        q &= Q(Q(item__all_sales_channels=True) | Q(item__limit_sales_channels__identifier=channel))
-    else:
-        q &= Q(Q(all_sales_channels=True) | Q(limit_sales_channels=channel))
-        q &= Q(Q(item__all_sales_channels=True) | Q(item__limit_sales_channels=channel))
-
-    if not allow_addons:
-        q &= Q(Q(item__category__isnull=True) | Q(item__category__is_addon=False))
-
-    if voucher:
-        if voucher.variation_id:
-            q &= Q(pk=voucher.variation_id)
-        elif voucher.item_id:
-            q &= Q(item_id=voucher.item_id)
-        elif voucher.quota_id:
-            q &= Q(quotas__in=[voucher.quota_id])
-
-    if not voucher or not voucher.show_hidden_items:
-        q &= Q(hide_without_voucher=False)
-        q &= Q(item__hide_without_voucher=False)
-
-    return qs.filter(q)
-
-
 class ItemQuerySet(models.QuerySet):
     def filter_available(self, channel='web', voucher=None, allow_addons=False):
         return filter_available(self, channel, voucher, allow_addons)
@@ -359,20 +317,6 @@ class ItemQuerySetManager(ScopedManager(organizer='event__organizer').__class__)
         return filter_available(self.get_queryset(), channel, voucher, allow_addons)
 
 
-class ItemVariationQuerySet(models.QuerySet):
-    def filter_available(self, channel='web', voucher=None, allow_addons=False):
-        return filter_variations_available(self, channel, voucher, allow_addons)
-
-
-class ItemVariationQuerySetManager(ScopedManager(organizer='item__event__organizer').__class__):
-    def __init__(self):
-        super().__init__()
-        self._queryset_class = ItemVariationQuerySet
-
-    def filter_available(self, channel='web', voucher=None, allow_addons=False):
-        return filter_variations_available(self.get_queryset(), channel, voucher, allow_addons)
-
-
 class Item(LoggedModel):
     """
     An item is a thing which can be sold. It belongs to an event and may or may not belong to a category.
@@ -1255,7 +1199,7 @@ class ItemVariation(models.Model):
         help_text=_('This text will be shown by the check-in app if a ticket of this type is scanned.')
     )
 
-    objects = ItemVariationQuerySetManager()
+    objects = ScopedManager(organizer='item__event__organizer')
 
     class Meta:
         verbose_name = _("Product variation")

src/pretix/base/models/orders.py

@@ -2835,14 +2835,6 @@ class OrderPosition(AbstractPosition):
             (self.order.event.settings.change_allow_user_addons and ItemAddOn.objects.filter(base_item_id__in=[op.item_id for op in positions]).exists())
         )
 
-    @property
-    def code(self):
-        """
-        A ticket code which is unique among all events of a single organizer,
-        built by the order code and the position number.
-        """
-        return '{order_code}-{position}'.format(order_code=self.order.code, position=self.positionid)
-
 
 class Transaction(models.Model):
     """

src/pretix/base/models/tax.py

@@ -29,8 +29,6 @@ from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.utils.deconstruct import deconstructible
 from django.utils.formats import localize
-from django.utils.functional import lazy
-from django.utils.html import format_html
 from django.utils.translation import gettext_lazy as _, pgettext
 from i18nfield.fields import I18nCharField
 from i18nfield.strings import LazyI18nString
@@ -122,8 +120,6 @@ EU_CURRENCIES = {
 }
 VAT_ID_COUNTRIES = EU_COUNTRIES | {'CH', 'NO'}
 
-format_html_lazy = lazy(format_html, str)
-
 
 def is_eu_country(cc):
     cc = str(cc)
@@ -197,17 +193,11 @@ class TaxRule(LoggedModel):
     eu_reverse_charge = models.BooleanField(
         verbose_name=_("Use EU reverse charge taxation rules"),
         default=False,
-        help_text=format_html_lazy(
-            '<span class="label label-warning" data-toggle="tooltip" title="{}">{}</span> {}',
-            _('This feature will be removed in the future as it does not handle VAT for non-business customers in '
-              'other EU countries in a way that works for all organizers. Use custom rules instead.'),
-            _('DEPRECATED'),
-            _("Not recommended. Most events will NOT be qualified for reverse charge since the place of "
-              "taxation is the location of the event. This option disables charging VAT for all customers "
-              "outside the EU and for business customers in different EU countries who entered a valid EU VAT "
-              "ID. Only enable this option after consulting a tax counsel. No warranty given for correct tax "
-              "calculation. USE AT YOUR OWN RISK.")
-        ),
+        help_text=_("Not recommended. Most events will NOT be qualified for reverse charge since the place of "
+                    "taxation is the location of the event. This option disables charging VAT for all customers "
+                    "outside the EU and for business customers in different EU countries who entered a valid EU VAT "
+                    "ID. Only enable this option after consulting a tax counsel. No warranty given for correct tax "
+                    "calculation. USE AT YOUR OWN RISK.")
     )
     home_country = FastCountryField(
         verbose_name=_('Merchant country'),

src/pretix/base/services/checkin.py

@@ -1182,11 +1182,10 @@ def process_exit_all(sender, **kwargs):
         positions = cl.positions_inside_query(ignore_status=True, at_time=cl.exit_all_at)
         for p in positions:
             with scope(organizer=cl.event.organizer):
-                ci, created = Checkin.objects.get_or_create(
+                ci = Checkin.objects.create(
                     position=p, list=cl, auto_checked_in=True, type=Checkin.TYPE_EXIT, datetime=cl.exit_all_at
                 )
-                if created:
-                    checkin_created.send(cl.event, checkin=ci)
+                checkin_created.send(cl.event, checkin=ci)
         d = cl.exit_all_at.astimezone(cl.event.timezone)
         if cl.event.settings.get(f'autocheckin_dst_hack_{cl.pk}'):  # move time back if yesterday was DST switch
             d -= timedelta(hours=1)

src/pretix/base/settings.py

@@ -1295,8 +1295,7 @@ DEFAULTS = {
         'form_kwargs': dict(
             label=_("Show event times and dates on the ticket shop"),
             help_text=_("If disabled, no date or time will be shown on the ticket shop's front page. This settings "
-                        "also affects a few other locations, however it should not be expected that the date of the "
-                        "event is shown nowhere to users."),
+                        "does however not affect the display in other locations."),
         )
     },
     'show_date_to': {

src/pretix/base/views/tasks.py

@@ -30,9 +30,7 @@ from celery import states
 from celery.result import AsyncResult
 from django.conf import settings
 from django.contrib import messages
-from django.core.exceptions import (
-    BadRequest, PermissionDenied, ValidationError,
-)
+from django.core.exceptions import PermissionDenied, ValidationError
 from django.core.files.uploadedfile import UploadedFile
 from django.db import transaction
 from django.http import HttpResponse, JsonResponse, QueryDict
@@ -133,8 +131,6 @@ class AsyncMixin:
         return data
 
     def get_result(self, request):
-        if not request.GET.get('async_id'):
-            raise BadRequest("No async_id given")
         res = AsyncResult(request.GET.get('async_id'))
         if 'ajax' in self.request.GET:
             return JsonResponse(self._return_ajax_result(res, timeout=0.25))
@@ -144,12 +140,7 @@ class AsyncMixin:
                     return self.success(res.info)
                 else:
                     return self.error(res.info)
-            state, info = res.state, res.info
-            return render(request, 'pretixpresale/waiting.html', {
-                'started': state in ('PROGRESS', 'STARTED'),
-                'percentage': info.get('value', 0) if isinstance(info, dict) else 0,
-                'steps': info.get('steps', []) if isinstance(info, dict) else None,
-            })
+            return render(request, 'pretixpresale/waiting.html')
 
     def success(self, value):
         smes = self.get_success_message(value)
@@ -217,8 +208,6 @@ class AsyncAction(AsyncMixin):
 
     def get(self, request, *args, **kwargs):
         if 'async_id' in request.GET and settings.HAS_CELERY:
-            if not request.GET.get('async_id'):
-                raise BadRequest("No async_id given")
             return self.get_result(request)
         return self.http_method_not_allowed(request)
 

src/pretix/control/forms/event.py

@@ -1143,12 +1143,12 @@ class MailSettingsForm(FormPlaceholderMixin, SettingsForm):
         widget=I18nTextInput,
     )
     mail_subject_order_incomplete_payment = I18nFormField(
-        label=_("Subject (if an incomplete payment was received)"),
+        label=_("Subject"),
         required=False,
         widget=I18nTextInput,
     )
     mail_text_order_incomplete_payment = I18nFormField(
-        label=_("Text (if an incomplete payment was received)"),
+        label=_("Text"),
         required=False,
         widget=I18nMarkdownTextarea,
         help_text=_("This email only applies to payment methods that can receive incomplete payments, "

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

@@ -41,7 +41,7 @@
                         {% bootstrap_field form.eu_reverse_charge layout="control" %}
                         {% bootstrap_field form.home_country layout="control" %}
                         {% bootstrap_field form.keep_gross_if_rate_changes layout="control" %}
-                        <h3>{% trans "Custom rules" %}</h3>
+                        <h3>{% trans "Custom taxation rules" %}</h3>
                         <div class="alert alert-warning">
                             {% blocktrans trimmed %}
                                 These settings are intended for professional users with very specific taxation situations.

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

@@ -133,7 +133,7 @@
                                 {% endif %}
                                 {{ i.default_price|money:request.event.currency }}
                                 {% if i.original_price %}<strike class="text-muted">{{ i.original_price|money:request.event.currency }}</strike>{% endif %}
-                                {% if i.tax_rule %}
+                                {% if i.tax_rule and i.default_price %}
                                     <br/>
                                     <small class="text-muted">
                                         {% if not i.tax_rule.price_includes_tax %}

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

@@ -102,24 +102,16 @@
             </tr>
             </thead>
             <tbody>
-            {% for t in tokens %}
+            {% for t in team.active_tokens %}
                 <tr>
-                    <td {% if not t.active %}class="text-muted"{% endif %}>
-                        {% if not t.active %}
-                            <del>
-                        {% endif %}
+                    <td>
                         {{ t.name }}
-                        {% if not t.active %}
-                            </del>
-                        {% endif %}
                     </td>
                     <td class="text-right flip">
-                        {% if t.active %}
-                            <button type="submit" name="remove-token" value="{{ t.id }}"
-                                    class="btn btn-danger btn-sm btn-block">
-                                <i class="fa fa-times"></i> {% trans "Remove" %}
-                            </button>
-                        {% endif %}
+                        <button type="submit" name="remove-token" value="{{ t.id }}"
+                                class="btn btn-danger btn-sm btn-block">
+                            <i class="fa fa-times"></i> {% trans "Remove" %}
+                        </button>
                     </td>
                 </tr>
             {% endfor %}

src/pretix/control/views/organizer.py

@@ -686,24 +686,14 @@ class TeamDeleteView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin,
         try:
             self.object.log_action('pretix.team.deleted', user=self.request.user)
             self.object.delete()
-        except ProtectedError as e:
-            is_logs = any(isinstance(e, LogEntry) for e in e.protected_objects)
-            if is_logs:
-                messages.error(
-                    self.request,
-                    _(
-                        "The team could not be deleted because the team or one of its API tokens is part of "
-                        "historical audit logs."
-                    )
-                )
-            else:
-                messages.error(
-                    self.request,
-                    _(
-                        'The team could not be deleted as some constraints (e.g. data created by '
-                        'plug-ins) do not allow it.'
-                    )
+        except ProtectedError:
+            messages.error(
+                self.request,
+                _(
+                    'The team could not be deleted as some constraints (e.g. data created by '
+                    'plug-ins) do not allow it.'
                 )
+            )
             return redirect(success_url)
 
         messages.success(request, _('The selected team has been deleted.'))
@@ -733,7 +723,6 @@ class TeamMemberView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin,
         ctx = super().get_context_data(**kwargs)
         ctx['add_form'] = self.add_form
         ctx['add_token_form'] = self.add_token_form
-        ctx['tokens'] = self.object.tokens.order_by("-active", "name", "pk")
         return ctx
 
     def _send_invite(self, instance):

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

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-27 13:34+0000\n"
-"PO-Revision-Date: 2024-09-10 07:17+0000\n"
+"PO-Revision-Date: 2024-08-27 16:02+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix-js/"
 "de/>\n"
@@ -572,8 +572,10 @@ msgid "Group of objects"
 msgstr "Gruppe von Objekten"
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:899
+#, fuzzy
+#| msgid "Text object"
 msgid "Text object (deprecated)"
-msgstr "Text-Objekt (veraltet)"
+msgstr "Text-Objekt"
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:901
 msgid "Text box"

src/pretix/locale/de/wordlist.txt

@@ -4,7 +4,6 @@ AES
 Absenderadresse
 Absenderinformation
 Absendername
-ABGEKÜNDIGT
 Admin
 Adminbereich
 Affirm
@@ -26,7 +25,6 @@ Ausgangsscans
 ausgeklappt
 ausgecheckt
 auswahl
-Auth
 Authentication
 Authenticator
 Authentifizierungsmechanismus
@@ -38,7 +36,6 @@ Bancontact
 BankID
 Banking
 barcodes
-Baskisch
 Bcc
 BCC
 Beispielevent

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

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-27 13:34+0000\n"
-"PO-Revision-Date: 2024-09-10 07:17+0000\n"
+"PO-Revision-Date: 2024-08-27 16:00+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German (informal) <https://translate.pretix.eu/projects/"
 "pretix/pretix-js/de_Informal/>\n"
@@ -571,8 +571,10 @@ msgid "Group of objects"
 msgstr "Gruppe von Objekten"
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:899
+#, fuzzy
+#| msgid "Text object"
 msgid "Text object (deprecated)"
-msgstr "Text-Objekt (veraltet)"
+msgstr "Text-Objekt"
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:901
 msgid "Text box"

src/pretix/locale/de_Informal/wordlist.txt

@@ -4,7 +4,6 @@ AES
 Absenderadresse
 Absenderinformation
 Absendername
-ABGEKÜNDIGT
 Admin
 Adminbereich
 Affirm
@@ -26,7 +25,6 @@ Ausgangsscans
 ausgeklappt
 ausgecheckt
 auswahl
-Auth
 Authentication
 Authenticator
 Authentifizierungsmechanismus
@@ -38,7 +36,6 @@ Bancontact
 BankID
 Banking
 barcodes
-Baskisch
 Bcc
 BCC
 Beispielevent

src/pretix/locale/djangojs.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-26 11:23+0000\n"
+"POT-Creation-Date: 2024-08-27 13:34+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/eu/LC_MESSAGES/djangojs.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-26 11:23+0000\n"
-"PO-Revision-Date: 2024-09-06 08:47+0000\n"
+"POT-Creation-Date: 2024-08-27 13:34+0000\n"
+"PO-Revision-Date: 2024-08-26 15:00+0000\n"
 "Last-Translator: Albizuri <oier@puntu.eus>\n"
 "Language-Team: Basque <https://translate.pretix.eu/projects/pretix/pretix-js/"
 "eu/>\n"
@@ -557,14 +557,17 @@ msgid "absent"
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:171
+#: pretix/static/pretixcontrol/js/ui/editor.js:72
 msgid "Check-in QR"
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:543
+#: pretix/static/pretixcontrol/js/ui/editor.js:387
 msgid "The PDF background file could not be loaded for the following reason:"
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:894
+#: pretix/static/pretixcontrol/js/ui/editor.js:656
 msgid "Group of objects"
 msgstr ""
 
@@ -577,35 +580,44 @@ msgid "Text box"
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:903
+#: pretix/static/pretixcontrol/js/ui/editor.js:663
 msgid "Barcode area"
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:905
+#: pretix/static/pretixcontrol/js/ui/editor.js:665
 msgid "Image area"
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:907
+#: pretix/static/pretixcontrol/js/ui/editor.js:667
 msgid "Powered by pretix"
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:909
+#: pretix/static/pretixcontrol/js/ui/editor.js:669
 msgid "Object"
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:913
+#: pretix/static/pretixcontrol/js/ui/editor.js:673
 msgid "Ticket design"
-msgstr "Sarrera diseinua"
+msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:1250
+#: pretix/static/pretixcontrol/js/ui/editor.js:972
 msgid "Saving failed."
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:1319
 #: pretix/static/pretixcontrol/js/ui/editor.js:1370
+#: pretix/static/pretixcontrol/js/ui/editor.js:1041
+#: pretix/static/pretixcontrol/js/ui/editor.js:1091
 msgid "Error while uploading your PDF file, please try again."
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:1353
+#: pretix/static/pretixcontrol/js/ui/editor.js:1074
 msgid "Do you really want to leave the editor without saving your changes?"
 msgstr ""
 
@@ -622,14 +634,17 @@ msgid "Unknown error."
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/main.js:318
+#: pretix/static/pretixcontrol/js/ui/main.js:313
 msgid "Your color has great contrast and is very easy to read!"
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/main.js:322
+#: pretix/static/pretixcontrol/js/ui/main.js:317
 msgid "Your color has decent contrast and is probably good-enough to read!"
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/main.js:326
+#: pretix/static/pretixcontrol/js/ui/main.js:321
 msgid ""
 "Your color has bad contrast for text on white background, please choose a "
 "darker shade."
@@ -637,38 +652,48 @@ msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/main.js:491
 #: pretix/static/pretixcontrol/js/ui/main.js:511
+#: pretix/static/pretixcontrol/js/ui/main.js:475
+#: pretix/static/pretixcontrol/js/ui/main.js:495
 msgid "Search query"
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/main.js:509
+#: pretix/static/pretixcontrol/js/ui/main.js:493
 msgid "All"
 msgstr "Guztiak"
 
 #: pretix/static/pretixcontrol/js/ui/main.js:510
+#: pretix/static/pretixcontrol/js/ui/main.js:494
 msgid "None"
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/main.js:514
+#: pretix/static/pretixcontrol/js/ui/main.js:498
 msgid "Selected only"
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/main.js:847
+#: pretix/static/pretixcontrol/js/ui/main.js:828
 msgid "Enter page number between 1 and %(max)s."
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/main.js:850
+#: pretix/static/pretixcontrol/js/ui/main.js:831
 msgid "Invalid page number."
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/main.js:1008
+#: pretix/static/pretixcontrol/js/ui/main.js:989
 msgid "Use a different name internally"
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/main.js:1048
+#: pretix/static/pretixcontrol/js/ui/main.js:1029
 msgid "Click to close"
 msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/main.js:1123
+#: pretix/static/pretixcontrol/js/ui/main.js:1104
 msgid "You have unsaved changes!"
 msgstr ""
 
@@ -695,19 +720,16 @@ msgid ""
 "The items in your cart are no longer reserved for you. You can still "
 "complete your order as long as they’re available."
 msgstr ""
-"Zure saskiko produktuak ez daude zuretzat erreserbatuta. Oraindik ere zure "
-"eskaera bete dezakezu, baldin eta eskuragarri badaude."
 
 #: pretix/static/pretixpresale/js/ui/cart.js:45
 msgid "Cart expired"
-msgstr "Saskia iraungita"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/ui/cart.js:50
 msgid "The items in your cart are reserved for you for one minute."
 msgid_plural "The items in your cart are reserved for you for {num} minutes."
-msgstr[0] "Zure saskiko produktuak minutu  -ez erreserbatuta daude zuretzat."
+msgstr[0] ""
 msgstr[1] ""
-"Zure saskiko produktuak {num}  minutuz erreserbatuta daude zuretzat."
 
 #: pretix/static/pretixpresale/js/ui/main.js:203
 msgid "The organizer keeps %(currency)s %(amount)s"
@@ -1075,3 +1097,7 @@ msgstr ""
 #: pretix/static/pretixpresale/js/widget/widget.js:89
 msgid "December"
 msgstr ""
+
+#: pretix/static/pretixcontrol/js/ui/editor.js:661
+msgid "Text object"
+msgstr ""

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

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-27 13:34+0000\n"
-"PO-Revision-Date: 2024-08-28 10:03+0000\n"
+"PO-Revision-Date: 2024-06-27 17:00+0000\n"
 "Last-Translator: Anarion Dunedain <anarion80@gmail.com>\n"
 "Language-Team: Polish <https://translate.pretix.eu/projects/pretix/pretix-js/"
 "pl/>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.7\n"
+"X-Generator: Weblate 5.6.1\n"
 
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -572,12 +572,16 @@ msgid "Group of objects"
 msgstr "Grupa obiektów"
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:899
+#, fuzzy
+#| msgid "Text object"
 msgid "Text object (deprecated)"
-msgstr "Obiekt tekstowy (przestarzały)"
+msgstr "Obiekt tekstowy"
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:901
+#, fuzzy
+#| msgid "Text object"
 msgid "Text box"
-msgstr "Pole tekstowe"
+msgstr "Obiekt tekstowy"
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:903
 msgid "Barcode area"

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

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-27 13:34+0000\n"
-"PO-Revision-Date: 2024-09-08 11:04+0000\n"
-"Last-Translator: Martin Gross <gross@rami.io>\n"
+"PO-Revision-Date: 2024-06-08 18:00+0000\n"
+"Last-Translator: David Vaz <davidmgvaz@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) <https://translate.pretix.eu/projects/"
 "pretix/pretix-js/pt_PT/>\n"
 "Language: pt_PT\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.7\n"
+"X-Generator: Weblate 5.5.5\n"
 
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -292,8 +292,10 @@ msgid "Information required"
 msgstr ""
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:58
+#, fuzzy
+#| msgid "Unknown error."
 msgid "Unknown ticket"
-msgstr "Bilhete desconhecido"
+msgstr "Erro desconhecido."
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:59
 msgid "Ticket type not allowed here"
@@ -803,19 +805,21 @@ msgstr ""
 #: pretix/static/pretixpresale/js/widget/widget.js:20
 msgctxt "widget"
 msgid "Select"
-msgstr "Selecionar"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:21
 #, javascript-format
 msgctxt "widget"
 msgid "Select %s"
-msgstr "Selecionados %s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:22
-#, javascript-format
+#, fuzzy, javascript-format
+#| msgctxt "widget"
+#| msgid "See variations"
 msgctxt "widget"
 msgid "Select variant %s"
-msgstr "Selecione variantes %s"
+msgstr "Ver alternativas"
 
 #: pretix/static/pretixpresale/js/widget/widget.js:23
 msgctxt "widget"

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

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-27 13:34+0000\n"
-"PO-Revision-Date: 2024-09-15 18:00+0000\n"
+"PO-Revision-Date: 2024-06-26 22:00+0000\n"
 "Last-Translator: Kristian Feldsam <feldsam@gmail.com>\n"
 "Language-Team: Slovak <https://translate.pretix.eu/projects/pretix/pretix-js/"
 "sk/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 5.7\n"
+"X-Generator: Weblate 5.6.1\n"
 
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -156,7 +156,7 @@ msgstr ""
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:15
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:39
 msgid "Paid orders"
-msgstr "Zaplatené objednávky"
+msgstr ""
 
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:27
 msgid "Total revenue"
@@ -176,15 +176,15 @@ msgstr ""
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:30
 msgid "Select a check-in list"
-msgstr "Vyberte zoznam na odbavenie"
+msgstr ""
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:31
 msgid "No active check-in lists found."
-msgstr "Nenašli sa žiadne aktívne zoznamy na odbavenie."
+msgstr ""
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:32
 msgid "Switch check-in list"
-msgstr "Prepnúť zoznam odbavení"
+msgstr ""
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:33
 msgid "Search results"
@@ -274,7 +274,7 @@ msgstr ""
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:56
 msgid "Ticket already used"
-msgstr "Už použitá vstupenka"
+msgstr ""
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:57
 msgid "Information required"
@@ -282,7 +282,7 @@ msgstr ""
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:58
 msgid "Unknown ticket"
-msgstr "Neznáma vstupenka"
+msgstr ""
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:59
 msgid "Ticket type not allowed here"
@@ -318,7 +318,7 @@ msgstr ""
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:68
 msgid "Checked-in Tickets"
-msgstr "Odbavené vstupenky"
+msgstr ""
 
 #: pretix/plugins/webcheckin/static/pretixplugins/webcheckin/main.js:69
 msgid "Valid Tickets"
@@ -398,9 +398,6 @@ msgid ""
 "than one minute, please check your internet connection and then reload this "
 "page and try again."
 msgstr ""
-"Momentálne odosielame vašu požiadavku na server. Ak to trvá dlhšie ako jednu "
-"minútu, skontrolujte svoje internetové pripojenie a potom znovu načítajte "
-"túto stránku a skúste to znova."
 
 #: pretix/static/pretixbase/js/asynctask.js:301
 #: pretix/static/pretixcontrol/js/ui/main.js:71
@@ -549,7 +546,7 @@ msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:171
 msgid "Check-in QR"
-msgstr "QR na odbavenie"
+msgstr ""
 
 #: pretix/static/pretixcontrol/js/ui/editor.js:543
 msgid "The PDF background file could not be loaded for the following reason:"
@@ -686,8 +683,6 @@ msgid ""
 "The items in your cart are no longer reserved for you. You can still "
 "complete your order as long as they’re available."
 msgstr ""
-"Vstupenky v košíku už nie sú pre Vás rezervované. Objednávku môžete "
-"dokončiť, ak sú stále k dispozícii."
 
 #: pretix/static/pretixpresale/js/ui/cart.js:45
 msgid "Cart expired"
@@ -696,9 +691,8 @@ msgstr ""
 #: pretix/static/pretixpresale/js/ui/cart.js:50
 msgid "The items in your cart are reserved for you for one minute."
 msgid_plural "The items in your cart are reserved for you for {num} minutes."
-msgstr[0] "Vstupenky v košíku sú pre Vás rezervované jednu minútu."
-msgstr[1] "Vstupenky v košíku sú pre Vás rezervované {num} minúty."
-msgstr[2] "Vstupenky v košíku sú pre Vás rezervované {num} minút."
+msgstr[0] ""
+msgstr[1] ""
 
 #: pretix/static/pretixpresale/js/ui/main.js:203
 msgid "The organizer keeps %(currency)s %(amount)s"
@@ -710,11 +704,11 @@ msgstr ""
 
 #: pretix/static/pretixpresale/js/ui/main.js:227
 msgid "Please enter the amount the organizer can keep."
-msgstr "Zadajte sumu, ktorú si organizátor môže ponechať."
+msgstr ""
 
 #: pretix/static/pretixpresale/js/ui/main.js:449
 msgid "Please enter a quantity for one of the ticket types."
-msgstr "Vyberte si prosím aspoň jednu vstupenku."
+msgstr ""
 
 #: pretix/static/pretixpresale/js/ui/main.js:485
 msgid "required"
@@ -736,131 +730,131 @@ msgstr ""
 #: pretix/static/pretixpresale/js/widget/widget.js:16
 msgctxt "widget"
 msgid "Quantity"
-msgstr "Počet"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:17
 msgctxt "widget"
 msgid "Decrease quantity"
-msgstr "Znížiť počet"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:18
 msgctxt "widget"
 msgid "Increase quantity"
-msgstr "Zvýšiť počet"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:19
 msgctxt "widget"
 msgid "Price"
-msgstr "Cena"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:20
 msgctxt "widget"
 msgid "Select"
-msgstr "Vybrať"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:21
 #, javascript-format
 msgctxt "widget"
 msgid "Select %s"
-msgstr "Vybrať %s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:22
 #, javascript-format
 msgctxt "widget"
 msgid "Select variant %s"
-msgstr "Vybrať variantu %s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:23
 msgctxt "widget"
 msgid "Sold out"
-msgstr "Vypredané"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:24
 msgctxt "widget"
 msgid "Buy"
-msgstr "Kúpiť"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:25
 msgctxt "widget"
 msgid "Register"
-msgstr "Registrovať sa"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:26
 msgctxt "widget"
 msgid "Reserved"
-msgstr "Rezervované"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:27
 msgctxt "widget"
 msgid "FREE"
-msgstr "ZADARMO"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:28
 msgctxt "widget"
 msgid "from %(currency)s %(price)s"
-msgstr "z %(currency)s %(price)s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:29
 msgctxt "widget"
 msgid "incl. %(rate)s% %(taxname)s"
-msgstr "vrátane %(rate)s% %(taxname)s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:30
 msgctxt "widget"
 msgid "plus %(rate)s% %(taxname)s"
-msgstr "plus %(rate)s% %(taxname)s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:31
 msgctxt "widget"
 msgid "incl. taxes"
-msgstr "vrátane dane"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:32
 msgctxt "widget"
 msgid "plus taxes"
-msgstr "plus daň"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:33
 #, javascript-format
 msgctxt "widget"
 msgid "currently available: %s"
-msgstr "aktuálne k dispozícii: %s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:34
 msgctxt "widget"
 msgid "Only available with a voucher"
-msgstr "K dispozícii len s poukážkou"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:35
 msgctxt "widget"
 msgid "Not yet available"
-msgstr "Zatiaľ nedostupné"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:36
 msgctxt "widget"
 msgid "Not available anymore"
-msgstr "Už nie je k dispozícii"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:37
 msgctxt "widget"
 msgid "Currently not available"
-msgstr "Momentálne nie je k dispozícii"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:38
 #, javascript-format
 msgctxt "widget"
 msgid "minimum amount to order: %s"
-msgstr "minimálna suma na objednávku: %s"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:39
 msgctxt "widget"
 msgid "Close ticket shop"
-msgstr "Zatvoriť obchod so vstupenkami"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:40
 msgctxt "widget"
 msgid "The ticket shop could not be loaded."
-msgstr "Obchod so vstupenkami sa nepodarilo načítať."
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:41
 msgctxt "widget"
@@ -868,18 +862,16 @@ msgid ""
 "There are currently a lot of users in this ticket shop. Please open the shop "
 "in a new tab to continue."
 msgstr ""
-"V súčasnosti je v tomto obchode so vstupenkami veľa používateľov. Ak chcete "
-"pokračovať, otvorte obchod v novej karte."
 
 #: pretix/static/pretixpresale/js/widget/widget.js:43
 msgctxt "widget"
 msgid "Open ticket shop"
-msgstr "Otvoriť obchod so vstupenkami"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:44
 msgctxt "widget"
 msgid "The cart could not be created. Please try again later"
-msgstr "Nákupný košík sa nepodarilo vytvoriť. Skúste to prosím neskôr"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:45
 msgctxt "widget"
@@ -887,14 +879,11 @@ msgid ""
 "We could not create your cart, since there are currently too many users in "
 "this ticket shop. Please click \"Continue\" to retry in a new tab."
 msgstr ""
-"Nepodarilo sa nám vytvoriť Váš nákupný košík, pretože v tomto obchode je "
-"momentálne príliš veľa používateľov. Kliknutím na tlačidlo „Pokračovať“ to "
-"skúste znova v novej karte."
 
 #: pretix/static/pretixpresale/js/widget/widget.js:47
 msgctxt "widget"
 msgid "Waiting list"
-msgstr "Čakací zoznam"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:48
 msgctxt "widget"
@@ -902,88 +891,86 @@ msgid ""
 "You currently have an active cart for this event. If you select more "
 "products, they will be added to your existing cart."
 msgstr ""
-"V súčasnosti máte aktívny nákupný košík pre toto podujatie. Ak si vyberiete "
-"ďalšie vstupenky, pridajú sa do vášho existujúceho košíka."
 
 #: pretix/static/pretixpresale/js/widget/widget.js:50
 msgctxt "widget"
 msgid "Resume checkout"
-msgstr "Pokračovať v objednávke"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:51
 msgctxt "widget"
 msgid "Redeem a voucher"
-msgstr "Uplatnenie poukážky"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:52
 msgctxt "widget"
 msgid "Redeem"
-msgstr "Uplatniť"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:53
 msgctxt "widget"
 msgid "Voucher code"
-msgstr "Kód poukážky"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:54
 msgctxt "widget"
 msgid "Close"
-msgstr "Zatvoriť"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:55
 msgctxt "widget"
 msgid "Continue"
-msgstr "Pokračovať"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:56
 msgctxt "widget"
 msgid "Show variants"
-msgstr "Zobraziť varianty"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:57
 msgctxt "widget"
 msgid "Hide variants"
-msgstr "Skryť varianty"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:58
 msgctxt "widget"
 msgid "Choose a different event"
-msgstr "Vybrať iné podujatie"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:59
 msgctxt "widget"
 msgid "Choose a different date"
-msgstr "Vybrať iný dátum"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:60
 msgctxt "widget"
 msgid "Back"
-msgstr "Späť"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:61
 msgctxt "widget"
 msgid "Next month"
-msgstr "Nasledujúci mesiac"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:62
 msgctxt "widget"
 msgid "Previous month"
-msgstr "Predchádzajúci mesiac"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:63
 msgctxt "widget"
 msgid "Next week"
-msgstr "Nasledujúci týždeň"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:64
 msgctxt "widget"
 msgid "Previous week"
-msgstr "Predchádzajúci týždeň"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:65
 msgctxt "widget"
 msgid "Open seat selection"
-msgstr "Zobraziť výber sedadiel"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:66
 msgctxt "widget"
@@ -992,14 +979,11 @@ msgid ""
 "add yourself to the waiting list. We will then notify if seats are available "
 "again."
 msgstr ""
-"Niektoré alebo všetky kategórie vstupeniek sú v súčasnosti vypredané. Ak "
-"chcete, môžete sa pridať na zoznam čakateľov. Budeme vás informovať, ak sa "
-"miesta uvoľnia."
 
 #: pretix/static/pretixpresale/js/widget/widget.js:67
 msgctxt "widget"
 msgid "Load more"
-msgstr "Načítať viac"
+msgstr ""
 
 #: pretix/static/pretixpresale/js/widget/widget.js:69
 msgid "Mo"

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

@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-27 13:34+0000\n"
-"PO-Revision-Date: 2024-09-12 03:00+0000\n"
-"Last-Translator: Tinna Sandström <tinna@coeo.events>\n"
-"Language-Team: Swedish <https://translate.pretix.eu/projects/pretix/"
-"pretix-js/sv/>\n"
+"PO-Revision-Date: 2024-06-27 17:00+0000\n"
+"Last-Translator: Erik Löfman <erik@disruptiveventures.se>\n"
+"Language-Team: Swedish <https://translate.pretix.eu/projects/pretix/pretix-"
+"js/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.7\n"
+"X-Generator: Weblate 5.6.1\n"
 
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
 #: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -727,8 +727,8 @@ msgstr "Varukorgen har gått ut"
 #: pretix/static/pretixpresale/js/ui/cart.js:50
 msgid "The items in your cart are reserved for you for one minute."
 msgid_plural "The items in your cart are reserved for you for {num} minutes."
-msgstr[0] "Produkterna i din bokning är reserverade för dig i en minut."
-msgstr[1] "Produkterna i din bokning är reserverade för dig i {num} minuter."
+msgstr[0] "Artiklarna i din varukorg är reserverade för dig i en minut."
+msgstr[1] "Artiklarna i din varukorg är reserverade för dig i {num} minuter."
 
 #: pretix/static/pretixpresale/js/ui/main.js:203
 msgid "The organizer keeps %(currency)s %(amount)s"
@@ -819,7 +819,7 @@ msgstr "Köp"
 #: pretix/static/pretixpresale/js/widget/widget.js:25
 msgctxt "widget"
 msgid "Register"
-msgstr "BOKA"
+msgstr "Registrera"
 
 #: pretix/static/pretixpresale/js/widget/widget.js:26
 msgctxt "widget"
@@ -829,7 +829,7 @@ msgstr "Reserverad"
 #: pretix/static/pretixpresale/js/widget/widget.js:27
 msgctxt "widget"
 msgid "FREE"
-msgstr "ANTAL"
+msgstr "GRATIS"
 
 #: pretix/static/pretixpresale/js/widget/widget.js:28
 msgctxt "widget"
@@ -921,7 +921,7 @@ msgstr "Öppna biljettbutik"
 #: pretix/static/pretixpresale/js/widget/widget.js:44
 msgctxt "widget"
 msgid "The cart could not be created. Please try again later"
-msgstr "Bokningen kunde inte skapas. Vänligen försök senare."
+msgstr "Varukorgen kunde inte skapas. Vänligen försök senare"
 
 #: pretix/static/pretixpresale/js/widget/widget.js:45
 msgctxt "widget"
@@ -929,8 +929,9 @@ msgid ""
 "We could not create your cart, since there are currently too many users in "
 "this ticket shop. Please click \"Continue\" to retry in a new tab."
 msgstr ""
-"Vi kunde inte skapa din bokning, då det just nu är många användare i den här "
-"biljettbutiken. Klicka på \"Fortsätt\" för att försöka på nytt i en ny flik."
+"Vi kunde inte skapa din varukorg, då det just nu är många användare i den "
+"här biljettbutiken. Klicka på \"Fortsätt\" för att försöka på nytt i en ny "
+"flik."
 
 #: pretix/static/pretixpresale/js/widget/widget.js:47
 msgctxt "widget"
@@ -943,13 +944,13 @@ msgid ""
 "You currently have an active cart for this event. If you select more "
 "products, they will be added to your existing cart."
 msgstr ""
-"Du har för tillfället en pågående bokning för den här eventet. Om du väljer "
-"fler produkter, kommer de att läggas till din befintliga bokning."
+"Du har för tillfället en aktiv varukorg för den här eventet. Om du väljer "
+"fler artiklar, kommer de att läggas till din befintliga varukorg."
 
 #: pretix/static/pretixpresale/js/widget/widget.js:50
 msgctxt "widget"
 msgid "Resume checkout"
-msgstr "Fortsätt med ditt bokningen"
+msgstr "Fortsätt med ditt köp"
 
 #: pretix/static/pretixpresale/js/widget/widget.js:51
 msgctxt "widget"

src/pretix/locale/wordlist.txt

@@ -9,7 +9,6 @@ acceptor
 analytics
 anonymize
 anonymized
-Auth
 authenticator
 automatical
 availabilities

src/pretix/plugins/banktransfer/tasks.py

@@ -162,21 +162,6 @@ def _handle_transaction(trans: BankTransaction, matches: tuple, event: Event = N
     else:
         trans.order = orders[0]
 
-    if len(orders) > 1:
-        # Multi-match! Can we split this automatically?
-        order_pending_sum = sum(o.pending_sum for o in orders)
-        if order_pending_sum != trans.amount:
-            # we can't :( this needs to be dealt with by a human
-            trans.state = BankTransaction.STATE_NOMATCH
-            trans.message = gettext_noop('Automatic split to multiple orders not possible.')
-            trans.save()
-            return
-
-        # we can!
-        splits = [(o, o.pending_sum) for o in orders]
-    else:
-        splits = [(orders[0], trans.amount)]
-
     for o in orders:
         if o.status == Order.STATUS_PAID and o.pending_sum <= Decimal('0.00'):
             trans.state = BankTransaction.STATE_DUPLICATE
@@ -194,6 +179,21 @@ def _handle_transaction(trans: BankTransaction, matches: tuple, event: Event = N
             trans.save()
             return
 
+    if len(orders) > 1:
+        # Multi-match! Can we split this automatically?
+        order_pending_sum = sum(o.pending_sum for o in orders)
+        if order_pending_sum != trans.amount:
+            # we can't :( this needs to be dealt with by a human
+            trans.state = BankTransaction.STATE_NOMATCH
+            trans.message = gettext_noop('Automatic split to multiple orders not possible.')
+            trans.save()
+            return
+
+        # we can!
+        splits = [(o, o.pending_sum) for o in orders]
+    else:
+        splits = [(orders[0], trans.amount)]
+
     trans.state = BankTransaction.STATE_VALID
     for order, amount in splits:
         info_data = {

src/pretix/plugins/banktransfer/views.py

@@ -669,7 +669,7 @@ class OrganizerActionView(OrganizerBanktransferView, OrganizerPermissionRequired
 
 
 def _row_key_func(row):
-    return row['iban'], row.get('bic') or ''
+    return row['iban'], row['bic']
 
 
 def _unite_transaction_rows(transaction_rows):

src/pretix/plugins/sendmail/tasks.py

@@ -31,8 +31,6 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
-from datetime import datetime
-
 from django.db.models import Exists, OuterRef, Q
 from i18nfield.strings import LazyI18nString
 
@@ -47,7 +45,6 @@ from pretix.helpers.format import format_map
 
 @app.task(base=ProfiledEventTask, acks_late=True)
 def send_mails_to_orders(event: Event, user: int, subject: dict, message: dict, objects: list, items: list,
-                         subevent: int, subevents_from: datetime, subevents_to: datetime,
                          recipients: str, filter_checkins: bool, not_checked_in: bool, checkin_lists: list,
                          attachments: list = None, attach_tickets: bool = False,
                          attach_ical: bool = False) -> None:
@@ -79,7 +76,7 @@ def send_mails_to_orders(event: Event, user: int, subject: dict, message: dict,
                         list_id__in=checkin_lists or []
                     )
                 ),
-            ).prefetch_related('addons', 'subevent'):
+            ).prefetch_related('addons'):
                 if p.addon_to_id is not None:
                     continue
 
@@ -102,15 +99,6 @@ def send_mails_to_orders(event: Event, user: int, subject: dict, message: dict,
                 if p.attendee_email == o.email and send_to_order:
                     continue
 
-                if subevent and p.subevent_id != subevent:
-                    continue
-
-                if subevents_from and p.subevent.date_from < subevents_from:
-                    continue
-
-                if subevents_to and p.subevent.date_from >= subevents_to:
-                    continue
-
                 try:
                     with language(o.locale, event.settings.region):
                         email_context = get_email_context(event=event, order=o, invoice_address=ia, position=p)

src/pretix/plugins/sendmail/views.py

@@ -429,9 +429,6 @@ class OrderSendView(BaseSenderView):
         kwargs.update({
             'recipients': form.cleaned_data['recipients'],
             'items': [i.pk for i in form.cleaned_data.get('items')],
-            'subevent': form.cleaned_data['subevent'].pk if form.cleaned_data.get('subevent') else None,
-            'subevents_from': form.cleaned_data.get('subevents_from'),
-            'subevents_to': form.cleaned_data.get('subevents_to'),
             'not_checked_in': form.cleaned_data.get('not_checked_in'),
             'checkin_lists': [i.pk for i in form.cleaned_data.get('checkin_lists')],
             'filter_checkins': form.cleaned_data.get('filter_checkins'),

src/pretix/plugins/stripe/templates/pretixplugins/stripe/sca.html

@@ -10,7 +10,7 @@
     <script type="text/plain" id="stripe_payment_intent_client_secret">{{ payment_intent_client_secret }}</script>
     {% if payment_intent_next_action_redirect_url %}
         <script type="text/plain" id="stripe_payment_intent_next_action_redirect_url">{{ payment_intent_next_action_redirect_url }}</script>
-    {% endif %}
+    {% endif %}}
     {% if payment_intent_redirect_action_handling %}
         <script type="text/plain" id="stripe_payment_intent_redirect_action_handling">{{ payment_intent_redirect_action_handling }}</script>
     {% endif %}

src/pretix/presale/checkoutflow.py

@@ -56,7 +56,7 @@ from django.views.generic.base import TemplateResponseMixin
 from django_scopes import scopes_disabled
 
 from pretix.base.models import Customer, Membership, Order
-from pretix.base.models.items import ItemAddOn, ItemVariation, Question
+from pretix.base.models.items import Question
 from pretix.base.models.orders import (
     InvoiceAddress, OrderPayment, QuestionAnswer,
 )
@@ -486,33 +486,9 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
     label = pgettext_lazy('checkoutflow', 'Add-on products')
     icon = 'puzzle-piece'
 
-    def _is_applicable(self, request):
-        categories = set(ItemAddOn.objects.filter(
-            base_item_id__in=get_cart(request).values_list("item_id", flat=True)
-        ).values_list("addon_category_id", flat=True))
-        if not categories:
-            return False
-
-        has_available_addons = (
-            self.event.items.filter_available(
-                channel=request.sales_channel,
-                allow_addons=True
-            ).filter(
-                variations__isnull=True,
-                category__in=categories,
-            ).exists() or ItemVariation.objects.filter_available(
-                channel=request.sales_channel,
-                allow_addons=True
-            ).filter(
-                item__event=self.event,
-                item__category__in=categories,
-            )
-        )
-        return has_available_addons
-
     def is_applicable(self, request):
         if not hasattr(request, '_checkoutflow_addons_applicable'):
-            request._checkoutflow_addons_applicable = self._is_applicable(request)
+            request._checkoutflow_addons_applicable = get_cart(request).filter(item__addons__isnull=False).exists()
         return request._checkoutflow_addons_applicable
 
     def is_completed(self, request, warn=False):

src/pretix/presale/forms/customer.py

@@ -19,7 +19,6 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-import functools
 import hashlib
 import ipaddress
 import random
@@ -28,7 +27,7 @@ from django import forms
 from django.conf import settings
 from django.contrib.auth.hashers import check_password
 from django.contrib.auth.password_validation import (
-    get_password_validators, password_validators_help_texts, validate_password,
+    password_validators_help_texts, validate_password,
 )
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
 from django.core import signing
@@ -272,11 +271,6 @@ class RegistrationForm(forms.Form):
         return customer
 
 
-@functools.lru_cache(maxsize=None)
-def get_customer_password_validators():
-    return get_password_validators(settings.CUSTOMER_AUTH_PASSWORD_VALIDATORS)
-
-
 class SetPasswordForm(forms.Form):
     required_css_class = 'required'
     error_messages = {
@@ -317,7 +311,7 @@ class SetPasswordForm(forms.Form):
 
     def clean_password(self):
         password1 = self.cleaned_data.get('password', '')
-        if validate_password(password1, user=self.customer, password_validators=get_customer_password_validators()) is not None:
+        if validate_password(password1, user=self.customer) is not None:
             raise forms.ValidationError(_(password_validators_help_texts()), code='pw_invalid')
         return password1
 
@@ -411,7 +405,7 @@ class ChangePasswordForm(forms.Form):
 
     def clean_password(self):
         password1 = self.cleaned_data.get('password', '')
-        if validate_password(password1, user=self.customer, password_validators=get_customer_password_validators()) is not None:
+        if validate_password(password1, user=self.customer) is not None:
             raise forms.ValidationError(_(password_validators_help_texts()), code='pw_invalid')
         return password1
 

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

@@ -6,16 +6,13 @@
 {% load eventsignal %}
 {% load rich_text %}
 {% for tup in items_by_category %}
-    {% if tup.0 %}
-        <section aria-labelledby="category-{{ tup.0.id }}"{% if tup.0.description %} aria-describedby="category-info-{{ tup.0.id }}"{% endif %}>
+    <section {% if tup.0 %}aria-labelledby="category-{{ tup.0.id }}"{% else %}aria-label="{% trans "Uncategorized items" %}"{% endif %}{% if tup.0.description %} aria-describedby="category-info-{{ tup.0.id }}"{% endif %}>
+        {% if tup.0 %}
             <h3 id="category-{{ tup.0.id }}">{{ tup.0.name }}</h3>
             {% if tup.0.description %}
                 <div id="category-info-{{ tup.0.id }}">{{ tup.0.description|localize|rich_text }}</div>
             {% endif %}
-    {% else %}
-        <section aria-labelledby="category-none">
-            <h3 id="category-none" class="sr-only">{% trans "Uncategorized items" %}</h3>
-    {% endif %}
+        {% endif %}
         {% for item in tup.1 %}
             {% if item.has_variations %}
                 <article aria-labelledby="item-{{ item.pk }}-legend"{% if item.description %} aria-describedby="item-{{ item.pk }}-description"{% endif %} class="item-with-variations{% if event.settings.show_variations_expanded %} details-open{% endif %}" id="item-{{ item.pk }}">

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

@@ -31,7 +31,7 @@
                                 <span class="label label-success">{% trans "Book now" %}</span>
                             {% endif %}
                         {% endif %}
-                    {% elif subev.waiting_list_active and subev.best_availability_state >= 0 %}
+                    {% elif event.waiting_list_active and subev.best_availability_state >= 0 %}
                         <span class="label label-warning">{% trans "Waiting list" %}</span>
                     {% elif subev.best_availability_state == 20 %}
                         <span class="label label-danger">{% trans "Reserved" %}</span>

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

@@ -185,7 +185,7 @@
 
                 {% if waitinglist_seated %}
                     <aside class="front-page" aria-labelledby="waiting-list">
-                        <h3 id="waiting-list" class="sr-only">{% trans "Waiting list" %}</h3>
+                        <h3 id="waiting-list">{% trans "Waiting list" %}</h3>
                         <div class="row">
                             <div class="col-md-8 col-sm-6 col-xs-12">
                                 <p>

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

@@ -1,7 +1,6 @@
 {% extends "pretixpresale/event/base.html" %}
 {% load i18n %}
 {% load eventurl %}
-{% load rich_text %}
 {% load money %}
 {% block title %}{% trans "Change payment method" %}{% endblock %}
 {% block custom_header %}
@@ -24,9 +23,6 @@
     {% endif %}
     <form method="post">
         {% csrf_token %}
-        {% if event.settings.payment_explanation %}
-            {{ event.settings.payment_explanation|rich_text }}
-        {% endif %}
         <div class="panel-group" id="payment_accordion">
             {% for p in providers %}
                 <div class="panel panel-default" data-total="{{ p.total|money_numberfield:request.event.currency }}">