Introduce a hidden setting to toggle between "common" and "official" country names

.readthedocs.requirements.txt

@@ -0,0 +1 @@
+-r doc/requirements.txt

.readthedocs.yaml

@@ -1,15 +0,0 @@
-version: 2
-sphinx:
-   configuration: doc/conf.py
-build:
-  os: ubuntu-22.04
-  tools:
-    python: "3.8"
-    nodejs: "16"
-  apt_packages:
-    - gettext
-python:
-  install:
-    - method: pip
-      path: ./src/
-    - requirements: doc/requirements.rtd.txt

doc/admin/config.rst

@@ -117,9 +117,6 @@ Example::
 ``loglevel``
     Set console and file log level (``DEBUG``, ``INFO``, ``WARNING``, ``ERROR`` or ``CRITICAL``). Defaults to ``INFO``.
 
-``request_id_header``
-    Specifies the name of a header that should be used for logging request IDs. Off by default.
-
 Locale settings
 ---------------
 

doc/api/resources/carts.rst

@@ -17,8 +17,8 @@ The cart position resource contains the following public fields:
 Field                                 Type                       Description
 ===================================== ========================== =======================================================
 id                                    integer                    Internal ID of the cart position
-cart_id                               string                     Identifier of the cart this belongs to, needs to end
-                                                                 in "@api" for API-created positions
+cart_id                               string                     Identifier of the cart this belongs to. Needs to end
+                                                                 in "@api" for API-created positions.
 datetime                              datetime                   Time of creation
 expires                               datetime                   The cart position will expire at this time and no longer block quota
 item                                  integer                    ID of the item
@@ -29,15 +29,14 @@ attendee_name_parts                   object of strings          Composition of
 attendee_email                        string                     Specified attendee email address for this position (or ``null``)
 voucher                               integer                    Internal ID of the voucher used for this position (or ``null``)
 addon_to                              integer                    Internal ID of the position this position is an add-on for (or ``null``)
-is_bundled                            boolean                    If ``addon_to`` is set, this shows whether this is a bundled product or an addon product
-subevent                              integer                    ID of the date inside an event series this position belongs to (or ``null``)
+subevent                              integer                    ID of the date inside an event series this position belongs to (or ``null``).
 answers                               list of objects            Answers to user-defined questions
 ├ question                            integer                    Internal ID of the answered question
 ├ answer                              string                     Text representation of the answer
 ├ question_identifier                 string                     The question's ``identifier`` field
 ├ options                             list of integers           Internal IDs of selected option(s)s (only for choice types)
 └ option_identifiers                  list of strings            The ``identifier`` fields of the selected option(s)s
-seat                                  objects                    The assigned seat (or ``null``)
+seat                                  objects                    The assigned seat. Can be ``null``.
 ├ id                                  integer                    Internal ID of the seat instance
 ├ name                                string                     Human-readable seat name
 └ seat_guid                           string                     Identifier of the seat within the seating plan
@@ -47,10 +46,6 @@ seat                                  objects                    The assigned se
 
    This ``seat`` attribute has been added.
 
-.. versionchanged:: 4.14
-
-   This ``is_bundled`` attribute has been added and the cart creation endpoints have been updated.
-
 
 Cart position endpoints
 -----------------------
@@ -92,7 +87,6 @@ Cart position endpoints
             "attendee_email": null,
             "voucher": null,
             "addon_to": null,
-            "is_bundled": false,
             "subevent": null,
             "datetime": "2018-06-11T10:00:00Z",
             "expires": "2018-06-11T10:00:00Z",
@@ -139,7 +133,6 @@ Cart position endpoints
         "attendee_email": null,
         "voucher": null,
         "addon_to": null,
-        "is_bundled": false,
         "subevent": null,
         "datetime": "2018-06-11T10:00:00Z",
         "expires": "2018-06-11T10:00:00Z",
@@ -175,7 +168,7 @@ Cart position endpoints
 
        * does not validate if the event's ticket sales are already over or haven't started
 
-       * does not validate constraints on add-on products at the moment
+       * does not support add-on products at the moment
 
        * does not check or calculate prices but believes any prices you send
 
@@ -183,8 +176,6 @@ Cart position endpoints
 
        * does not support file upload questions
 
-       Note that more validation might be added in the future, so please do not rely on missing validation.
-
    You can supply the following fields of the resource:
 
    * ``cart_id`` (optional, needs to end in ``@api``)
@@ -199,8 +190,6 @@ Cart position endpoints
    * ``includes_tax`` (optional, **deprecated**, do not use, will be removed)
    * ``sales_channel`` (optional)
    * ``voucher`` (optional, expect a voucher code)
-   * ``addons`` (optional, expect a list of nested objects of cart positions)
-   * ``bundled`` (optional, expect a list of nested objects of cart positions)
    * ``answers``
 
       * ``question``
@@ -232,12 +221,6 @@ Cart position endpoints
             "options": []
           }
         ],
-        "addons": [
-          {
-            "item": 2,
-            "variation": null,
-          }
-        ],
         "subevent": null
       }
 
@@ -249,7 +232,7 @@ Cart position endpoints
       Vary: Accept
       Content-Type: application/json
 
-      (Full cart position resource, see above, with additional nested objects "addons" and "bundled".)
+      (Full cart position resource, see above.)
 
    :param organizer: The ``slug`` field of the organizer of the event to create a position for
    :param event: The ``slug`` field of the event to create a position for
@@ -261,8 +244,8 @@ Cart position endpoints
 
 .. http:post:: /api/v1/organizers/(organizer)/events/(event)/cartpositions/bulk_create/
 
-   Creates multiple new cart position. **This operation is deliberately not atomic, so each cart position can succeed
-   or fail individually, so the response code of the response is not the only thing to look at!**
+   Creates multiple new cart position. This operation is deliberately not atomic, so each cart position can succeed
+   or fail individually, so the response code of the response is not the only thing to look at!
 
    .. warning:: This endpoint is considered **experimental**. It might change at any time without prior notice.
 

doc/api/resources/orders.rst

@@ -1925,7 +1925,7 @@ otherwise, such as splitting an order or changing fees.
 
    .. sourcecode:: http
 
-      POST /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/change/ HTTP/1.1
+      POST /api/v1/organizers/bigevents/events/sampleconf/orders/ABC12/ HTTP/1.1
       Host: pretix.eu
       Accept: application/json, text/javascript
       Content-Type: application/json

doc/api/resources/vouchers.rst

@@ -19,8 +19,6 @@ max_usages                            integer                    The maximum num
                                                                  redeemed (default: 1).
 redeemed                              integer                    The number of times this voucher already has been
                                                                  redeemed.
-min_usages                            integer                    The minimum number of times this voucher must be
-                                                                 redeemed on first usage (default: 1).
 valid_until                           datetime                   The voucher expiration date (or ``null``).
 block_quota                           boolean                    If ``true``, quota is blocked for this voucher.
 allow_ignore_quota                    boolean                    If ``true``, this voucher can be redeemed even if a

doc/development/api/exporter.rst

@@ -60,13 +60,7 @@ The exporter class
    .. py:attribute:: BaseExporter.event
 
       The default constructor sets this property to the event we are currently
-      working for. This will be ``None`` if the exporter is run for multiple
-      events.
-
-   .. py:attribute:: BaseExporter.events
-
-      The default constructor sets this property to the list of events to work
-      on, regardless of whether the exporter is called for one or multiple events.
+      working for.
 
    .. autoattribute:: identifier
 

doc/plugins/digital.rst

@@ -93,7 +93,6 @@ id                                    integer                    Internal conten
 title                                 multi-lingual string       The content title (required)
 content_type                          string                     The type of content, valid values are ``webinar``, ``video``, ``livestream``, ``link``, ``file``
 url                                   string                     The location of the digital content
-file                                  file                       A downloadable file. Either ``url`` or ``file`` must be ``null``.
 description                           multi-lingual string       A public description of the item. May contain Markdown
                                                                  syntax and is not required.
 available_from                        datetime                   The first date time at which this content will be shown
@@ -145,7 +144,6 @@ API Endpoints
             },
             "content_type": "link",
             "url": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
-            "file": null,
             "description": {
                 "en": "Watch our event live here on YouTube!"
             },
@@ -193,7 +191,6 @@ API Endpoints
         },
         "content_type": "link",
         "url": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
-        "file": null,
         "description": {
             "en": "Watch our event live here on YouTube!"
         },
@@ -232,7 +229,6 @@ API Endpoints
         },
         "content_type": "link",
         "url": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
-        "file": null,
         "description": {
             "en": "Watch our event live here on YouTube!"
         },
@@ -259,7 +255,6 @@ API Endpoints
         },
         "content_type": "link",
         "url": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
-        "file": null,
         "description": {
             "en": "Watch our event live here on YouTube!"
         },
@@ -314,7 +309,6 @@ API Endpoints
         },
         "content_type": "link",
         "url": "https://mywebsite.com",
-        "file": null,
         "description": {
             "en": "Watch our event live here on YouTube!"
         },

doc/requirements.rtd.txt

@@ -1,10 +0,0 @@
-sphinx==2.3.*
-jinja2==3.0.*
-sphinx-rtd-theme
-sphinxcontrib-httpdomain
-sphinxcontrib-images
-sphinxcontrib-spelling==4.*
-sphinxemoji
-pygments-markdown-lexer
-# See https://github.com/rfk/pyenchant/pull/130
-git+https://github.com/raphaelm/pyenchant.git@patch-1#egg=pyenchant

readthedocs.yml

@@ -0,0 +1,6 @@
+
+build:
+  image: latest
+
+python:
+  version: 3.6

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__ = "4.14.0"
+__version__ = "4.13.0.dev0"

src/pretix/api/auth/devicesecurity.py

@@ -46,7 +46,6 @@ class PretixScanSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:version'),
         ('GET', 'api-v1:device.eventselection'),
         ('GET', 'api-v1:idempotency.query'),
-        ('GET', 'api-v1:device.info'),
         ('POST', 'api-v1:device.update'),
         ('POST', 'api-v1:device.revoke'),
         ('POST', 'api-v1:device.roll'),
@@ -81,7 +80,6 @@ class PretixScanNoSyncNoSearchSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:version'),
         ('GET', 'api-v1:device.eventselection'),
         ('GET', 'api-v1:idempotency.query'),
-        ('GET', 'api-v1:device.info'),
         ('POST', 'api-v1:device.update'),
         ('POST', 'api-v1:device.revoke'),
         ('POST', 'api-v1:device.roll'),
@@ -114,7 +112,6 @@ class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:version'),
         ('GET', 'api-v1:device.eventselection'),
         ('GET', 'api-v1:idempotency.query'),
-        ('GET', 'api-v1:device.info'),
         ('POST', 'api-v1:device.update'),
         ('POST', 'api-v1:device.revoke'),
         ('POST', 'api-v1:device.roll'),
@@ -148,7 +145,6 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:version'),
         ('GET', 'api-v1:device.eventselection'),
         ('GET', 'api-v1:idempotency.query'),
-        ('GET', 'api-v1:device.info'),
         ('POST', 'api-v1:device.update'),
         ('POST', 'api-v1:device.revoke'),
         ('POST', 'api-v1:device.roll'),
@@ -196,7 +192,6 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
         ('POST', 'plugins:pretix_posbackend:posdebuglogentry-bulk-create'),
         ('GET', 'plugins:pretix_posbackend:poscashier-list'),
         ('POST', 'plugins:pretix_posbackend:stripeterminal.token'),
-        ('POST', 'plugins:pretix_posbackend:stripeterminal.paymentintent'),
         ('PUT', 'plugins:pretix_posbackend:file.upload'),
         ('GET', 'api-v1:revokedsecrets-list'),
         ('GET', 'api-v1:event.settings'),

src/pretix/api/exception.py

@@ -19,17 +19,11 @@
 # 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 logging
-
-import ujson
-from rest_framework import exceptions
 from rest_framework.response import Response
 from rest_framework.views import exception_handler, status
 
 from pretix.base.services.locking import LockTimeoutException
 
-logger = logging.getLogger(__name__)
-
 
 def custom_exception_handler(exc, context):
     response = exception_handler(exc, context)
@@ -43,7 +37,4 @@ def custom_exception_handler(exc, context):
             }
         )
 
-    if isinstance(exc, exceptions.APIException):
-        logger.info(f'API Exception [{exc.status_code}]: {ujson.dumps(exc.detail)}')
-
     return response

src/pretix/api/serializers/cart.py

@@ -23,7 +23,8 @@ import os
 from datetime import timedelta
 
 from django.core.files import File
-from django.db.models import prefetch_related_objects
+from django.db.models import Q
+from django.utils.crypto import get_random_string
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy
 from rest_framework import serializers
@@ -33,7 +34,7 @@ from pretix.api.serializers.i18n import I18nAwareModelSerializer
 from pretix.api.serializers.order import (
     AnswerCreateSerializer, AnswerSerializer, InlineSeatSerializer,
 )
-from pretix.base.models import Seat, Voucher
+from pretix.base.models import Quota, Seat, Voucher
 from pretix.base.models.orders import CartPosition
 
 
@@ -51,18 +52,148 @@ class CartPositionSerializer(I18nAwareModelSerializer):
         model = CartPosition
         fields = ('id', 'cart_id', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts',
                   'attendee_email', 'voucher', 'addon_to', 'subevent', 'datetime', 'expires', 'includes_tax',
-                  'answers', 'seat', 'is_bundled')
+                  'answers', 'seat')
 
 
-class BaseCartPositionCreateSerializer(I18nAwareModelSerializer):
+class CartPositionCreateSerializer(I18nAwareModelSerializer):
     answers = AnswerCreateSerializer(many=True, required=False)
+    expires = serializers.DateTimeField(required=False)
     attendee_name = serializers.CharField(required=False, allow_null=True)
+    seat = serializers.CharField(required=False, allow_null=True)
+    sales_channel = serializers.CharField(required=False, default='sales_channel')
     includes_tax = serializers.BooleanField(required=False, allow_null=True)
+    voucher = serializers.CharField(required=False, allow_null=True)
 
     class Meta:
         model = CartPosition
-        fields = ('item', 'variation', 'price', 'attendee_name', 'attendee_name_parts', 'attendee_email',
-                  'subevent', 'includes_tax', 'answers')
+        fields = ('cart_id', 'item', 'variation', 'price', 'attendee_name', 'attendee_name_parts', 'attendee_email',
+                  'subevent', 'expires', 'includes_tax', 'answers', 'seat', 'sales_channel', 'voucher')
+
+    def create(self, validated_data):
+        answers_data = validated_data.pop('answers')
+        if not validated_data.get('cart_id'):
+            cid = "{}@api".format(get_random_string(48))
+            while CartPosition.objects.filter(cart_id=cid).exists():
+                cid = "{}@api".format(get_random_string(48))
+            validated_data['cart_id'] = cid
+
+        if not validated_data.get('expires'):
+            validated_data['expires'] = now() + timedelta(
+                minutes=self.context['event'].settings.get('reservation_time', as_type=int)
+            )
+
+        new_quotas = (validated_data.get('variation').quotas.filter(subevent=validated_data.get('subevent'))
+                      if validated_data.get('variation')
+                      else validated_data.get('item').quotas.filter(subevent=validated_data.get('subevent')))
+        if len(new_quotas) == 0:
+            raise ValidationError(
+                gettext_lazy('The product "{}" is not assigned to a quota.').format(
+                    str(validated_data.get('item'))
+                )
+            )
+        for quota in new_quotas:
+            avail = quota.availability(_cache=self.context['quota_cache'])
+            if avail[0] != Quota.AVAILABILITY_OK or (avail[1] is not None and avail[1] < 1):
+                raise ValidationError(
+                    gettext_lazy('There is not enough quota available on quota "{}" to perform '
+                                 'the operation.').format(
+                        quota.name
+                    )
+                )
+
+        for quota in new_quotas:
+            oldsize = self.context['quota_cache'][quota.pk][1]
+            newsize = oldsize - 1 if oldsize is not None else None
+            self.context['quota_cache'][quota.pk] = (
+                Quota.AVAILABILITY_OK if newsize is None or newsize > 0 else Quota.AVAILABILITY_GONE,
+                newsize
+            )
+
+        attendee_name = validated_data.pop('attendee_name', '')
+        if attendee_name and not validated_data.get('attendee_name_parts'):
+            validated_data['attendee_name_parts'] = {
+                '_legacy': attendee_name
+            }
+
+        seated = validated_data.get('item').seat_category_mappings.filter(subevent=validated_data.get('subevent')).exists()
+        if validated_data.get('seat'):
+            if not seated:
+                raise ValidationError('The specified product does not allow to choose a seat.')
+            try:
+                seat = self.context['event'].seats.get(seat_guid=validated_data['seat'], subevent=validated_data.get('subevent'))
+            except Seat.DoesNotExist:
+                raise ValidationError('The specified seat does not exist.')
+            except Seat.MultipleObjectsReturned:
+                raise ValidationError('The specified seat ID is not unique.')
+            else:
+                validated_data['seat'] = seat
+        elif seated:
+            raise ValidationError('The specified product requires to choose a seat.')
+
+        if validated_data.get('voucher'):
+            try:
+                voucher = self.context['event'].vouchers.get(code__iexact=validated_data.get('voucher'))
+            except Voucher.DoesNotExist:
+                raise ValidationError('The specified voucher does not exist.')
+
+            if voucher and not voucher.applies_to(validated_data.get('item'), validated_data.get('variation')):
+                raise ValidationError('The specified voucher is not valid for the given item and variation.')
+
+            if voucher and voucher.seat and voucher.seat != validated_data.get('seat'):
+                raise ValidationError('The specified voucher is not valid for this seat.')
+
+            if voucher and voucher.subevent_id and (not validated_data.get('subevent') or voucher.subevent_id != validated_data['subevent'].pk):
+                raise ValidationError('The specified voucher is not valid for this subevent.')
+
+            if voucher.valid_until is not None and voucher.valid_until < now():
+                raise ValidationError('The specified voucher is expired.')
+
+            redeemed_in_carts = CartPosition.objects.filter(
+                Q(voucher=voucher) & Q(event=self.context['event']) & Q(expires__gte=now())
+            )
+            cart_count = redeemed_in_carts.count()
+            v_avail = voucher.max_usages - voucher.redeemed - cart_count
+            if v_avail < 1:
+                raise ValidationError('The specified voucher has already been used the maximum number of times.')
+
+            validated_data['voucher'] = voucher
+
+        if validated_data.get('seat'):
+            if not validated_data['seat'].is_available(
+                sales_channel=validated_data.get('sales_channel', 'web'),
+                distance_ignore_cart_id=validated_data['cart_id'],
+                ignore_voucher_id=validated_data['voucher'].pk if validated_data.get('voucher') else None,
+            ):
+                raise ValidationError(
+                    gettext_lazy('The selected seat "{seat}" is not available.').format(seat=validated_data['seat'].name))
+
+        validated_data.pop('sales_channel')
+        # todo: does this make sense?
+        validated_data['custom_price_input'] = validated_data['price']
+        # todo: listed price, etc?
+        # currently does not matter because there is no way to transform an API cart position into an order that keeps
+        # prices, cart positions are just quota/voucher placeholders
+        validated_data['custom_price_input_is_net'] = not validated_data.pop('includes_tax', True)
+        cp = CartPosition.objects.create(event=self.context['event'], **validated_data)
+
+        for answ_data in answers_data:
+            options = answ_data.pop('options')
+            if isinstance(answ_data['answer'], File):
+                an = answ_data.pop('answer')
+                answ = cp.answers.create(**answ_data, answer='')
+                answ.file.save(os.path.basename(an.name), an, save=False)
+                answ.answer = 'file://' + answ.file.name
+                answ.save()
+                an.close()
+            else:
+                answ = cp.answers.create(**answ_data)
+                answ.options.add(*options)
+        return cp
+
+    def validate_cart_id(self, cid):
+        if cid and not cid.endswith('@api'):
+            raise ValidationError('Cart ID should end in @api or be empty.')
+        return cid
 
     def validate_item(self, item):
         if item.event != self.context['event']:
@@ -109,178 +240,4 @@ class BaseCartPositionCreateSerializer(I18nAwareModelSerializer):
             raise ValidationError(
                 {'attendee_name': ['Do not specify attendee_name if you specified attendee_name_parts.']}
             )
-
-        if not data.get('expires'):
-            data['expires'] = now() + timedelta(
-                minutes=self.context['event'].settings.get('reservation_time', as_type=int)
-            )
-
-        quotas_for_item_cache = self.context.get('quotas_for_item_cache', {})
-        quotas_for_variation_cache = self.context.get('quotas_for_variation_cache', {})
-
-        seated = data.get('item').seat_category_mappings.filter(subevent=data.get('subevent')).exists()
-        if data.get('seat'):
-            if not seated:
-                raise ValidationError({'seat': ['The specified product does not allow to choose a seat.']})
-            try:
-                seat = self.context['event'].seats.get(seat_guid=data['seat'], subevent=data.get('subevent'))
-            except Seat.DoesNotExist:
-                raise ValidationError({'seat': ['The specified seat does not exist.']})
-            except Seat.MultipleObjectsReturned:
-                raise ValidationError({'seat': ['The specified seat ID is not unique.']})
-            else:
-                data['seat'] = seat
-        elif seated:
-            raise ValidationError({'seat': ['The specified product requires to choose a seat.']})
-
-        if data.get('voucher'):
-            try:
-                voucher = self.context['event'].vouchers.get(code__iexact=data['voucher'])
-            except Voucher.DoesNotExist:
-                raise ValidationError({'voucher': ['The specified voucher does not exist.']})
-
-            if voucher and not voucher.applies_to(data['item'], data.get('variation')):
-                raise ValidationError({'voucher': ['The specified voucher is not valid for the given item and variation.']})
-
-            if voucher and voucher.seat and voucher.seat != data.get('seat'):
-                raise ValidationError({'voucher': ['The specified voucher is not valid for this seat.']})
-
-            if voucher and voucher.subevent_id and (not data.get('subevent') or voucher.subevent_id != data['subevent'].pk):
-                raise ValidationError({'voucher': ['The specified voucher is not valid for this subevent.']})
-
-            if voucher.valid_until is not None and voucher.valid_until < now():
-                raise ValidationError({'voucher': ['The specified voucher is expired.']})
-
-            data['voucher'] = voucher
-
-        if not data.get('voucher') or (not data['voucher'].allow_ignore_quota and not data['voucher'].block_quota):
-            if data.get('variation'):
-                if data['variation'].pk not in quotas_for_variation_cache:
-                    quotas_for_variation_cache[data['variation'].pk] = data['variation'].quotas.filter(subevent=data.get('subevent'))
-                data['_quotas'] = quotas_for_variation_cache[data['variation'].pk]
-            else:
-                if data['item'].pk not in quotas_for_item_cache:
-                    quotas_for_item_cache[data['item'].pk] = data['item'].quotas.filter(subevent=data.get('subevent'))
-                data['_quotas'] = quotas_for_item_cache[data['item'].pk]
-
-            if len(data['_quotas']) == 0:
-                raise ValidationError(
-                    gettext_lazy('The product "{}" is not assigned to a quota.').format(
-                        str(data.get('item'))
-                    )
-                )
-        else:
-            data['_quotas'] = []
-
-        return data
-
-    def create(self, validated_data):
-        validated_data.pop('_quotas')
-        answers_data = validated_data.pop('answers')
-
-        attendee_name = validated_data.pop('attendee_name', '')
-        if attendee_name and not validated_data.get('attendee_name_parts'):
-            validated_data['attendee_name_parts'] = {
-                '_legacy': attendee_name
-            }
-
-        # todo: does this make sense?
-        validated_data['custom_price_input'] = validated_data['price']
-        # todo: listed price, etc?
-        # currently does not matter because there is no way to transform an API cart position into an order that keeps
-        # prices, cart positions are just quota/voucher placeholders
-        validated_data['custom_price_input_is_net'] = not validated_data.pop('includes_tax', True)
-        cp = CartPosition.objects.create(event=self.context['event'], **validated_data)
-
-        for answ_data in answers_data:
-            options = answ_data.pop('options')
-            if isinstance(answ_data['answer'], File):
-                an = answ_data.pop('answer')
-                answ = cp.answers.create(**answ_data, answer='')
-                answ.file.save(os.path.basename(an.name), an, save=False)
-                answ.answer = 'file://' + answ.file.name
-                answ.save()
-                an.close()
-            else:
-                answ = cp.answers.create(**answ_data)
-                answ.options.add(*options)
-        return cp
-
-
-class CartPositionCreateSerializer(BaseCartPositionCreateSerializer):
-    expires = serializers.DateTimeField(required=False)
-    addons = BaseCartPositionCreateSerializer(many=True, required=False)
-    bundled = BaseCartPositionCreateSerializer(many=True, required=False)
-    seat = serializers.CharField(required=False, allow_null=True)
-    sales_channel = serializers.CharField(required=False, default='sales_channel')
-    voucher = serializers.CharField(required=False, allow_null=True)
-
-    class Meta:
-        model = CartPosition
-        fields = BaseCartPositionCreateSerializer.Meta.fields + (
-            'cart_id', 'expires', 'addons', 'bundled', 'seat', 'sales_channel', 'voucher'
-        )
-
-    def validate_cart_id(self, cid):
-        if cid and not cid.endswith('@api'):
-            raise ValidationError('Cart ID should end in @api or be empty.')
-        return cid
-
-    def create(self, validated_data):
-        validated_data.pop('sales_channel')
-        addons_data = validated_data.pop('addons', None)
-        bundled_data = validated_data.pop('bundled', None)
-
-        cp = super().create(validated_data)
-
-        if addons_data:
-            for addon_data in addons_data:
-                addon_data['addon_to'] = cp
-                addon_data['is_bundled'] = False
-                super().create(addon_data)
-
-        if bundled_data:
-            for bundle_data in bundled_data:
-                bundle_data['addon_to'] = cp
-                bundle_data['is_bundled'] = True
-                super().create(bundle_data)
-
-        return cp
-
-    def validate(self, data):
-        data = super().validate(data)
-
-        # This is currently only a very basic validation of add-ons and bundled products, we don't validate their number
-        # or price. We can always go stricter, as the endpoint is documented as experimental.
-        # However, this serializer should always be *at least* as strict as the order creation serializer.
-
-        if data.get('item') and data.get('addons'):
-            prefetch_related_objects([data['item']], 'addons')
-            for sub_data in data['addons']:
-                if not any(a.addon_category_id == sub_data['item'].category_id for a in data['item'].addons.all()):
-                    raise ValidationError({
-                        'addons': [
-                            'The product "{prod}" can not be used as an add-on product for "{main}".'.format(
-                                prod=str(sub_data['item']),
-                                main=str(data['item']),
-                            )
-                        ]
-                    })
-
-        if data.get('item') and data.get('bundled'):
-            prefetch_related_objects([data['item']], 'bundles')
-            for sub_data in data['bundled']:
-                if not any(
-                    a.bundled_item_id == sub_data['item'].pk and
-                    a.bundled_variation_id == (sub_data['variation'].pk if sub_data.get('variation') else None)
-                    for a in data['item'].bundles.all()
-                ):
-                    raise ValidationError({
-                        'bundled': [
-                            'The product "{prod}" can not be used as an bundled product for "{main}".'.format(
-                                prod=str(sub_data['item']),
-                                main=str(data['item']),
-                            )
-                        ]
-                    })
         return data

src/pretix/api/serializers/event.py

@@ -411,7 +411,7 @@ class CloneEventSerializer(EventSerializer):
         has_subevents = validated_data.pop('has_subevents', None)
         tz = validated_data.pop('timezone', None)
         sales_channels = validated_data.pop('sales_channels', None)
-        new_event = super().create({**validated_data, 'plugins': None})
+        new_event = super().create(validated_data)
 
         event = Event.objects.filter(slug=self.context['event'], organizer=self.context['organizer'].pk).first()
         new_event.copy_data_from(event)

src/pretix/api/serializers/exporters.py

@@ -23,8 +23,6 @@ from django import forms
 from django.http import QueryDict
 from rest_framework import serializers
 
-from pretix.base.exporter import OrganizerLevelExportMixin
-
 
 class FormFieldWrapperField(serializers.Field):
     def __init__(self, *args, **kwargs):
@@ -51,6 +49,7 @@ simple_mappings = (
     (forms.EmailField, serializers.EmailField, ()),
     (forms.UUIDField, serializers.UUIDField, ()),
     (forms.URLField, serializers.URLField, ()),
+    (forms.NullBooleanField, serializers.NullBooleanField, ()),
     (forms.BooleanField, serializers.BooleanField, ()),
 )
 
@@ -88,7 +87,7 @@ class JobRunSerializer(serializers.Serializer):
         ex = kwargs.pop('exporter')
         events = kwargs.pop('events', None)
         super().__init__(*args, **kwargs)
-        if events is not None and not isinstance(ex, OrganizerLevelExportMixin):
+        if events is not None:
             self.fields["events"] = serializers.SlugRelatedField(
                 queryset=events,
                 required=True,
@@ -107,12 +106,6 @@ class JobRunSerializer(serializers.Serializer):
                     )
                     break
 
-            if isinstance(v, forms.NullBooleanField):
-                self.fields[k] = serializers.BooleanField(
-                    required=v.required,
-                    allow_null=True,
-                    validators=v.validators,
-                )
             if isinstance(v, forms.ModelMultipleChoiceField):
                 self.fields[k] = PrimaryKeyRelatedField(
                     queryset=v.queryset,

src/pretix/api/serializers/item.py

@@ -184,8 +184,6 @@ class ItemSerializer(I18nAwareModelSerializer):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields['default_price'].allow_null = False
-        self.fields['default_price'].required = True
         if not self.read_only:
             self.fields['require_membership_types'].queryset = self.context['event'].organizer.membership_types.all()
             self.fields['grant_membership_type'].queryset = self.context['event'].organizer.membership_types.all()

src/pretix/api/serializers/order.py

@@ -1086,10 +1086,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
 
                 seated = pos_data.get('item').seat_category_mappings.filter(subevent=pos_data.get('subevent')).exists()
                 if pos_data.get('seat'):
-                    if pos_data.get('addon_to'):
-                        errs[i]['seat'] = ['Seats are currently not supported for add-on products.']
-                        continue
-
                     if not seated:
                         errs[i]['seat'] = ['The specified product does not allow to choose a seat.']
                     try:
@@ -1285,9 +1281,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
 
             if not simulate:
                 for cp in delete_cps:
-                    if cp.addon_to_id:
-                        continue
-                    cp.addons.all().delete()
                     cp.delete()
 
         order.total = sum([p.price for p in pos_map.values()])

src/pretix/api/serializers/voucher.py

@@ -61,7 +61,7 @@ class VoucherSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = Voucher
-        fields = ('id', 'code', 'max_usages', 'redeemed', 'min_usages', 'valid_until', 'block_quota',
+        fields = ('id', 'code', 'max_usages', 'redeemed', 'valid_until', 'block_quota',
                   'allow_ignore_quota', 'price_mode', 'value', 'item', 'variation', 'quota',
                   'tag', 'comment', 'subevent', 'show_hidden_items', 'seat')
         read_only_fields = ('id', 'redeemed')

src/pretix/api/views/cart.py

@@ -19,28 +19,19 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from collections import Counter
-from typing import List
-
 from django.db import transaction
-from django.utils.crypto import get_random_string
-from django.utils.functional import cached_property
-from django.utils.translation import gettext as _
 from rest_framework import status, viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import ValidationError
 from rest_framework.filters import OrderingFilter
 from rest_framework.mixins import CreateModelMixin, DestroyModelMixin
 from rest_framework.response import Response
-from rest_framework.serializers import as_serializer_error
+from rest_framework.settings import api_settings
 
 from pretix.api.serializers.cart import (
     CartPositionCreateSerializer, CartPositionSerializer,
 )
 from pretix.base.models import CartPosition
-from pretix.base.services.cart import (
-    _get_quota_availability, _get_voucher_availability, error_messages,
-)
 from pretix.base.services.locking import NoLockManager
 
 
@@ -63,17 +54,18 @@ class CartPositionViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnly
     def get_serializer_context(self):
         ctx = super().get_serializer_context()
         ctx['event'] = self.request.event
-        ctx['quotas_for_item_cache'] = {}
-        ctx['quotas_for_variation_cache'] = {}
+        ctx['quota_cache'] = {}
         return ctx
 
     def create(self, request, *args, **kwargs):
-        ctx = self.get_serializer_context()
-        serializer = CartPositionCreateSerializer(data=request.data, context=ctx)
+        serializer = CartPositionCreateSerializer(data=request.data, context=self.get_serializer_context())
         serializer.is_valid(raise_exception=True)
-        results = self._create(serializers=[serializer], raise_exception=True, ctx=ctx)
+        with transaction.atomic(), self.request.event.lock():
+            self.perform_create(serializer)
+        cp = serializer.instance
+        serializer = CartPositionSerializer(cp, context=serializer.context)
         headers = self.get_success_headers(serializer.data)
-        return Response(results[0]['data'], status=status.HTTP_201_CREATED, headers=headers)
+        return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
 
     @action(detail=False, methods=['POST'])
     def bulk_create(self, request, *args, **kwargs):
@@ -81,163 +73,42 @@ class CartPositionViewSet(CreateModelMixin, DestroyModelMixin, viewsets.ReadOnly
             return Response({"error": "Please supply a list"}, status=status.HTTP_400_BAD_REQUEST)
 
         ctx = self.get_serializer_context()
-        serializers = [
-            CartPositionCreateSerializer(data=d, context=ctx)
-            for d in request.data
-        ]
+        with transaction.atomic():
+            serializers = [
+                CartPositionCreateSerializer(data=d, context=ctx)
+                for d in request.data
+            ]
+
+            lockfn = self.request.event.lock
+            if not any(s.is_valid(raise_exception=False) for s in serializers):
+                lockfn = NoLockManager
+
+            results = []
+            with lockfn():
+                for s in serializers:
+                    if s.is_valid(raise_exception=False):
+                        try:
+                            cp = s.save()
+                        except ValidationError as e:
+                            results.append({
+                                'success': False,
+                                'data': None,
+                                'errors': {api_settings.NON_FIELD_ERRORS_KEY: e.detail},
+                            })
+                        else:
+                            results.append({
+                                'success': True,
+                                'data': CartPositionSerializer(cp, context=ctx).data,
+                                'errors': None,
+                            })
+                    else:
+                        results.append({
+                            'success': False,
+                            'data': None,
+                            'errors': s.errors,
+                        })
 
-        results = self._create(serializers=serializers, raise_exception=False, ctx=ctx)
         return Response({'results': results}, status=status.HTTP_200_OK)
 
     def perform_create(self, serializer):
-        raise NotImplementedError()
-
-    @transaction.atomic()
-    def perform_destroy(self, instance):
-        instance.addons.all().delete()
-        instance.delete()
-
-    def _require_locking(self, quota_diff, voucher_use_diff, seat_diff):
-        if voucher_use_diff or seat_diff:
-            # If any vouchers or seats are used, we lock to make sure we don't redeem them to often
-            return True
-
-        if quota_diff and any(q.size is not None for q in quota_diff):
-            # If any quotas are affected that are not unlimited, we lock
-            return True
-
-        return False
-
-    @cached_property
-    def _create_default_cart_id(self):
-        cid = "{}@api".format(get_random_string(48))
-        while CartPosition.objects.filter(cart_id=cid).exists():
-            cid = "{}@api".format(get_random_string(48))
-        return cid
-
-    def _create(self, serializers: List[CartPositionCreateSerializer], ctx, raise_exception=False):
-        voucher_use_diff = Counter()
-        quota_diff = Counter()
-        seat_diff = Counter()
-        results = [{} for pserializer in serializers]
-
-        for i, pserializer in enumerate(serializers):
-            if not pserializer.is_valid(raise_exception=raise_exception):
-                results[i] = {
-                    'success': False,
-                    'data': None,
-                    'errors': pserializer.errors,
-                }
-
-        for pserializer in serializers:
-            if pserializer.errors:
-                continue
-
-            validated_data = pserializer.validated_data
-            if not validated_data.get('cart_id'):
-                validated_data['cart_id'] = self._create_default_cart_id
-
-            if validated_data.get('voucher'):
-                voucher_use_diff[validated_data['voucher']] += 1
-
-            if validated_data.get('seat'):
-                seat_diff[validated_data['seat']] += 1
-
-            for q in validated_data['_quotas']:
-                quota_diff[q] += 1
-            for sub_data in validated_data.get('addons', []) + validated_data.get('bundled', []):
-                for q in sub_data['_quotas']:
-                    quota_diff[q] += 1
-
-        seats_seen = set()
-
-        lockfn = NoLockManager
-        if self._require_locking(quota_diff, voucher_use_diff, seat_diff):
-            lockfn = self.request.event.lock
-
-        with lockfn() as now_dt, transaction.atomic():
-            vouchers_ok, vouchers_depend_on_cart = _get_voucher_availability(
-                self.request.event,
-                voucher_use_diff,
-                now_dt,
-                exclude_position_ids=[],
-            )
-            quotas_ok = _get_quota_availability(quota_diff, now_dt)
-
-            for i, pserializer in enumerate(serializers):
-                if results[i]:
-                    continue
-
-                try:
-                    validated_data = pserializer.validated_data
-
-                    if validated_data.get('seat'):
-                        # Assumption: Add-ons currently can't have seats
-                        if validated_data['seat'] in seats_seen:
-                            raise ValidationError(error_messages['seat_multiple'])
-                        seats_seen.add(validated_data['seat'])
-
-                    quotas_needed = Counter()
-                    for q in validated_data['_quotas']:
-                        quotas_needed[q] += 1
-                    for sub_data in validated_data.get('addons', []) + validated_data.get('bundled', []):
-                        for q in sub_data['_quotas']:
-                            quotas_needed[q] += 1
-
-                    for q, needed in quotas_needed.items():
-                        if quotas_ok[q] < needed:
-                            raise ValidationError(
-                                _('There is not enough quota available on quota "{}" to perform the operation.').format(
-                                    q.name
-                                )
-                            )
-
-                    if validated_data.get('voucher'):
-                        # Assumption: Add-ons currently can't have vouchers, thus we only need to check the main voucher
-                        if vouchers_ok[validated_data['voucher']] < 1:
-                            raise ValidationError(
-                                {'voucher': [_('The specified voucher has already been used the maximum number of times.')]}
-                            )
-
-                    if validated_data.get('seat'):
-                        # Assumption: Add-ons currently can't have seats, thus we only need to check the main product
-                        if not validated_data['seat'].is_available(
-                            sales_channel=validated_data.get('sales_channel', 'web'),
-                            distance_ignore_cart_id=validated_data['cart_id'],
-                            ignore_voucher_id=validated_data['voucher'].pk if validated_data.get('voucher') else None,
-                        ):
-                            raise ValidationError(
-                                {'seat': [_('The selected seat "{seat}" is not available.').format(seat=validated_data['seat'].name)]}
-                            )
-
-                    for q, needed in quotas_needed.items():
-                        quotas_ok[q] -= needed
-                    if validated_data.get('voucher'):
-                        vouchers_ok[validated_data['voucher']] -= 1
-
-                    if any(qa < 0 for qa in quotas_ok.values()):
-                        # Safeguard, should never happen because of conditions above
-                        raise ValidationError(error_messages['unavailable'])
-
-                    cp = pserializer.create(validated_data)
-
-                    d = CartPositionSerializer(cp, context=ctx).data
-                    addons = sorted(cp.addons.all(), key=lambda a: a.pk)  # order of creation, safe since they are created in the same transaction
-                    d['addons'] = CartPositionSerializer([a for a in addons if not a.is_bundled], many=True, context=ctx).data
-                    d['bundled'] = CartPositionSerializer([a for a in addons if a.is_bundled], many=True, context=ctx).data
-
-                    results[i] = {
-                        'success': True,
-                        'data': d,
-                        'errors': None,
-                    }
-                except ValidationError as e:
-                    if raise_exception:
-                        raise
-                    results[i] = {
-                        'success': False,
-                        'data': None,
-                        'errors': as_serializer_error(e),
-                    }
-
-        return results
+        serializer.save()

src/pretix/api/views/event.py

@@ -241,17 +241,13 @@ class EventViewSet(viewsets.ModelViewSet):
             except Event.DoesNotExist:
                 raise ValidationError('Event to copy from was not found')
 
-        # Ensure that .installed() is only called when we NOT clone
-        plugins = serializer.validated_data.pop('plugins', None)
-        serializer.validated_data['plugins'] = None
-
         new_event = serializer.save(organizer=self.request.organizer)
 
         if copy_from:
             new_event.copy_data_from(copy_from)
 
-            if plugins:
-                new_event.set_active_plugins(plugins)
+            if 'plugins' in serializer.validated_data:
+                new_event.set_active_plugins(serializer.validated_data['plugins'])
             if 'is_public' in serializer.validated_data:
                 new_event.is_public = serializer.validated_data['is_public']
             if 'testmode' in serializer.validated_data:
@@ -266,10 +262,6 @@ class EventViewSet(viewsets.ModelViewSet):
         else:
             serializer.instance.set_defaults()
 
-            if plugins:
-                new_event.set_active_plugins(plugins)
-                new_event.save(update_fields=['plugins'])
-
         serializer.instance.log_action(
             'pretix.event.added',
             user=self.request.user,

src/pretix/api/views/exporters.py

@@ -35,8 +35,7 @@ from rest_framework.reverse import reverse
 from pretix.api.serializers.exporters import (
     ExporterSerializer, JobRunSerializer,
 )
-from pretix.base.exporter import OrganizerLevelExportMixin
-from pretix.base.models import CachedFile, Device, Event, TeamAPIToken
+from pretix.base.models import CachedFile, Device, TeamAPIToken
 from pretix.base.services.export import export, multiexport
 from pretix.base.signals import (
     register_data_exporters, register_multievent_data_exporters,
@@ -156,19 +155,7 @@ class OrganizerExportersViewSet(ExportersMixin, viewsets.ViewSet):
             organizer=self.request.organizer
         )
         responses = register_multievent_data_exporters.send(self.request.organizer)
-        raw_exporters = [
-            response(Event.objects.none() if issubclass(response, OrganizerLevelExportMixin) else events, self.request.organizer)
-            for r, response in responses
-            if response
-        ]
-        raw_exporters = [
-            ex for ex in raw_exporters
-            if (
-                not isinstance(ex, OrganizerLevelExportMixin) or
-                perm_holder.has_organizer_permission(self.request.organizer, ex.organizer_required_permission, self.request)
-            )
-        ]
-        for ex in sorted(raw_exporters, key=lambda ex: str(ex.verbose_name)):
+        for ex in sorted([response(events, self.request.organizer) for r, response in responses if response], key=lambda ex: str(ex.verbose_name)):
             ex._serializer = JobRunSerializer(exporter=ex, events=events)
             exporters.append(ex)
         return exporters

src/pretix/api/views/order.py

@@ -61,7 +61,6 @@ from pretix.api.serializers.orderchange import (
     OrderPositionCreateForExistingOrderSerializer,
     OrderPositionInfoPatchSerializer,
 )
-from pretix.api.views import RichOrderingFilter
 from pretix.base.i18n import language
 from pretix.base.models import (
     CachedCombinedTicket, CachedTicket, Checkin, Device, EventMetaValue,
@@ -931,7 +930,7 @@ with scopes_disabled():
 class OrderPositionViewSet(viewsets.ModelViewSet):
     serializer_class = OrderPositionSerializer
     queryset = OrderPosition.all.none()
-    filter_backends = (DjangoFilterBackend, RichOrderingFilter)
+    filter_backends = (DjangoFilterBackend, OrderingFilter)
     ordering = ('order__datetime', 'positionid')
     ordering_fields = ('order__code', 'order__datetime', 'positionid', 'attendee_name', 'order__status',)
     filterset_class = OrderPositionFilter

src/pretix/base/exporter.py

@@ -51,7 +51,7 @@ from pretix.helpers.safe_openpyxl import (  # NOQA: backwards compatibility for
     SafeWorkbook, remove_invalid_excel_chars as excel_safe,
 )
 
-__ = excel_safe  # just so the compatibility import above is "used" and doesn't get removed by linter
+__ = excel_safe  # just so the compatbility import above is "used" and doesn't get removed by linter
 
 
 class BaseExporter:
@@ -80,7 +80,7 @@ class BaseExporter:
     def verbose_name(self) -> str:
         """
         A human-readable name for this exporter. This should be short but
-        self-explaining. Good examples include 'Orders as JSON' or 'Orders as Microsoft Excel'.
+        self-explaining. Good examples include 'JSON' or 'Microsoft Excel'.
         """
         raise NotImplementedError()  # NOQA
 
@@ -137,16 +137,6 @@ class BaseExporter:
         raise NotImplementedError()  # NOQA
 
 
-class OrganizerLevelExportMixin:
-    @property
-    def organizer_required_permission(self) -> str:
-        """
-        The permission level required to use this exporter. Only useful for organizer-level exports,
-        not for event-level exports.
-        """
-        return 'can_view_orders'
-
-
 class ListExporter(BaseExporter):
     ProgressSetTotal = namedtuple('ProgressSetTotal', 'total')
 

src/pretix/base/exporters/__init__.py

@@ -20,7 +20,6 @@
 # <https://www.gnu.org/licenses/>.
 #
 from .answers import *  # noqa
-from .customers import *  # noqa
 from .dekodi import *  # noqa
 from .events import *  # noqa
 from .invoices import *  # noqa

src/pretix/base/exporters/customers.py

@@ -1,113 +0,0 @@
-#
-# This file is part of pretix (Community Edition).
-#
-# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-2021 rami.io GmbH and contributors
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
-# Public License as published by the Free Software Foundation in version 3 of the License.
-#
-# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
-# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
-# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
-# this file, see <https://pretix.eu/about/en/license>.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
-# <https://www.gnu.org/licenses/>.
-#
-
-# This file is based on an earlier version of pretix which was released under the Apache License 2.0. The full text of
-# the Apache License 2.0 can be obtained at <http://www.apache.org/licenses/LICENSE-2.0>.
-#
-# This file may have since been changed and any changes are released under the terms of AGPLv3 as described above. A
-# full history of changes and contributors is available at <https://github.com/pretix/pretix>.
-#
-# This file contains Apache-licensed contributions copyrighted by: Benjamin Hättasch, Tobias Kunze
-#
-# 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 collections import OrderedDict
-
-from django.dispatch import receiver
-from django.utils.timezone import get_current_timezone
-from django.utils.translation import gettext as _, gettext_lazy
-
-from pretix.base.settings import PERSON_NAME_SCHEMES
-
-from ..exporter import ListExporter, OrganizerLevelExportMixin
-from ..signals import register_multievent_data_exporters
-
-
-class CustomerListExporter(OrganizerLevelExportMixin, ListExporter):
-    identifier = 'customerlist'
-    verbose_name = gettext_lazy('Customer accounts')
-    organizer_required_permission = 'can_manage_customers'
-
-    @property
-    def additional_form_fields(self):
-        return OrderedDict(
-            []
-        )
-
-    def iterate_list(self, form_data):
-        qs = self.organizer.customers.prefetch_related('provider')
-
-        headers = [
-            _('Customer ID'),
-            _('SSO provider'),
-            _('External identifier'),
-            _('E-mail'),
-            _('Phone number'),
-            _('Full name'),
-        ]
-        name_scheme = PERSON_NAME_SCHEMES[self.organizer.settings.name_scheme]
-        if name_scheme and len(name_scheme['fields']) > 1:
-            for k, label, w in name_scheme['fields']:
-                headers.append(_('Name') + ': ' + str(label))
-
-        headers += [
-            _('Account active'),
-            _('Verified email address'),
-            _('Last login'),
-            _('Registration date'),
-            _('Language'),
-            _('Notes'),
-        ]
-        yield headers
-
-        tz = get_current_timezone()
-        for obj in qs:
-            row = [
-                obj.identifier,
-                obj.provider.name if obj.provider else None,
-                obj.external_identifier,
-                obj.email or '',
-                obj.phone or '',
-                obj.name,
-            ]
-            if name_scheme and len(name_scheme['fields']) > 1:
-                for k, label, w in name_scheme['fields']:
-                    row.append(obj.name_parts.get(k, ''))
-            row += [
-                _('Yes') if obj.is_active else _('No'),
-                _('Yes') if obj.is_verified else _('No'),
-                obj.last_login.astimezone(tz).date().strftime('%Y-%m-%d') if obj.last_login else '',
-                obj.date_joined.astimezone(tz).date().strftime('%Y-%m-%d') if obj.date_joined else '',
-                obj.get_locale_display(),
-                obj.notes or '',
-            ]
-            yield row
-
-    def get_filename(self):
-        return '{}_customers'.format(self.organizer.slug)
-
-
-@receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_customerlist")
-def register_multievent_i_customerlist_exporter(sender, **kwargs):
-    return CustomerListExporter

src/pretix/base/exporters/orderlist.py

@@ -60,9 +60,7 @@ from pretix.base.settings import PERSON_NAME_SCHEMES
 from ...control.forms.filter import get_all_payment_providers
 from ...helpers import GroupConcat
 from ...helpers.iter import chunked_iterable
-from ..exporter import (
-    ListExporter, MultiSheetListExporter, OrganizerLevelExportMixin,
-)
+from ..exporter import ListExporter, MultiSheetListExporter
 from ..signals import (
     register_data_exporters, register_multievent_data_exporters,
 )
@@ -886,75 +884,76 @@ class QuotaListExporter(ListExporter):
         return '{}_quotas'.format(self.event.slug)
 
 
-class GiftcardTransactionListExporter(OrganizerLevelExportMixin, ListExporter):
-    identifier = 'giftcardtransactionlist'
-    verbose_name = gettext_lazy('Gift card transactions')
-    organizer_required_permission = 'can_manage_gift_cards'
+def generate_GiftCardTransactionListExporter(organizer):  # hackhack
+    class GiftcardTransactionListExporter(ListExporter):
+        identifier = 'giftcardtransactionlist'
+        verbose_name = gettext_lazy('Gift card transactions')
 
-    @property
-    def additional_form_fields(self):
-        d = [
-            ('date_from',
-             forms.DateField(
-                 label=_('Start date'),
-                 widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
-                 required=False,
-             )),
-            ('date_to',
-             forms.DateField(
-                 label=_('End date'),
-                 widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
-                 required=False,
-             )),
-        ]
-        d = OrderedDict(d)
-        return d
-
-    def iterate_list(self, form_data):
-        qs = GiftCardTransaction.objects.filter(
-            card__issuer=self.organizer,
-        ).order_by('datetime').select_related('card', 'order', 'order__event')
-
-        if form_data.get('date_from'):
-            date_value = form_data.get('date_from')
-            if isinstance(date_value, str):
-                date_value = dateutil.parser.parse(date_value).date()
-            qs = qs.filter(
-                datetime__gte=make_aware(datetime.combine(date_value, time(0, 0, 0)), self.timezone)
-            )
-
-        if form_data.get('date_to'):
-            date_value = form_data.get('date_to')
-            if isinstance(date_value, str):
-                date_value = dateutil.parser.parse(date_value).date()
-
-            qs = qs.filter(
-                datetime__lte=make_aware(datetime.combine(date_value, time(23, 59, 59, 999999)), self.timezone)
-            )
-
-        headers = [
-            _('Gift card code'),
-            _('Test mode'),
-            _('Date'),
-            _('Amount'),
-            _('Currency'),
-            _('Order'),
-        ]
-        yield headers
-
-        for obj in qs:
-            row = [
-                obj.card.secret,
-                _('TEST MODE') if obj.card.testmode else '',
-                obj.datetime.astimezone(self.timezone).strftime('%Y-%m-%d %H:%M:%S'),
-                obj.value,
-                obj.card.currency,
-                obj.order.full_code if obj.order else None,
+        @property
+        def additional_form_fields(self):
+            d = [
+                ('date_from',
+                 forms.DateField(
+                     label=_('Start date'),
+                     widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
+                     required=False,
+                 )),
+                ('date_to',
+                 forms.DateField(
+                     label=_('End date'),
+                     widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
+                     required=False,
+                 )),
             ]
-            yield row
+            d = OrderedDict(d)
+            return d
 
-    def get_filename(self):
-        return '{}_giftcardtransactions'.format(self.organizer.slug)
+        def iterate_list(self, form_data):
+            qs = GiftCardTransaction.objects.filter(
+                card__issuer=organizer,
+            ).order_by('datetime').select_related('card', 'order', 'order__event')
+
+            if form_data.get('date_from'):
+                date_value = form_data.get('date_from')
+                if isinstance(date_value, str):
+                    date_value = dateutil.parser.parse(date_value).date()
+                qs = qs.filter(
+                    datetime__gte=make_aware(datetime.combine(date_value, time(0, 0, 0)), self.timezone)
+                )
+
+            if form_data.get('date_to'):
+                date_value = form_data.get('date_to')
+                if isinstance(date_value, str):
+                    date_value = dateutil.parser.parse(date_value).date()
+
+                qs = qs.filter(
+                    datetime__lte=make_aware(datetime.combine(date_value, time(23, 59, 59, 999999)), self.timezone)
+                )
+
+            headers = [
+                _('Gift card code'),
+                _('Test mode'),
+                _('Date'),
+                _('Amount'),
+                _('Currency'),
+                _('Order'),
+            ]
+            yield headers
+
+            for obj in qs:
+                row = [
+                    obj.card.secret,
+                    _('TEST MODE') if obj.card.testmode else '',
+                    obj.datetime.astimezone(self.timezone).strftime('%Y-%m-%d %H:%M:%S'),
+                    obj.value,
+                    obj.card.currency,
+                    obj.order.full_code if obj.order else None,
+                ]
+                yield row
+
+        def get_filename(self):
+            return '{}_giftcardtransactions'.format(organizer.slug)
+    return GiftcardTransactionListExporter
 
 
 class GiftcardRedemptionListExporter(ListExporter):
@@ -1001,112 +1000,114 @@ class GiftcardRedemptionListExporter(ListExporter):
             return '{}_giftcardredemptions'.format(self.event.slug)
 
 
-class GiftcardListExporter(OrganizerLevelExportMixin, ListExporter):
-    identifier = 'giftcardlist'
-    verbose_name = gettext_lazy('Gift cards')
-    organizer_required_permission = 'can_manage_gift_cards'
+def generate_GiftCardListExporter(organizer):  # hackhack
+    class GiftcardListExporter(ListExporter):
+        identifier = 'giftcardlist'
+        verbose_name = gettext_lazy('Gift cards')
 
-    @property
-    def additional_form_fields(self):
-        return OrderedDict(
-            [
-                ('date', forms.DateTimeField(
-                    label=_('Show value at'),
-                    initial=now(),
-                )),
-                ('testmode', forms.ChoiceField(
-                    label=_('Test mode'),
-                    choices=(
-                        ('', _('All')),
-                        ('yes', _('Test mode')),
-                        ('no', _('Live')),
-                    ),
-                    initial='no',
-                    required=False
-                )),
-                ('state', forms.ChoiceField(
-                    label=_('Status'),
-                    choices=(
-                        ('', _('All')),
-                        ('empty', _('Empty')),
-                        ('valid_value', _('Valid and with value')),
-                        ('expired_value', _('Expired and with value')),
-                        ('expired', _('Expired')),
-                    ),
-                    initial='valid_value',
-                    required=False
-                ))
+        @property
+        def additional_form_fields(self):
+            return OrderedDict(
+                [
+                    ('date', forms.DateTimeField(
+                        label=_('Show value at'),
+                        initial=now(),
+                    )),
+                    ('testmode', forms.ChoiceField(
+                        label=_('Test mode'),
+                        choices=(
+                            ('', _('All')),
+                            ('yes', _('Test mode')),
+                            ('no', _('Live')),
+                        ),
+                        initial='no',
+                        required=False
+                    )),
+                    ('state', forms.ChoiceField(
+                        label=_('Status'),
+                        choices=(
+                            ('', _('All')),
+                            ('empty', _('Empty')),
+                            ('valid_value', _('Valid and with value')),
+                            ('expired_value', _('Expired and with value')),
+                            ('expired', _('Expired')),
+                        ),
+                        initial='valid_value',
+                        required=False
+                    ))
+                ]
+            )
+
+        def iterate_list(self, form_data):
+            s = GiftCardTransaction.objects.filter(
+                card=OuterRef('pk'),
+                datetime__lte=form_data['date']
+            ).order_by().values('card').annotate(s=Sum('value')).values('s')
+            qs = organizer.issued_gift_cards.filter(
+                issuance__lte=form_data['date']
+            ).annotate(
+                cached_value=Coalesce(Subquery(s), Decimal('0.00')),
+            ).order_by('issuance').prefetch_related(
+                'transactions', 'transactions__order', 'transactions__order__event', 'transactions__order__invoices'
+            )
+
+            if form_data.get('testmode') == 'yes':
+                qs = qs.filter(testmode=True)
+            elif form_data.get('testmode') == 'no':
+                qs = qs.filter(testmode=False)
+
+            if form_data.get('state') == 'empty':
+                qs = qs.filter(cached_value=0)
+            elif form_data.get('state') == 'valid_value':
+                qs = qs.exclude(cached_value=0).filter(Q(expires__isnull=True) | Q(expires__gte=form_data['date']))
+            elif form_data.get('state') == 'expired_value':
+                qs = qs.exclude(cached_value=0).filter(expires__lt=form_data['date'])
+            elif form_data.get('state') == 'expired':
+                qs = qs.filter(expires__lt=form_data['date'])
+
+            headers = [
+                _('Gift card code'),
+                _('Test mode card'),
+                _('Creation date'),
+                _('Expiry date'),
+                _('Special terms and conditions'),
+                _('Currency'),
+                _('Current value'),
+                _('Created in order'),
+                _('Last invoice number of order'),
+                _('Last invoice date of order'),
             ]
-        )
+            yield headers
 
-    def iterate_list(self, form_data):
-        s = GiftCardTransaction.objects.filter(
-            card=OuterRef('pk'),
-            datetime__lte=form_data['date']
-        ).order_by().values('card').annotate(s=Sum('value')).values('s')
-        qs = self.organizer.issued_gift_cards.filter(
-            issuance__lte=form_data['date']
-        ).annotate(
-            cached_value=Coalesce(Subquery(s), Decimal('0.00')),
-        ).order_by('issuance').prefetch_related(
-            'transactions', 'transactions__order', 'transactions__order__event', 'transactions__order__invoices'
-        )
+            tz = get_current_timezone()
+            for obj in qs:
+                o = None
+                i = None
+                trans = list(obj.transactions.all())
+                if trans:
+                    o = trans[0].order
+                if o:
+                    invs = list(o.invoices.all())
+                    if invs:
+                        i = invs[-1]
+                row = [
+                    obj.secret,
+                    _('Yes') if obj.testmode else _('No'),
+                    obj.issuance.astimezone(tz).date().strftime('%Y-%m-%d'),
+                    obj.expires.astimezone(tz).date().strftime('%Y-%m-%d') if obj.expires else '',
+                    obj.conditions or '',
+                    obj.currency,
+                    obj.cached_value,
+                    o.full_code if o else '',
+                    i.number if i else '',
+                    i.date.strftime('%Y-%m-%d') if i else '',
+                ]
+                yield row
 
-        if form_data.get('testmode') == 'yes':
-            qs = qs.filter(testmode=True)
-        elif form_data.get('testmode') == 'no':
-            qs = qs.filter(testmode=False)
+        def get_filename(self):
+            return '{}_giftcards'.format(organizer.slug)
 
-        if form_data.get('state') == 'empty':
-            qs = qs.filter(cached_value=0)
-        elif form_data.get('state') == 'valid_value':
-            qs = qs.exclude(cached_value=0).filter(Q(expires__isnull=True) | Q(expires__gte=form_data['date']))
-        elif form_data.get('state') == 'expired_value':
-            qs = qs.exclude(cached_value=0).filter(expires__lt=form_data['date'])
-        elif form_data.get('state') == 'expired':
-            qs = qs.filter(expires__lt=form_data['date'])
-
-        headers = [
-            _('Gift card code'),
-            _('Test mode card'),
-            _('Creation date'),
-            _('Expiry date'),
-            _('Special terms and conditions'),
-            _('Currency'),
-            _('Current value'),
-            _('Created in order'),
-            _('Last invoice number of order'),
-            _('Last invoice date of order'),
-        ]
-        yield headers
-
-        tz = get_current_timezone()
-        for obj in qs:
-            o = None
-            i = None
-            trans = list(obj.transactions.all())
-            if trans:
-                o = trans[0].order
-            if o:
-                invs = list(o.invoices.all())
-                if invs:
-                    i = invs[-1]
-            row = [
-                obj.secret,
-                _('Yes') if obj.testmode else _('No'),
-                obj.issuance.astimezone(tz).date().strftime('%Y-%m-%d'),
-                obj.expires.astimezone(tz).date().strftime('%Y-%m-%d') if obj.expires else '',
-                obj.conditions or '',
-                obj.currency,
-                obj.cached_value,
-                o.full_code if o else '',
-                i.number if i else '',
-                i.date.strftime('%Y-%m-%d') if i else '',
-            ]
-            yield row
-
-    def get_filename(self):
-        return '{}_giftcards'.format(self.organizer.slug)
+    return GiftcardListExporter
 
 
 @receiver(register_data_exporters, dispatch_uid="exporter_orderlist")
@@ -1146,9 +1147,9 @@ def register_multievent_i_giftcardredemptionlist_exporter(sender, **kwargs):
 
 @receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_giftcardlist")
 def register_multievent_i_giftcardlist_exporter(sender, **kwargs):
-    return GiftcardListExporter
+    return generate_GiftCardListExporter(sender)
 
 
 @receiver(register_multievent_data_exporters, dispatch_uid="multiexporter_giftcardtransactionlist")
 def register_multievent_i_giftcardtransactionlist_exporter(sender, **kwargs):
-    return GiftcardTransactionListExporter
+    return generate_GiftCardTransactionListExporter(sender)

src/pretix/base/forms/questions.py

@@ -87,7 +87,7 @@ from pretix.control.forms import (
     ExtFileField, ExtValidationMixin, SizeValidationMixin, SplitDateTimeField,
 )
 from pretix.helpers.countries import (
-    CachedCountries, get_phone_prefixes_sorted_and_localized,
+    get_cached_countries_class, get_phone_prefixes_sorted_and_localized,
 )
 from pretix.helpers.escapejson import escapejson_attr
 from pretix.helpers.i18n import get_format_without_seconds
@@ -630,7 +630,7 @@ class BaseQuestionsForm(forms.Form):
             )
             country = (cartpos.country if cartpos else orderpos.country) or guess_country(event)
             add_fields['country'] = CountryField(
-                countries=CachedCountries
+                countries=get_cached_countries_class(common_names=event.settings.country_names_common),
             ).formfield(
                 required=event.settings.attendee_addresses_required and not self.all_optional,
                 label=_('Country'),
@@ -726,7 +726,7 @@ class BaseQuestionsForm(forms.Form):
                 )
             elif q.type == Question.TYPE_COUNTRYCODE:
                 field = CountryField(
-                    countries=CachedCountries,
+                    countries=get_cached_countries_class(common_names=event.settings.country_names_common),
                     blank=True, null=True, blank_label=' ',
                 ).formfield(
                     label=label, required=required,
@@ -974,7 +974,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
                 str(_('If you are registered in Switzerland, you can enter your UID instead.')),
             ])
 
-        self.fields['country'].choices = CachedCountries()
+        self.fields['country'].choices = get_cached_countries_class(event.settings.country_names_common)()
 
         c = [('', pgettext_lazy('address', 'Select state'))]
         fprefix = self.prefix + '-' if self.prefix else ''

src/pretix/base/migrations/0223_voucher_min_usages.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.12 on 2022-10-12 09:13
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0222_alter_question_unique_together'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='voucher',
-            name='min_usages',
-            field=models.PositiveIntegerField(default=1),
-        ),
-    ]

src/pretix/base/models/customers.py

@@ -78,7 +78,6 @@ class Customer(LoggedModel):
     organizer = models.ForeignKey(Organizer, related_name='customers', on_delete=models.CASCADE)
     provider = models.ForeignKey(CustomerSSOProvider, related_name='customers', on_delete=models.PROTECT, null=True, blank=True)
     identifier = models.CharField(
-        verbose_name=_('Customer ID'),
         max_length=190,
         db_index=True,
         help_text=_('You can enter any value here to make it easier to match the data with other sources. If you do '

src/pretix/base/models/event.py

@@ -590,7 +590,6 @@ class Event(EventMixin, LoggedModel):
         self.settings.event_list_type = 'calendar'
         self.settings.invoice_email_attachment = True
         self.settings.name_scheme = 'given_family'
-        self.settings.payment_banktransfer_invoice_immediately = True
 
     @property
     def social_image(self):

src/pretix/base/models/invoices.py

@@ -46,6 +46,7 @@ from django.utils.translation import pgettext
 from django_scopes import ScopedManager
 
 from pretix.base.settings import COUNTRIES_WITH_STATE_IN_ADDRESS
+from pretix.base.templatetags.country import country_name
 from pretix.helpers.countries import FastCountryField
 
 
@@ -181,7 +182,7 @@ class Invoice(models.Model):
             self.invoice_from_name,
             self.invoice_from,
             (self.invoice_from_zipcode or "") + " " + (self.invoice_from_city or ""),
-            self.invoice_from_country.name if self.invoice_from_country else "",
+            country_name(self.invoice_from_country, self.event.settings.country_names_common),
             pgettext("invoice", "VAT-ID: %s") % self.invoice_from_vat_id if self.invoice_from_vat_id else "",
             taxidrow,
         ]
@@ -193,7 +194,7 @@ class Invoice(models.Model):
             self.invoice_from_name,
             self.invoice_from,
             (self.invoice_from_zipcode or "") + " " + (self.invoice_from_city or ""),
-            self.invoice_from_country.name if self.invoice_from_country else "",
+            country_name(self.invoice_from_country, self.event.settings.country_names_common),
         ]
         return '\n'.join([p.strip() for p in parts if p and p.strip()])
 
@@ -219,7 +220,7 @@ class Invoice(models.Model):
             self.invoice_to_name,
             self.invoice_to_street,
             ((self.invoice_to_zipcode or "") + " " + (self.invoice_to_city or "") + " " + (state_name or "")).strip(),
-            self.invoice_to_country.name if self.invoice_to_country else "",
+            country_name(self.invoice_to_country, self.event.settings.country_names_common),
         ]
         return '\n'.join([p.strip() for p in parts if p and p.strip()])
 

src/pretix/base/models/orders.py

@@ -2237,7 +2237,7 @@ class OrderPosition(AbstractPosition):
 
     @cached_property
     def sort_key(self):
-        return self.addon_to.positionid if self.addon_to else self.positionid, self.addon_to_id or 0, self.positionid
+        return self.addon_to.positionid if self.addon_to else self.positionid, self.addon_to_id or 0
 
     @property
     def checkins(self):
@@ -2263,7 +2263,7 @@ class OrderPosition(AbstractPosition):
         ops = []
         cp_mapping = {}
         # The sorting key ensures that all addons come directly after the position they refer to
-        for i, cartpos in enumerate(sorted(cp, key=lambda c: c.sort_key)):
+        for i, cartpos in enumerate(sorted(cp, key=lambda c: (c.addon_to_id or c.pk, c.addon_to_id or 0))):
             op = OrderPosition(order=order)
             for f in AbstractPosition._meta.fields:
                 if f.name == 'addon_to':
@@ -2659,20 +2659,6 @@ class CartPosition(AbstractPosition):
                             self.event.currency)
         return self.price - net
 
-    @cached_property
-    def sort_key(self):
-        subevent_key = (self.subevent.date_from, str(self.subevent.name), self.subevent_id) if self.subevent_id else (0, "", 0)
-        category_key = (self.item.category.position, self.item.category.id) if self.item.category_id is not None else (0, 0)
-        item_key = self.item.position, self.item_id
-        variation_key = (self.variation.position, self.variation.id) if self.variation_id is not None else (0, 0)
-        line_key = (self.price, (self.voucher_id or 0), (self.seat.sorting_rank if self.seat_id else None), self.pk)
-        sort_key = subevent_key + category_key + item_key + variation_key + line_key
-
-        if self.addon_to_id:
-            return self.addon_to.sort_key + (1 if self.is_bundled else 2,) + sort_key
-        else:
-            return sort_key
-
     def update_listed_price_and_voucher(self, voucher_only=False, max_discount=None):
         from pretix.base.services.pricing import (
             get_listed_price, is_included_for_free,
@@ -2728,11 +2714,6 @@ class CartPosition(AbstractPosition):
             self.tax_rate = line_price.rate
             self.save(update_fields=['line_price_gross', 'tax_rate'])
 
-    @property
-    def addons_without_bundled(self):
-        addons = [op for op in self.addons.all() if not op.is_bundled]
-        return sorted(addons, key=lambda cp: cp.sort_key)
-
 
 class InvoiceAddress(models.Model):
     last_modified = models.DateTimeField(auto_now=True)

src/pretix/base/models/vouchers.py

@@ -137,8 +137,6 @@ class Voucher(LoggedModel):
     :type max_usages: int
     :param redeemed: The number of times this voucher already has been redeemed
     :type redeemed: int
-    :param min_usages: The minimum number of times this voucher must be redeemed
-    :type min_usages: int
     :param valid_until: The expiration date of this voucher (optional)
     :type valid_until: datetime
     :param block_quota: If set to true, this voucher will reserve quota for its holder
@@ -201,14 +199,6 @@ class Voucher(LoggedModel):
         verbose_name=_("Redeemed"),
         default=0
     )
-    min_usages = models.PositiveIntegerField(
-        verbose_name=_("Minimum usages"),
-        help_text=_("If set to more than one, the voucher must be redeemed for this many products when it is used for "
-                    "the first time. On later usages, it can also be used for lower numbers of products. Note that "
-                    "this means that the total number of usages in some cases can be lower than this limit, e.g. in "
-                    "case of cancellations."),
-        default=1
-    )
     budget = models.DecimalField(
         verbose_name=_("Maximum discount budget"),
         help_text=_("This is the maximum monetary amount that will be discounted using this voucher across all usages. "
@@ -360,10 +350,6 @@ class Voucher(LoggedModel):
                     'redeemed': redeemed
                 }
             )
-        if data.get('max_usages', 1) < data.get('min_usages', 1):
-            raise ValidationError(
-                _('The maximum number of usages may not be lower than the minimum number of usages.'),
-            )
 
     @staticmethod
     def clean_subevent(data, event):
@@ -478,7 +464,7 @@ class Voucher(LoggedModel):
         if quota:
             raise ValidationError(_('You need to choose a specific product if you select a seat.'))
 
-        if data.get('max_usages', 1) > 1 or data.get('min_usages', 1) > 1:
+        if data.get('max_usages', 1) > 1:
             raise ValidationError(_('Seat-specific vouchers can only be used once.'))
 
         if item and seat.product != item:
@@ -581,10 +567,6 @@ class Voucher(LoggedModel):
         else:
             return bool(subevent.seating_plan) if subevent else self.event.seating_plan
 
-    @property
-    def min_usages_remaining(self):
-        return max(1, self.min_usages - self.redeemed)
-
     @classmethod
     def annotate_budget_used_orders(cls, qs):
         opq = OrderPosition.objects.filter(

src/pretix/base/pdf.py

@@ -891,11 +891,7 @@ class Renderer:
                 elif o['type'] == "poweredby":
                     self._draw_poweredby(canvas, op, o)
                 if self.bg_pdf:
-                    page_size = (self.bg_pdf.pages[0].mediabox[2], self.bg_pdf.pages[0].mediabox[3])
-                    if self.bg_pdf.pages[0].get('/Rotate') in (90, 270):
-                        # swap dimensions due to pdf being rotated
-                        page_size = page_size[::-1]
-                    canvas.setPageSize(page_size)
+                    canvas.setPageSize((self.bg_pdf.pages[0].mediabox[2], self.bg_pdf.pages[0].mediabox[3]))
             if show_page:
                 canvas.showPage()
 
@@ -919,37 +915,13 @@ class Renderer:
                 with open(os.path.join(d, 'out.pdf'), 'rb') as f:
                     return BytesIO(f.read())
         else:
-            from PyPDF2 import PdfReader, PdfWriter, Transformation
-            from PyPDF2.generic import RectangleObject
+            from PyPDF2 import PdfReader, PdfWriter
             buffer.seek(0)
             new_pdf = PdfReader(buffer)
             output = PdfWriter()
 
             for i, page in enumerate(new_pdf.pages):
                 bg_page = copy.copy(self.bg_pdf.pages[i])
-                bg_rotation = bg_page.get('/Rotate')
-                if bg_rotation:
-                    # /Rotate is clockwise, transformation.rotate is counter-clockwise
-                    t = Transformation().rotate(bg_rotation)
-                    w = float(page.mediabox.getWidth())
-                    h = float(page.mediabox.getHeight())
-                    if bg_rotation in (90, 270):
-                        # offset due to rotation base
-                        if bg_rotation == 90:
-                            t = t.translate(h, 0)
-                        else:
-                            t = t.translate(0, w)
-                        # rotate mediabox as well
-                        page.mediabox = RectangleObject((
-                            page.mediabox.left.as_numeric(),
-                            page.mediabox.bottom.as_numeric(),
-                            page.mediabox.top.as_numeric(),
-                            page.mediabox.right.as_numeric(),
-                        ))
-                        page.trimbox = page.mediabox
-                    elif bg_rotation == 180:
-                        t = t.translate(w, h)
-                    page.add_transformation(t)
                 bg_page.merge_page(page)
                 output.add_page(bg_page)
 

src/pretix/base/secretgenerators/pretix_sig1_pb2.py

@@ -23,12 +23,11 @@
 
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: pretix_sig1.proto
-"""Generated protocol buffer code."""
+
 from google.protobuf import (
-    descriptor as _descriptor, descriptor_pool as _descriptor_pool,
+    descriptor as _descriptor, message as _message, reflection as _reflection,
     symbol_database as _symbol_database,
 )
-from google.protobuf.internal import builder as _builder
 
 # @@protoc_insertion_point(imports)
 
@@ -37,14 +36,80 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x11pretix_sig1.proto\"I\n\x06Ticket\x12\x0c\n\x04seed\x18\x01 \x01(\t\x12\x0c\n\x04item\x18\x02 \x01(\x03\x12\x11\n\tvariation\x18\x03 \x01(\x03\x12\x10\n\x08subevent\x18\x04 \x01(\x03\x42\x33\n#eu.pretix.libpretixsync.crypto.sig1B\x0cTicketProtosb\x06proto3')
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='pretix_sig1.proto',
+  package='',
+  syntax='proto3',
+  serialized_options=b'\n\026eu.pretix.secrets.sig1B\014TicketProtos',
+  create_key=_descriptor._internal_create_key,
+  serialized_pb=b'\n\x11pretix_sig1.proto\"I\n\x06Ticket\x12\x0c\n\x04seed\x18\x01 \x01(\t\x12\x0c\n\x04item\x18\x02 \x01(\x03\x12\x11\n\tvariation\x18\x03 \x01(\x03\x12\x10\n\x08subevent\x18\x04 \x01(\x03\x42&\n\x16\x65u.pretix.secrets.sig1B\x0cTicketProtosb\x06proto3'
+)
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'pretix_sig1_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
 
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n#eu.pretix.libpretixsync.crypto.sig1B\014TicketProtos'
-  _TICKET._serialized_start=21
-  _TICKET._serialized_end=94
+
+
+_TICKET = _descriptor.Descriptor(
+  name='Ticket',
+  full_name='Ticket',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='seed', full_name='Ticket.seed', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='item', full_name='Ticket.item', index=1,
+      number=2, type=3, cpp_type=2, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='variation', full_name='Ticket.variation', index=2,
+      number=3, type=3, cpp_type=2, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='subevent', full_name='Ticket.subevent', index=3,
+      number=4, type=3, cpp_type=2, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=21,
+  serialized_end=94,
+)
+
+DESCRIPTOR.message_types_by_name['Ticket'] = _TICKET
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+Ticket = _reflection.GeneratedProtocolMessageType('Ticket', (_message.Message,), {
+  'DESCRIPTOR' : _TICKET,
+  '__module__' : 'pretix_sig1_pb2'
+  # @@protoc_insertion_point(class_scope:Ticket)
+  })
+_sym_db.RegisterMessage(Ticket)
+
+
+DESCRIPTOR._options = None
 # @@protoc_insertion_point(module_scope)

src/pretix/base/services/cart.py

@@ -101,20 +101,15 @@ error_messages = {
     'min_items_per_product': _("You need to select at least %(min)s items of the product %(product)s."),
     'min_items_per_product_removed': _("We removed %(product)s from your cart as you can not buy less than "
                                        "%(min)s items of it."),
-    'not_started': _('The booking period for this event has not yet started.'),
-    'ended': _('The booking period for this event has ended.'),
+    'not_started': _('The presale period for this event has not yet started.'),
+    'ended': _('The presale period for this event has ended.'),
     'payment_ended': _('All payments for this event need to be confirmed already, so no new orders can be created.'),
-    'some_subevent_not_started': _('The booking period for this event has not yet started. The affected positions '
+    'some_subevent_not_started': _('The presale period for this event has not yet started. The affected positions '
                                    'have been removed from your cart.'),
-    'some_subevent_ended': _('The booking period for one of the events in your cart has ended. The affected '
+    'some_subevent_ended': _('The presale period for one of the events in your cart has ended. The affected '
                              'positions have been removed from your cart.'),
     'price_too_high': _('The entered price is to high.'),
     'voucher_invalid': _('This voucher code is not known in our database.'),
-    'voucher_min_usages': _('The voucher code "%(voucher)s" can only be used if you select at least %(number)s '
-                            'matching products.'),
-    'voucher_min_usages_removed': _('The voucher code "%(voucher)s" can only be used if you select at least '
-                                    '%(number)s matching products. We have therefore removed some positions from '
-                                    'your cart that can no longer be purchased like this.'),
     'voucher_redeemed': _('This voucher code has already been used the maximum number of times allowed.'),
     'voucher_redeemed_cart': _('This voucher code is currently locked since it is already contained in a cart. This '
                                'might mean that someone else is redeeming this voucher right now, or that you tried '
@@ -152,45 +147,6 @@ error_messages = {
 }
 
 
-def _get_quota_availability(quota_diff, now_dt):
-    quotas_ok = defaultdict(int)
-    qa = QuotaAvailability()
-    qa.queue(*[k for k, v in quota_diff.items() if v > 0])
-    qa.compute(now_dt=now_dt)
-    for quota, count in quota_diff.items():
-        if count <= 0:
-            quotas_ok[quota] = 0
-            break
-        avail = qa.results[quota]
-        if avail[1] is not None and avail[1] < count:
-            quotas_ok[quota] = min(count, avail[1])
-        else:
-            quotas_ok[quota] = count
-    return quotas_ok
-
-
-def _get_voucher_availability(event, voucher_use_diff, now_dt, exclude_position_ids):
-    vouchers_ok = {}
-    _voucher_depend_on_cart = set()
-    for voucher, count in voucher_use_diff.items():
-        voucher.refresh_from_db()
-
-        if voucher.valid_until is not None and voucher.valid_until < now_dt:
-            raise CartError(error_messages['voucher_expired'])
-
-        redeemed_in_carts = CartPosition.objects.filter(
-            Q(voucher=voucher) & Q(event=event) &
-            Q(expires__gte=now_dt)
-        ).exclude(pk__in=exclude_position_ids)
-        cart_count = redeemed_in_carts.count()
-        v_avail = voucher.max_usages - voucher.redeemed - cart_count
-        if cart_count > 0:
-            _voucher_depend_on_cart.add(voucher)
-        vouchers_ok[voucher] = v_avail
-
-    return vouchers_ok, _voucher_depend_on_cart
-
-
 class CartManager:
     AddOperation = namedtuple('AddOperation', ('count', 'item', 'variation', 'voucher', 'quotas',
                                                'addon_to', 'subevent', 'bundled', 'seat', 'listed_price',
@@ -529,15 +485,6 @@ class CartManager:
             voucher_use_diff[voucher] += 1
             ops.append((listed_price - price_after_voucher, self.VoucherOperation(p, voucher, price_after_voucher)))
 
-        for voucher, cnt in list(voucher_use_diff.items()):
-            if 0 < cnt < voucher.min_usages_remaining:
-                raise CartError(
-                    _(error_messages['voucher_min_usages']) % {
-                        'voucher': voucher.code,
-                        'number': voucher.min_usages_remaining,
-                    }
-                )
-
         # If there are not enough voucher usages left for the full cart, let's apply them in the order that benefits
         # the user the most.
         ops.sort(key=lambda k: k[0], reverse=True)
@@ -872,13 +819,43 @@ class CartManager:
         self._quota_diff.update(quota_diff)
         self._operations += operations
 
+    def _get_quota_availability(self):
+        quotas_ok = defaultdict(int)
+        qa = QuotaAvailability()
+        qa.queue(*[k for k, v in self._quota_diff.items() if v > 0])
+        qa.compute(now_dt=self.now_dt)
+        for quota, count in self._quota_diff.items():
+            if count <= 0:
+                quotas_ok[quota] = 0
+                break
+            avail = qa.results[quota]
+            if avail[1] is not None and avail[1] < count:
+                quotas_ok[quota] = min(count, avail[1])
+            else:
+                quotas_ok[quota] = count
+        return quotas_ok
+
     def _get_voucher_availability(self):
-        vouchers_ok, self._voucher_depend_on_cart = _get_voucher_availability(
-            self.event, self._voucher_use_diff, self.now_dt,
-            exclude_position_ids=[
+        vouchers_ok = {}
+        self._voucher_depend_on_cart = set()
+        for voucher, count in self._voucher_use_diff.items():
+            voucher.refresh_from_db()
+
+            if voucher.valid_until is not None and voucher.valid_until < self.now_dt:
+                raise CartError(error_messages['voucher_expired'])
+
+            redeemed_in_carts = CartPosition.objects.filter(
+                Q(voucher=voucher) & Q(event=self.event) &
+                Q(expires__gte=self.now_dt)
+            ).exclude(pk__in=[
                 op.position.id for op in self._operations if isinstance(op, self.ExtendOperation)
-            ]
-        )
+            ])
+            cart_count = redeemed_in_carts.count()
+            v_avail = voucher.max_usages - voucher.redeemed - cart_count
+            if cart_count > 0:
+                self._voucher_depend_on_cart.add(voucher)
+            vouchers_ok[voucher] = v_avail
+
         return vouchers_ok
 
     def _check_min_max_per_product(self):
@@ -929,44 +906,9 @@ class CartManager:
                     )
         return err
 
-    def _check_min_per_voucher(self):
-        vouchers = Counter()
-        for p in self.positions:
-            vouchers[p.voucher] += 1
-        for op in self._operations:
-            if isinstance(op, self.AddOperation):
-                vouchers[op.voucher] += op.count
-            elif isinstance(op, self.RemoveOperation):
-                vouchers[op.position.voucher] -= 1
-
-        err = None
-        for voucher, count in vouchers.items():
-            if not voucher or count == 0:
-                continue
-            if count < voucher.min_usages_remaining:
-                self._operations = [o for o in self._operations if not (
-                    isinstance(o, self.AddOperation) and o.voucher.pk == voucher.pk
-                )]
-                removals = [o.position.pk for o in self._operations if isinstance(o, self.RemoveOperation)]
-                for p in self.positions:
-                    if p.voucher_id == voucher.pk and p.pk not in removals:
-                        self._operations.append(self.RemoveOperation(position=p))
-                        err = _(error_messages['voucher_min_usages_removed']) % {
-                            'voucher': voucher.code,
-                            'number': voucher.min_usages_remaining,
-                        }
-                if not err:
-                    raise CartError(
-                        _(error_messages['voucher_min_usages']) % {
-                            'voucher': voucher.code,
-                            'number': voucher.min_usages_remaining,
-                        }
-                    )
-        return err
-
     def _perform_operations(self):
         vouchers_ok = self._get_voucher_availability()
-        quotas_ok = _get_quota_availability(self._quota_diff, self.now_dt)
+        quotas_ok = self._get_quota_availability()
         err = None
         new_cart_positions = []
 
@@ -1220,7 +1162,6 @@ class CartManager:
 
         err = self._delete_out_of_timeframe()
         err = self.extend_expired_positions() or err
-        err = err or self._check_min_per_voucher()
 
         lockfn = NoLockManager
         if self._require_locking():

src/pretix/base/services/export.py

@@ -26,7 +26,6 @@ from django.core.files.base import ContentFile
 from django.utils.timezone import override
 from django.utils.translation import gettext
 
-from pretix.base.exporter import OrganizerLevelExportMixin
 from pretix.base.i18n import LazyLocaleException, language
 from pretix.base.models import (
     CachedFile, Device, Event, Organizer, TeamAPIToken, User, cachedfile_name,
@@ -67,8 +66,8 @@ def export(self, event: Event, fileid: str, provider: str, form_data: Dict[str,
                         gettext('Your export did not contain any data.')
                     )
                 file.filename, file.type, data = d
-                f = ContentFile(data)
-                file.file.save(cachedfile_name(file, file.filename), f)
+                file.file.save(cachedfile_name(file, file.filename), ContentFile(data))
+                file.save()
     return file.pk
 
 
@@ -102,9 +101,9 @@ def multiexport(self, organizer: Organizer, user: User, device: int, token: int,
             timezone = e.settings.timezone
             region = e.settings.region
         else:
-            locale = organizer.settings.locale or settings.LANGUAGE_CODE
-            timezone = organizer.settings.timezone or settings.TIME_ZONE
-            region = organizer.settings.region
+            locale = settings.LANGUAGE_CODE
+            timezone = settings.TIME_ZONE
+            region = None
     with language(locale, region), override(timezone):
         if form_data.get('events') is not None:
             if isinstance(form_data['events'][0], str):
@@ -120,21 +119,12 @@ def multiexport(self, organizer: Organizer, user: User, device: int, token: int,
                 continue
             ex = response(events, organizer, set_progress)
             if ex.identifier == provider:
-                if (
-                    isinstance(ex, OrganizerLevelExportMixin) and
-                    not staff_session and
-                    not (device or token or user).has_organizer_permission(organizer, ex.organizer_required_permission)
-                ):
-                    raise ExportError(
-                        gettext('You do not have sufficient permission to perform this export.')
-                    )
-
                 d = ex.render(form_data)
                 if d is None:
                     raise ExportError(
                         gettext('Your export did not contain any data.')
                     )
                 file.filename, file.type, data = d
-                f = ContentFile(data)
-                file.file.save(cachedfile_name(file, file.filename), f)
+                file.file.save(cachedfile_name(file, file.filename), ContentFile(data))
+                file.save()
     return file.pk

src/pretix/base/services/invoices.py

@@ -62,6 +62,7 @@ from pretix.base.models.tax import EU_CURRENCIES
 from pretix.base.services.tasks import TransactionAwareTask
 from pretix.base.settings import GlobalSettingsObject
 from pretix.base.signals import invoice_line_text, periodic_task
+from pretix.base.templatetags.country import country_name
 from pretix.celery_app import app
 from pretix.helpers.database import rolledback_transaction
 from pretix.helpers.models import modelcopy
@@ -122,7 +123,7 @@ def build_invoice(invoice: Invoice) -> Invoice:
             invoice.invoice_to = "\n".join(
                 a.strip() for a in addr_template.format(
                     i=ia,
-                    country=ia.country.name if ia.country else ia.country_old,
+                    country=country_name(ia.country, invoice.event.settings.country_names_common) if ia.country else ia.country_old,
                     state=ia.state_for_address
                 ).split("\n") if a.strip()
             )

src/pretix/base/services/locking.py

@@ -77,7 +77,7 @@ class LockTimeoutException(Exception):
     pass
 
 
-class LockReleaseException(LockTimeoutException):
+class LockReleaseException(Exception):
     pass
 
 
@@ -180,5 +180,5 @@ def release_event_redis(event):
         lock.release()
     except RedisError:
         logger.exception('Error releasing an event lock')
-        raise LockReleaseException()
+        raise LockTimeoutException()
     event._lock = None

src/pretix/base/services/mail.py

@@ -506,7 +506,7 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
                 else:
                     # Most likely some other kind of temporary failure, retry again (but pretty soon)
                     max_retries = 5
-                    retry_after = [10, 30, 60, 300, 900, 900][self.request.retries]
+                    retry_after = [10, 30, 60, 300, 900][self.request.retries]
 
                 try:
                     self.retry(max_retries=max_retries, countdown=retry_after)
@@ -542,7 +542,7 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
             if not any(c >= 500 for c in smtp_codes):
                 # Not a permanent failure (mailbox full, service unavailable), retry later, but with large intervals
                 try:
-                    self.retry(max_retries=5, countdown=[60, 300, 600, 1200, 1800, 1800][self.request.retries])
+                    self.retry(max_retries=5, countdown=[60, 300, 600, 1200, 1800][self.request.retries])
                 except MaxRetriesExceededError:
                     # ignore and go on with logging the error
                     pass
@@ -567,7 +567,7 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
         except Exception as e:
             if isinstance(e, (smtplib.SMTPServerDisconnected, smtplib.SMTPConnectError, ssl.SSLError, OSError)):
                 try:
-                    self.retry(max_retries=5, countdown=[10, 30, 60, 300, 900, 900][self.request.retries])
+                    self.retry(max_retries=5, countdown=[10, 30, 60, 300, 900][self.request.retries])
                 except MaxRetriesExceededError:
                     if log_target:
                         log_target.log_action(

src/pretix/base/services/orders.py

@@ -113,10 +113,8 @@ error_messages = {
                                "surplus items from your cart."),
     'busy': _('We were not able to process your request completely as the '
               'server was too busy. Please try again.'),
-    'not_started': _('The booking period for this event has not yet started.'),
-    'ended': _('The booking period has ended.'),
-    'voucher_min_usages': _('The voucher code "%(voucher)s" can only be used if you select at least %(number)s '
-                            'matching products.'),
+    'not_started': _('The presale period for this event has not yet started.'),
+    'ended': _('The presale period has ended.'),
     'voucher_invalid': _('The voucher code used for one of the items in your cart is not known in our database.'),
     'voucher_redeemed': _('The voucher code used for one of the items in your cart has already been used the maximum '
                           'number of times allowed. We removed this item from your cart.'),
@@ -127,9 +125,9 @@ error_messages = {
     'voucher_invalid_item': _('The voucher code used for one of the items in your cart is not valid for this item. We '
                               'removed this item from your cart.'),
     'voucher_required': _('You need a valid voucher code to order one of the products.'),
-    'some_subevent_not_started': _('The booking period for one of the events in your cart has not yet started. The '
+    'some_subevent_not_started': _('The presale period for one of the events in your cart has not yet started. The '
                                    'affected positions have been removed from your cart.'),
-    'some_subevent_ended': _('The booking period for one of the events in your cart has ended. The affected '
+    'some_subevent_ended': _('The presale period for one of the events in your cart has ended. The affected '
                              'positions have been removed from your cart.'),
     'seat_invalid': _('One of the seats in your order was invalid, we removed the position from your cart.'),
     'seat_unavailable': _('One of the seats in your order has been taken in the meantime, we removed the position from your cart.'),
@@ -571,7 +569,6 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
     products_seen = Counter()
     q_avail = Counter()
     v_avail = Counter()
-    v_usages = Counter()
     v_budget = {}
     deleted_positions = set()
     seats_seen = set()
@@ -609,7 +606,6 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
             break
 
         if cp.voucher:
-            v_usages[cp.voucher] += 1
             if cp.voucher not in v_avail:
                 redeemed_in_carts = CartPosition.objects.filter(
                     Q(voucher=cp.voucher) & Q(event=event) & Q(expires__gte=now_dt)
@@ -721,13 +717,6 @@ def _check_positions(event: Event, now_dt: datetime, positions: List[CartPositio
             # Sorry, can't let you keep that!
             delete(cp)
 
-    for voucher, cnt in v_usages.items():
-        if 0 < cnt < voucher.min_usages_remaining:
-            raise OrderError(error_messages['voucher_min_usages'], {
-                'voucher': voucher.code,
-                'number': voucher.min_usages_remaining,
-            })
-
     # Check prices
     sorted_positions = [cp for cp in sorted_positions if cp.pk and cp.pk not in deleted_positions]
     old_total = sum(cp.price for cp in sorted_positions)
@@ -1955,14 +1944,14 @@ class OrderChangeManager:
                         'position': op.position.pk,
                         'positionid': op.position.positionid,
                         'addon_to': op.position.addon_to_id,
-                        'old_taxrule': op.position.tax_rule.pk if op.position.tax_rule else None,
+                        'old_taxrule': op.position.tax_rule.pk if op.position.tax_rate else None,
                         'new_taxrule': op.tax_rule.pk
                     })
                 elif isinstance(op.position, OrderFee):
                     self.order.log_action('pretix.event.order.changed.tax_rule', user=self.user, auth=self.auth, data={
                         'fee': op.position.pk,
                         'fee_type': op.position.fee_type,
-                        'old_taxrule': op.position.tax_rule.pk if op.position.tax_rule else None,
+                        'old_taxrule': op.position.tax_rule.pk if op.position.tax_rate else None,
                         'new_taxrule': op.tax_rule.pk
                     })
                 op.position._calculate_tax(op.tax_rule)

src/pretix/base/services/stats.py

@@ -112,7 +112,7 @@ def dictsum(*dicts) -> dict:
 
 def order_overview(
         event: Event, subevent: SubEvent=None, date_filter='', date_from=None, date_until=None, fees=False,
-        admission_only=False, base_qs=None
+        admission_only=False
 ) -> Tuple[List[Tuple[ItemCategory, List[Item]]], Dict[str, Tuple[Decimal, Decimal]]]:
     items = event.items.all().select_related(
         'category',  # for re-grouping
@@ -120,7 +120,7 @@ def order_overview(
         'variations'
     ).order_by('category__position', 'category_id', 'position', 'name')
 
-    qs = OrderPosition.all if base_qs is None else base_qs
+    qs = OrderPosition.all
     if isinstance(subevent, (list, QuerySet)):
         qs = qs.filter(subevent__in=subevent)
     elif subevent:

src/pretix/base/settings.py

@@ -2604,6 +2604,14 @@ Your {organizer} team"""))
             help_text=_('This will be displayed on the organizer homepage.')
         )
     },
+    'country_names_common': {
+        # Hidden setting to toggle things like ("Taiwan" vs "Taiwan (Province of China)" or "Russia" vs
+        # "Russian Federation". Can be turned to False on request for diplomacy-sensitive users.
+        'default': 'True',
+        'type': bool,
+        'serializer_class': serializers.BooleanField,
+        'serializer_kwargs': {},
+    },
     'name_scheme': {
         'default': 'full',  # default for new events is 'given_family'
         'type': str,
@@ -2756,11 +2764,6 @@ PERSON_NAME_TITLE_GROUPS = OrderedDict([
         'Dr.',
         'Prof.',
         'Prof. Dr.',
-    ))),
-    ('dr_prof_he', ('Dr., Prof., H.E.', (
-        'Dr.',
-        'Prof.',
-        'H.E.',
     )))
 ])
 
@@ -3047,7 +3050,7 @@ settings_hierarkey.add_type(LazyI18nStringList,
 settings_hierarkey.add_type(RelativeDateWrapper,
                             serialize=lambda rdw: rdw.to_string(),
                             unserialize=lambda s: RelativeDateWrapper.from_string(s))
-settings_hierarkey.add_type(PhoneNumber, lambda pn: pn.as_international, lambda s: parse(s) if s else None)
+settings_hierarkey.add_type(PhoneNumber, lambda pn: pn.as_international, lambda s: parse(s))
 
 
 @settings_hierarkey.set_global(cache_namespace='global')

src/pretix/base/signals.py

@@ -64,10 +64,6 @@ class EventPluginSignal(django.dispatch.Signal):
             # Send to all events!
             return True
 
-        # If sentry packed this in a wrapper, unpack that
-        if "sentry" in receiver.__module__:
-            receiver = receiver.__wrapped__
-
         # Find the Django application this belongs to
         searchpath = receiver.__module__
         core_module = any([searchpath.startswith(cm) for cm in settings.CORE_MODULES])

src/pretix/base/templatetags/country.py

@@ -19,29 +19,21 @@
 # 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 urllib.parse import urljoin, urlsplit
 
-from django.conf import settings
-from django.templatetags.static import static
+from django import template
+from django_countries.fields import Country
 
-from pretix.base.models import Event
-from pretix.multidomain.urlreverse import (
-    get_event_domain, get_organizer_domain,
-)
+from pretix.helpers.countries import get_cached_countries_class
+
+register = template.Library()
 
 
-def static_absolute(object, path):
-    sp = static(path)
-    if sp.startswith("/"):
-        if isinstance(object, Event):
-            domain = get_event_domain(object, fallback=True)
-        else:
-            domain = get_organizer_domain(object)
-        if domain:
-            siteurlsplit = urlsplit(settings.SITE_URL)
-            if siteurlsplit.port and siteurlsplit.port not in (80, 443):
-                domain = '%s:%d' % (domain, siteurlsplit.port)
-            sp = urljoin('%s://%s' % (siteurlsplit.scheme, domain), sp)
-        else:
-            sp = urljoin(settings.SITE_URL, sp)
-    return sp
+@register.filter("country_name")
+def country_name(country: Country, common_names=True):
+    if not country:
+        return ''
+    if not isinstance(country, Country):
+        country = Country(country)
+
+    klass = get_cached_countries_class(common_names=common_names)
+    return klass().name(country.code)

src/pretix/base/views/mixins.py

@@ -44,6 +44,16 @@ class BaseQuestionsViewMixin:
     form_class = BaseQuestionsForm
     all_optional = False
 
+    @staticmethod
+    def _keyfunc(pos):
+        # Sort addons after the item they are an addon to
+        if isinstance(pos, OrderPosition):
+            i = pos.addon_to.positionid if pos.addon_to else pos.positionid
+        else:
+            i = pos.addon_to.pk if pos.addon_to else pos.pk
+        addon_penalty = 1 if pos.addon_to else 0
+        return i, addon_penalty, pos.pk
+
     @cached_property
     def _positions_for_questions(self):
         raise NotImplementedError()

src/pretix/base/views/tasks.py

@@ -215,13 +215,6 @@ class AsyncFormView(AsyncMixin, FormView):
     expected_exceptions = (ValidationError,)
     task_base = ProfiledEventTask
 
-    def async_set_progress(self, percentage):
-        if not self._task_self.request.called_directly:
-            self._task_self.update_state(
-                state='PROGRESS',
-                meta={'value': percentage}
-            )
-
     def __init_subclass__(cls):
         def async_execute(self, *, request_path, query_string, form_kwargs, locale, tz, url_kwargs=None, url_args=None,
                           organizer=None, event=None, user=None, session_key=None):
@@ -247,9 +240,6 @@ class AsyncFormView(AsyncMixin, FormView):
                 self.SessionStore = engine.SessionStore
                 view_instance.request.session = self.SessionStore(session_key)
 
-            task_self = self
-            view_instance._task_self = task_self
-
             with translation.override(locale), timezone.override(pytz.timezone(tz)):
                 form_class = view_instance.get_form_class()
                 if form_kwargs.get('instance'):
@@ -341,13 +331,6 @@ class AsyncPostView(AsyncMixin, View):
     expected_exceptions = (ValidationError,)
     task_base = ProfiledEventTask
 
-    def async_set_progress(self, percentage):
-        if not self._task_self.request.called_directly:
-            self._task_self.update_state(
-                state='PROGRESS',
-                meta={'value': percentage}
-            )
-
     def __init_subclass__(cls):
         def async_execute(self, *, request_path, url_args, url_kwargs, query_string, post_data, locale, tz,
                           organizer=None, event=None, user=None, session_key=None):
@@ -372,9 +355,6 @@ class AsyncPostView(AsyncMixin, View):
                 self.SessionStore = engine.SessionStore
                 view_instance.request.session = self.SessionStore(session_key)
 
-            task_self = self
-            view_instance._task_self = task_self
-
             with translation.override(locale), timezone.override(pytz.timezone(tz)):
                 return view_instance.async_post(view_instance.request, *url_args, **url_kwargs)
 

src/pretix/control/forms/event.py

@@ -589,7 +589,7 @@ class EventSettingsForm(SettingsForm):
             (k, '{scheme}: {samples}'.format(
                 scheme=v[0],
                 samples=', '.join(v[1])
-            ) if v[0] != ', '.join(v[1]) else v[0])
+            ))
             for k, v in PERSON_NAME_TITLE_GROUPS.items()
         ]
         if not self.event.has_subevents:

src/pretix/control/forms/item.py

@@ -768,6 +768,10 @@ class ItemAddOnsFormSet(I18nFormSet):
                 if self._should_delete_form(form):
                     # This form is going to be deleted so any of its errors
                     # should not cause the entire formset to be invalid.
+                    try:
+                        categories.remove(form.cleaned_data['addon_category'].pk)
+                    except KeyError:
+                        pass
                     continue
 
             if 'addon_category' in form.cleaned_data:

src/pretix/control/forms/vouchers.py

@@ -72,7 +72,7 @@ class VoucherForm(I18nModelForm):
         localized_fields = '__all__'
         fields = [
             'code', 'valid_until', 'block_quota', 'allow_ignore_quota', 'value', 'tag',
-            'comment', 'max_usages', 'min_usages', 'price_mode', 'subevent', 'show_hidden_items', 'budget'
+            'comment', 'max_usages', 'price_mode', 'subevent', 'show_hidden_items', 'budget'
         ]
         field_classes = {
             'valid_until': SplitDateTimeField,
@@ -308,7 +308,7 @@ class VoucherBulkForm(VoucherForm):
         localized_fields = '__all__'
         fields = [
             'valid_until', 'block_quota', 'allow_ignore_quota', 'value', 'tag', 'comment',
-            'max_usages', 'min_usages', 'price_mode', 'subevent', 'show_hidden_items', 'budget'
+            'max_usages', 'price_mode', 'subevent', 'show_hidden_items', 'budget'
         ]
         field_classes = {
             'valid_until': SplitDateTimeField,

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

@@ -3,6 +3,7 @@
 {% load bootstrap3 %}
 {% load eventurl %}
 {% load money %}
+{% load country %}
 {% load rich_text %}
 {% load safelink %}
 {% load eventsignal %}
@@ -498,7 +499,7 @@
                                                 {% if line.street or line.zipcode or line.city or line.country %}
                                                     {{ line.street|default_if_none:""|linebreaksbr }}<br>
                                                     {{ line.zipcode|default_if_none:"" }} {{ line.city|default_if_none:"" }}<br>
-                                                    {{ line.country.name|default_if_none:"" }}
+                                                    {{ line.country|country_name:request.event.settings.country_names_common }}
                                                     {% if line.state %}<br>{{ line.state }}{% endif %}
                                                 {% else %}
                                                     <em>{% trans "not answered" %}</em>
@@ -889,7 +890,9 @@
                                     <dt>{% trans "ZIP code and city" %}</dt>
                                     <dd>{{ order.invoice_address.zipcode }} {{ order.invoice_address.city }}</dd>
                                     <dt>{% trans "Country" %}</dt>
-                                    <dd>{{ order.invoice_address.country.name|default:order.invoice_address.country_old }}</dd>
+                                    <dd>
+                                        {{ order.invoice_address.country|country_name:request.event.settings.country_names_common|default:order.invoice_address.country_old }}
+                                    </dd>
                                     {% if order.invoice_address.state %}
                                         <dt>{% trans "State" context "address" %}</dt>
                                         <dd>{{ order.invoice_address.state_name }}</dd>

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

@@ -73,7 +73,6 @@
             <legend>{% trans "Advanced settings" %}</legend>
             {% bootstrap_field form.block_quota layout="control" %}
             {% bootstrap_field form.allow_ignore_quota layout="control" %}
-            {% bootstrap_field form.min_usages layout="control" %}
             {% bootstrap_field form.budget addon_after=request.event.currency layout="control" %}
             {% bootstrap_field form.tag layout="control" %}
             {% bootstrap_field form.comment layout="control" %}

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

@@ -85,7 +85,6 @@
                     <legend>{% trans "Advanced settings" %}</legend>
                     {% bootstrap_field form.block_quota layout="control" %}
                     {% bootstrap_field form.allow_ignore_quota layout="control" %}
-                    {% bootstrap_field form.min_usages layout="control" %}
                     {% bootstrap_field form.budget addon_after=request.event.currency layout="control" %}
                     {% bootstrap_field form.tag layout="control" %}
                     {% bootstrap_field form.comment layout="control" %}

src/pretix/control/views/main.py

@@ -276,8 +276,7 @@ class EventWizard(SafeSessionWizardView):
                     t.limit_events.add(event)
                 elif event.organizer.settings.event_team_provisioning:
                     t = Team.objects.create(
-                        organizer=event.organizer,
-                        name=_('Team {event}').format(event=str(event.name)[:188] + "…" if len(str(event.name)) > 190 else str(event.name)),
+                        organizer=event.organizer, name=_('Team {event}').format(event=event.name),
                         can_change_event_settings=True, can_change_items=True,
                         can_view_orders=True, can_change_orders=True, can_view_vouchers=True,
                         can_change_vouchers=True

src/pretix/control/views/orders.py

@@ -1178,7 +1178,7 @@ class OrderTransition(OrderView):
             }
         )
 
-    def post(self, request, *args, **kwargs):
+    def post(self, *args, **kwargs):
         to = self.request.POST.get('status', '')
         if self.order.status in (Order.STATUS_PENDING, Order.STATUS_EXPIRED) and to == 'p' and self.mark_paid_form.is_valid():
             ps = self.mark_paid_form.cleaned_data['amount']
@@ -1267,41 +1267,38 @@ class OrderTransition(OrderView):
                                                  'confirmation mail.'))
             else:
                 messages.success(self.request, _('The payment has been created successfully.'))
-        elif self.order.cancel_allowed() and to == 'c':
-            if self.mark_canceled_form.is_valid():
-                try:
-                    cancel_order(self.order.pk, user=self.request.user,
-                                 email_comment=self.mark_canceled_form.cleaned_data['comment'],
-                                 send_mail=self.mark_canceled_form.cleaned_data['send_email'],
-                                 cancel_invoice=self.mark_canceled_form.cleaned_data.get('cancel_invoice', True),
-                                 cancellation_fee=self.mark_canceled_form.cleaned_data.get('cancellation_fee'))
-                except OrderError as e:
-                    messages.error(self.request, str(e))
-                else:
-                    self.order.refresh_from_db()
-                    if self.order.pending_sum < 0:
-                        messages.success(self.request, _('The order has been canceled. You can now select how you want to '
-                                                         'transfer the money back to the user.'))
-                        with language(self.order.locale):
-                            return redirect(reverse('control:event.order.refunds.start', kwargs={
-                                'event': self.request.event.slug,
-                                'organizer': self.request.event.organizer.slug,
-                                'code': self.order.code
-                            }) + '?start-action=do_nothing&start-mode=partial&start-partial_amount={}&giftcard={}&comment={}'.format(
-                                round_decimal(self.order.pending_sum * -1),
-                                'true' if self.req and self.req.refund_as_giftcard else 'false',
-                                quote(gettext('Order canceled'))
-                            ))
-
-                    messages.success(self.request, _('The order has been canceled.'))
+        elif self.order.cancel_allowed() and to == 'c' and self.mark_canceled_form.is_valid():
+            try:
+                cancel_order(self.order.pk, user=self.request.user,
+                             email_comment=self.mark_canceled_form.cleaned_data['comment'],
+                             send_mail=self.mark_canceled_form.cleaned_data['send_email'],
+                             cancel_invoice=self.mark_canceled_form.cleaned_data.get('cancel_invoice', True),
+                             cancellation_fee=self.mark_canceled_form.cleaned_data.get('cancellation_fee'))
+            except OrderError as e:
+                messages.error(self.request, str(e))
             else:
-                return self.get(self.request, *args, **kwargs)
+                self.order.refresh_from_db()
+                if self.order.pending_sum < 0:
+                    messages.success(self.request, _('The order has been canceled. You can now select how you want to '
+                                                     'transfer the money back to the user.'))
+                    with language(self.order.locale):
+                        return redirect(reverse('control:event.order.refunds.start', kwargs={
+                            'event': self.request.event.slug,
+                            'organizer': self.request.event.organizer.slug,
+                            'code': self.order.code
+                        }) + '?start-action=do_nothing&start-mode=partial&start-partial_amount={}&giftcard={}&comment={}'.format(
+                            round_decimal(self.order.pending_sum * -1),
+                            'true' if self.req and self.req.refund_as_giftcard else 'false',
+                            quote(gettext('Order canceled'))
+                        ))
+
+                messages.success(self.request, _('The order has been canceled.'))
         elif self.order.status == Order.STATUS_PENDING and to == 'e':
             mark_order_expired(self.order, user=self.request.user)
             messages.success(self.request, _('The order has been marked as expired.'))
         return redirect(self.get_order_url())
 
-    def get(self, request, *args, **kwargs):
+    def get(self, *args, **kwargs):
         to = self.request.GET.get('status', '')
         if self.order.status in (Order.STATUS_PENDING, Order.STATUS_EXPIRED) and to == 'p':
             return render(self.request, 'pretixcontrol/order/pay.html', {

src/pretix/control/views/organizer.py

@@ -65,7 +65,6 @@ from pretix.api.models import WebHook
 from pretix.api.webhooks import manually_retry_all_calls
 from pretix.base.auth import get_auth_backends
 from pretix.base.channels import get_all_sales_channels
-from pretix.base.exporter import OrganizerLevelExportMixin
 from pretix.base.i18n import language
 from pretix.base.models import (
     CachedFile, Customer, Device, Gate, GiftCard, Invoice, LogEntry,
@@ -1509,19 +1508,7 @@ class ExportMixin:
         )
         responses = register_multievent_data_exporters.send(self.request.organizer)
         id = self.request.GET.get("identifier") or self.request.POST.get("exporter")
-        raw_exporters = [
-            response(Event.objects.none() if issubclass(response, OrganizerLevelExportMixin) else events, self.request.organizer)
-            for r, response in responses
-            if response
-        ]
-        raw_exporters = [
-            ex for ex in raw_exporters
-            if (
-                not isinstance(ex, OrganizerLevelExportMixin) or
-                self.request.user.has_organizer_permission(self.request.organizer, ex.organizer_required_permission, self.request)
-            )
-        ]
-        for ex in sorted(raw_exporters, key=lambda ex: str(ex.verbose_name)):
+        for ex in sorted([response(events, self.request.organizer) for r, response in responses if response], key=lambda ex: str(ex.verbose_name)):
             if id and ex.identifier != id:
                 continue
 
@@ -1539,19 +1526,18 @@ class ExportMixin:
                 initial=initial
             )
             ex.form.fields = ex.export_form_fields
-            if not isinstance(ex, OrganizerLevelExportMixin):
-                ex.form.fields.update([
-                    ('events',
-                     forms.ModelMultipleChoiceField(
-                         queryset=events,
-                         initial=events,
-                         widget=forms.CheckboxSelectMultiple(
-                             attrs={'class': 'scrolling-multiple-choice'}
-                         ),
-                         label=_('Events'),
-                         required=True
-                     )),
-                ])
+            ex.form.fields.update([
+                ('events',
+                 forms.ModelMultipleChoiceField(
+                     queryset=events,
+                     initial=events,
+                     widget=forms.CheckboxSelectMultiple(
+                         attrs={'class': 'scrolling-multiple-choice'}
+                     ),
+                     label=_('Events'),
+                     required=True
+                 )),
+            ])
             exporters.append(ex)
         return exporters
 

src/pretix/control/views/typeahead.py

@@ -763,7 +763,7 @@ def item_meta_values(request, organizer, event):
         or request.user.teams.filter(all_events=True, organizer=organizer, can_change_items=True).exists()
     )
     if not all_access:
-        defaults = defaults.filter(
+        defaults = matches.filter(
             event__id__in=request.user.teams.filter(can_change_items=True).values_list(
                 'limit_events__id', flat=True
             )

src/pretix/helpers/countries.py

@@ -23,7 +23,8 @@ import pyuca
 from babel.core import Locale
 from django.core.cache import cache
 from django.utils import translation
-from django_countries import Countries
+from django.utils.encoding import force_str
+from django_countries import Countries, CountryTuple
 from django_countries.fields import CountryField
 from phonenumbers.data import _COUNTRY_CODE_TO_REGION_CODE
 
@@ -35,6 +36,7 @@ _collator = pyuca.Collator()
 class CachedCountries(Countries):
     _cached_lists = {}
     cache_subkey = None
+    common_names = True
 
     def __iter__(self):
         """
@@ -42,7 +44,7 @@ class CachedCountries(Countries):
         django-countries performs a unicode-aware sorting based on pyuca which is incredibly
         slow.
         """
-        cache_key = "countries:all:{}".format(get_language_without_region())
+        cache_key = "countries:all:{}:{}".format(get_language_without_region(), self.common_names)
         if self.cache_subkey:
             cache_key += ":" + self.cache_subkey
         if cache_key in self._cached_lists:
@@ -60,6 +62,33 @@ class CachedCountries(Countries):
         cache.set(cache_key, val, 3600 * 24 * 30)
         yield from val
 
+    def translate_pair(self, code: str, name=None):
+        # We need to temporarily override this function until
+        # https://github.com/SmileyChris/django-countries/issues/364
+        # is fixed
+        if name is None:
+            name = self.countries[code]
+        if isinstance(name, dict):
+            if "names" in name:
+                country_name: str = name["names"][0]
+            else:
+                country_name = name["name"]
+        else:
+            country_name = name
+        country_name = force_str(country_name)
+        return CountryTuple(code, country_name)
+
+
+class CachedCountriesOfficialNames(CachedCountries):
+    common_names = False
+
+
+def get_cached_countries_class(common_names=True):
+    if common_names:
+        return CachedCountries
+    else:
+        return CachedCountriesOfficialNames
+
 
 class FastCountryField(CountryField):
     def __init__(self, *args, **kwargs):

src/pretix/helpers/logs.py

@@ -21,49 +21,9 @@
 #
 import logging
 
-import sentry_sdk
-from django.core.signals import request_finished
-from django.dispatch import receiver
-
-try:
-    from asgiref.local import Local
-except ImportError:
-    from threading import local as Local
-
 from django.conf import settings
 
 
 class AdminExistsFilter(logging.Filter):
     def filter(self, record):
         return not settings.DEBUG and len(settings.ADMINS) > 0
-
-
-local = Local()
-
-
-class RequestIdFilter(logging.Filter):
-    def filter(self, record):
-        record.request_id = getattr(local, 'request_id', None)
-        return True
-
-
-class RequestIdMiddleware:
-    def __init__(self, get_response):
-        self.get_response = get_response
-
-    def __call__(self, request):
-        if settings.REQUEST_ID_HEADER and settings.REQUEST_ID_HEADER in request.headers:
-            local.request_id = request.request_id = request.headers[settings.REQUEST_ID_HEADER]
-
-            if settings.SENTRY_ENABLED:
-                sentry_sdk.set_tag("request_id", request.request_id)
-        else:
-            local.request_id = request.request_id = None
-
-        return self.get_response(request)
-
-
-@receiver(request_finished)
-def on_request_finished(sender, **kwargs):
-    # not part of middleware, since things could be logged after the middleware stack is finished
-    local.request_id = None

src/pretix/helpers/safe_openpyxl.py

@@ -74,30 +74,7 @@ def SafeCell(*args, value=None, **kwargs):
     return c
 
 
-class SafeWriteOnlyWorksheet(WriteOnlyWorksheet):
-    def append(self, row):
-        if not isgenerator(row) and not isinstance(row, (list, tuple, range)):
-            self._invalid_row(row)
-
-        self._get_writer()
-
-        if self._rows is None:
-            self._rows = self._write_rows()
-            next(self._rows)
-
-        filtered_row = []
-        for content in row:
-            if isinstance(content, Cell):
-                filtered_row.append(content)
-            else:
-                filtered_row.append(
-                    SafeCell(self, row=1, column=1, value=remove_invalid_excel_chars(content))
-                )
-
-        self._rows.send(filtered_row)
-
-
-class SafeWorksheet(Worksheet):
+class SafeAppendMixin:
     def append(self, iterable):
         row_idx = self._current_row + 1
 
@@ -128,16 +105,21 @@ class SafeWorksheet(Worksheet):
         self._current_row = row_idx
 
 
+class SafeWriteOnlyWorksheet(SafeAppendMixin, WriteOnlyWorksheet):
+    pass
+
+
+class SafeWorksheet(SafeAppendMixin, Worksheet):
+    pass
+
+
 class SafeWorkbook(Workbook):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if self._sheets:
             # monkeypatch existing sheets
             for s in self._sheets:
-                if self.write_only:
-                    s.append = SafeWriteOnlyWorksheet.append
-                else:
-                    s.append = SafeWorksheet.append
+                s.append = SafeAppendMixin.append
 
     def create_sheet(self, title=None, index=None):
         if self.read_only:

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2021-09-15 11:22+0000\n"
 "Last-Translator: Mohamed Tawfiq <mtawfiq@wafyapp.com>\n"
 "Language-Team: Arabic <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -643,32 +643,32 @@ msgstr[3] "سيتم حجز العناصر لك في سلة التسوق لعدة
 msgstr[4] "سيتم حجز العناصر لك في سلة التسوق لدقائق {num}."
 msgstr[5] "سيتم حجز العناصر لك في سلة التسوق لمدة {num}."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "يحصل المنظم على %(currency) %(amount)"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr "ستسترد %(currency)%(amount)"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr "الرجاء إدخال المبلغ الذي يمكن للمنظم الاحتفاظ به."
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "الرجاء إدخال عدد لأحد أنواع التذاكر."
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 msgid "required"
 msgstr "مطلوب"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr "المنطقة الزمنية:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr "التوقيت المحلي:"
 

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2020-12-19 07:00+0000\n"
 "Last-Translator: albert <albert.serra.monner@gmail.com>\n"
 "Language-Team: Catalan <https://translate.pretix.eu/projects/pretix/pretix-"
@@ -616,34 +616,34 @@ msgid_plural "The items in your cart are reserved for you for {num} minutes."
 msgstr[0] "El contingut de la cistella ja no el teniu reservat."
 msgstr[1] "El contingut de la cistella ja no el teniu reservat."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 #, fuzzy
 #| msgid "Cart expired"
 msgid "required"
 msgstr "Cistella expirada"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr ""
 

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2021-12-06 23:00+0000\n"
 "Last-Translator: Ondřej Sokol <osokol@treesoft.cz>\n"
 "Language-Team: Czech <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -636,32 +636,32 @@ msgstr[1] ""
 msgstr[2] ""
 "Produkty v nákupním košíku jsou pro vás rezervovány na dalších {num} minut."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "Organizátor si ponechává %(currency)s %(amount)s"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr "Dostanete %(currency)s %(amount)s zpět"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr "Zadejte částku, kterou si organizátor může ponechat."
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "Zadejte prosím množství pro jeden z typů vstupenek."
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 msgid "required"
 msgstr "povinný"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr "Časové pásmo:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr "Místní čas:"
 

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

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-04-01 13:36+0000\n"
 "Last-Translator: Anna-itk <abc@aarhus.dk>\n"
 "Language-Team: Danish <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -665,40 +665,40 @@ msgid_plural "The items in your cart are reserved for you for {num} minutes."
 msgstr[0] "Varerne i din kurv er reserveret for dig i et minut."
 msgstr[1] "Varerne i din kurv er reserveret for dig i {num} minutter."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 #, fuzzy
 #| msgctxt "widget"
 #| msgid "from %(currency)s %(price)s"
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "fra %(currency)s %(price)s"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 #, fuzzy
 #| msgctxt "widget"
 #| msgid "from %(currency)s %(price)s"
 msgid "You get %(currency)s %(amount)s back"
 msgstr "fra %(currency)s %(price)s"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 #, fuzzy
 #| msgid "Cart expired"
 msgid "required"
 msgstr "Kurv udløbet"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr "Tidszone:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr "Din lokaltid:"
 

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-07-26 08:58+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -638,32 +638,32 @@ msgstr[0] ""
 msgstr[1] ""
 "Die Produkte in Ihrem Warenkorb sind noch {num} Minuten für Sie reserviert."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "Der Veranstalter behält %(currency)s %(amount)s ein"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr "Sie erhalten %(currency)s %(amount)s zurück"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr "Bitte geben Sie den Betrag ein, den der Veranstalter einbehalten darf."
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "Bitte tragen Sie eine Menge für eines der Produkte ein."
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 msgid "required"
 msgstr "verpflichtend"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr "Zeitzone:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr "Deine lokale Zeit:"
 

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-07-26 08:58+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German (informal) <https://translate.pretix.eu/projects/"
@@ -637,32 +637,32 @@ msgstr[0] ""
 msgstr[1] ""
 "Die Produkte in deinem Warenkorb sind noch {num} Minuten für dich reserviert."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "Der Veranstalter behält %(currency)s %(amount)s ein"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr "Du erhältst %(currency)s %(amount)s zurück"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr "Bitte gib den Betrag ein, den der Veranstalter einbehalten darf."
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "Bitte trage eine Menge für eines der Produkte ein."
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 msgid "required"
 msgstr "verpflichtend"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr "Zeitzone:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr "Deine lokale Zeit:"
 

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: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+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"
@@ -611,32 +611,32 @@ msgid_plural "The items in your cart are reserved for you for {num} minutes."
 msgstr[0] ""
 msgstr[1] ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 msgid "required"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr ""
 

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2019-10-03 19:00+0000\n"
 "Last-Translator: Chris Spy <chrispiropoulou@hotmail.com>\n"
 "Language-Team: Greek <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -677,40 +677,40 @@ msgid_plural "The items in your cart are reserved for you for {num} minutes."
 msgstr[0] "Τα είδη στο καλάθι θα παραμείνουν δεσμευμένα για ένα λεπτό."
 msgstr[1] "Τα είδη στο καλάθι θα παραμείνουν δεσμευμένα για {num} λεπτά."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 #, fuzzy
 #| msgctxt "widget"
 #| msgid "from %(currency)s %(price)s"
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "απο %(currency)s %(price)s"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 #, fuzzy
 #| msgctxt "widget"
 #| msgid "from %(currency)s %(price)s"
 msgid "You get %(currency)s %(amount)s back"
 msgstr "απο %(currency)s %(price)s"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "Εισαγάγετε μια ποσότητα για έναν από τους τύπους εισιτηρίων."
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 #, fuzzy
 #| msgid "Cart expired"
 msgid "required"
 msgstr "Το καλάθι έληξε"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr ""
 

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2021-11-25 21:00+0000\n"
 "Last-Translator: Ismael Menéndez Fernández <ismael.menendez@balidea.com>\n"
 "Language-Team: Spanish <https://translate.pretix.eu/projects/pretix/pretix-"
@@ -637,32 +637,32 @@ msgstr[0] ""
 msgstr[1] ""
 "Los elementos en su carrito de compras se han reservado por {num} minutos."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "El organizador se queda %(currency)s %(price)s"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr "Obtienes %(currency)s %(price)s de vuelta"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr "Por favor, ingrese el monto que el organizador puede quedarse."
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "Por favor, introduzca un valor para cada tipo de entrada."
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 msgid "required"
 msgstr "campo requerido"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr "Zona horaria:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr "Su hora local:"
 

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2021-11-10 05:00+0000\n"
 "Last-Translator: Jaakko Rinta-Filppula <jaakko@r-f.fi>\n"
 "Language-Team: Finnish <https://translate.pretix.eu/projects/pretix/pretix-"
@@ -636,34 +636,34 @@ msgid_plural "The items in your cart are reserved for you for {num} minutes."
 msgstr[0] "Ostoskorissasi olevat tuotteet eivät ole enää varattu sinulle."
 msgstr[1] "Ostoskorissasi olevat tuotteet eivät ole enää varattu sinulle."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 #, fuzzy
 #| msgid "Cart expired"
 msgid "required"
 msgstr "Ostoskori on vanhentunut"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr "Aikavyöhyke:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr ""
 

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

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: French\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-04-07 10:40+0000\n"
 "Last-Translator: Eva-Maria Obermann <obermann@rami.io>\n"
 "Language-Team: French <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -665,40 +665,40 @@ msgid_plural "The items in your cart are reserved for you for {num} minutes."
 msgstr[0] "Les articles de votre panier sont réservés pour une minute."
 msgstr[1] "Les articles de votre panier sont réservés pendant {num} minutes."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 #, fuzzy
 #| msgctxt "widget"
 #| msgid "from %(currency)s %(price)s"
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "de %(currency)s %(price)s"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 #, fuzzy
 #| msgctxt "widget"
 #| msgid "from %(currency)s %(price)s"
 msgid "You get %(currency)s %(amount)s back"
 msgstr "de %(currency)s %(price)s"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "SVP entrez une quantité pour un de vos types de billets."
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 #, fuzzy
 #| msgid "Cart expired"
 msgid "required"
 msgstr "Panier expiré"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr ""
 

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-02-22 22:00+0000\n"
 "Last-Translator: Ismael Menéndez Fernández <ismael.menendez@balidea.com>\n"
 "Language-Team: Galician <https://translate.pretix.eu/projects/pretix/pretix-"
@@ -634,32 +634,32 @@ msgstr[0] "Os artigos da túa cesta están reservados para ti durante un minuto.
 msgstr[1] ""
 "Os artigos da túa cesta están reservados para ti durante {num} minutos."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "O organizador queda %(currency)s %(price)s"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr "Obtés %(currency)s %(price)s de volta"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr "Por favor, ingrese a cantidade que pode conservar o organizador."
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "Por favor, introduza un valor para cada tipo de entrada."
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 msgid "required"
 msgstr "campo requirido"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr "Zona horaria:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr "A súa hora local:"
 

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2021-09-24 13:54+0000\n"
 "Last-Translator: ofirtro <ofir.tro@gmail.com>\n"
 "Language-Team: Hebrew <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -619,32 +619,32 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 msgid "required"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr ""
 

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2020-01-24 08:00+0000\n"
 "Last-Translator: Prokaj Miklós <mixolid0@gmail.com>\n"
 "Language-Team: Hungarian <https://translate.pretix.eu/projects/pretix/pretix-"
@@ -665,40 +665,40 @@ msgid_plural "The items in your cart are reserved for you for {num} minutes."
 msgstr[0] "A kosár tartalma egy percig foglalva van számodra."
 msgstr[1] "A kosár tartalma {num} percig foglalva van számodra."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 #, fuzzy
 #| msgctxt "widget"
 #| msgid "from %(currency)s %(price)s"
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "%(currency) %(price)-tól"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 #, fuzzy
 #| msgctxt "widget"
 #| msgid "from %(currency)s %(price)s"
 msgid "You get %(currency)s %(amount)s back"
 msgstr "%(currency) %(price)-tól"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "Adjon meg egy mennyiséget az egyik jegytípusból."
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 #, fuzzy
 #| msgid "Cart expired"
 msgid "required"
 msgstr "A kosár lejárt"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr ""
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr ""
 

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-05-08 19:00+0000\n"
 "Last-Translator: Emanuele Signoretta <signorettae@gmail.com>\n"
 "Language-Team: Italian <https://translate.pretix.eu/projects/pretix/pretix-"
@@ -632,32 +632,32 @@ msgid_plural "The items in your cart are reserved for you for {num} minutes."
 msgstr[0] "Gli elementi nel tuo carrello sono riservati per 1 minuto."
 msgstr[1] "Gli elementi nel tuo carrello sono riservati per {num} minuti."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "L'organizzatore trattiene %(currency)s %(amount)s"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr "Ricevi indietro %(currency)s %(amount)s"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr "Inserisci l'importo che l'organizzatore può trattenere."
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "Inserisci la quantità per una tipologia di biglietto."
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 msgid "required"
 msgstr "richiesto"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr "Fuso orario:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr "Ora locale:"
 

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-03-15 00:00+0000\n"
 "Last-Translator: Yuriko Matsunami <y.matsunami@enobyte.com>\n"
 "Language-Team: Japanese <https://translate.pretix.eu/projects/pretix/pretix-"
@@ -627,32 +627,32 @@ 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] "カート内の商品の予約は {num} 分以内に完了します。"
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "主催者には%(currency)s %(amount)sが与えられます"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr "%(currency)s %(amount)s が払い戻されます"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr "イベント開催者が受け取る料金を入力してください。"
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "商品の総数を入力してください。"
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 msgid "required"
 msgstr "必須"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr "タイムゾーン："
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr "現地時間："
 

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-04-06 03:00+0000\n"
 "Last-Translator: Liga V <lerning_by_dreaming@gmx.de>\n"
 "Language-Team: Latvian <https://translate.pretix.eu/projects/pretix/pretix-"
@@ -638,32 +638,32 @@ msgstr[0] "Preces jūsu grozā ir rezervētas nulle minūtes."
 msgstr[1] "Preces jūsu grozā ir rezervētas vienu minūti."
 msgstr[2] "Preces jūsu grozā ir rezervētas uz {num} minūtēm."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "Pasākuma organizators patur %(valūta)s %(skaits)s"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr "Jūs saņemsiet %(valūta)s %(cena)s atpakaļ"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr "Lūdzu ievadiet skaitu (summu), ko pasākuma organizators var paturēt."
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "Lūdzu, ievadiet nepieciešamo daudzumu izvēlētajam biļešu veidam."
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 msgid "required"
 msgstr "obligāts"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr "Laika zona:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr "Vietējais laiks:"
 

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2022-06-20 02:00+0000\n"
 "Last-Translator: fyksen <fredrik@fyksen.me>\n"
 "Language-Team: Norwegian Bokmål <https://translate.pretix.eu/projects/pretix/"
@@ -624,32 +624,32 @@ msgid_plural "The items in your cart are reserved for you for {num} minutes."
 msgstr[0] "Varene i handlekurven din er reservert for deg i ett minutt."
 msgstr[1] "Varene i handlekurven din er reservert for deg i {num} minutter."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "Arrangøren beholder %(currency)s %(beløp)"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr "Du mottar %(currency)s %(amount)s tilbake"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr "Vennligst skriv inn beløpet arrangøren kan beholde."
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "Vennligst skriv inn et antall for en av billetttypene."
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 msgid "required"
 msgstr "nødvendig"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr "Tidssone:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr "Din lokale tid:"
 

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

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-26 18:57+0000\n"
+"POT-Creation-Date: 2022-09-19 16:32+0000\n"
 "PO-Revision-Date: 2021-10-29 02:00+0000\n"
 "Last-Translator: Maarten van den Berg <maartenberg1@gmail.com>\n"
 "Language-Team: Dutch <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -630,32 +630,32 @@ msgstr[0] "De items in uw winkelwagen zijn nog één minuut voor u gereserveerd.
 msgstr[1] ""
 "De items in uw winkelwagen zijn nog {num} minuten voor u gereserveerd."
 
-#: pretix/static/pretixpresale/js/ui/main.js:152
+#: pretix/static/pretixpresale/js/ui/main.js:144
 msgid "The organizer keeps %(currency)s %(amount)s"
 msgstr "De organisator houdt %(currency)s %(amount)s"
 
-#: pretix/static/pretixpresale/js/ui/main.js:160
+#: pretix/static/pretixpresale/js/ui/main.js:152
 msgid "You get %(currency)s %(amount)s back"
 msgstr "U krijgt %(currency)s %(amount)s terug"
 
-#: pretix/static/pretixpresale/js/ui/main.js:176
+#: pretix/static/pretixpresale/js/ui/main.js:168
 msgid "Please enter the amount the organizer can keep."
 msgstr "Voer het bedrag in dat de organisator mag houden."
 
-#: pretix/static/pretixpresale/js/ui/main.js:388
+#: pretix/static/pretixpresale/js/ui/main.js:380
 msgid "Please enter a quantity for one of the ticket types."
 msgstr "Voer een hoeveelheid voor een van de producten in."
 
-#: pretix/static/pretixpresale/js/ui/main.js:424
+#: pretix/static/pretixpresale/js/ui/main.js:416
 msgid "required"
 msgstr "verplicht"
 
-#: pretix/static/pretixpresale/js/ui/main.js:527
-#: pretix/static/pretixpresale/js/ui/main.js:546
+#: pretix/static/pretixpresale/js/ui/main.js:519
+#: pretix/static/pretixpresale/js/ui/main.js:538
 msgid "Time zone:"
 msgstr "Tijdzone:"
 
-#: pretix/static/pretixpresale/js/ui/main.js:537
+#: pretix/static/pretixpresale/js/ui/main.js:529
 msgid "Your local time:"
 msgstr "Uw lokale tijd:"